Merge pull request #3426 from pandamicro/develop

Fix issues reported by QA

Author: pandamicro

cocos2d/actions/CCActionInterval.js

@@ -3363,7 +3363,7 @@ cc.Animate = cc.ActionInterval.extend(/** @lends cc.Animate# */{
     startWithTarget: function (target) {
         cc.ActionInterval.prototype.startWithTarget.call(this, target);
         if (this._animation.getRestoreOriginalFrame())
-            this._origFrame = target.displayFrame();
+            this._origFrame = target.getSpriteFrame();
         this._nextFrame = 0;
         this._executedLoops = 0;
     },

cocos2d/clipping-nodes/CCClippingNode.js

@@ -47,12 +47,14 @@ cc.stencilBits = -1;
  * @property {cc.Node}  stencil         - he cc.Node to use as a stencil to do the clipping.
  */
 cc.ClippingNode = cc.Node.extend(/** @lends cc.ClippingNode# */{
-    alphaThreshold: 0,
     inverted: false,
+    _alphaThreshold: 0,
 
     _stencil: null,
     _className: "ClippingNode",
 
+    _originStencilProgram: null,
+
     /**
      * Constructor function, override it to extend the construction behavior, remember to call "this._super()" in the extended "ctor" function.
      * @param {cc.Node} [stencil=null]
@@ -61,6 +63,9 @@ cc.ClippingNode = cc.Node.extend(/** @lends cc.ClippingNode# */{
         stencil = stencil || null;
         cc.Node.prototype.ctor.call(this);
         this._stencil = stencil;
+        if (stencil) {
+            this._originStencilProgram = stencil.getShaderProgram();
+        }
         this.alphaThreshold = 1;
         this.inverted = false;
         this._renderCmd.initStencilBits();
@@ -154,15 +159,19 @@ cc.ClippingNode = cc.Node.extend(/** @lends cc.ClippingNode# */{
      * @return {Number}
      */
     getAlphaThreshold: function () {
-        return this.alphaThreshold;
+        return this._alphaThreshold;
     },
 
     /**
      * set alpha threshold.
      * @param {Number} alphaThreshold
      */
     setAlphaThreshold: function (alphaThreshold) {
-        this.alphaThreshold = alphaThreshold;
+        if (alphaThreshold === 1 && alphaThreshold !== this._alphaThreshold) {
+            // should reset program used by _stencil
+            this._renderCmd.resetProgramByStencil();
+        }
+        this._alphaThreshold = alphaThreshold;
     },
 
     /**
@@ -202,6 +211,8 @@ cc.ClippingNode = cc.Node.extend(/** @lends cc.ClippingNode# */{
     setStencil: function (stencil) {
         if (this._stencil === stencil)
             return;
+        if (stencil)
+            this._originStencilProgram = stencil.getShaderProgram();
         this._renderCmd.setStencil(stencil);
     },
 
@@ -219,6 +230,9 @@ var _p = cc.ClippingNode.prototype;
 /** @expose */
 _p.stencil;
 cc.defineGetterSetter(_p, "stencil", _p.getStencil, _p.setStencil);
+/** @expose */
+_p.alphaThreshold;
+cc.defineGetterSetter(_p, "alphaThreshold", _p.getAlphaThreshold, _p.setAlphaThreshold);
 
 
 /**

cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js

@@ -124,6 +124,14 @@
             node._stencil._parent = node;
     };
 
+    proto.resetProgramByStencil = function () {
+        var node = this._node;
+        if (node._stencil) {
+            var program = node._originStencilProgram;
+            setProgram(node._stencil, program);
+        }
+    };
+
     proto._onBeforeVisit = function (ctx) {
         var gl = ctx || cc._renderContext, node = this._node;
         cc.ClippingNode.WebGLRenderCmd._layer++;

cocos2d/core/base-nodes/CCNode.js

@@ -306,7 +306,6 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
      * @param {Number} localZOrder
      */
     setLocalZOrder: function (localZOrder) {
-        this._localZOrder = localZOrder;
         if (this._parent)
             this._parent.reorderChild(this, localZOrder);
         cc.eventManager._setDirtyForNode(this);
@@ -1717,7 +1716,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
         cc.assert(interval >= 0, cc._LogInfos.Node_schedule_2);
 
         interval = interval || 0;
-        repeat = (repeat == null) ? cc.REPEAT_FOREVER : repeat;
+        repeat = isNaN(repeat) ? cc.REPEAT_FOREVER : repeat;
         delay = delay || 0;
 
         this.scheduler.schedule(callback, this, interval, repeat, delay, !this._running, key);

cocos2d/core/platform/CCMacro.js

@@ -499,10 +499,11 @@ cc.ORIENTATION_AUTO = 3;
 
 /**
  * The limit count for concurrency http request, useful in some mobile browsers
+ * Adjust its value with the test results based on your game, the preset value is just a placeholder
  * @constant
  * @type Number
  */
-cc.CONCURRENCY_HTTP_REQUEST_COUNT = cc.sys.isMobile ? 9 : 0;
+cc.CONCURRENCY_HTTP_REQUEST_COUNT = cc.sys.isMobile ? 20 : 0;
 
 
 // ------------------- vertex attrib flags -----------------------------

cocos2d/core/platform/CCTypes.js

@@ -60,12 +60,10 @@ _p._getB = function () {
 _p._setB = function (value) {
     this._val = (this._val & 0xffff00ff) | (value << 8);
 };
-
 _p._getA = function () {
     return this._val & 0x000000ff;
 };
-
-_p.setA = function (value) {
+_p._setA = function (value) {
     this._val = (this._val & 0xffffff00) | value;
 };
 

cocos2d/core/sprites/CCSpriteWebGLRenderCmd.js

@@ -39,7 +39,7 @@
         this._dirty = false;
         this._recursiveDirty = false;
 
-        this._shaderProgram = cc.shaderCache.programForKey(cc.SHADER_SPRITE_POSITION_TEXTURECOLORALPHATEST);
+        this._shaderProgram = cc.shaderCache.programForKey(cc.SHADER_SPRITE_POSITION_TEXTURECOLOR);
     };
 
     var proto = cc.Sprite.WebGLRenderCmd.prototype = Object.create(cc.Node.WebGLRenderCmd.prototype);
@@ -230,22 +230,19 @@
 
     proto._setTexture = function (texture) {
         var node = this._node;
-        // If batchnode, then texture id should be the same
-        if (node._batchNode) {
-            if (node._batchNode.texture !== texture) {
-                cc.log(cc._LogInfos.Sprite_setTexture);
-                return;
-            }
-        } else {
-            if (node._texture !== texture) {
-                node._textureLoaded = texture ? texture._textureLoaded : false;
-                node._texture = texture;
-                this._updateBlendFunc();
-
-                if (node._textureLoaded) {
-                    // Force refresh the render command list
-                    cc.renderer.childrenOrderDirty = true;
-                }
+        if (node._texture !== texture) {
+            node._textureLoaded = texture ? texture._textureLoaded : false;
+            node._texture = texture;
+
+            // Update texture rect and blend func
+            var texSize = texture._contentSize;
+            var rect = cc.rect(0, 0, texSize.width, texSize.height);
+            node.setTextureRect(rect);
+            this._updateBlendFunc();
+
+            if (node._textureLoaded) {
+                // Force refresh the render command list
+                cc.renderer.childrenOrderDirty = true;
             }
         }
     };

cocos2d/particle/CCParticleSystem.js

@@ -1405,8 +1405,14 @@ cc.ParticleSystem = cc.Node.extend(/** @lends cc.ParticleSystem# */{
                 locModeA.tangentialAccelVar = (pszTmp) ? parseFloat(pszTmp) : 0;
 
                 // rotation is dir
-                var locRotationIsDir = locValueForKey("rotationIsDir", dictionary).toLowerCase();
-                locModeA.rotationIsDir = (locRotationIsDir != null && (locRotationIsDir === "true" || locRotationIsDir === "1"));
+                var locRotationIsDir = locValueForKey("rotationIsDir", dictionary);
+                if (locRotationIsDir !== null) {
+                    locRotationIsDir = locRotationIsDir.toString().toLowerCase();
+                    locModeA.rotationIsDir = (locRotationIsDir === "true" || locRotationIsDir === "1");
+                }
+                else {
+                    locModeA.rotationIsDir = false;
+                }
             } else if (this.emitterMode === cc.ParticleSystem.MODE_RADIUS) {
                 // or Mode B: radius movement
                 var locModeB = this.modeB;

extensions/ccui/base-classes/UIWidgetRenderCmd.js

@@ -98,6 +98,11 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () {
         };
 
         proto.transform = function (parentCmd, recursive) {
+            if (!this._transform) {
+                this._transform = {a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0};
+                this._worldTransform = {a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0};
+            }
+
             var node = this._node;
             if (node._visible && node._running) {
                 node._adaptRenderers();

extensions/ccui/layouts/UILayoutWebGLRenderCmd.js

@@ -77,7 +77,6 @@
 
         gl.stencilMask(mask_layer);
         gl.clear(gl.STENCIL_BUFFER_BIT);
-
     };
 
     proto._onAfterDrawStencil = function (ctx) {