wip

oxygine/src/STDRenderer.cpp

@@ -246,7 +246,17 @@ namespace oxygine
         setViewProjTransform(vp);
     }
 
-    void STDRenderer::setViewProjTransform(const Matrix& viewProj)
+    IVideoDriver* STDRenderer::getDriver()
+    {
+        return _driver;
+    }
+
+    void STDRenderer::setDriver(IVideoDriver* driver)
+    {
+        _driver = driver;
+    }
+
+    void STDRenderer::setViewProj(const Matrix& viewProj)
     {
         _vp = viewProj;
         if (_drawing)
@@ -258,16 +268,6 @@ namespace oxygine
         _driver->setUniform("mat", &_vp);
     }
 
-    IVideoDriver* STDRenderer::getDriver()
-    {
-        return _driver;
-    }
-
-    void STDRenderer::setDriver(IVideoDriver* driver)
-    {
-        _driver = driver;
-    }
-
     void STDRenderer::resetSettings()
     {
         _resetSettings();

oxygine/src/STDRenderer.h

@@ -47,7 +47,8 @@ namespace oxygine
 
         void setDriver(IVideoDriver*);
 
-        void setViewProjTransform(const Matrix& viewProj);
+        void setViewProj(const Matrix& viewProj);
+        void setViewProjTransform(const Matrix& viewProj) { setViewProj(viewProj); }
         void setVertexDeclaration(const VertexDeclaration* decl);
         void setUberShaderProgram(UberShaderProgram* pr);
         /**Sets blend mode. Default value is blend_premultiplied_alpha*/

oxygine/src/Stage.cpp

@@ -147,18 +147,16 @@ namespace oxygine
         if (clearColor)
             driver->clear(*clearColor);
 
-        //STDMaterial& mat = *STDMaterial::instance;
-        //mat.apply(0);
         Matrix vp = view * proj;
-        //mat.setViewProj(vp);
-
         STDRenderer::instance->setViewProjTransform(vp);
 
-        timeMS t = getTimeMS();
         RenderState rs;
         rs.material = _material;
         Point ds = core::getDisplaySize();
 
+
+        Material::setCurrent(_material);
+
         RectF clip(0.0f, 0.0f, (float)ds.x, (float)ds.y);
         rs.clip = &clip;
 
@@ -171,7 +169,6 @@ namespace oxygine
         Actor::render(rs);
 
         Material::setCurrent(0);
-        //mat.finish();
     }
 
     void Stage::render(const Color& clearColor, const Rect& viewport)