Issue cocos2d#2416: Add ParticleBatchNode RenderCmd

Author: VisualSJ

cocos2d/core/renderer/RendererWebGL.js

@@ -170,21 +170,6 @@ cc.ParticleRenderCmdWebGL.prototype.rendering = function (ctx) {
     gl.drawElements(gl.TRIANGLES, _t._particleIdx * 6, gl.UNSIGNED_SHORT, 0);
 };
 
-cc.ParticleBatchNodeRenderCmdWebGL = function (node) {
-    this._node = node;
-};
-
-cc.ParticleBatchNodeRenderCmdWebGL.prototype.rendering = function (ctx) {
-    var _t = this._node;
-    if (_t.textureAtlas.totalQuads == 0)
-        return;
-
-    _t._shaderProgram.use();
-    _t._shaderProgram._setUniformForMVPMatrixWithMat4(_t._stackMatrix);
-    cc.glBlendFuncForParticle(_t._blendFunc.src, _t._blendFunc.dst);
-    _t.textureAtlas.drawQuads();
-};
-
 //RenderTexture render command
 cc.RenderTextureRenderCmdWebGL = function (node) {
     this._node = node;

cocos2d/particle/CCParticleBatchNode.js

@@ -101,6 +101,8 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{
         } else if (fileImage instanceof cc.Texture2D) {
             this.initWithTexture(fileImage, capacity);
         }
+        if(cc._renderType === cc._RENDER_TYPE_WEBGL)
+            this._rendererCmd = new cc.ParticleBatchNode.WebGLRenderCmd(this);
     },
 
     /**
@@ -555,11 +557,6 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{
      */
     setTextureAtlas:function (textureAtlas) {
         this.textureAtlas = textureAtlas;
-    },
-
-    _initRendererCmd:function(){
-        if(cc._renderType === cc._RENDER_TYPE_WEBGL)
-            this._rendererCmd = new cc.ParticleBatchNodeRenderCmdWebGL(this);
     }
 });
 

cocos2d/particle/CCParticleBatchNodeRenderCmd.js

@@ -0,0 +1,42 @@
+/****************************************************************************
+ Copyright (c) 2013-2014 Chukong Technologies Inc.
+
+ http://www.cocos2d-x.org
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ ****************************************************************************/
+
+cc.ParticleBatchNode.WebGLRenderCmd = function(renderableObject){
+    cc.Node.WebGLRenderCmd.call(this, renderableObject);
+    this._needDraw = true;
+};
+
+cc.ParticleBatchNode.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype);
+cc.ParticleBatchNode.WebGLRenderCmd.prototype.constructor = cc.ParticleBatchNode.WebGLRenderCmd;
+
+cc.ParticleBatchNode.WebGLRenderCmd.prototype.rendering = function (ctx) {
+    var _t = this._node;
+    if (_t.textureAtlas.totalQuads == 0)
+        return;
+
+    _t._shaderProgram.use();
+    _t._shaderProgram._setUniformForMVPMatrixWithMat4(_t._stackMatrix);
+    cc.glBlendFuncForParticle(_t._blendFunc.src, _t._blendFunc.dst);
+    _t.textureAtlas.drawQuads();
+};

moduleConfig.json

@@ -178,7 +178,8 @@
             "cocos2d/particle/CCParticleSystem.js",
             "cocos2d/particle/CCParticleSystemRenderCmd.js",
             "cocos2d/particle/CCParticleExamples.js",
-            "cocos2d/particle/CCParticleBatchNode.js"
+            "cocos2d/particle/CCParticleBatchNode.js",
+            "cocos2d/particle/CCParticleBatchNodeRenderCmd.js"
         ],
         "physics" : [
             "core", "shape-nodes",