min

examples/Demo/src/TestUserShader.h

@@ -64,7 +64,7 @@ public:
             _client->setMaterial(0);
     }
 
-    void _start(Actor& actor) OVERRIDE
+    void _start(Actor& actor) override
     {
         actor.setName("zzz");
         actor.setMaterial(this);
@@ -85,7 +85,7 @@ public:
         driver->setUniform("userValue", &_val, 1);
     }
 
-    void apply(Material* prev) OVERRIDE
+    void apply(Material* prev) override
     {
         STDRenderer* renderer = STDMaterial::instance->getRenderer();
         _program->setShaderUniformsCallback(CLOSURE(this, &TweenShader::setUniforms));
@@ -93,12 +93,12 @@ public:
         renderer->setUberShaderProgram(_program);
     }
 
-    void doRender(Sprite* s, const RenderState& rs) OVERRIDE
+    void doRender(Sprite* s, const RenderState& rs) override
     {
         STDMaterial::instance->doRender(s, rs);
     }
 
-    void finish() OVERRIDE
+    void finish() override
     {
         STDRenderer* renderer = STDMaterial::instance->getRenderer();
         renderer->drawBatch();

examples/Demo/src/TestUserShader2.h

@@ -49,7 +49,7 @@ public:
         driver->setUniformInt("normal_texture", 1);
     }
 
-    void apply(Material* prev) OVERRIDE
+    void apply(Material* prev) override
     {
         IVideoDriver* driver = IVideoDriver::instance;
         driver->setShaderProgram(_lightShader);
@@ -66,7 +66,7 @@ public:
         driver->setBlendFunc(IVideoDriver::BT_SRC_ALPHA, IVideoDriver::BT_ONE_MINUS_SRC_ALPHA);
     }
 
-    void finish() OVERRIDE
+    void finish() override
     {
         drawBatch(IVideoDriver::instance);
     }
@@ -86,7 +86,7 @@ public:
     }
 
 
-    void doRender(Sprite* sprite, const RenderState& rs) OVERRIDE
+    void doRender(Sprite* sprite, const RenderState& rs) override
     {
         Material::setCurrent(this);