inc drawcall

Author: super626

cocos/3d/CCMesh.h

@@ -99,12 +99,11 @@ class Mesh : public Ref
     void cleanAndFreeBuffers();
 
 protected:
-    std::string _name;
-    GLuint _vertexBuffer;
     PrimitiveType _primitiveType;
     IndexFormat _indexFormat;
-    unsigned int _indexCount;
+    GLuint _vertexBuffer;
     GLuint _indexBuffer;
+    unsigned int _indexCount;
 
 private:
     RenderMeshData _renderdata;

cocos/3d/CCSprite3D.cpp

@@ -152,7 +152,7 @@ bool Sprite3D::initWithFile(const std::string &path)
         std::string ext = path.substr(path.length() - 4, 4);
         if (ext != ".obj" || !loadFromObj(path))
         {
-                return false;
+            return false;
         }
         return true;
     }
@@ -182,23 +182,6 @@ GLProgram* Sprite3D::getDefGLProgram(bool textured)
     {
         return GLProgramCache::getInstance()->getGLProgram(GLProgram::SHADER_3D_POSITION);
     }
-//    static GLProgram s_defGLProgramTex;
-//    static GLProgram s_defGLProgram;
-//    if(textured && s_defGLProgramTex.getProgram() == 0)
-//    {
-//        s_defGLProgramTex.initWithByteArrays(baseVertexShader, baseTexturedFrag);
-//        s_defGLProgramTex.link();
-//        s_defGLProgramTex.updateUniforms();
-//    }
-//    
-//    if(!textured && s_defGLProgram.getProgram() == 0)
-//    {
-//        s_defGLProgram.initWithByteArrays(baseVertexShader, baseTexturedFrag);
-//        s_defGLProgram.link();
-//        s_defGLProgram.updateUniforms();
-//    }
-//    
-//    return textured ? &s_defGLProgramTex : &s_defGLProgram;
 }
 
 

cocos/renderer/CCMeshCommand.cpp

@@ -22,10 +22,12 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-
+#include "base/ccMacros.h"
+#include "base/CCDirector.h"
 #include "renderer/CCMeshCommand.h"
 #include "renderer/ccGLStateCache.h"
 #include "renderer/CCGLProgramState.h"
+#include "renderer/CCRenderer.h"
 #include "2d/CCTextureAtlas.h"
 #include "2d/CCTexture2D.h"
 
@@ -141,6 +143,8 @@ void MeshCommand::execute()
     // Draw
     glDrawElements(_primitive, _indexCount, _indexFormat, 0);
 
+    CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(1, _indexCount);
+    
     //restore render state
     restoreRenderState();
 }

tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp

@@ -372,6 +372,7 @@ void Effect3DOutline::drawWithSprite(EffectSprite3D* sprite, const Mat4 &transfo
         glDisable(GL_DEPTH_TEST);
         glCullFace(GL_BACK);
         glDisable(GL_CULL_FACE);
+        CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(1, mesh->getIndexCount());
     }
 }