Merge pull request #4 from dabingnn/newRendererCommandPool

New renderer command pool

Author: darkdukey

cocos/2d/CCLayer.cpp

@@ -695,7 +695,7 @@ void LayerColor::updateColor()
 void LayerColor::draw()
 {
     kmGLGetMatrix(KM_GL_MODELVIEW, &_transformMatrix);
-    CustomCommand* cmd = new CustomCommand();
+    CustomCommand* cmd = CustomCommand::getCommandPool().generateCommand();
     cmd->init(0, _vertexZ);
     cmd->func = CC_CALLBACK_0(LayerColor::onDraw, this);
     Renderer::getInstance()->addCommand(cmd);

cocos/2d/CCParticleSystemQuad.cpp

@@ -415,7 +415,7 @@ void ParticleSystemQuad::draw()
     CCASSERT( _particleIdx == _particleCount, "Abnormal error in particle quad");
     kmGLGetMatrix(KM_GL_MODELVIEW, &_transformMatrix);
 
-    CustomCommand* cmd = new CustomCommand();
+    CustomCommand* cmd = CustomCommand::getCommandPool().generateCommand();
     cmd->init(0, _vertexZ);
     cmd->func = CC_CALLBACK_0(ParticleSystemQuad::onDraw, this);
     Renderer::getInstance()->addCommand(cmd);

cocos/2d/CCSprite.cpp

@@ -663,7 +663,7 @@ void Sprite::draw(void)
 {
     updateQuadVertices();
     //TODO implement z order
-    QuadCommand* renderCommand = new QuadCommand();
+    QuadCommand* renderCommand = QuadCommand::getCommandPool().generateCommand();
     renderCommand->init(0, _vertexZ, _texture->getName(), _shaderProgram, _blendFunc, &_quad, 1);
     Renderer::getInstance()->addCommand(renderCommand);
 }

cocos/2d/renderer/CCNewDrawNode.cpp

@@ -44,7 +44,7 @@ void NewDrawNode::draw()
 {
     kmGLGetMatrix(KM_GL_MODELVIEW, &_transformMatrix);
 
-    CustomCommand* cmd = new CustomCommand();
+    CustomCommand* cmd = CustomCommand::getCommandPool().generateCommand();
     cmd->init(0, _vertexZ);
     cmd->func = CC_CALLBACK_0(NewDrawNode::onDraw, this);
     Renderer::getInstance()->addCommand(cmd);

cocos/2d/renderer/CCNewSprite.cpp

@@ -140,7 +140,7 @@ void NewSprite::draw(void)
     }
 
     //TODO implement z order
-    QuadCommand* renderCommand = new QuadCommand();
+    QuadCommand* renderCommand = QuadCommand::getCommandPool().generateCommand();
     renderCommand->init(0, _vertexZ, _texture->getName(), _shaderProgram, _blendFunc, &_quad, 1);
 
     Renderer::getInstance()->addCommand(renderCommand);

cocos/2d/renderer/CCNewSpriteBatchNode.cpp

@@ -60,7 +60,7 @@ void NewSpriteBatchNode::draw()
 
     arrayMakeObjectsPerformSelector(_children, updateTransform, NewSprite*);
 
-    QuadCommand* cmd = new QuadCommand();
+    QuadCommand* cmd = QuadCommand::getCommandPool().generateCommand();
     cmd->init(0, _vertexZ, _textureAtlas->getTexture()->getName(), _shaderProgram, _blendFunc, _textureAtlas->getQuads(), _textureAtlas->getTotalQuads());
     Renderer::getInstance()->addCommand(cmd);
 }

cocos/2d/renderer/CustomCommand.cpp

@@ -6,6 +6,7 @@
 #include "CustomCommand.h"
 
 NS_CC_BEGIN
+RenderCommandPool<CustomCommand> CustomCommand::_commandPool;
 
 CustomCommand::CustomCommand()
 :RenderCommand()
@@ -46,4 +47,9 @@ void CustomCommand::execute()
     }
 }
 
+void CustomCommand::releaseToCommandPool()
+{
+    getCommandPool().pushBackCommand(this);
+}
+
 NS_CC_END

cocos/2d/renderer/CustomCommand.h

@@ -8,16 +8,19 @@
 #define _CC_CUSTOMCOMMAND_H_
 
 #include "RenderCommand.h"
+#include "RenderCommandPool.h"
 
 NS_CC_BEGIN
 using namespace std;
 
 class CustomCommand : public RenderCommand
 {
-public:
+protected:
     CustomCommand();
-    void init(int viewport, int32_t depth);
     ~CustomCommand();
+    
+public:
+    void init(int viewport, int32_t depth);
 
     // +----------+----------+-----+-----------------------------------+
     // |          |          |     |                |                  |
@@ -29,6 +32,7 @@ class CustomCommand : public RenderCommand
     void execute();
 
     inline bool isTranslucent() { return true; }
+    virtual void releaseToCommandPool() override;
 
 public:
     function<void()> func;
@@ -37,6 +41,12 @@ class CustomCommand : public RenderCommand
     int _viewport;
 
     int32_t _depth;
+    
+public:
+    friend class RenderCommandPool<CustomCommand>;
+    static RenderCommandPool<CustomCommand>& getCommandPool() { return _commandPool; }
+protected:
+    static RenderCommandPool<CustomCommand> _commandPool;
 
 };
 

cocos/2d/renderer/GroupCommand.cpp

@@ -7,6 +7,7 @@
 #include "Renderer.h"
 
 NS_CC_BEGIN
+RenderCommandPool<GroupCommand> GroupCommand::_commandPool;
 
 static GroupCommandManager* s_instance;
 GroupCommandManager *GroupCommandManager::getInstance()
@@ -96,5 +97,10 @@ int64_t GroupCommand::generateID()
     return _id;
 }
 
+void GroupCommand::releaseToCommandPool()
+{
+    getCommandPool().pushBackCommand(this);
+}
+
 
 NS_CC_END

cocos/2d/renderer/GroupCommand.h

@@ -9,6 +9,7 @@
 
 #include "CCPlatformMacros.h"
 #include "RenderCommand.h"
+#include "RenderCommandPool.h"
 #include <map>
 
 NS_CC_BEGIN
@@ -33,11 +34,11 @@ class GroupCommandManager : public Object
 
 class GroupCommand : public RenderCommand
 {
-
-public:
+protected:
     GroupCommand();
-    void init(int viewport, int32_t depth);
     ~GroupCommand();
+public:
+    void init(int viewport, int32_t depth);
 
     // +----------+----------+-----+-----------------------------------+
     // |          |          |     |                |                  |
@@ -48,11 +49,18 @@ class GroupCommand : public RenderCommand
 
     inline bool isTranslucent() {return true;}
     inline int getRenderQueueID() {return _renderQueueID;}
-
+    virtual void releaseToCommandPool() override;
+    
 protected:
     int _viewport;
     int32_t _depth;
     int _renderQueueID;
+    
+public:
+    friend class RenderCommandPool<GroupCommand>;
+    static RenderCommandPool<GroupCommand>& getCommandPool() { return _commandPool; }
+protected:
+    static RenderCommandPool<GroupCommand> _commandPool;
 };
 
 NS_CC_END