wip

examples/Demo/src/TestOpenGL.h

@@ -99,7 +99,7 @@ public:
 
         CHECKGL();
 
-        Matrix m = Matrix(rs.transform) * STDMaterial::instance->getRenderer()->getViewProjection();
+        Matrix m = Matrix(rs.transform) * STDRenderer::instance->getViewProjection();
 
         int projLocation = oxglGetUniformLocation(_program, "projection");
         oxglUniformMatrix4fv(projLocation, 1, GL_FALSE, m.ml);

examples/Demo/src/TestUserShader.h

@@ -87,9 +87,8 @@ public:
 
     void apply(Material* prev) override
     {
-        STDRenderer* renderer = STDMaterial::instance->getRenderer();
+        STDRenderer* renderer = STDRenderer::getCurrent();
         _program->setShaderUniformsCallback(CLOSURE(this, &TweenShader::setUniforms));
-        //STDRenderer* renderer = safeCast<STDRenderer*>(r);
         renderer->setUberShaderProgram(_program);
     }
 
@@ -100,7 +99,7 @@ public:
 
     void finish() override
     {
-        STDRenderer* renderer = STDMaterial::instance->getRenderer();
+        STDRenderer* renderer = STDRenderer::getCurrent();
         renderer->drawBatch();
     }
 };

examples/Demo/src/TestUserShader2.h

@@ -57,7 +57,7 @@ public:
         Vector2 light = getStage()->getDescendant("light")->getPosition();
 
         driver->setUniform("light", &light, 1);
-        driver->setUniform("mat", &STDMaterial::instance->getRenderer()->getViewProjection());
+        driver->setUniform("mat", &STDRenderer::getCurrent()->getViewProjection());
 
         driver->setTexture(1, _normal.getDiffuse().base);
 

oxygine/src/PostProcess.cpp

@@ -415,7 +415,7 @@ namespace oxygine
 
         RenderState rs;
         STDMaterial* mat = STDMaterial::instance;
-        STDRenderer* renderer = mat->getRenderer();
+        STDRenderer* renderer = STDRenderer::instance;
         rs.material = mat;
 
         RectF clip = vp.cast<RectF>();

oxygine/src/STDMaterial.cpp

@@ -235,6 +235,7 @@ namespace oxygine
 
     void STDMaterial::finish()
     {
-        STDRenderer::getCurrent()->end();
+        if (STDRenderer::getCurrent())
+            STDRenderer::getCurrent()->end();
     }
 }

oxygine/src/STDMaterial.h

@@ -24,8 +24,6 @@ namespace oxygine
         void doRender(ProgressBar*, const RenderState& rs) override;
 
 
-        STDRenderer* getRenderer() { return STDRenderer::getCurrent(); }
-
     protected:
     };
 

oxygine/src/STDRenderer.cpp

@@ -301,7 +301,7 @@ namespace oxygine
             _prevRT = 0;
         }
 
-        current = 0;
+        //current = 0;
 
         _drawing = false;
     }

oxygine/src/TweenAlphaFade.cpp

@@ -12,8 +12,7 @@ namespace oxygine
         void render(Actor* actor, const RenderState& rs)
         {
             int _a = lerp(_fadeIn ? 0 : 255, _fadeIn ? 255 : 0, _progress);
-            STDMaterial* mat = STDMaterial::instance;
-            STDRenderer* renderer = mat->getRenderer();
+            STDRenderer* renderer = STDRenderer::getCurrent();
 
             spNativeTexture rt = _pp._rt;
             RectF src(0, 0,

oxygine/src/TweenGlow.cpp

@@ -23,7 +23,7 @@ namespace oxygine
         void render(Actor* actor, const RenderState& rs) override
         {
             STDMaterial* mat = STDMaterial::instance;
-            STDRenderer* renderer = mat->getRenderer();
+            STDRenderer* renderer = STDRenderer::getCurrent();
 
 
             RenderState r = rs;

oxygine/src/TweenOutline.cpp

@@ -23,7 +23,7 @@ namespace oxygine
         void render(Actor* actor, const RenderState& rs) override
         {
             STDMaterial* mat = STDMaterial::instance;
-            STDRenderer* renderer = mat->getRenderer();
+            STDRenderer* renderer = STDRenderer::getCurrent();
 
             RectF src(0, 0,
                       _pp._screen.getWidth() / (float)_pp._rt->getWidth() / _downsample,