Issue cocos2d#2416: added CCNodeRenderCmd.js to engine

Author: dingpinglv

cocos2d/core/base-nodes/CCNodeRenderCmd.js

@@ -0,0 +1,49 @@
+/****************************************************************************
+ 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.
+ ****************************************************************************/
+
+//The cc.Node's render command for Canvas
+cc.NodeCanvasRenderCmd = function(){
+    this._needDraw = false;
+    this._anchorPointInPoints = new cc.Point(0,0);
+    this._transform = {a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0};
+    this._transformWorld = {a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0};
+
+};
+
+cc.NodeCanvasRenderCmd.prototype = {
+    constructor: cc.NodeCanvasRenderCmd
+
+};
+
+//register to renderer
+
+//The cc.Node's render command for WebGL
+cc.NodeWebGLRenderCmd = function(){
+    this._needDraw = false;
+};
+
+cc.NodeWebGLRenderCmd.prototype = {
+    constructor: cc.NodeCanvasRenderCmd
+
+};

cocos2d/core/layers/CCLayer.js

@@ -308,7 +308,7 @@ cc.LayerColor = cc.Layer.extend(/** @lends cc.LayerColor# */{
         this._updateColor();
     },
 
-    _blendFuncStr: "source",
+    _blendFuncStr: "source-over",
 
     /**
      * Constructor of cc.LayerColor

cocos2d/core/renderer/RendererCanvas.js

@@ -171,7 +171,7 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
             locHeight = node._rect.height,
             image, curColor, contentSize;
 
-        var blendChange = (node._blendFuncStr !== "source"), alpha = (node._displayedOpacity / 255);
+        var blendChange = (node._blendFuncStr !== "source-over"), alpha = (node._displayedOpacity / 255);
 
         if (t.a !== 1 || t.b !== 0 || t.c !== 0 || t.d !== 1 || node._flippedX || node._flippedY) {
             context.save();
@@ -304,7 +304,7 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
             return;
 
         var needTransform = (t.a !== 1 || t.b !== 0 || t.c !== 0 || t.d !== 1);         //TODO
-        var needRestore = (node._blendFuncStr !== "source") || needTransform;
+        var needRestore = (node._blendFuncStr !== "source-over") || needTransform;
 
         if (needRestore) {
             context.save();
@@ -343,7 +343,7 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
             return;
 
         var needTransform = (t.a !== 1 || t.b !== 0 || t.c !== 0 || t.d !== 1);
-        var needRestore = (node._blendFuncStr !== "source") || needTransform;
+        var needRestore = (node._blendFuncStr !== "source-over") || needTransform;
         if(needRestore){
             context.save();
             context.globalCompositeOperation = node._blendFuncStr;
@@ -490,7 +490,7 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
         context.save();
         context.transform(t.a, t.c, t.b, t.d, t.tx * scaleX, -t.ty * scaleY);
 
-        if (locSprite._blendFuncStr != "source")
+        if (locSprite._blendFuncStr != "source-over")
             context.globalCompositeOperation = locSprite._blendFuncStr;
         context.globalAlpha = alpha;
 

cocos2d/core/sprites/CCSprite.js

@@ -800,7 +800,7 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
     _quadWebBuffer: null,
     _quadDirty: false,
     _colorized: false,
-    _blendFuncStr: "source",
+    _blendFuncStr: "source-over",
     _originalTexture: null,
     _drawSize_Canvas: null,
 

cocos2d/physics/CCPhysicsSprite.js

@@ -369,7 +369,7 @@
          * @return {Number}
          */
         getRotation:function () {
-            return this._ignoreBodyRotation ? cc.radiansToDegrees(this._rotationRadiansX) : -cc.radiansToDegrees(this._body.a);
+            return this._ignoreBodyRotation ? this._rotationX : -cc.radiansToDegrees(this._body.a);
         },
 
         /**

moduleConfig.json

@@ -76,6 +76,7 @@
             "cocos2d/core/base-nodes/BaseNodesWebGL.js",
             "cocos2d/core/base-nodes/BaseNodesPropertyDefine.js",
             "cocos2d/core/base-nodes/CCNode.js",
+            "cocos2d/core/base-nodes/CCNodeRenderCmd.js",
             "cocos2d/core/base-nodes/CCAtlasNode.js",
 
             "cocos2d/core/textures/TexturesWebGL.js",