dmuratshin 9 years ago
parent
commit
d791111aa8

+ 1 - 1
examples/Demo/src/TestRender2Texture.h

@@ -86,7 +86,7 @@ public:
         else
         {
             color = Color::White;
-            renderer.setBlendMode(blend_erase);
+            renderer.setBlendMode(blend_disabled);
         }
 
 

+ 2 - 2
oxygine/src/STDMaterial.cpp

@@ -31,9 +31,9 @@ namespace oxygine
         }
     }
 
-    void STDMaterial::setViewProj(const Matrix& view, const Matrix& proj)
+    void STDMaterial::setViewProj(const Matrix& vp)
     {
-        _renderer->setViewProjTransform(view, proj);
+        _renderer->setViewProjTransform(vp);
     }
 
     void STDMaterial::render(ClipRectActor* actor, const RenderState& parentRS)

+ 1 - 1
oxygine/src/STDMaterial.h

@@ -25,7 +25,7 @@ namespace oxygine
         void doRender(ColorRectSprite*, const RenderState& rs) OVERRIDE;
         void doRender(ProgressBar*, const RenderState& rs) OVERRIDE;
 
-        void setViewProj(const Matrix& view, const Matrix& proj);
+        void setViewProj(const Matrix& vp);
 
         STDRenderer* getRenderer() { return _renderer; }
 

+ 2 - 1
oxygine/src/STDRenderer.cpp

@@ -251,7 +251,8 @@ namespace oxygine
         //initialize projection matrix
         Matrix::orthoLH(proj, (float)width, (float)height, 0, 1);
 
-        setViewProjTransform(view, proj);
+        Matrix vp = view * proj;
+        setViewProjTransform(vp);
     }
 
     void STDRenderer::setViewProjTransform(const Matrix& viewProj)

+ 2 - 1
oxygine/src/Stage.cpp

@@ -142,7 +142,8 @@ namespace oxygine
 
         STDMaterial& mat = *STDMaterial::instance;
         mat.apply(0);
-        mat.setViewProj(view, proj);
+        Matrix vp = view * proj;
+        mat.setViewProj(vp);
 
         timeMS t = getTimeMS();
         RenderState rs;