Merge pull request #2 from boyu0/develop_removeCommandPool

Develop remove command pool

Author: Huabing.Xu

cocos/2d/CCAtlasNode.cpp

@@ -34,7 +34,7 @@ THE SOFTWARE.
 #include "CCDirector.h"
 #include "TransformUtils.h"
 #include "CCRenderer.h"
-#include "CCQuadCommand.h"
+#include "renderer/CCQuadCommand.h"
 
 // external
 #include "kazmath/GL/matrix.h"
@@ -151,8 +151,7 @@ void AtlasNode::draw(void)
 
     auto shader = ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_COLOR_NO_MVP);
 
-    QuadCommand* cmd = new QuadCommand();
-    cmd->init(0,
+    _quadCommand.init(0,
               _vertexZ,
               _textureAtlas->getTexture()->getName(),
               shader,
@@ -161,7 +160,7 @@ void AtlasNode::draw(void)
               _textureAtlas->getTotalQuads(),
               _modelViewTransform);
 
-    Director::getInstance()->getRenderer()->addCommand(cmd);
+    Director::getInstance()->getRenderer()->addCommand(&_quadCommand);
 
 }
 

cocos/2d/CCAtlasNode.h

@@ -30,6 +30,7 @@ THE SOFTWARE.
 #include "CCNode.h"
 #include "CCProtocols.h"
 #include "ccTypes.h"
+#include "renderer/CCQuadCommand.h"
 
 NS_CC_BEGIN
 
@@ -130,6 +131,8 @@ class CC_DLL AtlasNode : public Node, public TextureProtocol
     GLint    _uniformColor;
     // This varible is only used for LabelAtlas FPS display. So plz don't modify its value.
     bool _ignoreContentScaleFactor;
+    // quad command
+    QuadCommand _quadCommand;
 
 private:
     CC_DISALLOW_COPY_AND_ASSIGN(AtlasNode);

cocos/2d/CCClippingNode.cpp

@@ -209,23 +209,20 @@ void ClippingNode::visit()
 
     Renderer* renderer = Director::getInstance()->getRenderer();
 
-    GroupCommand* groupCommand = new GroupCommand();
-    groupCommand->init(0,_vertexZ);
-    renderer->addCommand(groupCommand);
+    _groupCommand.init(0,_vertexZ);
+    renderer->addCommand(&_groupCommand);
 
-    renderer->pushGroup(groupCommand->getRenderQueueID());
+    renderer->pushGroup(_groupCommand.getRenderQueueID());
 
-    CustomCommand* beforeVisitCmd = new CustomCommand();
-    beforeVisitCmd->init(0,_vertexZ);
-    beforeVisitCmd->func = CC_CALLBACK_0(ClippingNode::onBeforeVisit, this);
-    renderer->addCommand(beforeVisitCmd);
+    _beforeVisitCmd.init(0,_vertexZ);
+    _beforeVisitCmd.func = CC_CALLBACK_0(ClippingNode::onBeforeVisit, this);
+    renderer->addCommand(&_beforeVisitCmd);
 
     _stencil->visit();
 
-    CustomCommand* afterDrawStencilCmd = new CustomCommand();
-    afterDrawStencilCmd->init(0,_vertexZ);
-    afterDrawStencilCmd->func = CC_CALLBACK_0(ClippingNode::onAfterDrawStencil, this);
-    renderer->addCommand(afterDrawStencilCmd);
+    _afterDrawStencilCmd.init(0,_vertexZ);
+    _afterDrawStencilCmd.func = CC_CALLBACK_0(ClippingNode::onAfterDrawStencil, this);
+    renderer->addCommand(&_afterDrawStencilCmd);
 
     int i = 0;
 
@@ -253,10 +250,9 @@ void ClippingNode::visit()
         this->draw();
     }
 
-    CustomCommand* afterVisitCmd = new CustomCommand();
-    afterVisitCmd->init(0,_vertexZ);
-    afterVisitCmd->func = CC_CALLBACK_0(ClippingNode::onAfterVisit, this);
-    renderer->addCommand(afterVisitCmd);
+    _afterVisitCmd.init(0,_vertexZ);
+    _afterVisitCmd.func = CC_CALLBACK_0(ClippingNode::onAfterVisit, this);
+    renderer->addCommand(&_afterVisitCmd);
 
     renderer->popGroup();
 

cocos/2d/CCClippingNode.h

@@ -30,6 +30,8 @@
 
 #include "CCNode.h"
 #include "CCGL.h"
+#include "renderer/CCGroupCommand.h"
+#include "renderer/CCCustomCommand.h"
 
 NS_CC_BEGIN
 
@@ -141,6 +143,11 @@ class CC_DLL ClippingNode : public Node
     GLclampf _currentAlphaTestRef;
 
     GLint _mask_layer_le;
+    
+    GroupCommand _groupCommand;
+    CustomCommand _beforeVisitCmd;
+    CustomCommand _afterDrawStencilCmd;
+    CustomCommand _afterVisitCmd;
 
 private:
     CC_DISALLOW_COPY_AND_ASSIGN(ClippingNode);

cocos/2d/CCDrawNode.cpp

@@ -241,10 +241,9 @@ void DrawNode::render()
 
 void DrawNode::draw()
 {
-    CustomCommand* cmd = new CustomCommand();
-    cmd->init(0, _vertexZ);
-    cmd->func = CC_CALLBACK_0(DrawNode::onDraw, this);
-    Director::getInstance()->getRenderer()->addCommand(cmd);
+    _customCommand.init(0, _vertexZ);
+    _customCommand.func = CC_CALLBACK_0(DrawNode::onDraw, this);
+    Director::getInstance()->getRenderer()->addCommand(&_customCommand);
 }
 
 void DrawNode::onDraw()

cocos/2d/CCDrawNode.h

@@ -32,6 +32,7 @@
 
 #include "CCNode.h"
 #include "ccTypes.h"
+#include "renderer/CCCustomCommand.h"
 
 NS_CC_BEGIN
 
@@ -105,6 +106,7 @@ class CC_DLL DrawNode : public Node
     V2F_C4B_T2F *_buffer;
 
     BlendFunc   _blendFunc;
+    CustomCommand _customCommand;
 
     bool        _dirty;
 

cocos/2d/CCLayer.cpp

@@ -564,10 +564,9 @@ void LayerColor::updateColor()
 
 void LayerColor::draw()
 {
-    CustomCommand* cmd = new CustomCommand();
-    cmd->init(0, _vertexZ);
-    cmd->func = CC_CALLBACK_0(LayerColor::onDraw, this);
-    Director::getInstance()->getRenderer()->addCommand(cmd);
+    _customCommand.init(0, _vertexZ);
+    _customCommand.func = CC_CALLBACK_0(LayerColor::onDraw, this);
+    Director::getInstance()->getRenderer()->addCommand(&_customCommand);
 }
 
 void LayerColor::onDraw()

cocos/2d/CCLayer.h

@@ -35,6 +35,7 @@ THE SOFTWARE.
 #endif // EMSCRIPTEN
 
 #include "CCEventKeyboard.h"
+#include "renderer/CCCustomCommand.h"
 
 NS_CC_BEGIN
 
@@ -296,6 +297,7 @@ class CC_DLL LayerColor : public Layer, public BlendProtocol
     BlendFunc _blendFunc;
     Vertex2F _squareVertices[4];
     Color4F  _squareColors[4];
+    CustomCommand _customCommand;
 
 private:
     CC_DISALLOW_COPY_AND_ASSIGN(LayerColor);

cocos/2d/CCMotionStreak.cpp

@@ -358,10 +358,9 @@ void MotionStreak::draw()
     if(_nuPoints <= 1)
         return;
     kmGLGetMatrix(KM_GL_MODELVIEW,&_cachedMV);
-    CustomCommand* cmd = new CustomCommand();
-    cmd->init(0,_vertexZ);
-    cmd->func = CC_CALLBACK_0(MotionStreak::onDraw, this);
-    Director::getInstance()->getRenderer()->addCommand(cmd);
+    _customCommand.init(0,_vertexZ);
+    _customCommand.func = CC_CALLBACK_0(MotionStreak::onDraw, this);
+    Director::getInstance()->getRenderer()->addCommand(&_customCommand);
 
 }
 

cocos/2d/CCMotionStreak.h

@@ -29,6 +29,7 @@ THE SOFTWARE.
 #include "CCTexture2D.h"
 #include "ccTypes.h"
 #include "CCNode.h"
+#include "renderer/CCCustomCommand.h"
 #ifdef EMSCRIPTEN
 #include "CCGLBufferedNode.h"
 #endif // EMSCRIPTEN
@@ -144,6 +145,8 @@ class CC_DLL MotionStreak : public Node, public TextureProtocol
     Vertex2F* _vertices;
     GLubyte* _colorPointer;
     Tex2F* _texCoords;
+    
+    CustomCommand _customCommand;
 
 private:
     CC_DISALLOW_COPY_AND_ASSIGN(MotionStreak);