rename

examples/HelloWorld/src/example.cpp

@@ -1,5 +1,6 @@
 #include "oxygine-framework.h"
 #include <functional>
+
 using namespace oxygine;
 
 //it is our resources
@@ -29,9 +30,14 @@ public:
         button->setPosition(pos);
 
         //register  click handler to button
-        EventCallback cb = CLOSURE(this, &MainActor::buttonClicked);
+        EventCallback cb = CLOSURE(this, &MainActor::buttonClicked);        
         button->addEventListener(TouchEvent::CLICK, cb);
 
+        //animate mouse over and mouse out events
+        cb = CLOSURE(this, &MainActor::buttonOverOut);
+        button->addEventListener(TouchEvent::OVER, cb);
+        button->addEventListener(TouchEvent::OUT, cb);
+
 #ifdef CLOSURE_FUNCTION //if your compiler supports lambda
 
         button->addEventListener(TouchEvent::CLICK, [](Event * e)->void
@@ -81,6 +87,19 @@ public:
         runSprite();
     }
 
+    void buttonOverOut(Event* e)
+    {
+        if (e->type == TouchEvent::OVER)
+        {
+            _button->addTween(Sprite::TweenAddColor(Color(64, 64, 64, 0)), 300);
+        }
+
+        if (e->type == TouchEvent::OUT)
+        {
+            _button->addTween(Sprite::TweenAddColor(Color(0, 0, 0, 0)), 300);
+        }
+    }
+
     void runSprite()
     {
         spSprite sprite = new Sprite();

oxygine/SDL/win32/oxygine.vcxproj

@@ -173,7 +173,7 @@
     <ClCompile Include="..\..\src\oxygine\json\jsoncpp.cpp" />
     <ClCompile Include="..\..\src\oxygine\key.cpp" />
     <ClCompile Include="..\..\src\oxygine\MaskedRenderer.cpp" />
-    <ClCompile Include="..\..\src\oxygine\Material.cpp" />
+    <ClCompile Include="..\..\src\oxygine\RenderDelegate.cpp" />
     <ClCompile Include="..\..\src\oxygine\Image.cpp" />
     <ClCompile Include="..\..\src\oxygine\MaterialCache.cpp" />
     <ClCompile Include="..\..\src\oxygine\MaterialX.cpp" />
@@ -197,7 +197,7 @@
     <ClCompile Include="..\..\src\oxygine\res\ResStarlingAtlas.cpp" />
     <ClCompile Include="..\..\src\oxygine\Serializable.cpp" />
     <ClCompile Include="..\..\src\oxygine\Serialize.cpp" />
-    <ClCompile Include="..\..\src\oxygine\STDMaterial.cpp" />
+    <ClCompile Include="..\..\src\oxygine\STDRenderDelegate.cpp" />
     <ClCompile Include="..\..\src\oxygine\STDRenderer.cpp" />
     <ClCompile Include="..\..\src\oxygine\text_utils\Aligner.cpp" />
     <ClCompile Include="..\..\src\oxygine\text_utils\Node.cpp" />
@@ -287,7 +287,7 @@
     <ClInclude Include="..\..\src\oxygine\key.h" />
     <ClInclude Include="..\..\src\oxygine\KeyEvent.h" />
     <ClInclude Include="..\..\src\oxygine\MaskedRenderer.h" />
-    <ClInclude Include="..\..\src\oxygine\Material.h" />
+    <ClInclude Include="..\..\src\oxygine\RenderDelegate.h" />
     <ClInclude Include="..\..\src\oxygine\MaterialCache.h" />
     <ClInclude Include="..\..\src\oxygine\MaterialX.h" />
     <ClInclude Include="..\..\src\oxygine\math\OBBox.h" />
@@ -318,7 +318,7 @@
     <ClInclude Include="..\..\src\oxygine\res\ResStarlingAtlas.h" />
     <ClInclude Include="..\..\src\oxygine\Serializable.h" />
     <ClInclude Include="..\..\src\oxygine\Serialize.h" />
-    <ClInclude Include="..\..\src\oxygine\STDMaterial.h" />
+    <ClInclude Include="..\..\src\oxygine\STDRenderDelegate.h" />
     <ClInclude Include="..\..\src\oxygine\STDRenderer.h" />
     <ClInclude Include="..\..\src\oxygine\TextStyle.h" />
     <ClInclude Include="..\..\src\oxygine\text_utils\Aligner.h" />

oxygine/SDL/win32/oxygine.vcxproj.filters

@@ -258,12 +258,6 @@
     <ClCompile Include="..\..\src\oxygine\json\jsoncpp.cpp">
       <Filter>src\json</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\STDMaterial.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\oxygine\Material.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\oxygine\res\ResAtlasGeneric.cpp">
       <Filter>src\res</Filter>
     </ClCompile>
@@ -357,6 +351,12 @@
     <ClCompile Include="..\..\src\oxygine\tween\TweenQueue.cpp">
       <Filter>src\tween</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\oxygine\RenderDelegate.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\oxygine\STDRenderDelegate.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\oxygine\closure\closure.h">
@@ -653,12 +653,6 @@
     <ClInclude Include="..\..\src\oxygine\json\json-forwards.h">
       <Filter>src\json</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\STDMaterial.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\oxygine\Material.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\oxygine\res\ResAtlasGeneric.h">
       <Filter>src\res</Filter>
     </ClInclude>
@@ -761,6 +755,12 @@
     <ClInclude Include="..\..\src\oxygine\tween\TweenQueue.h">
       <Filter>src\tween</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\oxygine\RenderDelegate.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\oxygine\STDRenderDelegate.h">
+      <Filter>src</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />

oxygine/src/ox/Material.hpp

@@ -1 +1 @@
-#include "oxygine/Material.h"
+#include "oxygine/RenderDelegate.h"

oxygine/src/oxygine-framework.h

@@ -135,4 +135,9 @@
 //#include "oxygine/winnie_alloc/system_alloc.h"
 //#include "oxygine/winnie_alloc/winnie_alloc.h"
 //#include "oxygine/winnie_alloc/winnie_alloc_config.h"
+
+#ifdef OUT
+#undef OUT
+#endif
+
 #endif

oxygine/src/oxygine/Material.cpp

@@ -1,9 +0,0 @@
-#include "Material.h"
-
-namespace oxygine
-{
-    Material::~Material()
-    {
-    }
-
-}

oxygine/src/oxygine/PostProcess.cpp

@@ -1,6 +1,6 @@
 #include "PostProcess.h"
 #include "RenderState.h"
-#include "STDMaterial.h"
+#include "STDRenderDelegate.h"
 #include "actor/Actor.h"
 #include "core/ZipFileSystem.h"
 #include "core/file.h"
@@ -452,13 +452,13 @@ namespace oxygine
         }
 
         //OX_ASSERT(0);
-        Material* rd = actor->getMaterial();
-        actor->setMaterial(STDMaterial::instance);
-        STDMaterial::instance->Material::render(actor, rs);
+        RenderDelegate* rd = actor->getMaterial();
+        actor->setRenderDelegate(STDRenderDelegate::instance);
+        STDRenderDelegate::instance->RenderDelegate::render(actor, rs);
 
         STDRenderer::current->flush();
 
-        actor->setMaterial(rd);
+        actor->setRenderDelegate(rd);
 
         MaterialX::null->apply();
     }
@@ -476,7 +476,7 @@ namespace oxygine
 
         removePostProcessItem(this);
         if (_actor && _actor->getMaterial())
-            _actor->setMaterial(_prevMaterial);
+            _actor->setRenderDelegate(_prevMaterial);
     }
 
 
@@ -503,7 +503,7 @@ namespace oxygine
     {
         _actor = &actor;
         _prevMaterial = _actor->getMaterial();
-        _actor->setMaterial(this);
+        _actor->setRenderDelegate(this);
     }
 
     void TweenPostProcess::update(Actor& actor, float p, const UpdateState& us)
@@ -515,7 +515,7 @@ namespace oxygine
     void TweenPostProcess::done(Actor& actor)
     {
         if (_actor->getMaterial())
-            _actor->setMaterial(_prevMaterial);
+            _actor->setRenderDelegate(_prevMaterial);
     }
 
 }

oxygine/src/oxygine/PostProcess.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "oxygine-include.h"
-#include "Material.h"
+#include "RenderDelegate.h"
 #include "core/NativeTexture.h"
 #include "core/Renderer.h"
 #include "math/Rect.h"
@@ -73,7 +73,7 @@ namespace oxygine
 
     DECLARE_SMART(TweenPostProcess, spTweenPostProcess);
 
-    class TweenPostProcess : public TweenObj, public Material, public PPTask
+    class TweenPostProcess : public TweenObj, public RenderDelegate, public PPTask
     {
     public:
         TweenPostProcess(const PostProcessOptions& opt);
@@ -94,7 +94,7 @@ namespace oxygine
         PostProcess _pp;
         float _progress;
 
-        Material* _prevMaterial;
+        RenderDelegate* _prevMaterial;
     };
 
 

oxygine/src/oxygine/RenderDelegate.cpp

@@ -0,0 +1,9 @@
+#include "RenderDelegate.h"
+
+namespace oxygine
+{
+    RenderDelegate::~RenderDelegate()
+    {
+    }
+
+}

oxygine/src/oxygine/Material.h → oxygine/src/oxygine/RenderDelegate.h

@@ -3,10 +3,10 @@
 
 namespace oxygine
 {
-    class Material
+    class RenderDelegate
     {
     public:
-        virtual ~Material();
+        virtual ~RenderDelegate();
 
         virtual void render(Actor*, const RenderState& rs);
         virtual void render(ClipRectActor*, const RenderState& rs) {}

oxygine/src/oxygine/RenderState.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "oxygine-include.h"
-#include "STDMaterial.h"
+#include "STDRenderDelegate.h"
 #include "core/Renderer.h"
 
 namespace oxygine

oxygine/src/oxygine/STDMaterial.cpp → oxygine/src/oxygine/STDRenderDelegate.cpp

@@ -1,4 +1,4 @@
-#include "STDMaterial.h"
+#include "STDRenderDelegate.h"
 #include "MaskedRenderer.h"
 #include "RenderState.h"
 #include "STDRenderer.h"
@@ -16,9 +16,9 @@
 
 namespace oxygine
 {
-    STDMaterial* STDMaterial::instance = 0;
+    STDRenderDelegate* STDRenderDelegate::instance = 0;
 
-    void Material::render(Actor* parent, const RenderState& parentRS)
+    void RenderDelegate::render(Actor* parent, const RenderState& parentRS)
     {
         RenderState rs;
         if (!parent->internalRender(rs, parentRS))
@@ -33,7 +33,7 @@ namespace oxygine
         }
     }
 
-    void STDMaterial::render(ClipRectActor* actor, const RenderState& parentRS)
+    void STDRenderDelegate::render(ClipRectActor* actor, const RenderState& parentRS)
     {
         STDRenderer* renderer = STDRenderer::getCurrent();
         IVideoDriver* driver = renderer->getDriver();
@@ -90,7 +90,7 @@ namespace oxygine
         }
     }
 
-    void STDMaterial::render(MaskedSprite* sprite, const RenderState& parentRS)
+    void STDRenderDelegate::render(MaskedSprite* sprite, const RenderState& parentRS)
     {
         spSprite maskSprite = sprite->getMask();
         if (!maskSprite)
@@ -192,7 +192,7 @@ namespace oxygine
 
     }
 
-    void STDMaterial::doRender(Sprite* sprite, const RenderState& rs)
+    void STDRenderDelegate::doRender(Sprite* sprite, const RenderState& rs)
     {
         if (!sprite->getAnimFrame().getDiffuse().base)
             return;
@@ -204,7 +204,7 @@ namespace oxygine
         sprite->_mat->render(rs.transform, color, sprite->getAnimFrame().getSrcRect(), sprite->getDestRect());
     }
 
-    void STDMaterial::doRender(TextField* tf, const RenderState& rs)
+    void STDRenderDelegate::doRender(TextField* tf, const RenderState& rs)
     {
         float scale = sqrtf(rs.transform.a * rs.transform.a + rs.transform.c * rs.transform.c);
 
@@ -225,30 +225,15 @@ namespace oxygine
         root->draw(dc);
     }
 
-    void STDMaterial::doRender(ColorRectSprite* sprite, const RenderState& rs)
+    void STDRenderDelegate::doRender(ColorRectSprite* sprite, const RenderState& rs)
     {
         sprite->_mat->apply();
-
         Color color = rs.getFinalColor(sprite->getColor());
-
         sprite->_mat->render(rs.transform, color, sprite->getAnimFrame().getSrcRect(), sprite->getDestRect());
     }
 
-    void STDMaterial::doRender(ProgressBar*, const RenderState& rs)
+    void STDRenderDelegate::doRender(ProgressBar*, const RenderState& rs)
     {
 
     }
-    /*
-    void STDMaterial::apply(Material* prev)
-    {
-        STDRenderer* cur = STDRenderer::getCurrent();
-        cur->begin();
-        cur->setUberShaderProgram(&STDRenderer::uberShader);
-    }
-
-    void STDMaterial::finish()
-    {
-        STDRenderer::getCurrent()->end();
-    }
-    */
 }

oxygine/src/oxygine/STDMaterial.h → oxygine/src/oxygine/STDRenderDelegate.h

@@ -1,17 +1,17 @@
 #pragma once
 #include "oxygine-include.h"
-#include "Material.h"
+#include "RenderDelegate.h"
 #include "STDRenderer.h"
 
 namespace oxygine
 {
-    DECLARE_SMART(STDMaterial, spSTDMaterial);
-    class STDMaterial : public Material
+    DECLARE_SMART(STDRenderDelegate, spSTDMaterial);
+    class STDRenderDelegate : public RenderDelegate
     {
     public:
-        static STDMaterial* instance;
+        static STDRenderDelegate* instance;
 
-        STDMaterial() {}
+        STDRenderDelegate() {}
 
         void render(ClipRectActor*,     const RenderState& rs) override;
         void render(MaskedSprite*,      const RenderState& rs) override;

oxygine/src/oxygine/STDRenderer.cpp

@@ -2,7 +2,7 @@
 #include "AnimationFrame.h"
 #include "Image.h"
 #include "RenderState.h"
-#include "STDMaterial.h"
+#include "STDRenderDelegate.h"
 #include "VisualStyle.h"
 #include "core/ImageDataOperations.h"
 #include "core/UberShaderProgram.h"

oxygine/src/oxygine/actor/Actor.cpp

@@ -14,7 +14,7 @@
 #include "../RenderState.h"
 #include <stdio.h>
 #include "../Serialize.h"
-#include "../Material.h"
+#include "../RenderDelegate.h"
 #include "../math/OBBox.h"
 
 namespace oxygine
@@ -37,7 +37,7 @@ namespace oxygine
         _parent(0),
         _alpha(255),
         _stage(0),
-        _rdelegate(STDMaterial::instance)
+        _rdelegate(STDRenderDelegate::instance)
     {
         _transform.identity();
         _transformInvert.identity();
@@ -678,7 +678,7 @@ namespace oxygine
         _alpha = alpha;
     }
 
-    void Actor::setMaterial(Material* mat)
+    void Actor::setRenderDelegate(RenderDelegate* mat)
     {
         _rdelegate = mat;
     }

oxygine/src/oxygine/actor/Actor.h

@@ -114,7 +114,7 @@ namespace oxygine
         bool                getTouchEnabled() const { return (_flags & flag_touchEnabled) != 0; }
         bool                getTouchChildrenEnabled() const { return (_flags & flag_touchChildrenEnabled) != 0; }
         UpdateCallback      getCallbackDoUpdate() const {return _cbDoUpdate;}
-        Material*           getMaterial() { return _rdelegate; }
+        RenderDelegate*     getMaterial() { return _rdelegate; }
         //RenderCallback        getCallbackDoRender() const {return _cbDoRender;}
 
         /**return local actor transformation*/
@@ -165,7 +165,7 @@ namespace oxygine
         void setExtendedClickArea(char add) {_extendedIsOn = add;}
 
         void setClock(spClock clock);
-        void setMaterial(Material* mat);
+        void setRenderDelegate(RenderDelegate* mat);
 
         /**Show/Hide actor and children. Invisible Actor doesn't receive Touch events.*/
         void setVisible(bool vis) {_flags &= ~flag_visible; if (vis) _flags |= flag_visible;}
@@ -292,7 +292,7 @@ namespace oxygine
 
     protected:
 
-        Material* _rdelegate;
+        RenderDelegate* _rdelegate;
         Stage* _stage;
 
         void added2stage(Stage*);

oxygine/src/oxygine/actor/Box9Sprite.cpp

@@ -1,7 +1,7 @@
 #include "Box9Sprite.h"
 #include "DebugActor.h"
 #include "../RenderState.h"
-#include "../STDMaterial.h"
+#include "../STDRenderDelegate.h"
 #include "../STDRenderer.h"
 #include "../Serialize.h"
 #include "../math/ScalarMath.h"

oxygine/src/oxygine/actor/ClipRectActor.cpp

@@ -1,6 +1,6 @@
 #include "ClipRectActor.h"
 #include "Stage.h"
-#include "../Material.h"
+#include "../RenderDelegate.h"
 #include "../RenderState.h"
 #include "../Serialize.h"
 #include "../core/log.h"

oxygine/src/oxygine/actor/ColorRectSprite.cpp

@@ -1,5 +1,5 @@
 #include "ColorRectSprite.h"
-#include "../Material.h"
+#include "../RenderDelegate.h"
 #include "../MaterialCache.h"
 #include "../RenderState.h"
 #include "../Serialize.h"

oxygine/src/oxygine/actor/DebugActor.cpp

@@ -7,7 +7,7 @@
 #include "../Event.h"
 #include "../MaterialCache.h"
 #include "../RenderState.h"
-#include "../STDMaterial.h"
+#include "../STDRenderDelegate.h"
 #include "../STDRenderer.h"
 #include "../core/NativeTexture.h"
 #include "../core/ZipFileSystem.h"

oxygine/src/oxygine/actor/MaskedSprite.cpp

@@ -1,6 +1,6 @@
 #include "MaskedSprite.h"
 #include "../MaskedRenderer.h"
-#include "../Material.h"
+#include "../RenderDelegate.h"
 #include "../RenderState.h"
 #include "../Serialize.h"
 

oxygine/src/oxygine/actor/Polygon.cpp

@@ -1,7 +1,7 @@
 #include "Polygon.h"
-#include "../Material.h"
+#include "../RenderDelegate.h"
 #include "../RenderState.h"
-#include "../STDMaterial.h"
+#include "../STDRenderDelegate.h"
 #include "../STDRenderer.h"
 #include "../Serialize.h"
 #include "../core/UberShaderProgram.h"

oxygine/src/oxygine/actor/ProgressBar.cpp

@@ -1,7 +1,7 @@
 #include "ProgressBar.h"
-#include "../Material.h"
+#include "../RenderDelegate.h"
 #include "../RenderState.h"
-#include "../STDMaterial.h"
+#include "../STDRenderDelegate.h"
 #include "../STDRenderer.h"
 #include "../Serialize.h"
 #include <sstream>

oxygine/src/oxygine/actor/Sprite.cpp

@@ -1,6 +1,6 @@
 #include "Sprite.h"
 #include "Stage.h"
-#include "../Material.h"
+#include "../RenderDelegate.h"
 #include "../MaterialCache.h"
 #include "../RenderState.h"
 #include "../Serialize.h"

oxygine/src/oxygine/actor/Stage.cpp

@@ -1,7 +1,7 @@
 #include "Stage.h"
 #include "../Clock.h"
 #include "../RenderState.h"
-#include "../STDMaterial.h"
+#include "../STDRenderDelegate.h"
 #include "../core/oxygine.h"
 #include "../math/Rect.h"
 #include <sstream>

oxygine/src/oxygine/actor/TextField.cpp

@@ -1,7 +1,7 @@
 #include "TextField.h"
 #include "DebugActor.h"
 #include "../Font.h"
-#include "../Material.h"
+#include "../RenderDelegate.h"
 #include "../RenderState.h"
 #include "../Serialize.h"
 #include "../core/gl/VideoDriverGLES20.h"

oxygine/src/oxygine/core/oxygine.cpp

@@ -36,7 +36,7 @@
 
 
 #include "gl/VideoDriverGLES20.h"
-#include "../STDMaterial.h"
+#include "../STDRenderDelegate.h"
 
 
 #ifdef EMSCRIPTEN
@@ -471,7 +471,7 @@ namespace oxygine
             Resources::registerResourceType(ResStarlingAtlas::create, "starling");
 
             STDRenderer::instance = new STDRenderer;
-            STDMaterial::instance = new STDMaterial;
+            STDRenderDelegate::instance = new STDRenderDelegate;
             MaterialX::null       = new NullMaterialX;
             MaterialX::current = MaterialX::null;
 
@@ -849,8 +849,8 @@ namespace oxygine
             mc().clear();
 
             STDRenderer::release();
-            delete STDMaterial::instance;
-            STDMaterial::instance = 0;
+            delete STDRenderDelegate::instance;
+            STDRenderDelegate::instance = 0;
 
             delete IVideoDriver::instance;
             IVideoDriver::instance = 0;

oxygine/src/oxygine/dev_tools/TreeInspectorPreview.cpp

@@ -1,7 +1,7 @@
 #include "TreeInspectorPreview.h"
 #include "TreeInspector.h"
 #include "../RenderState.h"
-#include "../STDMaterial.h"
+#include "../STDRenderDelegate.h"
 #include "../STDRenderer.h"
 #include "../actor/DebugActor.h"
 #include "../actor/Stage.h"

oxygine/src/oxygine/oxygine-forwards.h

@@ -58,7 +58,7 @@ namespace oxygine
     DECLARE_SMART(ResBuffer, spResBuffer);
     DECLARE_SMART(ResFont, spResFont);
     DECLARE_SMART(Resource, spResource);
-    DECLARE_SMART(STDMaterial, spSTDMaterial);
+    DECLARE_SMART(STDRenderDelegate, spSTDMaterial);
     DECLARE_SMART(SlidingActor, spSlidingActor);
     DECLARE_SMART(Sprite, spSprite);
     DECLARE_SMART(Stage, spStage);
@@ -85,7 +85,7 @@ namespace oxygine
     class ImageData;
     class LoadResourcesContext;
     class MaskedSprite;
-    class Material;
+    class RenderDelegate;
     class Mem2Native;
     class Mutex;
     class PointerState;

oxygine/src/oxygine/text_utils/Node.cpp

@@ -3,7 +3,7 @@
 #include "../Font.h"
 #include "../MaterialCache.h"
 #include "../RenderState.h"
-#include "../STDMaterial.h"
+#include "../STDRenderDelegate.h"
 #include "../pugixml/pugixml.hpp"
 #include "../res/ResFont.h"
 #include "../utils/stringUtils.h"

oxygine/src/oxygine/tween/TweenAlphaFade.cpp

@@ -1,5 +1,5 @@
 #include "TweenAlphaFade.h"
-#include "../STDMaterial.h"
+#include "../STDRenderDelegate.h"
 #include "../actor/Actor.h"
 
 namespace oxygine

oxygine/src/oxygine/tween/TweenGlow.cpp

@@ -1,6 +1,6 @@
 #include "TweenGlow.h"
 #include "../RenderState.h"
-#include "../STDMaterial.h"
+#include "../STDRenderDelegate.h"
 #include "../actor/Actor.h"
 #include "../core/gl/VertexDeclarationGL.h"
 
@@ -19,14 +19,14 @@ namespace oxygine
 
         void render(Actor* actor, const RenderState& rs) override
         {
-            STDMaterial* mat = STDMaterial::instance;
+            STDRenderDelegate* mat = STDRenderDelegate::instance;
             STDRenderer* renderer = STDRenderer::getCurrent();
 
 
             RenderState r = rs;
-            actor->setMaterial(_prevMaterial);
+            actor->setRenderDelegate(_prevMaterial);
             actor->render(r);
-            actor->setMaterial(this);
+            actor->setRenderDelegate(this);
 
 
             RectF src(0, 0,

oxygine/src/oxygine/tween/TweenOutline.cpp

@@ -1,6 +1,6 @@
 #include "TweenOutline.h"
 #include "../RenderState.h"
-#include "../STDMaterial.h"
+#include "../STDRenderDelegate.h"
 #include "../actor/Actor.h"
 #include "../core/gl/VertexDeclarationGL.h"
 
@@ -47,9 +47,9 @@ namespace oxygine
 
 
             RenderState r = rs;
-            actor->setMaterial(_prevMaterial);
+            actor->setRenderDelegate(_prevMaterial);
             actor->render(r);
-            actor->setMaterial(this);
+            actor->setRenderDelegate(this);
         }
 
         void _renderPP() override