Improve ActionManager performance and fix memory leak caused by element pool

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--;
             }
         }