dmuratshin 8 years ago
parent
commit
c1ead0f06f
2 changed files with 3 additions and 5 deletions
  1. 1 1
      oxygine/src/oxygine/MaterialX.cpp
  2. 2 4
      oxygine/src/oxygine/STDRenderer.h

+ 1 - 1
oxygine/src/oxygine/MaterialX.cpp

@@ -50,7 +50,7 @@ namespace oxygine
 
 
     void STDMaterialX::xflush()
     void STDMaterialX::xflush()
     {
     {
-        STDRenderer::getCurrent()->drawBatch();
+        STDRenderer::getCurrent()->flush();
     }
     }
 
 
     MaterialX::MaterialX(const MaterialX& other)
     MaterialX::MaterialX(const MaterialX& other)

+ 2 - 4
oxygine/src/oxygine/STDRenderer.h

@@ -59,10 +59,6 @@ namespace oxygine
         void draw(const Color&, const RectF& srcRect, const RectF& destRect);
         void draw(const Color&, const RectF& srcRect, const RectF& destRect);
         void setTextureNew(int sampler, const spNativeTexture& t);
         void setTextureNew(int sampler, const spNativeTexture& t);
 
 
-        /**Draws existing batch immediately.*/
-        void drawBatch();
-
-
         void applySimpleMode(bool basePremultiplied);
         void applySimpleMode(bool basePremultiplied);
         /**used in pair with applySimpleMode/applySDF, fast, don't have excess checks*/
         /**used in pair with applySimpleMode/applySDF, fast, don't have excess checks*/
         void draw(const spNativeTexture& texture, unsigned int color, const RectF& src, const RectF& dest) override;
         void draw(const spNativeTexture& texture, unsigned int color, const RectF& src, const RectF& dest) override;
@@ -83,6 +79,8 @@ namespace oxygine
         void resetSettings();
         void resetSettings();
         void process();
         void process();
         void process(int);
         void process(int);
+
+        /**Draws existing batch immediately.*/
         void flush();
         void flush();
 
 
         virtual void addVertices(const void* data, unsigned int size);
         virtual void addVertices(const void* data, unsigned int size);