Merge pull request #2407 from dingpinglv/SpriteWithoutTexture

Correct a mistake of cc.Sprite that its rendering is incorrect without texture

Author: dingpinglv

cocos2d/core/base-nodes/CCNode.js

@@ -1345,7 +1345,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
      * If the cleanup parameter is not passed, it will force a cleanup. <br/>
      * If the node orphan, then nothing happens.
      * @function
-     * @param {Boolean} cleanup true if all actions and callbacks on this node should be removed, false otherwise.
+     * @param {Boolean} [cleanup=true] true if all actions and callbacks on this node should be removed, false otherwise.
      * @see cc.Node#removeFromParentAndCleanup
      */
     removeFromParent: function (cleanup) {
@@ -1360,7 +1360,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
      * Removes this node itself from its parent node.  <br/>
      * If the node orphan, then nothing happens.
      * @deprecated since v3.0, please use removeFromParent() instead
-     * @param {Boolean} cleanup true if all actions and callbacks on this node should be removed, false otherwise.
+     * @param {Boolean} [cleanup=true] true if all actions and callbacks on this node should be removed, false otherwise.
      */
     removeFromParentAndCleanup: function (cleanup) {
         cc.log(cc._LogInfos.Node_removeFromParentAndCleanup);
@@ -1374,7 +1374,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
      * to override this method </p>
      * @function
      * @param {cc.Node} child  The child node which will be removed.
-     * @param {Boolean|null} [cleanup=null]  true if all running actions and callbacks on the child node will be cleanup, false otherwise.
+     * @param {Boolean} [cleanup=true]  true if all running actions and callbacks on the child node will be cleanup, false otherwise.
      */
     removeChild: function (child, cleanup) {
         // explicit nil handling
@@ -1395,7 +1395,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
      * If the cleanup parameter is not passed, it will force a cleanup. <br/>
      * @function
      * @param {Number} tag An integer number that identifies a child node
-     * @param {Boolean} cleanup true if all running actions and callbacks on the child node will be cleanup, false otherwise.
+     * @param {Boolean} [cleanup=true] true if all running actions and callbacks on the child node will be cleanup, false otherwise.
      * @see cc.Node#removeChildByTag
      */
     removeChildByTag: function (tag, cleanup) {
@@ -1411,7 +1411,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
 
     /**
      * Removes all children from the container and do a cleanup all running actions depending on the cleanup parameter.
-     * @param {Boolean | null } cleanup
+     * @param {Boolean} [cleanup=true]
      */
     removeAllChildrenWithCleanup: function (cleanup) {
         //cc.log(cc._LogInfos.Node_removeAllChildrenWithCleanup);        //TODO It should be discuss in v3.0
@@ -1422,7 +1422,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
      * Removes all children from the container and do a cleanup all running actions depending on the cleanup parameter. <br/>
      * If the cleanup parameter is not passed, it will force a cleanup. <br/>
      * @function
-     * @param {Boolean | null } cleanup true if all running actions on all children nodes should be cleanup, false otherwise.
+     * @param {Boolean} [cleanup=true] true if all running actions on all children nodes should be cleanup, false otherwise.
      */
     removeAllChildren: function (cleanup) {
         // not using detachChild improves speed here

cocos2d/core/renderer/RendererCanvas.js

@@ -173,8 +173,8 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
 
         var blendChange = (node._blendFuncStr !== "source"), alpha = (node._displayedOpacity / 255);
         /*if(cc.renderer.contextSession.globalAlpha !== alpha){
-            cc.renderer.contextSession.globalAlpha = context.globalAlpha = alpha;                         //TODO
-        }*/
+         cc.renderer.contextSession.globalAlpha = context.globalAlpha = alpha;                         //TODO
+         }*/
 
         if (t.a !== 1 || t.b !== 0 || t.c !== 0 || t.d !== 1 || node._flippedX || node._flippedY) {
             context.save();
@@ -223,9 +223,9 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
                 }
             } else {
                 contentSize = node._contentSize;
-                if(contentSize.width !== 0 && contentSize.height !== 0) {
+                if(locTextureCoord.validRect) {
                     curColor = node._displayedColor;
-                    context.fillStyle = "rgba(" + curColor.r + "," + curColor.g + "," + curColor.b + "," + (node._displayedOpacity/255).toFixed(4) + ")";
+                    context.fillStyle = "rgba(" + curColor.r + "," + curColor.g + "," + curColor.b + ",1)";
                     context.fillRect(locX * scaleX, locY * scaleY, contentSize.width * scaleX, contentSize.height * scaleY);
                 }
             }
@@ -263,9 +263,9 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
                 }
             } else {
                 contentSize = node._contentSize;
-                if(contentSize.width !== 0 && contentSize.height !== 0) {
+                if(locTextureCoord.validRect) {
                     curColor = node._displayedColor;
-                    context.fillStyle = "rgba(" + curColor.r + "," + curColor.g + "," + curColor.b + "," + (node._displayedOpacity/255).toFixed(4) + ")";
+                    context.fillStyle = "rgba(" + curColor.r + "," + curColor.g + "," + curColor.b + ",1)";
                     context.fillRect((t.tx + locX) * scaleX, (-t.ty + locY) * scaleY, contentSize.width * scaleX, contentSize.height * scaleY);
                 }
             }

cocos2d/core/sprites/CCSprite.js

@@ -1269,7 +1269,6 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
 
         cc.Node.prototype.init.call(_t);
         _t.dirty = _t._recursiveDirty = false;
-        _t._opacityModifyRGB = true;
 
         _t._blendFunc.src = cc.BLEND_SRC;
         _t._blendFunc.dst = cc.BLEND_DST;

cocos2d/core/sprites/SpritesWebGL.js

@@ -85,7 +85,6 @@ cc._tmp.WebGLSprite = function () {
 
         cc.Node.prototype.init.call(_t);
         _t.dirty = _t._recursiveDirty = false;
-        _t._opacityModifyRGB = true;
 
         _t._blendFunc.src = cc.BLEND_SRC;
         _t._blendFunc.dst = cc.BLEND_DST;