Issue cocos2d#2416: Add AtlasNode RenderCmd

Author: VisualSJ

cocos2d/core/base-nodes/CCAtlasNode.js

@@ -84,11 +84,9 @@ cc.AtlasNode = cc.Node.extend(/** @lends cc.AtlasNode# */{
         this._ignoreContentScaleFactor = false;
 
         itemsToRender !== undefined && this.initWithTileFile(tile, tileWidth, tileHeight, itemsToRender);
-    },
 
-    _initRendererCmd: function () {
         if(cc._renderType === cc._RENDER_TYPE_WEBGL)
-            this._rendererCmd = new cc.AtlasNodeRenderCmdWebGL(this);
+            this._rendererCmd = new cc.AtlasNode.WebGLRenderCmd(this);
     },
 
     /**

cocos2d/core/base-nodes/CCAtlasNodeRenderCmd.js

@@ -0,0 +1,44 @@
+/****************************************************************************
+ 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.AtlasNode.WebGLRenderCmd = function(renderableObject){
+    cc.Node.WebGLRenderCmd.call(this, renderableObject);
+    this._needDraw = true;
+};
+
+cc.AtlasNode.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype);
+cc.AtlasNode.WebGLRenderCmd.prototype.constructor = cc.AtlasNode.WebGLRenderCmd;
+
+cc.AtlasNode.WebGLRenderCmd.prototype.rendering = function (ctx) {
+    var context = ctx || cc._renderContext, node = this._node;
+
+    node._shaderProgram.use();
+    node._shaderProgram._setUniformForMVPMatrixWithMat4(node._stackMatrix);
+
+    cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst);
+    if (node._uniformColor && node._colorF32Array) {
+        context.uniform4fv(node._uniformColor, node._colorF32Array);
+        node.textureAtlas.drawNumberOfQuads(node.quadsToDraw, 0);
+    }
+};

cocos2d/core/renderer/RendererWebGL.js

@@ -170,23 +170,6 @@ cc.ParticleRenderCmdWebGL.prototype.rendering = function (ctx) {
     gl.drawElements(gl.TRIANGLES, _t._particleIdx * 6, gl.UNSIGNED_SHORT, 0);
 };
 
-cc.AtlasNodeRenderCmdWebGL = function (node) {
-    this._node = node;
-};
-
-cc.AtlasNodeRenderCmdWebGL.prototype.rendering = function (ctx) {
-    var context = ctx || cc._renderContext, node = this._node;
-
-    node._shaderProgram.use();
-    node._shaderProgram._setUniformForMVPMatrixWithMat4(node._stackMatrix);
-
-    cc.glBlendFunc(node._blendFunc.src, node._blendFunc.dst);
-    if (node._uniformColor && node._colorF32Array) {
-        context.uniform4fv(node._uniformColor, node._colorF32Array);
-        node.textureAtlas.drawNumberOfQuads(node.quadsToDraw, 0);
-    }
-};
-
 cc.ArmatureRenderCmdWebGL = function (node) {
     this._node = node;
 };

moduleConfig.json

@@ -147,6 +147,7 @@
             "core",
 
             "cocos2d/labels/CCLabelAtlas.js",
+            "cocos2d/labels/CCAtlasNodeRenderCmd.js",
             "cocos2d/labels/CCLabelBMFont.js"
         ],
         "menus" : [