adjust code style

Author: dabingnn

cocos/3d/CCMesh.cpp

@@ -17,7 +17,8 @@ NS_CC_BEGIN
 
 bool RenderMeshData::hasVertexAttrib(int attrib)
 {
-    for (auto itr = _vertexAttribs.begin(); itr != _vertexAttribs.end(); itr++) {
+    for (auto itr = _vertexAttribs.begin(); itr != _vertexAttribs.end(); itr++)
+    {
         if ((*itr).vertexAttrib == attrib)
             return true; //already has
     }
@@ -93,7 +94,6 @@ bool RenderMeshData::initFrom(std::vector<float>& posions, std::vector<float>& n
     return true;
 }
 
-
 Mesh::Mesh()
 :_vertexBuffer(0)
 , _indexBuffer(0)
@@ -102,23 +102,13 @@ Mesh::Mesh()
 , _indexCount(0)
 {
 
-
 }
 
 Mesh::~Mesh()
 {
     cleanAndFreeBuffers();
 }
 
-//void Mesh::releaseMeshPart()
-//{
-//    glDeleteBuffers(1, &_indexBuffer);
-//    _primitiveType = PrimitiveType_TRIANGLES;
-//    _indexFormat = IndexFormat_INDEX16;
-//    _indexCount = 0;
-//    _indexBuffer = 0;
-//}
-
 Mesh* Mesh::create(std::vector<float>& posions, std::vector<float>& normals, std::vector<float>& texs, const std::vector<unsigned short>& indices)
 {
     auto mesh = new Mesh();
@@ -133,13 +123,11 @@ Mesh* Mesh::create(std::vector<float>& posions, std::vector<float>& normals, std
 
 bool Mesh::init(std::vector<float>& posions, std::vector<float>& normals, std::vector<float>& texs, const std::vector<unsigned short>& indices)
 {
-    
     bool bRet = _renderdata.initFrom(posions, normals, texs, indices);
     if (!bRet)
         return false;
 
     restore();
-    
     return true;
 }
 
@@ -193,9 +181,7 @@ void Mesh::buildBuffer()
 void Mesh::restore()
 {
     cleanAndFreeBuffers();
-    
     buildBuffer();
-    
 }
 
 NS_CC_END

cocos/3d/CCMesh.h

@@ -10,7 +10,6 @@
 #include "math/CCMath.h"
 #include "renderer/CCGLProgram.h"
 
-
 NS_CC_BEGIN
 
 /**
@@ -41,10 +40,8 @@ struct MeshVertexAttrib
     GLint size;
     //GL_FLOAT
     GLenum type;
-    
     //VERTEX_ATTRIB_POSITION,VERTEX_ATTRIB_COLOR,VERTEX_ATTRIB_TEX_COORD,VERTEX_ATTRIB_NORMAL, GLProgram for detail
     int  vertexAttrib;
-    
     //size in bytes
     int attribSizeBytes;
 };
@@ -56,9 +53,7 @@ class RenderMeshData
     RenderMeshData(): _vertexsizeBytes(0)
     {
     }
-    
     bool hasVertexAttrib(int attrib);
-    
     bool initFrom(std::vector<float>& posions, std::vector<float>& normals, std::vector<float>& texs, const std::vector<unsigned short>& indices);
 
 protected:
@@ -69,68 +64,49 @@ class RenderMeshData
     std::vector<MeshVertexAttrib> _vertexAttribs;
 };
 
-
 class Mesh : public Ref
 {
 public:
-    
-    virtual ~Mesh();
-    
     //create
     static Mesh* create(std::vector<float>& posions, std::vector<float>& normals, std::vector<float>& texs, const std::vector<unsigned short>& indices);
-    
-    bool init(std::vector<float>& posions, std::vector<float>& normals, std::vector<float>& texs, const std::vector<unsigned short>& indices);
 
     //get vertex buffer
     inline GLuint getVertexBuffer() const { return _vertexBuffer; }
 
     //get mesh vertex attribute count
     int getMeshVertexAttribCount() const { return _renderdata._vertexAttribs.size(); }
-    
     //get MeshVertexAttribute by index
     const MeshVertexAttrib& getMeshVertexAttribute(int idx) const { return _renderdata._vertexAttribs[idx]; }
-    
     //has vertex attribute?
     bool hasVertexAttrib(int attrib) { return _renderdata.hasVertexAttrib(attrib); }
-    
     //get per vertex size in bytes
     int getVertexSizeInBytes() const { return _renderdata._vertexsizeBytes; }
 
     PrimitiveType getPrimitiveType() const { return _primitiveType; }
-    
     unsigned int getIndexCount() const { return _indexCount; }
-    
     IndexFormat getIndexFormat() const { return _indexFormat; }
-    
     GLuint getIndexBuffer() const {return _indexBuffer; }
 
     //build vertex buffer from renderdata
     void restore();
 protected:
     Mesh();
+    virtual ~Mesh();
+    bool init(std::vector<float>& posions, std::vector<float>& normals, std::vector<float>& texs, const std::vector<unsigned short>& indices);
 
     //build buffer
     void buildBuffer();
-
     void cleanAndFreeBuffers();
 
-    //void releaseMeshPart();
-    
-    //void addMeshPart(PrimitiveType primitiveType, IndexFormat indexformat,  void* indexData, unsigned int indexCount);
-    
 protected:
-    void countVertexData() const;
     std::string _name;
-
     GLuint _vertexBuffer;
-    
     PrimitiveType _primitiveType;
     IndexFormat _indexFormat;
     unsigned int _indexCount;
     GLuint _indexBuffer;
 
 private:
-    
     RenderMeshData _renderdata;
 };