Merge pull request cocos2d#3433 from pandamicro/develop

Fix canvas crash and rendering issues

Author: pandamicro

cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js

@@ -38,6 +38,10 @@
     var proto = cc.ClippingNode.CanvasRenderCmd.prototype = Object.create(cc.Node.CanvasRenderCmd.prototype);
     proto.constructor = cc.ClippingNode.CanvasRenderCmd;
 
+    proto.resetProgramByStencil = function () {
+        
+    };
+
     proto.initStencilBits = function () {
     };
 

cocos2d/core/layers/CCLayerCanvasRenderCmd.js

@@ -61,7 +61,7 @@
             this._cacheDirty = true;
             if (this._updateCache === 0)
                 this._updateCache = 2;
-            this._dirtyFlag = locFlag & flags.orderDirty ^ locFlag;
+            this._dirtyFlag &= ~flags.orderDirty;
         }
 
         this.originUpdateStatus();
@@ -365,7 +365,7 @@
         var flags = cc.Node._dirtyFlags, locFlag = this._dirtyFlag;
         if (locFlag & flags.gradientDirty) {
             this._dirtyFlag |= flags.colorDirty;
-            this._dirtyFlag = locFlag & flags.gradientDirty ^ locFlag;
+            this._dirtyFlag &= ~flags.gradientDirty;
         }
 
         this.originUpdateStatus();
@@ -375,7 +375,7 @@
         var flags = cc.Node._dirtyFlags, locFlag = this._dirtyFlag;
         if (locFlag & flags.gradientDirty) {
             this._dirtyFlag |= flags.colorDirty;
-            this._dirtyFlag = locFlag & flags.gradientDirty ^ locFlag;
+            this._dirtyFlag &= ~flags.gradientDirty;
         }
 
         this._originSyncStatus(parentCmd);

cocos2d/core/layers/CCLayerWebGLRenderCmd.js

@@ -174,7 +174,7 @@
         if (locFlag & flags.gradientDirty) {
             this._dirtyFlag |= flags.colorDirty;
             this._updateVertex();
-            this._dirtyFlag = locFlag & flags.gradientDirty ^ locFlag;
+            this._dirtyFlag &= ~flags.gradientDirty;
         }
 
         this.originUpdateStatus();
@@ -185,7 +185,7 @@
         if (locFlag & flags.gradientDirty) {
             this._dirtyFlag |= flags.colorDirty;
             this._updateVertex();
-            this._dirtyFlag = locFlag & flags.gradientDirty ^ locFlag;
+            this._dirtyFlag &= ~flags.gradientDirty;
         }
 
         this._originSyncStatus(parentCmd);

cocos2d/core/sprites/CCSprite.js

@@ -677,7 +677,7 @@ cc.Sprite = cc.Node.extend(/** @lends cc.Sprite# */{
         var _t = this;
         if (typeof newFrame === 'string') {
             newFrame = cc.spriteFrameCache.getSpriteFrame(newFrame);
-            cc.assert(newFrame, cc._LogInfos.Sprite_setSpriteFrame)
+            cc.assert(newFrame, cc._LogInfos.Sprite_setSpriteFrame);
         }
         this._loader.clear();
 

cocos2d/core/sprites/CCSpriteCanvasRenderCmd.js

@@ -51,12 +51,12 @@
     proto._setTexture = function (texture) {
         var node = this._node;
         if (node._texture !== texture) {
-            if (texture) {
-                node._textureLoaded = texture._textureLoaded;
-            } else {
-                node._textureLoaded = false;
-            }
+            node._textureLoaded = texture ? texture._textureLoaded : false;
             node._texture = texture;
+
+            var texSize = texture._contentSize;
+            var rect = cc.rect(0, 0, texSize.width, texSize.height);
+            node.setTextureRect(rect);
             this._updateColor();
         }
     };

cocos2d/render-texture/CCRenderTextureCanvasRenderCmd.js

@@ -25,7 +25,7 @@
 (function () {
     cc.RenderTexture.CanvasRenderCmd = function (renderableObject) {
         this._rootCtor(renderableObject);
-        this._needDraw = true;
+        this._needDraw = false;
         this._clearColorStr = "rgba(255,255,255,1)";
 
         this._cacheCanvas = document.createElement('canvas');

extensions/ccui/base-classes/UIScale9SpriteCanvasRenderCmd.js

@@ -70,7 +70,7 @@
         if (this._textureToRender === null || this._originalTexture !== locTexture) {
             this._textureToRender = this._originalTexture = locTexture;
             if (cc.Scale9Sprite.state.GRAY === this._state) {
-                this._textureToRender = this._textureToRender._generateGrayTexture();
+                this._textureToRender = this._textureToRender._switchToGray();
             }
             var color = node.getDisplayedColor();
             if (locTexture && (color.r !== 255 || color.g !==255 || color.b !== 255))