Merge pull request #3502 from pandamicro/programstate

Improve Spine rendering and fix action manager leak

Author: pandamicro

cocos2d/core/CCActionManager.js

@@ -30,25 +30,13 @@
  * @example
  * var element = new cc.HashElement();
  */
-cc.HashElement = cc.Class.extend(/** @lends cc.HashElement# */{
-    actions:null,
-    target:null, //ccobject
-    actionIndex:0,
-    currentAction:null, //CCAction
-    currentActionSalvaged:false,
-    paused:false,
-    /**
-     * Constructor
-     */
-    ctor:function () {
-        this.actions = [];
-        this.target = null;
-        this.actionIndex = 0;
-        this.currentAction = null; //CCAction
-        this.currentActionSalvaged = false;
-        this.paused = false;
-    }
-});
+cc.HashElement = function () {
+    this.actions = [];
+    this.target = null;
+    this.actionIndex = 0;
+    this.currentAction = null; //CCAction
+    this.paused = false;
+};
 
 /**
  * cc.ActionManager is a class that can manage actions.<br/>
@@ -64,10 +52,6 @@ cc.HashElement = cc.Class.extend(/** @lends cc.HashElement# */{
  * var mng = new cc.ActionManager();
  */
 cc.ActionManager = cc.Class.extend(/** @lends cc.ActionManager# */{
-    _hashTargets:null,
-    _arrayTargets:null,
-    _currentTarget:null,
-    _currentTargetSalvaged:false,
     _elementPool: [],
 
     _searchElementByTarget:function (arr, target) {
@@ -82,7 +66,6 @@ cc.ActionManager = cc.Class.extend(/** @lends cc.ActionManager# */{
         this._hashTargets = {};
         this._arrayTargets = [];
         this._currentTarget = null;
-        this._currentTargetSalvaged = false;
     },
 
     _getElement: function (target, paused) {
@@ -99,8 +82,8 @@ cc.ActionManager = cc.Class.extend(/** @lends cc.ActionManager# */{
         element.actions.length = 0;
         element.actionIndex = 0;
         element.currentAction = null;
-        element.currentActionSalvaged = false;
         element.paused = false;
+        element.target = null;
         this._elementPool.push(element);
     },
 
@@ -156,15 +139,8 @@ cc.ActionManager = cc.Class.extend(/** @lends cc.ActionManager# */{
             return;
         var element = this._hashTargets[target.__instanceId];
         if (element) {
-            if (element.actions.indexOf(element.currentAction) !== -1 && !(element.currentActionSalvaged))
-                element.currentActionSalvaged = true;
-
             element.actions.length = 0;
-            if (this._currentTarget === element && !forceDelete) {
-                this._currentTargetSalvaged = true;
-            } else {
-                this._deleteHashElement(element);
-            }
+            this._deleteHashElement(element);
         }
     },
     /** Removes an action given an action reference.
@@ -181,6 +157,9 @@ cc.ActionManager = cc.Class.extend(/** @lends cc.ActionManager# */{
             for (var i = 0; i < element.actions.length; i++) {
                 if (element.actions[i] === action) {
                     element.actions.splice(i, 1);
+                    // update actionIndex in case we are in tick. looping over the actions
+                    if (element.actionIndex >= i)
+                        element.actionIndex--;
                     break;
                 }
             }
@@ -291,10 +270,10 @@ cc.ActionManager = cc.Class.extend(/** @lends cc.ActionManager# */{
      * @param {Array} targetsToResume
      */
     resumeTargets:function(targetsToResume){
-        if(!targetsToResume)
+        if (!targetsToResume)
             return;
 
-        for(var i = 0 ; i< targetsToResume.length; i++){
+        for (var i = 0; i< targetsToResume.length; i++) {
             if(targetsToResume[i])
                 this.resumeTarget(targetsToResume[i]);
         }
@@ -311,21 +290,14 @@ cc.ActionManager = cc.Class.extend(/** @lends cc.ActionManager# */{
     _removeActionAtIndex:function (index, element) {
         var action = element.actions[index];
 
-        if ((action === element.currentAction) && (!element.currentActionSalvaged))
-            element.currentActionSalvaged = true;
-
         element.actions.splice(index, 1);
 
         // update actionIndex in case we are in tick. looping over the actions
         if (element.actionIndex >= index)
             element.actionIndex--;
 
         if (element.actions.length === 0) {
-            if (this._currentTarget === element) {
-                this._currentTargetSalvaged = true;
-            } else {
-                this._deleteHashElement(element);
-            }
+            this._deleteHashElement(element);
         }
     },
 
@@ -356,25 +328,17 @@ cc.ActionManager = cc.Class.extend(/** @lends cc.ActionManager# */{
         for (var elt = 0; elt < locTargets.length; elt++) {
             this._currentTarget = locTargets[elt];
             locCurrTarget = this._currentTarget;
-            //this._currentTargetSalvaged = false;
-            if (!locCurrTarget.paused) {
+            if (!locCurrTarget.paused && locCurrTarget.actions) {
                 // The 'actions' CCMutableArray may change while inside this loop.
-                for (locCurrTarget.actionIndex = 0;
-                     locCurrTarget.actionIndex < (locCurrTarget.actions ? locCurrTarget.actions.length : 0);
-                     locCurrTarget.actionIndex++) {
+                for (locCurrTarget.actionIndex = 0; locCurrTarget.actionIndex < locCurrTarget.actions.length; locCurrTarget.actionIndex++) {
                     locCurrTarget.currentAction = locCurrTarget.actions[locCurrTarget.actionIndex];
                     if (!locCurrTarget.currentAction)
                         continue;
 
-                    locCurrTarget.currentActionSalvaged = false;
                     //use for speed
                     locCurrTarget.currentAction.step(dt * ( locCurrTarget.currentAction._speedMethod ? locCurrTarget.currentAction._speed : 1 ) );
-                    if (locCurrTarget.currentActionSalvaged) {
-                        // The currentAction told the node to remove it. To prevent the action from
-                        // accidentally deallocating itself before finishing its step, we retained
-                        // it. Now that step is done, it's safe to release it.
-                        locCurrTarget.currentAction = null;//release
-                    } else if (locCurrTarget.currentAction.isDone()) {
+                    
+                    if (locCurrTarget.currentAction.isDone()) {
                         locCurrTarget.currentAction.stop();
                         var action = locCurrTarget.currentAction;
                         // Make currentAction nil to prevent removeAction from salvaging it.
@@ -385,12 +349,8 @@ cc.ActionManager = cc.Class.extend(/** @lends cc.ActionManager# */{
                     locCurrTarget.currentAction = null;
                 }
             }
-
-            // elt, at this moment, is still valid
-            // so it is safe to ask this here (issue #490)
-
             // only delete currentTarget if no actions were scheduled during the cycle (issue #481)
-            if (this._currentTargetSalvaged && locCurrTarget.actions.length === 0) {
+            if (locCurrTarget.actions.length === 0) {
                 this._deleteHashElement(locCurrTarget) && elt--;
             }
         }

cocos2d/core/platform/CCMacro.js

@@ -499,6 +499,13 @@ cc.ORIENTATION_AUTO = 3;
  */
 cc.CONCURRENCY_HTTP_REQUEST_COUNT = cc.sys.isMobile ? 20 : 0;
 
+/**
+ * The maximum vertex count for a single batched draw call.
+ * @constant
+ * @type Number
+ */
+cc.BATCH_VERTEX_COUNT = 2000;
+
 
 // ------------------- vertex attrib flags -----------------------------
 /**

cocos2d/core/renderer/RendererWebGL.js

@@ -33,7 +33,7 @@ var _batchedInfo = {
         blendSrc: null,
         // The batched blend destination, all batching element should have the same blend destination
         blendDst: null,
-        // The batched glProgramState, all batching element should have the same glProgramState
+        // The batched gl program state, all batching element should have the same state
         glProgramState: null
     },
 
@@ -129,7 +129,7 @@ return {
     _cacheToBufferCmds: {},                              // an array saves the renderer commands need for cache to other canvas
     _cacheInstanceIds: [],
     _currentID: 0,
-    _clearColor: cc.color(),                            //background color,default BLACK
+    _clearColor: cc.color(0, 0, 0, 255),              //background color,default BLACK
 
     init: function () {
         var gl = cc._renderContext;
@@ -138,7 +138,7 @@ return {
 
         this.mat4Identity = new cc.math.Matrix4();
         this.mat4Identity.identity();
-        initQuadBuffer(2000);
+        initQuadBuffer(cc.BATCH_VERTEX_COUNT);
         if (cc.sys.os === cc.sys.OS_IOS) {
             _IS_IOS = true;
         }
@@ -313,18 +313,23 @@ return {
         _batchingSize += increment;
     },
 
-    _updateBatchedInfo: function (texture, blendFunc, shaderProgram) {
-        if (texture) {
+    _updateBatchedInfo: function (texture, blendFunc, glProgramState) {
+        if (texture !== _batchedInfo.texture ||
+            blendFunc.src !== _batchedInfo.blendSrc ||
+            blendFunc.dst !== _batchedInfo.blendDst ||
+            glProgramState !== _batchedInfo.glProgramState) {
+            // Draw batched elements
+            this._batchRendering();
+            // Update _batchedInfo
             _batchedInfo.texture = texture;
-        }
-
-        if (blendFunc) {
             _batchedInfo.blendSrc = blendFunc.src;
             _batchedInfo.blendDst = blendFunc.dst;
-        }
+            _batchedInfo.glProgramState = glProgramState;
 
-        if (shaderProgram) {
-            _batchedInfo.shader = shaderProgram;
+            return true;
+        }
+        else {
+            return false;
         }
     },
 
@@ -339,7 +344,7 @@ return {
 
         // Check batching
         var node = cmd._node;
-        var texture = node._texture || (node._spriteFrame ? node._spriteFrame._texture : null);
+        var texture = node._texture || (node._spriteFrame && node._spriteFrame._texture);
         var blendSrc = node._blendFunc.src;
         var blendDst = node._blendFunc.dst;
         var glProgramState = cmd._glProgramState;
@@ -361,38 +366,7 @@ return {
         // Upload vertex data
         var len = cmd.uploadData(_vertexDataF32, _vertexDataUI32, _batchingSize * _sizePerVertex);
         if (len > 0) {
-            var i, curr, type = cmd.vertexType || VertexType.QUAD;
-            switch (type) {
-            case VertexType.QUAD:
-                for (i = 0; i < len; i += 4) {
-                    curr = _batchingSize + i;
-                    _indexData[_indexSize++] = curr + 0;
-                    _indexData[_indexSize++] = curr + 1;
-                    _indexData[_indexSize++] = curr + 2;
-                    _indexData[_indexSize++] = curr + 1;
-                    _indexData[_indexSize++] = curr + 2;
-                    _indexData[_indexSize++] = curr + 3;
-                }
-                break;
-            case VertexType.TRIANGLE:
-                _pureQuad = false;
-                for (i = 0; i < len; i += 3) {
-                    curr = _batchingSize + i;
-                    _indexData[_indexSize++] = curr + 0;
-                    _indexData[_indexSize++] = curr + 1;
-                    _indexData[_indexSize++] = curr + 2;
-                }
-                break;
-            case VertexType.CUSTOM:
-                _pureQuad = false;
-                if (cmd.uploadIndexData) {
-                    _indexSize += cmd.uploadIndexData(_indexData, _indexSize, _batchingSize);
-                }
-                break;
-            default:
-                return;
-            }
-            _batchingSize += len;
+            this._increaseBatchingSize(len, cmd.vertexType);
         }
     },
 

cocos2d/core/textures/CCTexture2D.js

@@ -190,7 +190,6 @@ cc.game.addEventListener(cc.game.EVENT_RENDERER_INITED, function () {
              */
             handleLoadedTexture: function () {
                 var self = this;
-                if (self._textureLoaded) return;
                 if (!self._htmlElementObj) {
                     return;
                 }