fixed warnings

examples/Demo/src/TestOpenGL.h

@@ -17,7 +17,7 @@ public:
 
     int _program;
 
-    OpenGLSprite() 
+    OpenGLSprite()
     {
         const char* vertexShaderData = "\
 									uniform mediump mat4 projection;\
@@ -68,7 +68,7 @@ public:
         CHECKGL();
     }
 
-    ~OpenGLSprite() 
+    ~OpenGLSprite()
     {
         oxglDeleteProgram(_program);
     }
@@ -107,8 +107,8 @@ public:
         CHECKGL();
 
         myVertex vertices[4];
-        myVertex *v = vertices;
-        
+        myVertex* v = vertices;
+
         v->pos = Vector3(-100, -100, 0);
         v->uv = srcRect.getLeftTop();
         ++v;
@@ -125,7 +125,7 @@ public:
         v->uv = srcRect.getLeftBottom();
         ++v;
 
-        
+
         oxglEnableVertexAttribArray(0);
         oxglVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(myVertex), vertices);
 
@@ -135,7 +135,7 @@ public:
 
 
         glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-    
+
 
         oxglDisableVertexAttribArray(0);
         oxglDisableVertexAttribArray(1);
@@ -150,7 +150,7 @@ public:
     TestOpenGL()
     {
         spOpenGLSprite sprite = new OpenGLSprite;
-        sprite->setPosition(getStage()->getSize()/2);
+        sprite->setPosition(getStage()->getSize() / 2);
         sprite->setScale(3);
         content->addChild(sprite);
     }

oxygine/src/Actor.h

@@ -42,9 +42,11 @@ namespace oxygine
     class Actor: public EventDispatcher, public intrusive_list_item<spActor>, public Serializable
     {
         typedef intrusive_list_item<spActor> intr_list;
-    public:
 
-        DECLARE_COPYCLONE_NEW2(Actor);
+    public:
+        Actor(const Actor& src, cloneOptions opt = 0);
+        virtual Actor* clone(cloneOptions opt = 0) const;
+        void copyFrom(const Actor& src, cloneOptions opt = 0);
 
         Actor();
         virtual ~Actor();
@@ -210,7 +212,7 @@ namespace oxygine
         Actor* detach();
 
         /**Dispatches an event into the event flow. The event target is the EventDispatcher object upon which the dispatchEvent() method is called.*/
-        void dispatchEvent(Event* event);
+        void dispatchEvent(Event* event) override;
 
         virtual void updateStateOvered() {}
         virtual void updateStatePressed() {}
@@ -270,8 +272,8 @@ namespace oxygine
         typedef Property<unsigned char, unsigned char, Actor, &Actor::getAlpha, &Actor::setAlpha>               TweenAlpha;
 
 
-        void serialize(serializedata*);
-        void deserialize(const deserializedata*);
+        void serialize(serializedata*) override;
+        void deserialize(const deserializedata*) override;
 
         /**Returns detailed actor information. Used for debug purposes. */
         virtual std::string dump(const dumpOptions& opt) const;

oxygine/src/Box9Sprite.h

@@ -34,16 +34,16 @@ namespace oxygine
 
         bool isOn(const Vector2& localPosition, float localScale) override;
 
-        std::string dump(const dumpOptions&) const;
+        std::string dump(const dumpOptions&) const override;
 
-        void serialize(serializedata* data);
-        void deserialize(const deserializedata* data);
+        void serialize(serializedata* data) override;
+        void deserialize(const deserializedata* data) override;
 
-        virtual RectF getDestRect() const;
+        RectF getDestRect() const override;
 
     protected:
-        void sizeChanged(const Vector2& size);
-        void animFrameChanged(const AnimationFrame& f);
+        void sizeChanged(const Vector2& size)  override;
+        void animFrameChanged(const AnimationFrame& f) override;
         void changeAnimFrame(const AnimationFrame& f) override;
 
         bool _prepared;
@@ -61,7 +61,7 @@ namespace oxygine
 
         void prepare();
 
-        virtual void doRender(const RenderState& rs);
+        void doRender(const RenderState&) override;
     };
 }
 

oxygine/src/ClipRectActor.h

@@ -21,13 +21,13 @@ namespace oxygine
         /**Enables clipping for children. By default is on*/
         void setClipping(bool enable) {_clipping = enable;}
 
-        void render(const RenderState& rs);
+        void render(const RenderState& rs) override;
 
 
-        void handleEvent(Event* event);
+        void handleEvent(Event* event) override;
 
-        void serialize(serializedata* data);
-        void deserialize(const deserializedata* data);
+        void serialize(serializedata* data) override;
+        void deserialize(const deserializedata* data) override;
 
     protected:
 

oxygine/src/ColorRectSprite.h

@@ -14,10 +14,10 @@ namespace oxygine
         ColorRectSprite();
         ~ColorRectSprite();
 
-        void serialize(serializedata* data);
-        void deserialize(const deserializedata* data);
+        void serialize(serializedata* data) override;
+        void deserialize(const deserializedata* data) override;
 
-        void doRender(const RenderState& rs);
+        void doRender(const RenderState&) override;
 
         RectF getDestRect() const override { return Actor::getDestRect(); }
 

oxygine/src/DebugActor.cpp

@@ -366,8 +366,8 @@ namespace oxygine
 #endif
 
 #ifdef __ANDROID__
-        
-        
+
+
         auto info = mallinfo();
 
         s << "memory=" << info.uordblks / 1024 << "|" << info.fordblks / 1024 << "kb ";

oxygine/src/DebugActor.h

@@ -33,14 +33,14 @@ namespace oxygine
         void showTexel2PixelErrors(bool show);
 
     protected:
-        void onAdded2Stage();
-        void onRemovedFromStage();
+        void onAdded2Stage() override;
+        void onRemovedFromStage() override;
         void showDevMenu(spActor data);
         void _btnClicked(Event* ev);
 
 
-        void doUpdate(const UpdateState& us);
-        void render(RenderState const& parentRenderState);
+        void doUpdate(const UpdateState& us) override;
+        void render(const RenderState&) override;
         void addButton(float& x, const char* name, const char* anim);
     private:
 

oxygine/src/HttpRequestTask.h

@@ -56,7 +56,7 @@ namespace oxygine
         void setSuccessOnAnyResponseCode(bool en) { _successOnAnyResponceCode = en; }
 
     protected:
-        void _prerun();
+        void _prerun() override;
         void _onError() override;
         void _onComplete() override;
         void _dispatchComplete() override;
@@ -64,7 +64,7 @@ namespace oxygine
         //async
         void progress(int loaded, int total);
 
-        void _onCustom(const ThreadDispatcher::message& msg);
+        void _onCustom(const ThreadDispatcher::message& msg) override;
         void dispatchProgress(int loaded, int total);
 
         virtual void _setFileName(const std::string& name) {}

oxygine/src/MaskedSprite.h

@@ -19,12 +19,12 @@ namespace oxygine
 
         void setMask(spSprite, bool useRChannel = false);
 
-        void serialize(serializedata* data);
-        void deserialize(const deserializedata* data);
-        void deserializeLink(const deserializeLinkData*);
+        void serialize(serializedata* data) override;
+        void deserialize(const deserializedata* data) override;
+        void deserializeLink(const deserializeLinkData*) override;
 
     protected:
-        void render(const RenderState& parentRS);
+        void render(const RenderState& parentRS) override;
 
     private:
         spSprite _mask;

oxygine/src/Polygon.h

@@ -19,13 +19,13 @@ namespace oxygine
         */
         void setVertices(const void* data, int size, int bformat, bool own);
 
-        void serialize(serializedata* data);
-        void deserialize(const deserializedata* data);
+        void serialize(serializedata* data) override;
+        void deserialize(const deserializedata* data) override;
 
-        std::string dump(const dumpOptions&) const;
+        std::string dump(const dumpOptions&) const override;
 
     protected:
-        void doRender(const RenderState& rs);
+        void doRender(const RenderState&) override;
 
         const VertexDeclaration* _vdecl;
         bool _own;

oxygine/src/ProgressBar.h

@@ -36,19 +36,19 @@ namespace oxygine
         void setProgress(float value);
         void setDirection(direction dir);
 
-        std::string dump(const dumpOptions&) const;
+        std::string dump(const dumpOptions&) const override;
 
-        void serialize(serializedata* data);
-        void deserialize(const deserializedata* data);
+        void serialize(serializedata* data) override;
+        void deserialize(const deserializedata* data) override;
 
         typedef Property<float, float, ProgressBar, &ProgressBar::getProgress, &ProgressBar::setProgress> TweenProgress;
 
     private:
-        void doRender(const RenderState& rs);
+        void doRender(const RenderState&) override;
 
         virtual void _update();
 
-        void animFrameChanged(const AnimationFrame& f);
+        void animFrameChanged(const AnimationFrame& f) override;
 
         float _progress;
         direction _direction;

oxygine/src/STDRenderer.cpp

@@ -515,7 +515,7 @@ namespace oxygine
         _blend = blend_disabled;
     }
 
-    void STDRenderer::begin(spNativeTexture nt, const Rect *viewport)
+    void STDRenderer::begin(spNativeTexture nt, const Rect* viewport)
     {
         OX_ASSERT(!_drawing);
         OX_ASSERT(_prevRT == 0);

oxygine/src/STDRenderer.h

@@ -64,7 +64,7 @@ namespace oxygine
 
         /**Begins rendering into RenderTexture or into primary framebuffer if rt is null*/
         void begin(STDRenderer* prev = 0);
-        void begin(spNativeTexture nt, const Rect *viewport = 0);
+        void begin(spNativeTexture nt, const Rect* viewport = 0);
         /**Completes started rendering and restores previous Frame Buffer.*/
         void end();
         /**initializes View + Projection matrices where TopLeft is (0,0) and RightBottom is (width, height). use flipU = true for render to texture*/

oxygine/src/SlidingActor.h

@@ -46,16 +46,15 @@ namespace oxygine
         /**stop if sliding*/
         void stop();
 
-        void serialize(serializedata* data);
-        void deserialize(const deserializedata* data);
+        void serialize(serializedata* data) override;
+        void deserialize(const deserializedata* data) override;
 
     protected:
         void destroy();
 
-        void handleEvent(Event* event);
-
-        void sizeChanged(const Vector2& size);
-        void doUpdate(const UpdateState& us);
+        void handleEvent(Event* event) override;
+        void sizeChanged(const Vector2& size)  override;
+        void doUpdate(const UpdateState& us)  override;
         void updateDragBounds();
 
 

oxygine/src/Sprite.h

@@ -50,13 +50,13 @@ namespace oxygine
         void                    setFlippedY(bool flippedY);
         void                    setFlipped(bool flippedX, bool flippedY);
 
-        void serialize(serializedata* data);
-        void deserialize(const deserializedata* data);
+        void serialize(serializedata* data) override;
+        void deserialize(const deserializedata* data) override;
 
         typedef oxygine::TweenAnim TweenAnim;
-        std::string dump(const dumpOptions&) const;
+        std::string dump(const dumpOptions&) const override;
 
-        void doRender(const RenderState& rs);
+        void doRender(const RenderState&) override;
     protected:
         enum
         {

oxygine/src/Stage.h

@@ -43,10 +43,10 @@ namespace oxygine
 
         void cleanup();
 
-        RectF getDestRect() const;
+        RectF getDestRect() const override;
 
 
-        std::string dump(const dumpOptions& opt) const;
+        std::string dump(const dumpOptions& opt) const override;
 
 #if OXYGINE_SDL
         void associateWithWindow(SDL_Window* wnd);

oxygine/src/TextField.h

@@ -18,8 +18,8 @@ namespace oxygine
         TextField();
         ~TextField();
 
-        void serialize(serializedata* data);
-        void deserialize(const deserializedata* data);
+        void serialize(serializedata* data) override;
+        void deserialize(const deserializedata* data) override;
 
         /**Returns current text style*/
         const TextStyle&            getStyle() const {return _style;}
@@ -100,8 +100,8 @@ namespace oxygine
 
     public:
 
-        std::string dump(const dumpOptions& options) const;
-        void doRender(RenderState const& parentRenderState);
+        std::string dump(const dumpOptions& options) const override;
+        void doRender(const RenderState&) override;
 
         text::Node* getRootNode(float scale);
     protected:
@@ -120,7 +120,7 @@ namespace oxygine
 
 
         void needRebuild();
-        void sizeChanged(const Vector2& size);
+        void sizeChanged(const Vector2& size) override;
     };
 }
 

oxygine/src/TweenGlow.cpp

@@ -34,8 +34,8 @@ namespace oxygine
 
 
             RectF src(0, 0,
-            _pp._screen.getWidth() / (float)_pp._rt->getWidth() / _downsample,
-            _pp._screen.getHeight() / (float)_pp._rt->getHeight() / _downsample);
+                      _pp._screen.getWidth() / (float)_pp._rt->getWidth() / _downsample,
+                      _pp._screen.getHeight() / (float)_pp._rt->getHeight() / _downsample);
 
             RectF dest = _pp._screen.cast<RectF>();
 

oxygine/src/TweenOutline.cpp

@@ -26,8 +26,8 @@ namespace oxygine
             STDRenderer* renderer = mat->getRenderer();
 
             RectF src(0, 0,
-            _pp._screen.getWidth() / (float)_pp._rt->getWidth() / _downsample,
-            _pp._screen.getHeight() / (float)_pp._rt->getHeight() / _downsample);
+                      _pp._screen.getWidth() / (float)_pp._rt->getWidth() / _downsample,
+                      _pp._screen.getHeight() / (float)_pp._rt->getHeight() / _downsample);
 
             RectF dest = _pp._screen.cast<RectF>();
 

oxygine/src/VisualStyle.h

@@ -33,8 +33,8 @@ namespace oxygine
         DECLARE_COPYCLONE_NEW(VStyleActor);
         VStyleActor();
 
-        void serialize(serializedata* data);
-        void deserialize(const deserializedata* data);
+        void serialize(serializedata* data) override;
+        void deserialize(const deserializedata* data) override;
 
         blend_mode              getBlendMode() const {return _vstyle.getBlendMode();}
         const Color&            getColor() const;

oxygine/src/core/ThreadDispatcher.cpp

@@ -17,7 +17,7 @@ namespace oxygine
 #define  LOGDN(...)  ((void)0)
 
 #endif
-    
+
 
     MutexPthreadLock::MutexPthreadLock(pthread_mutex_t& m, bool lock) : _mutex(m), _locked(lock)
     {

oxygine/src/core/curl/HttpRequestCurlTask.cpp

@@ -245,7 +245,7 @@ namespace oxygine
         curl_easy_setopt(_easy, CURLOPT_PROGRESSDATA, this);
 #endif
         curl_easy_setopt(_easy, CURLOPT_FOLLOWLOCATION, true);
-        
+
 
 
         curl_easy_setopt(_easy, CURLOPT_SSL_VERIFYPEER, false);

oxygine/src/core/gl/VideoDriverGLES20.h

@@ -13,31 +13,31 @@ namespace oxygine
         VideoDriverGLES20();
         ~VideoDriverGLES20();
 
-        void reset();
-        void restore();
+        void reset() override;
+        void restore() override;
 
-        spNativeTexture createTexture();
+        spNativeTexture createTexture() override;
 
-        bool isReady() const;
+        bool isReady() const  override;
 
-        void begin(const Rect& viewport, const Color* clearColor);
-        void clear(const Color& color);
+        void begin(const Rect& viewport, const Color* clearColor) override;
+        void clear(const Color& color) override;
 
         ShaderProgram*  getShaderProgram() const override { return _p; }
 
-        void draw(PRIMITIVE_TYPE pt, const VertexDeclaration* decl, const void* verticesData, unsigned int verticesDataSize);
-        void draw(PRIMITIVE_TYPE pt, const VertexDeclaration* decl, const void* verticesData, unsigned int verticesDataSize, const unsigned short* indicesData, unsigned int numIndices);
-        void setDefaultSettings();
-
-        void setViewport(const Rect& viewport);
-        void setShaderProgram(ShaderProgram*);
-        void setTexture(int sampler, spNativeTexture);
-        void setUniformInt(const char* id, int v);
-        void setUniform(const char* id, const Vector4* v, int num);
-        void setUniform(const char* id, const Vector3* v, int num);
-        void setUniform(const char* id, const Vector2* v, int num);
-        void setUniform(const char* id, const Matrix* mat);
-        void setUniform(const char* id, float val);
+        void draw(PRIMITIVE_TYPE pt, const VertexDeclaration* decl, const void* verticesData, unsigned int verticesDataSize) override;
+        void draw(PRIMITIVE_TYPE pt, const VertexDeclaration* decl, const void* verticesData, unsigned int verticesDataSize, const unsigned short* indicesData, unsigned int numIndices) override;
+        void setDefaultSettings() override;
+
+        void setViewport(const Rect& viewport) override;
+        void setShaderProgram(ShaderProgram*) override;
+        void setTexture(int sampler, spNativeTexture) override;
+        void setUniformInt(const char* id, int v) override;
+        void setUniform(const char* id, const Vector4* v, int num) override;
+        void setUniform(const char* id, const Vector3* v, int num) override;
+        void setUniform(const char* id, const Vector2* v, int num) override;
+        void setUniform(const char* id, const Matrix* mat) override;
+        void setUniform(const char* id, float val) override;
 
     protected:
         GLuint _vbo;

oxygine/src/core/gl/oxgl.cpp

@@ -26,151 +26,151 @@ extern "C"
     {}
 
 //!--defgl-begin--!
-GLAPI void APIENTRY def_glUseProgram (GLuint program)
-{}
-GLAPI void APIENTRY def_glVertexAttribPointer (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer)
-{}
-GLAPI void APIENTRY def_glActiveTexture (GLenum texture)
-{}
-GLAPI void APIENTRY def_glEnableVertexAttribArray (GLuint index)
-{}
-GLAPI void APIENTRY def_glDisableVertexAttribArray (GLuint index)
-{}
-GLAPI void APIENTRY def_glDeleteProgram (GLuint program)
-{}
-GLAPI void APIENTRY def_glGetShaderiv (GLuint shader, GLenum pname, GLint *params)
-{}
-GLAPI void APIENTRY def_glGetShaderInfoLog (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
-{}
-GLAPI GLuint APIENTRY def_glCreateShader (GLenum type)
-{return 0;}
-GLAPI GLuint APIENTRY def_glCreateProgram (void)
-{return 0;}
-GLAPI void APIENTRY def_glAttachShader (GLuint program, GLuint shader)
-{}
-GLAPI void APIENTRY def_glCompileShader (GLuint shader)
-{}
-GLAPI void APIENTRY def_glDetachShader (GLuint program, GLuint shader)
-{}
-GLAPI void APIENTRY def_glBindAttribLocation (GLuint program, GLuint index, const GLchar *name)
-{}
-GLAPI void APIENTRY def_glLinkProgram (GLuint program)
-{}
-GLAPI void APIENTRY def_glUniform1i (GLint location, GLint v0)
-{}
-GLAPI void APIENTRY def_glUniform2f (GLint location, GLfloat v0, GLfloat v1)
-{}
-GLAPI void APIENTRY def_glUniform2fv (GLint location, GLsizei count, const GLfloat *value)
-{}
-GLAPI void APIENTRY def_glUniform3fv (GLint location, GLsizei count, const GLfloat *value)
-{}
-GLAPI void APIENTRY def_glUniform4fv (GLint location, GLsizei count, const GLfloat *value)
-{}
-GLAPI void APIENTRY def_glUniform1f (GLint location, GLfloat v0)
-{}
-GLAPI void APIENTRY def_glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
-{}
-GLAPI void APIENTRY def_glBindFramebuffer (GLenum target, GLuint framebuffer)
-{}
-GLAPI void APIENTRY def_glGenFramebuffers (GLsizei n, GLuint *framebuffers)
-{}
-GLAPI GLenum APIENTRY def_glCheckFramebufferStatus (GLenum target)
-{return 0;}
-GLAPI void APIENTRY def_glDeleteFramebuffers (GLsizei n, const GLuint *framebuffers)
-{}
-GLAPI GLint APIENTRY def_glGetUniformLocation (GLuint program, const GLchar *name)
-{return 0;}
-GLAPI void APIENTRY def_glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
-{}
-GLAPI void APIENTRY def_glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data)
-{}
-GLAPI void APIENTRY def_glBindBuffer (GLenum target, GLuint buffer)
-{}
-GLAPI void APIENTRY def_glGenBuffers (GLsizei n, GLuint *buffers)
-{}
-GLAPI void APIENTRY def_glBufferData (GLenum target, GLsizeiptr size, const void *data, GLenum usage)
-{}
-GLAPI void APIENTRY def_glGetProgramiv (GLuint program, GLenum pname, GLint *params)
-{}
-GLAPI void APIENTRY def_glGenerateMipmap (GLenum target)
-{}
-GLAPI void APIENTRY def_glStencilOpSeparate (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
-{}
-GLAPI void APIENTRY def_glGenRenderbuffers (GLsizei n, GLuint *renderbuffers)
-{}
-GLAPI void APIENTRY def_glBindRenderbuffer (GLenum target, GLuint renderbuffer)
-{}
-GLAPI void APIENTRY def_glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
-{}
-GLAPI void APIENTRY def_glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
-{}
-GLAPI void APIENTRY def_glDeleteRenderbuffers (GLsizei n, const GLuint *renderbuffers)
-{}
-GLAPI void APIENTRY def_glDeleteShader (GLuint shader)
-{}
-GLAPI void APIENTRY def_glDeleteBuffers (GLsizei n, const GLuint *buffers)
-{}
-GLAPI void APIENTRY def_glGetProgramInfoLog (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
-{}
-GLAPI void APIENTRY def_glBlendEquation (GLenum mode)
-{}
-GLAPI void APIENTRY def_glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
-{}
-GLAPI void APIENTRY def_glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha)
-{}
-GLAPI GLint APIENTRY def_glGetAttribLocation (GLuint program, const GLchar *name)
-{return 0;}
+    GLAPI void APIENTRY def_glUseProgram(GLuint program)
+    {}
+    GLAPI void APIENTRY def_glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* pointer)
+    {}
+    GLAPI void APIENTRY def_glActiveTexture(GLenum texture)
+    {}
+    GLAPI void APIENTRY def_glEnableVertexAttribArray(GLuint index)
+    {}
+    GLAPI void APIENTRY def_glDisableVertexAttribArray(GLuint index)
+    {}
+    GLAPI void APIENTRY def_glDeleteProgram(GLuint program)
+    {}
+    GLAPI void APIENTRY def_glGetShaderiv(GLuint shader, GLenum pname, GLint* params)
+    {}
+    GLAPI void APIENTRY def_glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei* length, GLchar* infoLog)
+    {}
+    GLAPI GLuint APIENTRY def_glCreateShader(GLenum type)
+    {return 0;}
+    GLAPI GLuint APIENTRY def_glCreateProgram(void)
+    {return 0;}
+    GLAPI void APIENTRY def_glAttachShader(GLuint program, GLuint shader)
+    {}
+    GLAPI void APIENTRY def_glCompileShader(GLuint shader)
+    {}
+    GLAPI void APIENTRY def_glDetachShader(GLuint program, GLuint shader)
+    {}
+    GLAPI void APIENTRY def_glBindAttribLocation(GLuint program, GLuint index, const GLchar* name)
+    {}
+    GLAPI void APIENTRY def_glLinkProgram(GLuint program)
+    {}
+    GLAPI void APIENTRY def_glUniform1i(GLint location, GLint v0)
+    {}
+    GLAPI void APIENTRY def_glUniform2f(GLint location, GLfloat v0, GLfloat v1)
+    {}
+    GLAPI void APIENTRY def_glUniform2fv(GLint location, GLsizei count, const GLfloat* value)
+    {}
+    GLAPI void APIENTRY def_glUniform3fv(GLint location, GLsizei count, const GLfloat* value)
+    {}
+    GLAPI void APIENTRY def_glUniform4fv(GLint location, GLsizei count, const GLfloat* value)
+    {}
+    GLAPI void APIENTRY def_glUniform1f(GLint location, GLfloat v0)
+    {}
+    GLAPI void APIENTRY def_glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
+    {}
+    GLAPI void APIENTRY def_glBindFramebuffer(GLenum target, GLuint framebuffer)
+    {}
+    GLAPI void APIENTRY def_glGenFramebuffers(GLsizei n, GLuint* framebuffers)
+    {}
+    GLAPI GLenum APIENTRY def_glCheckFramebufferStatus(GLenum target)
+    {return 0;}
+    GLAPI void APIENTRY def_glDeleteFramebuffers(GLsizei n, const GLuint* framebuffers)
+    {}
+    GLAPI GLint APIENTRY def_glGetUniformLocation(GLuint program, const GLchar* name)
+    {return 0;}
+    GLAPI void APIENTRY def_glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
+    {}
+    GLAPI void APIENTRY def_glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data)
+    {}
+    GLAPI void APIENTRY def_glBindBuffer(GLenum target, GLuint buffer)
+    {}
+    GLAPI void APIENTRY def_glGenBuffers(GLsizei n, GLuint* buffers)
+    {}
+    GLAPI void APIENTRY def_glBufferData(GLenum target, GLsizeiptr size, const void* data, GLenum usage)
+    {}
+    GLAPI void APIENTRY def_glGetProgramiv(GLuint program, GLenum pname, GLint* params)
+    {}
+    GLAPI void APIENTRY def_glGenerateMipmap(GLenum target)
+    {}
+    GLAPI void APIENTRY def_glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
+    {}
+    GLAPI void APIENTRY def_glGenRenderbuffers(GLsizei n, GLuint* renderbuffers)
+    {}
+    GLAPI void APIENTRY def_glBindRenderbuffer(GLenum target, GLuint renderbuffer)
+    {}
+    GLAPI void APIENTRY def_glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
+    {}
+    GLAPI void APIENTRY def_glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
+    {}
+    GLAPI void APIENTRY def_glDeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers)
+    {}
+    GLAPI void APIENTRY def_glDeleteShader(GLuint shader)
+    {}
+    GLAPI void APIENTRY def_glDeleteBuffers(GLsizei n, const GLuint* buffers)
+    {}
+    GLAPI void APIENTRY def_glGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei* length, GLchar* infoLog)
+    {}
+    GLAPI void APIENTRY def_glBlendEquation(GLenum mode)
+    {}
+    GLAPI void APIENTRY def_glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
+    {}
+    GLAPI void APIENTRY def_glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
+    {}
+    GLAPI GLint APIENTRY def_glGetAttribLocation(GLuint program, const GLchar* name)
+    {return 0;}
 //!--defgl-end--!
 
 //!--_gl-begin--!
-PFNGLSHADERSOURCEPROC _glShaderSource = 0;
-PFNGLUSEPROGRAMPROC _glUseProgram = 0;
-PFNGLVERTEXATTRIBPOINTERPROC _glVertexAttribPointer = 0;
-PFNGLACTIVETEXTUREPROC _glActiveTexture = 0;
-PFNGLENABLEVERTEXATTRIBARRAYPROC _glEnableVertexAttribArray = 0;
-PFNGLDISABLEVERTEXATTRIBARRAYPROC _glDisableVertexAttribArray = 0;
-PFNGLDELETEPROGRAMPROC _glDeleteProgram = 0;
-PFNGLGETSHADERIVPROC _glGetShaderiv = 0;
-PFNGLGETSHADERINFOLOGPROC _glGetShaderInfoLog = 0;
-PFNGLCREATESHADERPROC _glCreateShader = 0;
-PFNGLCREATEPROGRAMPROC _glCreateProgram = 0;
-PFNGLATTACHSHADERPROC _glAttachShader = 0;
-PFNGLCOMPILESHADERPROC _glCompileShader = 0;
-PFNGLDETACHSHADERPROC _glDetachShader = 0;
-PFNGLBINDATTRIBLOCATIONPROC _glBindAttribLocation = 0;
-PFNGLLINKPROGRAMPROC _glLinkProgram = 0;
-PFNGLUNIFORM1IPROC _glUniform1i = 0;
-PFNGLUNIFORM2FPROC _glUniform2f = 0;
-PFNGLUNIFORM2FVPROC _glUniform2fv = 0;
-PFNGLUNIFORM3FVPROC _glUniform3fv = 0;
-PFNGLUNIFORM4FVPROC _glUniform4fv = 0;
-PFNGLUNIFORM1FPROC _glUniform1f = 0;
-PFNGLUNIFORMMATRIX4FVPROC _glUniformMatrix4fv = 0;
-PFNGLBINDFRAMEBUFFERPROC _glBindFramebuffer = 0;
-PFNGLGENFRAMEBUFFERSPROC _glGenFramebuffers = 0;
-PFNGLCHECKFRAMEBUFFERSTATUSPROC _glCheckFramebufferStatus = 0;
-PFNGLDELETEFRAMEBUFFERSPROC _glDeleteFramebuffers = 0;
-PFNGLGETUNIFORMLOCATIONPROC _glGetUniformLocation = 0;
-PFNGLFRAMEBUFFERTEXTURE2DPROC _glFramebufferTexture2D = 0;
-PFNGLCOMPRESSEDTEXIMAGE2DPROC _glCompressedTexImage2D = 0;
-PFNGLBINDBUFFERPROC _glBindBuffer = 0;
-PFNGLGENBUFFERSPROC _glGenBuffers = 0;
-PFNGLBUFFERDATAPROC _glBufferData = 0;
-PFNGLGETPROGRAMIVPROC _glGetProgramiv = 0;
-PFNGLGENERATEMIPMAPPROC _glGenerateMipmap = 0;
-PFNGLSTENCILOPSEPARATEPROC _glStencilOpSeparate = 0;
-PFNGLGENRENDERBUFFERSPROC _glGenRenderbuffers = 0;
-PFNGLBINDRENDERBUFFERPROC _glBindRenderbuffer = 0;
-PFNGLRENDERBUFFERSTORAGEPROC _glRenderbufferStorage = 0;
-PFNGLFRAMEBUFFERRENDERBUFFERPROC _glFramebufferRenderbuffer = 0;
-PFNGLDELETERENDERBUFFERSPROC _glDeleteRenderbuffers = 0;
-PFNGLDELETESHADERPROC _glDeleteShader = 0;
-PFNGLDELETEBUFFERSPROC _glDeleteBuffers = 0;
-PFNGLGETPROGRAMINFOLOGPROC _glGetProgramInfoLog = 0;
-PFNGLBLENDEQUATIONPROC _glBlendEquation = 0;
-PFNGLBLENDFUNCSEPARATEPROC _glBlendFuncSeparate = 0;
-PFNGLBLENDEQUATIONSEPARATEPROC _glBlendEquationSeparate = 0;
-PFNGLGETATTRIBLOCATIONPROC _glGetAttribLocation = 0;
+    PFNGLSHADERSOURCEPROC _glShaderSource = 0;
+    PFNGLUSEPROGRAMPROC _glUseProgram = 0;
+    PFNGLVERTEXATTRIBPOINTERPROC _glVertexAttribPointer = 0;
+    PFNGLACTIVETEXTUREPROC _glActiveTexture = 0;
+    PFNGLENABLEVERTEXATTRIBARRAYPROC _glEnableVertexAttribArray = 0;
+    PFNGLDISABLEVERTEXATTRIBARRAYPROC _glDisableVertexAttribArray = 0;
+    PFNGLDELETEPROGRAMPROC _glDeleteProgram = 0;
+    PFNGLGETSHADERIVPROC _glGetShaderiv = 0;
+    PFNGLGETSHADERINFOLOGPROC _glGetShaderInfoLog = 0;
+    PFNGLCREATESHADERPROC _glCreateShader = 0;
+    PFNGLCREATEPROGRAMPROC _glCreateProgram = 0;
+    PFNGLATTACHSHADERPROC _glAttachShader = 0;
+    PFNGLCOMPILESHADERPROC _glCompileShader = 0;
+    PFNGLDETACHSHADERPROC _glDetachShader = 0;
+    PFNGLBINDATTRIBLOCATIONPROC _glBindAttribLocation = 0;
+    PFNGLLINKPROGRAMPROC _glLinkProgram = 0;
+    PFNGLUNIFORM1IPROC _glUniform1i = 0;
+    PFNGLUNIFORM2FPROC _glUniform2f = 0;
+    PFNGLUNIFORM2FVPROC _glUniform2fv = 0;
+    PFNGLUNIFORM3FVPROC _glUniform3fv = 0;
+    PFNGLUNIFORM4FVPROC _glUniform4fv = 0;
+    PFNGLUNIFORM1FPROC _glUniform1f = 0;
+    PFNGLUNIFORMMATRIX4FVPROC _glUniformMatrix4fv = 0;
+    PFNGLBINDFRAMEBUFFERPROC _glBindFramebuffer = 0;
+    PFNGLGENFRAMEBUFFERSPROC _glGenFramebuffers = 0;
+    PFNGLCHECKFRAMEBUFFERSTATUSPROC _glCheckFramebufferStatus = 0;
+    PFNGLDELETEFRAMEBUFFERSPROC _glDeleteFramebuffers = 0;
+    PFNGLGETUNIFORMLOCATIONPROC _glGetUniformLocation = 0;
+    PFNGLFRAMEBUFFERTEXTURE2DPROC _glFramebufferTexture2D = 0;
+    PFNGLCOMPRESSEDTEXIMAGE2DPROC _glCompressedTexImage2D = 0;
+    PFNGLBINDBUFFERPROC _glBindBuffer = 0;
+    PFNGLGENBUFFERSPROC _glGenBuffers = 0;
+    PFNGLBUFFERDATAPROC _glBufferData = 0;
+    PFNGLGETPROGRAMIVPROC _glGetProgramiv = 0;
+    PFNGLGENERATEMIPMAPPROC _glGenerateMipmap = 0;
+    PFNGLSTENCILOPSEPARATEPROC _glStencilOpSeparate = 0;
+    PFNGLGENRENDERBUFFERSPROC _glGenRenderbuffers = 0;
+    PFNGLBINDRENDERBUFFERPROC _glBindRenderbuffer = 0;
+    PFNGLRENDERBUFFERSTORAGEPROC _glRenderbufferStorage = 0;
+    PFNGLFRAMEBUFFERRENDERBUFFERPROC _glFramebufferRenderbuffer = 0;
+    PFNGLDELETERENDERBUFFERSPROC _glDeleteRenderbuffers = 0;
+    PFNGLDELETESHADERPROC _glDeleteShader = 0;
+    PFNGLDELETEBUFFERSPROC _glDeleteBuffers = 0;
+    PFNGLGETPROGRAMINFOLOGPROC _glGetProgramInfoLog = 0;
+    PFNGLBLENDEQUATIONPROC _glBlendEquation = 0;
+    PFNGLBLENDFUNCSEPARATEPROC _glBlendFuncSeparate = 0;
+    PFNGLBLENDEQUATIONSEPARATEPROC _glBlendEquationSeparate = 0;
+    PFNGLGETATTRIBLOCATIONPROC _glGetAttribLocation = 0;
 //!--_gl-end--!
 }
 
@@ -182,54 +182,54 @@ int initGLExtensions(myGetProcAdress func)
     int missing = 0;
 
 //!--getfunc-begin--!
-GETFUNC(_glShaderSource, def_glShaderSource, PFNGLSHADERSOURCEPROC, "glShaderSource");
-GETFUNC(_glUseProgram, def_glUseProgram, PFNGLUSEPROGRAMPROC, "glUseProgram");
-GETFUNC(_glVertexAttribPointer, def_glVertexAttribPointer, PFNGLVERTEXATTRIBPOINTERPROC, "glVertexAttribPointer");
-GETFUNC(_glActiveTexture, def_glActiveTexture, PFNGLACTIVETEXTUREPROC, "glActiveTexture");
-GETFUNC(_glEnableVertexAttribArray, def_glEnableVertexAttribArray, PFNGLENABLEVERTEXATTRIBARRAYPROC, "glEnableVertexAttribArray");
-GETFUNC(_glDisableVertexAttribArray, def_glDisableVertexAttribArray, PFNGLDISABLEVERTEXATTRIBARRAYPROC, "glDisableVertexAttribArray");
-GETFUNC(_glDeleteProgram, def_glDeleteProgram, PFNGLDELETEPROGRAMPROC, "glDeleteProgram");
-GETFUNC(_glGetShaderiv, def_glGetShaderiv, PFNGLGETSHADERIVPROC, "glGetShaderiv");
-GETFUNC(_glGetShaderInfoLog, def_glGetShaderInfoLog, PFNGLGETSHADERINFOLOGPROC, "glGetShaderInfoLog");
-GETFUNC(_glCreateShader, def_glCreateShader, PFNGLCREATESHADERPROC, "glCreateShader");
-GETFUNC(_glCreateProgram, def_glCreateProgram, PFNGLCREATEPROGRAMPROC, "glCreateProgram");
-GETFUNC(_glAttachShader, def_glAttachShader, PFNGLATTACHSHADERPROC, "glAttachShader");
-GETFUNC(_glCompileShader, def_glCompileShader, PFNGLCOMPILESHADERPROC, "glCompileShader");
-GETFUNC(_glDetachShader, def_glDetachShader, PFNGLDETACHSHADERPROC, "glDetachShader");
-GETFUNC(_glBindAttribLocation, def_glBindAttribLocation, PFNGLBINDATTRIBLOCATIONPROC, "glBindAttribLocation");
-GETFUNC(_glLinkProgram, def_glLinkProgram, PFNGLLINKPROGRAMPROC, "glLinkProgram");
-GETFUNC(_glUniform1i, def_glUniform1i, PFNGLUNIFORM1IPROC, "glUniform1i");
-GETFUNC(_glUniform2f, def_glUniform2f, PFNGLUNIFORM2FPROC, "glUniform2f");
-GETFUNC(_glUniform2fv, def_glUniform2fv, PFNGLUNIFORM2FVPROC, "glUniform2fv");
-GETFUNC(_glUniform3fv, def_glUniform3fv, PFNGLUNIFORM3FVPROC, "glUniform3fv");
-GETFUNC(_glUniform4fv, def_glUniform4fv, PFNGLUNIFORM4FVPROC, "glUniform4fv");
-GETFUNC(_glUniform1f, def_glUniform1f, PFNGLUNIFORM1FPROC, "glUniform1f");
-GETFUNC(_glUniformMatrix4fv, def_glUniformMatrix4fv, PFNGLUNIFORMMATRIX4FVPROC, "glUniformMatrix4fv");
-GETFUNC(_glBindFramebuffer, def_glBindFramebuffer, PFNGLBINDFRAMEBUFFERPROC, "glBindFramebuffer");
-GETFUNC(_glGenFramebuffers, def_glGenFramebuffers, PFNGLGENFRAMEBUFFERSPROC, "glGenFramebuffers");
-GETFUNC(_glCheckFramebufferStatus, def_glCheckFramebufferStatus, PFNGLCHECKFRAMEBUFFERSTATUSPROC, "glCheckFramebufferStatus");
-GETFUNC(_glDeleteFramebuffers, def_glDeleteFramebuffers, PFNGLDELETEFRAMEBUFFERSPROC, "glDeleteFramebuffers");
-GETFUNC(_glGetUniformLocation, def_glGetUniformLocation, PFNGLGETUNIFORMLOCATIONPROC, "glGetUniformLocation");
-GETFUNC(_glFramebufferTexture2D, def_glFramebufferTexture2D, PFNGLFRAMEBUFFERTEXTURE2DPROC, "glFramebufferTexture2D");
-GETFUNC(_glCompressedTexImage2D, def_glCompressedTexImage2D, PFNGLCOMPRESSEDTEXIMAGE2DPROC, "glCompressedTexImage2D");
-GETFUNC(_glBindBuffer, def_glBindBuffer, PFNGLBINDBUFFERPROC, "glBindBuffer");
-GETFUNC(_glGenBuffers, def_glGenBuffers, PFNGLGENBUFFERSPROC, "glGenBuffers");
-GETFUNC(_glBufferData, def_glBufferData, PFNGLBUFFERDATAPROC, "glBufferData");
-GETFUNC(_glGetProgramiv, def_glGetProgramiv, PFNGLGETPROGRAMIVPROC, "glGetProgramiv");
-GETFUNC(_glGenerateMipmap, def_glGenerateMipmap, PFNGLGENERATEMIPMAPPROC, "glGenerateMipmap");
-GETFUNC(_glStencilOpSeparate, def_glStencilOpSeparate, PFNGLSTENCILOPSEPARATEPROC, "glStencilOpSeparate");
-GETFUNC(_glGenRenderbuffers, def_glGenRenderbuffers, PFNGLGENRENDERBUFFERSPROC, "glGenRenderbuffers");
-GETFUNC(_glBindRenderbuffer, def_glBindRenderbuffer, PFNGLBINDRENDERBUFFERPROC, "glBindRenderbuffer");
-GETFUNC(_glRenderbufferStorage, def_glRenderbufferStorage, PFNGLRENDERBUFFERSTORAGEPROC, "glRenderbufferStorage");
-GETFUNC(_glFramebufferRenderbuffer, def_glFramebufferRenderbuffer, PFNGLFRAMEBUFFERRENDERBUFFERPROC, "glFramebufferRenderbuffer");
-GETFUNC(_glDeleteRenderbuffers, def_glDeleteRenderbuffers, PFNGLDELETERENDERBUFFERSPROC, "glDeleteRenderbuffers");
-GETFUNC(_glDeleteShader, def_glDeleteShader, PFNGLDELETESHADERPROC, "glDeleteShader");
-GETFUNC(_glDeleteBuffers, def_glDeleteBuffers, PFNGLDELETEBUFFERSPROC, "glDeleteBuffers");
-GETFUNC(_glGetProgramInfoLog, def_glGetProgramInfoLog, PFNGLGETPROGRAMINFOLOGPROC, "glGetProgramInfoLog");
-GETFUNC(_glBlendEquation, def_glBlendEquation, PFNGLBLENDEQUATIONPROC, "glBlendEquation");
-GETFUNC(_glBlendFuncSeparate, def_glBlendFuncSeparate, PFNGLBLENDFUNCSEPARATEPROC, "glBlendFuncSeparate");
-GETFUNC(_glBlendEquationSeparate, def_glBlendEquationSeparate, PFNGLBLENDEQUATIONSEPARATEPROC, "glBlendEquationSeparate");
-GETFUNC(_glGetAttribLocation, def_glGetAttribLocation, PFNGLGETATTRIBLOCATIONPROC, "glGetAttribLocation");
+    GETFUNC(_glShaderSource, def_glShaderSource, PFNGLSHADERSOURCEPROC, "glShaderSource");
+    GETFUNC(_glUseProgram, def_glUseProgram, PFNGLUSEPROGRAMPROC, "glUseProgram");
+    GETFUNC(_glVertexAttribPointer, def_glVertexAttribPointer, PFNGLVERTEXATTRIBPOINTERPROC, "glVertexAttribPointer");
+    GETFUNC(_glActiveTexture, def_glActiveTexture, PFNGLACTIVETEXTUREPROC, "glActiveTexture");
+    GETFUNC(_glEnableVertexAttribArray, def_glEnableVertexAttribArray, PFNGLENABLEVERTEXATTRIBARRAYPROC, "glEnableVertexAttribArray");
+    GETFUNC(_glDisableVertexAttribArray, def_glDisableVertexAttribArray, PFNGLDISABLEVERTEXATTRIBARRAYPROC, "glDisableVertexAttribArray");
+    GETFUNC(_glDeleteProgram, def_glDeleteProgram, PFNGLDELETEPROGRAMPROC, "glDeleteProgram");
+    GETFUNC(_glGetShaderiv, def_glGetShaderiv, PFNGLGETSHADERIVPROC, "glGetShaderiv");
+    GETFUNC(_glGetShaderInfoLog, def_glGetShaderInfoLog, PFNGLGETSHADERINFOLOGPROC, "glGetShaderInfoLog");
+    GETFUNC(_glCreateShader, def_glCreateShader, PFNGLCREATESHADERPROC, "glCreateShader");
+    GETFUNC(_glCreateProgram, def_glCreateProgram, PFNGLCREATEPROGRAMPROC, "glCreateProgram");
+    GETFUNC(_glAttachShader, def_glAttachShader, PFNGLATTACHSHADERPROC, "glAttachShader");
+    GETFUNC(_glCompileShader, def_glCompileShader, PFNGLCOMPILESHADERPROC, "glCompileShader");
+    GETFUNC(_glDetachShader, def_glDetachShader, PFNGLDETACHSHADERPROC, "glDetachShader");
+    GETFUNC(_glBindAttribLocation, def_glBindAttribLocation, PFNGLBINDATTRIBLOCATIONPROC, "glBindAttribLocation");
+    GETFUNC(_glLinkProgram, def_glLinkProgram, PFNGLLINKPROGRAMPROC, "glLinkProgram");
+    GETFUNC(_glUniform1i, def_glUniform1i, PFNGLUNIFORM1IPROC, "glUniform1i");
+    GETFUNC(_glUniform2f, def_glUniform2f, PFNGLUNIFORM2FPROC, "glUniform2f");
+    GETFUNC(_glUniform2fv, def_glUniform2fv, PFNGLUNIFORM2FVPROC, "glUniform2fv");
+    GETFUNC(_glUniform3fv, def_glUniform3fv, PFNGLUNIFORM3FVPROC, "glUniform3fv");
+    GETFUNC(_glUniform4fv, def_glUniform4fv, PFNGLUNIFORM4FVPROC, "glUniform4fv");
+    GETFUNC(_glUniform1f, def_glUniform1f, PFNGLUNIFORM1FPROC, "glUniform1f");
+    GETFUNC(_glUniformMatrix4fv, def_glUniformMatrix4fv, PFNGLUNIFORMMATRIX4FVPROC, "glUniformMatrix4fv");
+    GETFUNC(_glBindFramebuffer, def_glBindFramebuffer, PFNGLBINDFRAMEBUFFERPROC, "glBindFramebuffer");
+    GETFUNC(_glGenFramebuffers, def_glGenFramebuffers, PFNGLGENFRAMEBUFFERSPROC, "glGenFramebuffers");
+    GETFUNC(_glCheckFramebufferStatus, def_glCheckFramebufferStatus, PFNGLCHECKFRAMEBUFFERSTATUSPROC, "glCheckFramebufferStatus");
+    GETFUNC(_glDeleteFramebuffers, def_glDeleteFramebuffers, PFNGLDELETEFRAMEBUFFERSPROC, "glDeleteFramebuffers");
+    GETFUNC(_glGetUniformLocation, def_glGetUniformLocation, PFNGLGETUNIFORMLOCATIONPROC, "glGetUniformLocation");
+    GETFUNC(_glFramebufferTexture2D, def_glFramebufferTexture2D, PFNGLFRAMEBUFFERTEXTURE2DPROC, "glFramebufferTexture2D");
+    GETFUNC(_glCompressedTexImage2D, def_glCompressedTexImage2D, PFNGLCOMPRESSEDTEXIMAGE2DPROC, "glCompressedTexImage2D");
+    GETFUNC(_glBindBuffer, def_glBindBuffer, PFNGLBINDBUFFERPROC, "glBindBuffer");
+    GETFUNC(_glGenBuffers, def_glGenBuffers, PFNGLGENBUFFERSPROC, "glGenBuffers");
+    GETFUNC(_glBufferData, def_glBufferData, PFNGLBUFFERDATAPROC, "glBufferData");
+    GETFUNC(_glGetProgramiv, def_glGetProgramiv, PFNGLGETPROGRAMIVPROC, "glGetProgramiv");
+    GETFUNC(_glGenerateMipmap, def_glGenerateMipmap, PFNGLGENERATEMIPMAPPROC, "glGenerateMipmap");
+    GETFUNC(_glStencilOpSeparate, def_glStencilOpSeparate, PFNGLSTENCILOPSEPARATEPROC, "glStencilOpSeparate");
+    GETFUNC(_glGenRenderbuffers, def_glGenRenderbuffers, PFNGLGENRENDERBUFFERSPROC, "glGenRenderbuffers");
+    GETFUNC(_glBindRenderbuffer, def_glBindRenderbuffer, PFNGLBINDRENDERBUFFERPROC, "glBindRenderbuffer");
+    GETFUNC(_glRenderbufferStorage, def_glRenderbufferStorage, PFNGLRENDERBUFFERSTORAGEPROC, "glRenderbufferStorage");
+    GETFUNC(_glFramebufferRenderbuffer, def_glFramebufferRenderbuffer, PFNGLFRAMEBUFFERRENDERBUFFERPROC, "glFramebufferRenderbuffer");
+    GETFUNC(_glDeleteRenderbuffers, def_glDeleteRenderbuffers, PFNGLDELETERENDERBUFFERSPROC, "glDeleteRenderbuffers");
+    GETFUNC(_glDeleteShader, def_glDeleteShader, PFNGLDELETESHADERPROC, "glDeleteShader");
+    GETFUNC(_glDeleteBuffers, def_glDeleteBuffers, PFNGLDELETEBUFFERSPROC, "glDeleteBuffers");
+    GETFUNC(_glGetProgramInfoLog, def_glGetProgramInfoLog, PFNGLGETPROGRAMINFOLOGPROC, "glGetProgramInfoLog");
+    GETFUNC(_glBlendEquation, def_glBlendEquation, PFNGLBLENDEQUATIONPROC, "glBlendEquation");
+    GETFUNC(_glBlendFuncSeparate, def_glBlendFuncSeparate, PFNGLBLENDFUNCSEPARATEPROC, "glBlendFuncSeparate");
+    GETFUNC(_glBlendEquationSeparate, def_glBlendEquationSeparate, PFNGLBLENDEQUATIONSEPARATEPROC, "glBlendEquationSeparate");
+    GETFUNC(_glGetAttribLocation, def_glGetAttribLocation, PFNGLGETATTRIBLOCATIONPROC, "glGetAttribLocation");
 //!--getfunc-end--!
 
     return missing;

oxygine/src/core/gl/oxgl.h

@@ -26,54 +26,54 @@
 extern "C"
 {
 //!--pfngl-begin--!
-extern PFNGLSHADERSOURCEPROC _glShaderSource;
-extern PFNGLUSEPROGRAMPROC _glUseProgram;
-extern PFNGLVERTEXATTRIBPOINTERPROC _glVertexAttribPointer;
-extern PFNGLACTIVETEXTUREPROC _glActiveTexture;
-extern PFNGLENABLEVERTEXATTRIBARRAYPROC _glEnableVertexAttribArray;
-extern PFNGLDISABLEVERTEXATTRIBARRAYPROC _glDisableVertexAttribArray;
-extern PFNGLDELETEPROGRAMPROC _glDeleteProgram;
-extern PFNGLGETSHADERIVPROC _glGetShaderiv;
-extern PFNGLGETSHADERINFOLOGPROC _glGetShaderInfoLog;
-extern PFNGLCREATESHADERPROC _glCreateShader;
-extern PFNGLCREATEPROGRAMPROC _glCreateProgram;
-extern PFNGLATTACHSHADERPROC _glAttachShader;
-extern PFNGLCOMPILESHADERPROC _glCompileShader;
-extern PFNGLDETACHSHADERPROC _glDetachShader;
-extern PFNGLBINDATTRIBLOCATIONPROC _glBindAttribLocation;
-extern PFNGLLINKPROGRAMPROC _glLinkProgram;
-extern PFNGLUNIFORM1IPROC _glUniform1i;
-extern PFNGLUNIFORM2FPROC _glUniform2f;
-extern PFNGLUNIFORM2FVPROC _glUniform2fv;
-extern PFNGLUNIFORM3FVPROC _glUniform3fv;
-extern PFNGLUNIFORM4FVPROC _glUniform4fv;
-extern PFNGLUNIFORM1FPROC _glUniform1f;
-extern PFNGLUNIFORMMATRIX4FVPROC _glUniformMatrix4fv;
-extern PFNGLBINDFRAMEBUFFERPROC _glBindFramebuffer;
-extern PFNGLGENFRAMEBUFFERSPROC _glGenFramebuffers;
-extern PFNGLCHECKFRAMEBUFFERSTATUSPROC _glCheckFramebufferStatus;
-extern PFNGLDELETEFRAMEBUFFERSPROC _glDeleteFramebuffers;
-extern PFNGLGETUNIFORMLOCATIONPROC _glGetUniformLocation;
-extern PFNGLFRAMEBUFFERTEXTURE2DPROC _glFramebufferTexture2D;
-extern PFNGLCOMPRESSEDTEXIMAGE2DPROC _glCompressedTexImage2D;
-extern PFNGLBINDBUFFERPROC _glBindBuffer;
-extern PFNGLGENBUFFERSPROC _glGenBuffers;
-extern PFNGLBUFFERDATAPROC _glBufferData;
-extern PFNGLGETPROGRAMIVPROC _glGetProgramiv;
-extern PFNGLGENERATEMIPMAPPROC _glGenerateMipmap;
-extern PFNGLSTENCILOPSEPARATEPROC _glStencilOpSeparate;
-extern PFNGLGENRENDERBUFFERSPROC _glGenRenderbuffers;
-extern PFNGLBINDRENDERBUFFERPROC _glBindRenderbuffer;
-extern PFNGLRENDERBUFFERSTORAGEPROC _glRenderbufferStorage;
-extern PFNGLFRAMEBUFFERRENDERBUFFERPROC _glFramebufferRenderbuffer;
-extern PFNGLDELETERENDERBUFFERSPROC _glDeleteRenderbuffers;
-extern PFNGLDELETESHADERPROC _glDeleteShader;
-extern PFNGLDELETEBUFFERSPROC _glDeleteBuffers;
-extern PFNGLGETPROGRAMINFOLOGPROC _glGetProgramInfoLog;
-extern PFNGLBLENDEQUATIONPROC _glBlendEquation;
-extern PFNGLBLENDFUNCSEPARATEPROC _glBlendFuncSeparate;
-extern PFNGLBLENDEQUATIONSEPARATEPROC _glBlendEquationSeparate;
-extern PFNGLGETATTRIBLOCATIONPROC _glGetAttribLocation;
+    extern PFNGLSHADERSOURCEPROC _glShaderSource;
+    extern PFNGLUSEPROGRAMPROC _glUseProgram;
+    extern PFNGLVERTEXATTRIBPOINTERPROC _glVertexAttribPointer;
+    extern PFNGLACTIVETEXTUREPROC _glActiveTexture;
+    extern PFNGLENABLEVERTEXATTRIBARRAYPROC _glEnableVertexAttribArray;
+    extern PFNGLDISABLEVERTEXATTRIBARRAYPROC _glDisableVertexAttribArray;
+    extern PFNGLDELETEPROGRAMPROC _glDeleteProgram;
+    extern PFNGLGETSHADERIVPROC _glGetShaderiv;
+    extern PFNGLGETSHADERINFOLOGPROC _glGetShaderInfoLog;
+    extern PFNGLCREATESHADERPROC _glCreateShader;
+    extern PFNGLCREATEPROGRAMPROC _glCreateProgram;
+    extern PFNGLATTACHSHADERPROC _glAttachShader;
+    extern PFNGLCOMPILESHADERPROC _glCompileShader;
+    extern PFNGLDETACHSHADERPROC _glDetachShader;
+    extern PFNGLBINDATTRIBLOCATIONPROC _glBindAttribLocation;
+    extern PFNGLLINKPROGRAMPROC _glLinkProgram;
+    extern PFNGLUNIFORM1IPROC _glUniform1i;
+    extern PFNGLUNIFORM2FPROC _glUniform2f;
+    extern PFNGLUNIFORM2FVPROC _glUniform2fv;
+    extern PFNGLUNIFORM3FVPROC _glUniform3fv;
+    extern PFNGLUNIFORM4FVPROC _glUniform4fv;
+    extern PFNGLUNIFORM1FPROC _glUniform1f;
+    extern PFNGLUNIFORMMATRIX4FVPROC _glUniformMatrix4fv;
+    extern PFNGLBINDFRAMEBUFFERPROC _glBindFramebuffer;
+    extern PFNGLGENFRAMEBUFFERSPROC _glGenFramebuffers;
+    extern PFNGLCHECKFRAMEBUFFERSTATUSPROC _glCheckFramebufferStatus;
+    extern PFNGLDELETEFRAMEBUFFERSPROC _glDeleteFramebuffers;
+    extern PFNGLGETUNIFORMLOCATIONPROC _glGetUniformLocation;
+    extern PFNGLFRAMEBUFFERTEXTURE2DPROC _glFramebufferTexture2D;
+    extern PFNGLCOMPRESSEDTEXIMAGE2DPROC _glCompressedTexImage2D;
+    extern PFNGLBINDBUFFERPROC _glBindBuffer;
+    extern PFNGLGENBUFFERSPROC _glGenBuffers;
+    extern PFNGLBUFFERDATAPROC _glBufferData;
+    extern PFNGLGETPROGRAMIVPROC _glGetProgramiv;
+    extern PFNGLGENERATEMIPMAPPROC _glGenerateMipmap;
+    extern PFNGLSTENCILOPSEPARATEPROC _glStencilOpSeparate;
+    extern PFNGLGENRENDERBUFFERSPROC _glGenRenderbuffers;
+    extern PFNGLBINDRENDERBUFFERPROC _glBindRenderbuffer;
+    extern PFNGLRENDERBUFFERSTORAGEPROC _glRenderbufferStorage;
+    extern PFNGLFRAMEBUFFERRENDERBUFFERPROC _glFramebufferRenderbuffer;
+    extern PFNGLDELETERENDERBUFFERSPROC _glDeleteRenderbuffers;
+    extern PFNGLDELETESHADERPROC _glDeleteShader;
+    extern PFNGLDELETEBUFFERSPROC _glDeleteBuffers;
+    extern PFNGLGETPROGRAMINFOLOGPROC _glGetProgramInfoLog;
+    extern PFNGLBLENDEQUATIONPROC _glBlendEquation;
+    extern PFNGLBLENDFUNCSEPARATEPROC _glBlendFuncSeparate;
+    extern PFNGLBLENDEQUATIONSEPARATEPROC _glBlendEquationSeparate;
+    extern PFNGLGETATTRIBLOCATIONPROC _glGetAttribLocation;
 //!--pfngl-end--!
 }
 

oxygine/src/dev_tools/TreeInspector.h

@@ -31,10 +31,10 @@ namespace oxygine
 
     protected:
         static RectF calcBounds(Actor*);
-        void onAdded2Stage();
-        void onRemovedFromStage();
+        void onAdded2Stage() override;
+        void onRemovedFromStage() override;
 
-        void render(const RenderState& rs);
+        void render(const RenderState& rs) override;
 
         void updateSizes();
 

oxygine/src/dev_tools/TreeInspectorPreview.h

@@ -69,49 +69,32 @@ namespace oxygine
         cached_batch& current();
         const cached_batch& current() const;
 
-        spNativeTexture createTexture();
-
-        void begin(const Rect& viewport, const Color* color);
-
-        const VertexDeclaration* getVertexDeclaration(bvertex_format fmt) const;
-
-        void setDefaultSettings();
-
-        void setRenderTarget(spNativeTexture);
-
+        spNativeTexture createTexture() override;
+        void begin(const Rect& viewport, const Color* color) override;
+        const VertexDeclaration* getVertexDeclaration(bvertex_format fmt) const override;
+        void setDefaultSettings() override;
+        void setRenderTarget(spNativeTexture) override;
         spNativeTexture getRenderTarget() const override;
-
-        void setShaderProgram(ShaderProgram* program);
-
-        void setTexture(int sampler, spNativeTexture texture);
-
-        void setState(STATE state, unsigned int value);
+        void setShaderProgram(ShaderProgram* program) override;
+        void setTexture(int sampler, spNativeTexture texture) override;
+        void setState(STATE state, unsigned int value) override;
 
         void addUni(const char* id, cached_batch::uni::type tp, const void* ptr, int sz);
 
-        void setUniformInt(const char* id, int v);
-
-        void setUniform(const char* id, const Vector4* v, int num);
-
-        void setUniform(const char* id, const Vector3* v, int num);
-
-        void setUniform(const char* id, const Vector2* v, int num);
-
-        void setUniform(const char* id, const Matrix* v);
-
-        void setUniform(const char* id, float v);
-
-        void setBlendFunc(BLEND_TYPE src, BLEND_TYPE dest);
-
-        void setScissorRect(const Rect*);
+        void setUniformInt(const char* id, int v) override;
+        void setUniform(const char* id, const Vector4* v, int num) override;
+        void setUniform(const char* id, const Vector3* v, int num) override;
+        void setUniform(const char* id, const Vector2* v, int num) override;
+        void setUniform(const char* id, const Matrix* v) override;
+        void setUniform(const char* id, float v) override;
+        void setBlendFunc(BLEND_TYPE src, BLEND_TYPE dest) override;
+        void setScissorRect(const Rect*) override;
         bool getScissorRect(Rect&) const override;
 
         void nextBatch();
 
-        void draw(PRIMITIVE_TYPE pt, const VertexDeclaration* decl, const void* verticesData,  unsigned int numVertices);
-
-        void draw(PRIMITIVE_TYPE pt, const VertexDeclaration* decl, const void* verticesData,  unsigned int numVertices, const unsigned short* indicesData, unsigned int numIndices);
-
+        void draw(PRIMITIVE_TYPE pt, const VertexDeclaration* decl, const void* verticesData,  unsigned int numVertices) override;
+        void draw(PRIMITIVE_TYPE pt, const VertexDeclaration* decl, const void* verticesData,  unsigned int numVertices, const unsigned short* indicesData, unsigned int numIndices) override;
         void render(const AffineTransform& m);
         void transform(const AffineTransform& m);
 
@@ -128,10 +111,10 @@ namespace oxygine
 
         void init(spActor item, const Vector2& size, bool tree);
 
-        void doRender(RenderState const& parentRenderState);
+        void doRender(const RenderState& parentRenderState) override;
 
     private:
-        void doUpdate(const UpdateState& us);
+        void doUpdate(const UpdateState& us) override;
         friend class TreeInspector;
         //bool _onEvent(const EventState &es);
 

oxygine/src/oxygine-forwards.h

@@ -131,16 +131,16 @@ namespace oxygine
 
 
 #define DECLARE_COPYCLONE(type) type(const type &src, cloneOptions);\
-    virtual type* clone(cloneOptions opt=0) const {return new type(*this, opt);}\
+    virtual type* clone(cloneOptions opt=0) const override {return new type(*this, opt);}\
 
 
 #define DECLARE_COPYCLONE_NEW(type)  type(const type &src, cloneOptions opt = 0){copyFrom(src, opt);}\
-    virtual type* clone(cloneOptions opt=0) const {type *tp = new type(); tp->copyFrom(*this, opt); return tp;}\
-    virtual void copyFrom(const type &src, cloneOptions opt = 0);
+    virtual type* clone(cloneOptions opt=0) const override {type *tp = new type(); tp->copyFrom(*this, opt); return tp;}\
+    void copyFrom(const type &src, cloneOptions opt = 0);
 
 #define DECLARE_COPYCLONE_NEW2(type)  type(const type &src, cloneOptions opt = 0);\
-    virtual type* clone(cloneOptions opt=0) const;\
-    virtual void copyFrom(const type &src, cloneOptions opt = 0);
+    virtual type* clone(cloneOptions opt=0) const override;\
+    void copyFrom(const type &src, cloneOptions opt = 0);
 
 #define CREATE_COPYCLONE_NEW(type) type::type(const type &src, cloneOptions opt){copyFrom(src, opt);}\
     type* type::clone(cloneOptions opt) const {type *tp = new type(); tp->copyFrom(*this, opt); return tp;}

oxygine/src/res/CreateResourceContext.h

@@ -124,6 +124,6 @@ namespace oxygine
     public:
         static RestoreResourcesContext instance;
         void createTexture(const CreateTextureTask& opt) override;
-        bool isNeedProceed(spNativeTexture t);
+        bool isNeedProceed(spNativeTexture t) override;
     };
 }

oxygine/src/res/ResAnim.h

@@ -50,8 +50,8 @@ namespace oxygine
 
     protected:
 
-        void _load(LoadResourcesContext* ctx = 0);
-        void _unload();
+        void _load(LoadResourcesContext* ctx = 0) override;
+        void _unload() override;
 
         int         _columns;
         Resource*   _atlas;

oxygine/src/res/ResAtlas.h

@@ -32,8 +32,8 @@ namespace oxygine
     protected:
         void _restore(Restorable* r, void* user);
 
-        void _load(LoadResourcesContext*);
-        void _unload();
+        void _load(LoadResourcesContext*) override;
+        void _unload() override;
 
         //void loadAtlas(CreateResourceContext& context);
         ResAnim* createEmpty(const XmlWalker& walker, CreateResourceContext& context);

oxygine/src/res/ResBuffer.h

@@ -20,8 +20,8 @@ namespace oxygine
         const file::buffer& getBuffer() const {return _buffer;}
 
     private:
-        void _load(LoadResourcesContext*);
-        void _unload();
+        void _load(LoadResourcesContext*) override;
+        void _unload() override;
 
         file::buffer _buffer;
         std::string _path;

oxygine/src/res/ResFontBM.h

@@ -38,8 +38,8 @@ namespace oxygine
         void addPage(int tw, int th, const char* head, const char* file);
 
         void _loadPage(const page& p, LoadResourcesContext*);
-        void _load(LoadResourcesContext*);
-        void _unload();
+        void _load(LoadResourcesContext*) override;
+        void _unload() override;
         void _restore(Restorable*, void*);
         void _createFont(CreateResourceContext* context, bool sd, bool bmc, int downsample);
         void _createFontFromTxt(CreateResourceContext* context, char* fontData, const std::string& fontPath, int downsample);

oxygine/src/res/ResStarlingAtlas.h

@@ -19,8 +19,8 @@ namespace oxygine
 
     private:
         void loadAtlas(CreateResourceContext& context);
-        void _load(LoadResourcesContext*);
-        void _unload();
+        void _load(LoadResourcesContext*)override;
+        void _unload() override;
         void _restore(Restorable* r, void*);
 
         spNativeTexture _texture;

oxygine/src/res/Resources.h

@@ -120,8 +120,8 @@ namespace oxygine
 
     protected:
         void updateName(const std::string& filename);
-        void _load(LoadResourcesContext* context);
-        void _unload();
+        void _load(LoadResourcesContext* context) override;
+        void _unload() override;
 
 
         struct registeredResource

oxygine/src/text_utils/Node.h

@@ -69,9 +69,9 @@ namespace oxygine
             TextNode(const char* v);
 
             text_data _data;
-            void _resize(Aligner& rd);
-            void _finalPass(Aligner& rd);
-            void draw(DrawContext& dc);
+            void _resize(Aligner& rd) override;
+            void _finalPass(Aligner& rd) override;
+            void draw(DrawContext& dc) override;
 
             Symbol* getSymbol(int& pos) override;
 
@@ -84,8 +84,8 @@ namespace oxygine
         {
         public:
             DivNode(const pugi::xml_node& node);
-            void _resize(Aligner& rd);
-            void draw(DrawContext& dc);
+            void _resize(Aligner& rd) override;
+            void draw(DrawContext& dc) override;
 
             Color color;
         };