[cocos2dx] Closes #611, cocos2d-x v3 auto-batcher does it's work, makes SkeletonBatch a lot simpler

spine-cocos2dx/example/Classes/BatchingExample.cpp

@@ -44,10 +44,6 @@ Scene* BatchingExample::scene () {
 bool BatchingExample::init () {
 	if (!LayerColor::initWithColor(Color4B(128, 128, 128, 255))) return false;
 
-	// To avoid the SkeletonBatch buffer from being resized, set this to the number of vertices ever rendered in one frame.
-	// BatchingExample needs ~3200, but let's set it low to test the buffer resizing.
-	SkeletonBatch::setBufferSize(512);
-
 	// Load the texture atlas.
 	_atlas = spAtlas_createFromFile("spineboy.atlas", 0);
 	CCASSERT(_atlas, "Error reading atlas file.");

spine-cocos2dx/src/spine/SkeletonBatch.cpp

@@ -39,38 +39,31 @@ using std::max;
 
 namespace spine {
     
-static SkeletonBatch* instance = nullptr;
+    static SkeletonBatch* instance = nullptr;
     
-void SkeletonBatch::setBufferSize (int vertexCount) {
+    SkeletonBatch* SkeletonBatch::getInstance () {
-	if (instance) delete instance;
+        if (!instance) instance = new SkeletonBatch();
-	instance = new SkeletonBatch(vertexCount);
-}
-
-SkeletonBatch* SkeletonBatch::getInstance () {
-	if (!instance) instance = new SkeletonBatch(8192);
         return instance;
-}
+    }
     
-void SkeletonBatch::destroyInstance () {
+    void SkeletonBatch::destroyInstance () {
         if (instance) {
             delete instance;
             instance = nullptr;
         }
-}
+    }
     
-SkeletonBatch::SkeletonBatch (int capacity) :
+    SkeletonBatch::SkeletonBatch ()
-	_capacity(capacity), _position(0)
+    {
-{
-	_buffer = new V3F_C4B_T2F[capacity];
         _firstCommand = new Command();
         _command = _firstCommand;
         
         Director::getInstance()->getEventDispatcher()->addCustomEventListener(EVENT_AFTER_DRAW_RESET_POSITION, [this](EventCustom* eventCustom){
             this->update(0);
         });;
-}
+    }
     
-SkeletonBatch::~SkeletonBatch () {
+    SkeletonBatch::~SkeletonBatch () {
         Director::getInstance()->getEventDispatcher()->removeCustomEventListeners(EVENT_AFTER_DRAW_RESET_POSITION);
         
         Command* command = _firstCommand;
@@ -79,61 +72,38 @@ SkeletonBatch::~SkeletonBatch () {
             delete command;
             command = next;
         }
+    }
     
-	delete [] _buffer;
+    void SkeletonBatch::update (float delta) {
-}
-
-void SkeletonBatch::update (float delta) {
-	_position = 0;
         _command = _firstCommand;
-}
+    }
     
-void SkeletonBatch::addCommand (cocos2d::Renderer* renderer, float globalZOrder, GLuint textureID, GLProgramState* glProgramState,
+    void SkeletonBatch::addCommand (cocos2d::Renderer* renderer, float globalZOrder, GLuint textureID, GLProgramState* glProgramState,
                                     BlendFunc blendFunc, const TrianglesCommand::Triangles& triangles, const Mat4& transform, uint32_t transformFlags
-) {
+                                    ) {
-	if (_position + triangles.vertCount > _capacity) {
+        _command->triangles->verts = triangles.verts;
-		int newCapacity = max(_capacity + _capacity / 2, _position + triangles.vertCount);
-		V3F_C4B_T2F* newBuffer = new V3F_C4B_T2F[newCapacity];
-		memcpy(newBuffer, _buffer, _position);
-
-		int newPosition = 0;
-		Command* command = _firstCommand;
-		while (newPosition < _position) {
-			command->triangles->verts = newBuffer + newPosition;
-			newPosition += command->triangles->vertCount;
-			command = command->next;
-		}
-
-		delete [] _buffer;
-		_buffer = newBuffer;
-		_capacity = newCapacity;
-	}
-
-	memcpy(_buffer + _position, triangles.verts, sizeof(V3F_C4B_T2F) * triangles.vertCount);
-	_command->triangles->verts = _buffer + _position;
-	_position += triangles.vertCount;
         
         _command->triangles->vertCount = triangles.vertCount;
         _command->triangles->indexCount = triangles.indexCount;
         _command->triangles->indices = triangles.indices;
         
-	_command->trianglesCommand->init(globalZOrder, textureID, glProgramState, blendFunc, *_command->triangles, transform, transformFlags);
+        _command->trianglesCommand->init(globalZOrder, textureID, glProgramState, blendFunc, *_command->triangles, transform);
         renderer->addCommand(_command->trianglesCommand);
         
         if (!_command->next) _command->next = new Command();
         _command = _command->next;
-}
+    }
     
-SkeletonBatch::Command::Command () :
+    SkeletonBatch::Command::Command () :
     next(nullptr)
-{
+    {
         trianglesCommand = new TrianglesCommand();
         triangles = new TrianglesCommand::Triangles();
-}
+    }
     
-SkeletonBatch::Command::~Command () {
+    SkeletonBatch::Command::~Command () {
         delete triangles;
         delete trianglesCommand;
-}
+    }
     
 }

spine-cocos2dx/src/spine/SkeletonBatch.h

@@ -37,13 +37,8 @@
 
 namespace spine {
     
-class SkeletonBatch {
+    class SkeletonBatch {
-public:
+    public:
-	/* Sets the max number of vertices that can be drawn in a single frame. The buffer will grow automatically as needed, but
-	 * setting it to the appropriate is more efficient. Best to call before getInstance is called for the first time. Default is
-	 * 8192. */
-	static void setBufferSize (int vertexCount);
-
         static SkeletonBatch* getInstance ();
         
         static void destroyInstance ();
@@ -53,14 +48,10 @@ public:
         void addCommand (cocos2d::Renderer* renderer, float globalOrder, GLuint textureID, cocos2d::GLProgramState* glProgramState,
                          cocos2d::BlendFunc blendType, const cocos2d::TrianglesCommand:: Triangles& triangles, const cocos2d::Mat4& mv, uint32_t flags);
         
-protected:
+    protected:
-	SkeletonBatch (int capacity);
+        SkeletonBatch ();
         virtual ~SkeletonBatch ();
         
-	cocos2d::V3F_C4B_T2F* _buffer;
-	int _capacity;
-	int _position;
-
         class Command {
         public:
             Command ();
@@ -73,7 +64,7 @@ protected:
         
         Command* _firstCommand;
         Command* _command;
-};
+    };
     
 }