Issue cocos2d#2416: Add SpriteBatchNode RenderCmd

Author: VisualSJ

cocos2d/core/renderer/RendererWebGL.js

@@ -170,24 +170,6 @@ cc.ParticleRenderCmdWebGL.prototype.rendering = function (ctx) {
     gl.drawElements(gl.TRIANGLES, _t._particleIdx * 6, gl.UNSIGNED_SHORT, 0);
 };
 
-cc.SpriteBatchNodeRenderCmdWebGL = function (node) {
-    this._node = node;
-};
-
-cc.SpriteBatchNodeRenderCmdWebGL.prototype.rendering = function (ctx) {
-    var node = this._node;
-    if (node.textureAtlas.totalQuads === 0)
-        return;
-
-    //cc.nodeDrawSetup(this);
-    node._shaderProgram.use();
-    node._shaderProgram._setUniformForMVPMatrixWithMat4(node._stackMatrix);
-    node._arrayMakeObjectsPerformSelector(node._children, cc.Node._stateCallbackType.updateTransform);
-    cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst);
-
-    node.textureAtlas.drawQuads();
-};
-
 cc.AtlasNodeRenderCmdWebGL = function (node) {
     this._node = node;
 };

cocos2d/core/sprites/CCSpriteBatchNode.js

@@ -412,11 +412,8 @@ cc.SpriteBatchNode = cc.Node.extend(/** @lends cc.SpriteBatchNode# */{
         } else if (fileImage instanceof cc.Texture2D)
             texture2D = fileImage;
         texture2D && this.initWithTexture(texture2D, capacity);
-    },
 
-    _initRendererCmd: function(){
-         if(cc._renderType === cc._RENDER_TYPE_WEBGL)
-            this._rendererCmd = new cc.SpriteBatchNodeRenderCmdWebGL(this);
+        this._rendererCmd = new cc.SpriteBatchNode.WebGLRenderCmd(this);
     },
 
     /**

cocos2d/core/sprites/CCSpriteBatchNodeRenderCmd.js

@@ -0,0 +1,45 @@
+/****************************************************************************
+ 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.SpriteBatchNode.WebGLRenderCmd = function(renderableObject){
+    cc.Node.WebGLRenderCmd.call(this, renderableObject);
+    this._needDraw = true;
+};
+
+cc.SpriteBatchNode.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype);
+cc.SpriteBatchNode.WebGLRenderCmd.prototype.constructor = cc.SpriteBatchNode.WebGLRenderCmd;
+
+cc.SpriteBatchNode.WebGLRenderCmd.prototype.rendering = function (ctx) {
+    var node = this._node;
+    if (node.textureAtlas.totalQuads === 0)
+        return;
+
+    //cc.nodeDrawSetup(this);
+    node._shaderProgram.use();
+    node._shaderProgram._setUniformForMVPMatrixWithMat4(node._stackMatrix);
+    node._arrayMakeObjectsPerformSelector(node._children, cc.Node._stateCallbackType.updateTransform);
+    cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst);
+
+    node.textureAtlas.drawQuads();
+};

cocos2d/tilemap/CCTMXLayerRenderCmd.js

@@ -100,4 +100,4 @@ cc.TMXLayer.WebGLRenderCmd = function(renderableObject){
     this._needDraw = true;
 };
 
-cc.TMXLayer.WebGLRenderCmd.prototype.rendering = cc.SpriteBatchNodeRenderCmdWebGL.prototype.rendering;
+cc.TMXLayer.WebGLRenderCmd.prototype.rendering = cc.SpriteBatchNode.WebGLRenderCmd.prototype.rendering;

moduleConfig.json

@@ -99,6 +99,7 @@
             "cocos2d/core/sprites/CCSprite.js",
             "cocos2d/core/sprites/CCSpriteRenderCmd.js",
             "cocos2d/core/sprites/CCSpriteBatchNode.js",
+            "cocos2d/core/sprites/CCSpriteBatchNodeRenderCmd.js",
             "cocos2d/core/sprites/CCBakeSprite.js",
             "cocos2d/core/sprites/CCAnimation.js",
             "cocos2d/core/sprites/CCAnimationCache.js",