remove MeshPart

Author: dabingnn

cocos/3d/CCMesh.cpp

@@ -8,7 +8,6 @@
 
 #include "base/ccMacros.h"
 #include "renderer/ccGLStateCache.h"
-#include "CCMeshPart.h"
 #include "CCObjLoader.h"
 #include "CCSprite3DDataCache.h"
 
@@ -97,28 +96,28 @@ bool RenderMeshData::initFrom(std::vector<float>& posions, std::vector<float>& n
 
 Mesh::Mesh()
 :_vertexBuffer(0)
-, _parts(nullptr)
-, _partCount(0)
+, _indexBuffer(0)
+, _primitiveType(PrimitiveType_TRIANGLES)
+, _indexFormat(IndexFormat_INDEX16)
+, _indexCount(0)
 {
 
 
 }
 
 Mesh::~Mesh()
 {
-    releaseMeshPart();
-    
-    freeBuffers();
+    cleanAndFreeBuffers();
 }
 
-void Mesh::releaseMeshPart()
-{
-//    for (unsigned int i = 0; i < _partCount; ++i)
-//    {
-//        delete _parts[i];
-//    }
-//    delete _parts;
-}
+//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)
 {
@@ -144,18 +143,27 @@ bool Mesh::init(std::vector<float>& posions, std::vector<float>& normals, std::v
     return true;
 }
 
-void Mesh::freeBuffers()
+void Mesh::cleanAndFreeBuffers()
 {
     if(glIsBuffer(_vertexBuffer))
     {
         glDeleteBuffers(1, &_vertexBuffer);
         _vertexBuffer = 0;
     }
+    
+    if(glIsBuffer(_indexBuffer))
+    {
+        glDeleteBuffers(1, &_indexBuffer);
+        _indexBuffer = 0;
+    }
+    _primitiveType = PrimitiveType_TRIANGLES;
+    _indexFormat = IndexFormat_INDEX16;
+    _indexCount = 0;
 }
 
 void Mesh::buildBuffer()
 {
-    freeBuffers();
+    cleanAndFreeBuffers();
 
     glGenBuffers(1, &_vertexBuffer);
     glBindBuffer(GL_ARRAY_BUFFER, _vertexBuffer);
@@ -165,39 +173,10 @@ void Mesh::buildBuffer()
                  &_renderdata._vertexs[0],
                  GL_STATIC_DRAW);
     glBindBuffer(GL_ARRAY_BUFFER, 0);
-}
-
-//void Mesh::addMeshPart(PrimitiveType primitiveType, IndexFormat indexformat,  void* indexData, unsigned int indexCount)
-//{
-//    MeshPart* part = MeshPart::create(this, _partCount, primitiveType, indexformat, indexData, indexCount);
-//    if (part)
-//    {
-//        // Increase size of part array and copy old subets into it.
-//        MeshPart** oldParts = _parts;
-//        _parts = new MeshPart*[_partCount + 1];
-//        for (unsigned int i = 0; i < _partCount; ++i)
-//        {
-//            _parts[i] = oldParts[i];
-//        }
-//        
-//        // Add new part to array.
-//        _parts[_partCount++] = part;
-//        
-//        // Delete old part array.
-//        delete[] (oldParts);
-//    }
-//}
-
-void Mesh::restore()
-{
-    releaseMeshPart();
-    
-    buildBuffer();
 
-    GLuint vbo;
-    glGenBuffers(1, &vbo);
+    glGenBuffers(1, &_indexBuffer);
 
-    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, vbo);
+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _indexBuffer);
 
     unsigned int indexSize = 2;
     IndexFormat indexformat = IndexFormat_INDEX16;
@@ -209,7 +188,13 @@ void Mesh::restore()
     _primitiveType = PrimitiveType_TRIANGLES;
     _indexFormat = indexformat;
     _indexCount = _renderdata._indices.size();
-    _indexBuffer = vbo;
+}
+
+void Mesh::restore()
+{
+    cleanAndFreeBuffers();
+    
+    buildBuffer();
 
 }
 

cocos/3d/CCMesh.h

@@ -7,7 +7,6 @@
 
 #include "base/CCRef.h"
 #include "base/ccTypes.h"
-#include "CCMeshPart.h"
 #include "math/CCMath.h"
 #include "renderer/CCGLProgram.h"
 
@@ -16,7 +15,26 @@ USING_NS_CC_MATH;
 
 NS_CC_BEGIN
 
-class MeshPart;
+/**
+ * Defines supported index formats.
+ */
+enum IndexFormat
+{
+    IndexFormat_INDEX8 = GL_UNSIGNED_BYTE,
+    IndexFormat_INDEX16 = GL_UNSIGNED_SHORT,
+};
+
+/**
+ * Defines supported primitive types.
+ */
+enum PrimitiveType
+{
+    PrimitiveType_TRIANGLES = GL_TRIANGLES,
+    PrimitiveType_TRIANGLE_STRIP = GL_TRIANGLE_STRIP,
+    PrimitiveType_LINES = GL_LINES,
+    PrimitiveType_LINE_STRIP = GL_LINE_STRIP,
+    PrimitiveType_POINTS = GL_POINTS
+};
 
 //mesh vertex attribute
 struct MeshVertexAttrib
@@ -67,10 +85,6 @@ class Mesh : public Ref
     //get vertex buffer
     inline GLuint getVertexBuffer() const { return _vertexBuffer; }
 
-    
-    //build vertex buffer from renderdata
-    void restore();
-    
     //get mesh vertex attribute count
     int getMeshVertexAttribCount() const { return _renderdata._vertexAttribs.size(); }
 
@@ -90,15 +104,18 @@ class Mesh : public Ref
     IndexFormat getIndexFormat() const { return _indexFormat; }
 
     GLuint getIndexBuffer() const {return _indexBuffer; }
+    
+    //build vertex buffer from renderdata
+    void restore();
 protected:
     Mesh();
-    
+
     //build buffer
     void buildBuffer();
 
-    void freeBuffers();
+    void cleanAndFreeBuffers();
 
-    void releaseMeshPart();
+    //void releaseMeshPart();
 
     //void addMeshPart(PrimitiveType primitiveType, IndexFormat indexformat,  void* indexData, unsigned int indexCount);
 
@@ -108,9 +125,6 @@ class Mesh : public Ref
 
     GLuint _vertexBuffer;
 
-    unsigned int _partCount;
-    MeshPart** _parts;
-    
     PrimitiveType _primitiveType;
     IndexFormat _indexFormat;
     unsigned int _indexCount;

cocos/3d/CCMeshPart.cpp

@@ -112,7 +112,6 @@ void Sprite3DDataCache::listenBackToForeground(EventCustom* event)
     for (auto iter = _sprite3DDatas.begin(); iter != _sprite3DDatas.end(); ++iter)
     {
         auto mesh = iter->second.mesh;
-        mesh->restore();
     }
 }
 #endif