Fix the problem when the MeshBuffer is switched on the native platform.

cocos/renderer/scene/MeshBuffer.cpp

@@ -28,7 +28,7 @@
 #include "RenderFlow.hpp"
 #include "../gfx/DeviceGraphics.h"
 
-#define MAX_VB_SIZE 1310700
+#define MAX_VERTEX_COUNT 65535
 
 RENDERER_BEGIN
 
@@ -43,7 +43,7 @@ MeshBuffer::MeshBuffer(ModelBatcher* batcher, VertexFormat* fmt)
     _vbArr.pushBack(_vb);
 
     _ib = IndexBuffer::create(device, IndexFormat::UINT16, Usage::STATIC, nullptr, 0, 0);
-    _ib->retain();
+    _ibArr.pushBack(_ib);
 
     _vDataCount = MeshBuffer::INIT_VERTEX_COUNT * 4 * _bytesPerVertex / sizeof(float);
     _iDataCount = MeshBuffer::INIT_VERTEX_COUNT * 6;
@@ -60,9 +60,12 @@ MeshBuffer::~MeshBuffer()
     }
     _vbArr.clear();
 
-    _ib->destroy();
-    _ib->release();
-
+    for (std::size_t i = 0, n = _ibArr.size(); i < n; i++)
+    {
+         _ibArr.at(i)->destroy();
+    }
+    _ibArr.clear();
+
     if (iData)
     {
         delete[] iData;
@@ -115,37 +118,9 @@ const MeshBuffer::OffsetInfo& MeshBuffer::request(uint32_t vertexCount, uint32_t
 
 const MeshBuffer::OffsetInfo& MeshBuffer::requestStatic(uint32_t vertexCount, uint32_t indexCount)
 {
-    uint32_t byteOffset = _byteOffset + vertexCount * _bytesPerVertex;
-    if (MAX_VB_SIZE < byteOffset)
-    {
-        // Finish pre data.
-        _batcher->flush();
-        _vb->update(0, vData, _byteOffset);
-
-        // Prepare next data.
-        _vbPos++;
-        if (_vbPos >= _vbArr.size())
-        {
-            DeviceGraphics* device = _batcher->getFlow()->getDevice();
-            _vb = VertexBuffer::create(device, _vertexFmt, Usage::DYNAMIC, nullptr, 0, 0);
-            _vbArr.pushBack(_vb);
-        }
-        else
-        {
-            _vb = _vbArr.at(_vbPos);
-        }
-
-        _byteStart = 0;
-        _byteOffset = 0;
-        _vertexStart = 0;
-        _vertexOffset = 0;
-
-        _offsetInfo.vByte = 0;
-        _offsetInfo.vertex = 0;
-
-        byteOffset = vertexCount * _bytesPerVertex;
-    }
+    checkAndSwitchBuffer(vertexCount);
 
+    uint32_t byteOffset = _byteOffset + vertexCount * _bytesPerVertex;
     uint32_t indexOffset = _indexOffset + indexCount;
     uint32_t vBytes = _vDataCount * VDATA_BYTE;
 
@@ -174,10 +149,8 @@ const MeshBuffer::OffsetInfo& MeshBuffer::requestStatic(uint32_t vertexCount, ui
         reallocIBuffer();
     }
 
-    _vertexOffset += vertexCount;
-    _indexOffset += indexCount;
-    _byteOffset = byteOffset;
-    _dirty = true;
+    updateOffset(vertexCount, indexCount, byteOffset);
+
     return _offsetInfo;
 }
 
@@ -188,10 +161,62 @@ void MeshBuffer::uploadData()
     _dirty = false;
 }
 
+void MeshBuffer::switchBuffer(uint32_t vertexCount)
+{
+    std::size_t offset = ++_vbPos;
+
+    _byteOffset = 0;
+    _vertexOffset = 0;
+    _indexOffset = 0;
+    _indexStart = 0;
+
+    if (offset < _vbArr.size())
+    {
+        _vb = _vbArr.at(offset);
+        _ib = _ibArr.at(offset);
+    }
+    else
+    {
+        DeviceGraphics* device = _batcher->getFlow()->getDevice();
+        _vb = VertexBuffer::create(device, _vertexFmt, Usage::DYNAMIC, nullptr, 0, 0);
+        _vb->setBytes(_vDataCount * VDATA_BYTE);
+        _vbArr.pushBack(_vb);
+
+        _ib = IndexBuffer::create(device, IndexFormat::UINT16, Usage::STATIC, nullptr, 0, 0);
+        _ib->setBytes(_iDataCount * IDATA_BYTE);
+        _ibArr.pushBack(_ib);
+    }
+}
+
+void MeshBuffer::checkAndSwitchBuffer(uint32_t vertexCount)
+{
+    if (_vertexOffset + vertexCount > MAX_VERTEX_COUNT)
+    {
+        uploadData();
+        _batcher->flush();
+        switchBuffer(vertexCount);
+    }
+}
+
+void MeshBuffer::updateOffset (uint32_t vertexCount, uint32_t indiceCount, uint32_t byteOffset)
+{
+    _offsetInfo.vertex = _vertexOffset;
+    _vertexOffset += vertexCount;
+
+    _offsetInfo.index = _indexOffset;
+    _indexOffset += indiceCount;
+
+    _offsetInfo.vByte = _byteOffset;
+    _byteOffset = byteOffset;
+
+    _dirty = true;
+}
+
 void MeshBuffer::reset()
 {
     _vbPos = 0;
     _vb = _vbArr.at(0);
+    _ib = _ibArr.at(0);
     _byteStart = 0;
     _byteOffset = 0;
     _vertexStart = 0;

cocos/renderer/scene/MeshBuffer.hpp

@@ -154,6 +154,9 @@ class MeshBuffer
 protected:
     void reallocVBuffer();
     void reallocIBuffer();
+    void checkAndSwitchBuffer(uint32_t vertexCount);
+    void switchBuffer(uint32_t vertexCount);
+    void updateOffset(uint32_t vertexCount, uint32_t indiceCount, uint32_t byteOffset);
 private:
     uint32_t _byteStart = 0;
     uint32_t _byteOffset = 0;
@@ -174,6 +177,7 @@ class MeshBuffer
     ModelBatcher* _batcher = nullptr;
     std::size_t _vbPos = 0;
     cocos2d::Vector<VertexBuffer*> _vbArr;
+    cocos2d::Vector<IndexBuffer*> _ibArr;
     VertexBuffer* _vb = nullptr;
     IndexBuffer* _ib = nullptr;
     OffsetInfo _offsetInfo;