wip

oxygine/src/oxygine/STDMaterial.cpp

@@ -51,7 +51,7 @@ namespace oxygine
         bool vis = true;
         if (actor->getClipping())
         {
-            renderer->drawBatch();
+            renderer->flush();
 
             RectF ss_rect = getActorTransformedDestRect(actor, actor->getTransform() * parentRS.transform);
 
@@ -84,7 +84,7 @@ namespace oxygine
 
         if (actor->getClipping())
         {
-            renderer->drawBatch();
+            renderer->flush();
             driver->setScissorRect(scissorEnabled ? &scissorRect : 0);
         }
     }
@@ -110,7 +110,7 @@ namespace oxygine
 
             STDRenderer* original = STDRenderer::getCurrent();
 
-            original->drawBatch();
+            original->flush();
             original->end();
 
 

oxygine/src/oxygine/STDRenderer.cpp

@@ -226,7 +226,7 @@ namespace oxygine
 
     STDRenderer::~STDRenderer()
     {
-        drawBatch();
+        flush();
     }
 
     const oxygine::Matrix& STDRenderer::getViewProjection() const
@@ -255,11 +255,6 @@ namespace oxygine
         _vertices.clear();
     }
 
-    void STDRenderer::drawBatch()
-    {
-        flush();
-    }
-
     void STDRenderer::initCoordinateSystem(int width, int height, bool flipU)
     {
         Matrix view = makeViewMatrix(width, height, flipU);
@@ -285,7 +280,7 @@ namespace oxygine
     {
         _vp = viewProj;
         if (_drawing)
-            drawBatch();
+            flush();
 
         _driver->setUniform("mat", _vp);
     }
@@ -328,7 +323,7 @@ namespace oxygine
             return;
 
         OX_ASSERT(_drawing);
-        drawBatch();
+        flush();
 
         if (_prevRT)
         {
@@ -344,7 +339,7 @@ namespace oxygine
     void STDRenderer::setVertexDeclaration(const VertexDeclaration* decl)
     {
         if (_vdecl != decl)
-            drawBatch();
+            flush();
         _vdecl = decl;
     }
 
@@ -362,7 +357,7 @@ namespace oxygine
     void STDRenderer::checkDrawBatch()
     {
         if (_vertices.size() / sizeof(_vdecl->size) >= maxVertices)
-            drawBatch();
+            flush();
     }
 
     Matrix makeViewMatrix(int w, int h, bool flipU)
@@ -498,7 +493,7 @@ namespace oxygine
         if (base_ == _base && _alpha == alpha)
             return;
 
-        drawBatch();
+        flush();
 
         _renderTextureHook(base_);
         _renderTextureHook(alpha);
@@ -762,7 +757,7 @@ namespace oxygine
     {
         if (_alpha)
         {
-            drawBatch();
+            flush();
             _shaderFlags &= ~UberShaderProgram::SEPARATE_ALPHA;
             _alpha = 0;
         }
@@ -776,7 +771,7 @@ namespace oxygine
 
         if (_shaderFlags != shaderFlags)
         {
-            drawBatch();
+            flush();
         }
     }
 
@@ -784,7 +779,7 @@ namespace oxygine
     {
         if (_base != texture)
         {
-            drawBatch();
+            flush();
             _base = texture;
         }
 

oxygine/src/oxygine/TweenAlphaFade.cpp

@@ -30,7 +30,7 @@ namespace oxygine
             renderer->applySimpleMode(true);
             Color color = Color(Color::White).withAlpha(_a).premultiplied();
             renderer->draw(rt, color.rgba(), src, dest);
-            renderer->drawBatch();
+            renderer->flush();
         }
 
         bool _fadeIn;

oxygine/src/oxygine/TweenGlow.cpp

@@ -49,7 +49,7 @@ namespace oxygine
             color = Color::White;
             renderer->setBlendMode(blend_add);
             renderer->draw(_pp._rt, color.rgba(), src, dest);
-            renderer->drawBatch();
+            renderer->flush();
         }
 
         void _renderPP() override

oxygine/src/oxygine/TweenOutline.cpp

@@ -33,7 +33,7 @@ namespace oxygine
             renderer->applySimpleMode(true);
             Color color = Color(Color::White).withAlpha(255).premultiplied();
             renderer->draw(_pp._rt, color.rgba(), src, dest);
-            renderer->drawBatch();
+            renderer->flush();
 
 
             RenderState r = rs;