Merge remote-tracking branch 'origin/master' into dev

oxygine/src/oxygine/Draggable.h

@@ -41,18 +41,22 @@ namespace oxygine
         void onDrag(TouchEvent* es);
         void onMove(const Vector2& position);
 
-        Actor* _dragClient;
-        Actor* _actor;
-        timeMS _startTm;
-        bool _singleDrag;
-
         RectF _bounds;
         Vector2 _dragPos;
         Vector2 _clientPos;
+        
+        Actor* _dragClient;
+        Actor* _actor;
+        timeMS _startTm;
 
         bool _clientIsParent;
-        bool _pressed;
         bool _dragEnabled;
+        bool _pressed;
+        bool _singleDrag;
         bool _ignoreTouchUp;
+        
+
+
+
     };
 }

oxygine/src/oxygine/Event.h

@@ -21,15 +21,15 @@ namespace oxygine
         Event(eventType Type, bool Bubbles = false) : listenerID(0), userData(0), type(Type), phase(phase_target), bubbles(Bubbles), stopsImmediatePropagation(false), stopsPropagation(false) {}
         virtual ~Event() {}
 
+        int listenerID;
+        void* userData;
         eventType type;
         Phase phase;
         bool bubbles;
         bool stopsImmediatePropagation;
         bool stopsPropagation;
 
-        void* userData;
         spObject userDataObject;
-        int listenerID;
 
         /**The event target*/
         spEventDispatcher target;

oxygine/src/oxygine/HttpRequestTask.h

@@ -92,7 +92,6 @@ namespace oxygine
 
         std::string _url;
         std::string _fname;
-        file::handle _fhandle;
         bool _writeFileError;
         bool _cacheEnabled;
         bool _firstTimeProgressDispatched;
@@ -104,18 +103,18 @@ namespace oxygine
         std::vector<unsigned char> _response;
         std::vector<unsigned char> _postData;
 
-        responseCodeChecker _responseCodeChecker;
-
+        bool _continueDownload;
+        
+        size_t _expectedContentSize;
+        size_t _receivedContentSize;
+        file::handle _fhandle;
         bool _suitableResponse;
+        responseCodeChecker _responseCodeChecker;
 
         int _responseCode;
-        size_t _expectedContentSize;
-        size_t _receivedContentSize;
 
         spObject _object;
 
-        bool _continueDownload;
-
         typedef std::vector< std::pair<std::string, std::string> >  headers;
         headers _headers;
     };

oxygine/src/oxygine/TextStyle.h

@@ -44,15 +44,12 @@ namespace oxygine
 
         int linesOffset;//vertical distance offset between lines
         int kerning;//horizontal distance
-        size_t options;//additional flags could be used for generating custom glyphs
         bool multiline;
+        int fontSize;
         bool breakLongWords;//works with multiline flag. breakLongWords = false doesn't allow to break too long words
         Color color;
-
-        int fontSize;
         float baselineScale;//baseline distance multiplier
-
-
+        size_t options;//additional flags could be used for generating custom glyphs
 
         TextStyle withFont(const ResFont* f) const { TextStyle st = *this; st.font = f; return st; }
 

oxygine/src/oxygine/TouchEvent.h

@@ -31,18 +31,18 @@ namespace oxygine
         /**position in local space for Event::target actor*/
         Vector2 position;
 
+        MouseButton mouseButton;
         float pressure;
 
-        MouseButton mouseButton;
         pointer_index index;
 
-        Vector2 wheelDirection;//actual only for WHEEL_DIR event
-
         const PointerState* getPointer() const;
 
         static bool isTouchEvent(int eventID) { return eventID > __FIRST && eventID < __LAST; }
 
         bool __clickDispatched;
+        Vector2 wheelDirection;//actual only for WHEEL_DIR event
+        
         float __localScale;
     };
 }

oxygine/src/oxygine/actor/Button.h

@@ -31,10 +31,10 @@ namespace oxygine
         };
         virtual void updateButtonState(state s);
 
+        state _state;
         const ResAnim* _resAnim;
         int _row;
-        state _state;
-
+        
     private:
         pointer_index _btnPressed;
         pointer_index _btnOvered;

oxygine/src/oxygine/actor/DebugActor.h

@@ -48,9 +48,8 @@ namespace oxygine
         std::string _debugText;
         std::vector<int> _frameTime;
 
-
-        bool _showTouchedActor;
         bool _showTexel2PixelErrors;
+        bool _showTouchedActor;
 
         bool _dragging;
         Vector2 _local;

oxygine/src/oxygine/actor/SlidingActor.h

@@ -57,13 +57,14 @@ namespace oxygine
         void doUpdate(const UpdateState& us)  override;
         void updateDragBounds();
 
-
         void _newEvent(Event* event);
 
         bool _sliding;
         float _rad;
         float _maxSpeed;
         timeMS _downTime;
+        
+        bool _ignoreTouchUp;
 
         Vector2 _downPos;
         Vector2 _speed;
@@ -88,8 +89,6 @@ namespace oxygine
 
         timeMS _lastIterTime;
         pointer_index _finger;
-
-        bool _ignoreTouchUp;
     };
 }
 

oxygine/src/oxygine/core/VertexDeclaration.h

@@ -10,9 +10,8 @@ namespace oxygine
         VertexDeclaration(): bformat(0), numElements(0), size(0) {}
 
         bvertex_format bformat;
-        int size;
-
         int numElements;
+        int size;
     };
 
     template <class T>

oxygine/src/oxygine/core/VideoDriver.h

@@ -29,7 +29,7 @@ namespace oxygine
         class Stats
         {
         public:
-            Stats() : batches(0), duration(0), start(0) { memset(elements, 0, sizeof(elements)); }
+            Stats() : batches(0), start(0), duration(0) { memset(elements, 0, sizeof(elements)); }
             int batches;
             int elements[PT_COUNT];
             timeMS start;

oxygine/src/oxygine/core/gl/oxgl.cpp

@@ -64,6 +64,8 @@ extern "C"
     {}
     GLAPI void APIENTRY def_glUniform3fv(GLint location, GLsizei count, const GLfloat* value)
     {}
+    GLAPI void APIENTRY def_glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
+    {}
     GLAPI void APIENTRY def_glUniform4fv(GLint location, GLsizei count, const GLfloat* value)
     {}
     GLAPI void APIENTRY def_glUniform1f(GLint location, GLfloat v0)
@@ -90,6 +92,8 @@ extern "C"
     {}
     GLAPI void APIENTRY def_glBufferData(GLenum target, GLsizeiptr size, const void* data, GLenum usage)
     {}
+    GLAPI void APIENTRY def_glDrawBuffers( 	GLsizei n,const GLenum *bufs)
+    {}
     GLAPI void APIENTRY def_glGetProgramiv(GLuint program, GLenum pname, GLint* params)
     {}
     GLAPI void APIENTRY def_glGenerateMipmap(GLenum target)
@@ -143,6 +147,7 @@ extern "C"
     PFNGLUNIFORM2FPROC _glUniform2f = 0;
     PFNGLUNIFORM2FVPROC _glUniform2fv = 0;
     PFNGLUNIFORM3FVPROC _glUniform3fv = 0;
+    PFNGLUNIFORM3FPROC _glUniform3f = 0;
     PFNGLUNIFORM4FVPROC _glUniform4fv = 0;
     PFNGLUNIFORM1FPROC _glUniform1f = 0;
     PFNGLUNIFORMMATRIX4FVPROC _glUniformMatrix4fv = 0;
@@ -156,6 +161,7 @@ extern "C"
     PFNGLBINDBUFFERPROC _glBindBuffer = 0;
     PFNGLGENBUFFERSPROC _glGenBuffers = 0;
     PFNGLBUFFERDATAPROC _glBufferData = 0;
+    PFNGLDRAWBUFFERSPROC _glDrawBuffers = 0;
     PFNGLGETPROGRAMIVPROC _glGetProgramiv = 0;
     PFNGLGENERATEMIPMAPPROC _glGenerateMipmap = 0;
     PFNGLSTENCILOPSEPARATEPROC _glStencilOpSeparate = 0;
@@ -202,6 +208,7 @@ int initGLExtensions(myGetProcAdress func)
     GETFUNC(_glUniform2f, def_glUniform2f, PFNGLUNIFORM2FPROC, "glUniform2f");
     GETFUNC(_glUniform2fv, def_glUniform2fv, PFNGLUNIFORM2FVPROC, "glUniform2fv");
     GETFUNC(_glUniform3fv, def_glUniform3fv, PFNGLUNIFORM3FVPROC, "glUniform3fv");
+    GETFUNC(_glUniform3f, def_glUniform3f, PFNGLUNIFORM3FPROC, "glUniform3f");
     GETFUNC(_glUniform4fv, def_glUniform4fv, PFNGLUNIFORM4FVPROC, "glUniform4fv");
     GETFUNC(_glUniform1f, def_glUniform1f, PFNGLUNIFORM1FPROC, "glUniform1f");
     GETFUNC(_glUniformMatrix4fv, def_glUniformMatrix4fv, PFNGLUNIFORMMATRIX4FVPROC, "glUniformMatrix4fv");
@@ -215,6 +222,7 @@ int initGLExtensions(myGetProcAdress func)
     GETFUNC(_glBindBuffer, def_glBindBuffer, PFNGLBINDBUFFERPROC, "glBindBuffer");
     GETFUNC(_glGenBuffers, def_glGenBuffers, PFNGLGENBUFFERSPROC, "glGenBuffers");
     GETFUNC(_glBufferData, def_glBufferData, PFNGLBUFFERDATAPROC, "glBufferData");
+	GETFUNC(_glDrawBuffers, def_glDrawBuffers, PFNGLDRAWBUFFERSPROC, "glDrawBuffers");
     GETFUNC(_glGetProgramiv, def_glGetProgramiv, PFNGLGETPROGRAMIVPROC, "glGetProgramiv");
     GETFUNC(_glGenerateMipmap, def_glGenerateMipmap, PFNGLGENERATEMIPMAPPROC, "glGenerateMipmap");
     GETFUNC(_glStencilOpSeparate, def_glStencilOpSeparate, PFNGLSTENCILOPSEPARATEPROC, "glStencilOpSeparate");

oxygine/src/oxygine/core/gl/oxgl.h

@@ -38,6 +38,7 @@ extern "C"
     extern PFNGLUNIFORM2FPROC _glUniform2f;
     extern PFNGLUNIFORM2FVPROC _glUniform2fv;
     extern PFNGLUNIFORM3FVPROC _glUniform3fv;
+    extern PFNGLUNIFORM3FPROC _glUniform3f;
     extern PFNGLUNIFORM4FVPROC _glUniform4fv;
     extern PFNGLUNIFORM1FPROC _glUniform1f;
     extern PFNGLUNIFORMMATRIX4FVPROC _glUniformMatrix4fv;
@@ -50,6 +51,7 @@ extern "C"
     extern PFNGLCOMPRESSEDTEXIMAGE2DPROC _glCompressedTexImage2D;
     extern PFNGLBINDBUFFERPROC _glBindBuffer;
     extern PFNGLGENBUFFERSPROC _glGenBuffers;
+    extern PFNGLDRAWBUFFERSPROC _glDrawBuffers;
     extern PFNGLBUFFERDATAPROC _glBufferData;
     extern PFNGLGETPROGRAMIVPROC _glGetProgramiv;
     extern PFNGLGENERATEMIPMAPPROC _glGenerateMipmap;
@@ -142,6 +144,7 @@ extern "C"
 #define oxglUniform2f DECLARE_GLEXT(glUniform2f)
 #define oxglUniform2fv DECLARE_GLEXT(glUniform2fv)
 #define oxglUniform3fv DECLARE_GLEXT(glUniform3fv)
+#define oxglUniform3f DECLARE_GLEXT(glUniform3f)
 #define oxglUniform4fv DECLARE_GLEXT(glUniform4fv)
 #define oxglUniform1f DECLARE_GLEXT(glUniform1f)
 #define oxglUniformMatrix4fv DECLARE_GLEXT(glUniformMatrix4fv)
@@ -155,6 +158,7 @@ extern "C"
 #define oxglBindBuffer DECLARE_GLEXT(glBindBuffer)
 #define oxglGenBuffers DECLARE_GLEXT(glGenBuffers)
 #define oxglBufferData DECLARE_GLEXT(glBufferData)
+#define oxglDrawBuffers DECLARE_GLEXT(glDrawBuffers)
 #define oxglGetProgramiv DECLARE_GLEXT(glGetProgramiv)
 #define oxglGenerateMipmap DECLARE_GLEXT(glGenerateMipmap)
 #define oxglStencilOpSeparate DECLARE_GLEXT(glStencilOpSeparate)

oxygine/src/oxygine/core/oxygine.cpp

@@ -405,7 +405,7 @@ namespace oxygine
             file::init(desc.companyName, desc.appName);
 
 #ifdef OXYGINE_SDL
-            int missing = initGLExtensions(SDL_GL_GetProcAddress);
+            initGLExtensions(SDL_GL_GetProcAddress);
 #endif
 
             Point size = getDisplaySize();

oxygine/src/oxygine/dev_tools/TreeInspector.h

@@ -42,10 +42,10 @@ namespace oxygine
         void close(Event* ev);
         void wheel(Event* ev);
 
-        Resources* _resSystem;
-
         TreeInspectorPreview* _preview;
 
+        Resources* _resSystem;
+
         spTreeInspectorPage _rootPage;
         spSlidingActor _sliding;
 

oxygine/src/oxygine/initActor.h

@@ -76,12 +76,12 @@ namespace oxygine
 
         class animFrame
         {
-            const ResAnim* _resAnim;
             int _col;
             int _row;
+            const ResAnim* _resAnim;
+            bool _useResAnim;
             bool _managed;
             AnimationFrame _frame;
-            bool _useResAnim;
 
         public:
             animFrame(bool managed, int col, int row): _col(col), _row(row), _resAnim(0), _useResAnim(true), _managed(managed) {}

oxygine/src/oxygine/res/CreateResourceContext.h

@@ -66,11 +66,10 @@ namespace oxygine
         }
 
         Resources* resources;
-        XmlWalker walker;
-
         const std::string* xml_name;
         const std::string* prebuilt_folder;
         const ResourcesLoadOptions* options;
+        XmlWalker walker;
     };
 
     DECLARE_SMART(Image, spImage);