Merge pull request cocos2d#1271 from xbruce/develop

Update CCClass CCActionManager

Author: dingpinglv

README

@@ -62,7 +62,8 @@ cc.HashElement = cc.Class.extend(/** @lends cc.HashElement# */{
  * @extends cc.Class
  */
 cc.ActionManager = cc.Class.extend({
-    _targets:null,
+    _hashTargets:null,
+    _arrayTargets:null,
     _currentTarget:null,
     _currentTargetSalvaged:false,
 
@@ -78,7 +79,8 @@ cc.ActionManager = cc.Class.extend({
      * Constructor
      */
     ctor:function () {
-        this._targets = [];
+        this._hashTargets = {};
+        this._arrayTargets = [];
         this._currentTarget = null;
         this._currentTargetSalvaged = false;
     },
@@ -98,13 +100,14 @@ cc.ActionManager = cc.Class.extend({
             throw "cc.ActionManager.addAction(): action must be non-null";
 
         //check if the action target already exists
-        var element = this._searchElementByTarget(this._targets, target);
+        var element = this._hashTargets[target.__instanceId];
         //if doesnt exists, create a hashelement and push in mpTargets
         if (!element) {
             element = new cc.HashElement();
             element.paused = paused;
             element.target = target;
-            this._targets.push(element);
+            this._hashTargets[target.__instanceId] = element;
+            this._arrayTargets.push(element);
         }
         //creates a array for that eleemnt to hold the actions
         this._actionAllocWithHashElement(element);
@@ -117,7 +120,7 @@ cc.ActionManager = cc.Class.extend({
      * Removes all actions from all the targets.
      */
     removeAllActions:function () {
-        var locTargets = this._targets;
+        var locTargets = this._arrayTargets;
         for (var i = 0; i < locTargets.length; i++) {
             var element = locTargets[i];
             if (element)
@@ -133,9 +136,7 @@ cc.ActionManager = cc.Class.extend({
         // explicit null handling
         if (target == null)
             return;
-        var element = this._searchElementByTarget(this._targets, target);
-
-        //var element = (target in this._targets)? this._targets[ptarget]: null;
+        var element = this._hashTargets[target.__instanceId];
         if (element) {
             if (element.actions.indexOf(element.currentAction) !== -1 && !(element.currentActionSalvaged))
                 element.currentActionSalvaged = true;
@@ -146,9 +147,7 @@ cc.ActionManager = cc.Class.extend({
             } else {
                 this._deleteHashElement(element);
             }
-        } //else {
-            //cc.log("cocos2d: removeAllActionsFromTarget: Target not found");
-        //}
+        }
     },
     /** Removes an action given an action reference.
      * @param {cc.Action} action
@@ -158,7 +157,7 @@ cc.ActionManager = cc.Class.extend({
         if (action == null)
             return;
         var target = action.getOriginalTarget();
-        var element = this._searchElementByTarget(this._targets, target);
+        var element = this._hashTargets[target.__instanceId];
 
         if (element) {
             for (var i = 0; i < element.actions.length; i++) {
@@ -182,7 +181,7 @@ cc.ActionManager = cc.Class.extend({
         if(!target)
             throw "cc.ActionManager.removeActionByTag(): target must be non-null";
 
-        var element = this._searchElementByTarget(this._targets, target);
+        var element = this._hashTargets[target.__instanceId];
 
         if (element) {
             var limit = element.actions.length;
@@ -207,7 +206,7 @@ cc.ActionManager = cc.Class.extend({
         if(tag == cc.ACTION_TAG_INVALID)
             cc.log("cc.ActionManager.getActionByTag(): an invalid tag");
 
-        var element = this._searchElementByTarget(this._targets, target);
+        var element = this._hashTargets[target.__instanceId];
         if (element) {
             if (element.actions != null) {
                 for (var i = 0; i < element.actions.length; ++i) {
@@ -231,7 +230,7 @@ cc.ActionManager = cc.Class.extend({
      * @return {Number}
      */
     numberOfRunningActionsInTarget:function (target) {
-        var element = this._searchElementByTarget(this._targets, target);
+        var element = this._hashTargets[target.__instanceId];
         if (element)
             return (element.actions) ? element.actions.length : 0;
 
@@ -241,15 +240,15 @@ cc.ActionManager = cc.Class.extend({
      * @param {object} target
      */
     pauseTarget:function (target) {
-        var element = this._searchElementByTarget(this._targets, target);
+        var element = this._hashTargets[target.__instanceId];
         if (element)
             element.paused = true;
     },
     /** Resumes the target. All queued actions will be resumed.
      * @param {object} target
      */
     resumeTarget:function (target) {
-        var element = this._searchElementByTarget(this._targets, target);
+        var element = this._hashTargets[target.__instanceId];
         if (element)
             element.paused = false;
     },
@@ -259,7 +258,7 @@ cc.ActionManager = cc.Class.extend({
      */
     pauseAllRunningActions:function(){
         var idsWithActions = [];
-        var locTargets = this._targets;
+        var locTargets = this._arrayTargets;
         for(var i = 0; i< locTargets.length; i++){
             var element = locTargets[i];
             if(element && !element.paused){
@@ -314,8 +313,9 @@ cc.ActionManager = cc.Class.extend({
     },
 
     _deleteHashElement:function (element) {
-        cc.ArrayRemoveObject(this._targets, element);
         if (element) {
+            delete this._hashTargets[element.target.__instanceId];
+            cc.ArrayRemoveObject(this._arrayTargets, element);
             element.actions = null;
             element.target = null;
         }
@@ -332,7 +332,7 @@ cc.ActionManager = cc.Class.extend({
      * @param {Number} dt delta time in seconds
      */
     update:function (dt) {
-        var locTargets = this._targets , locCurrTarget;
+        var locTargets = this._arrayTargets , locCurrTarget;
         for (var elt = 0; elt < locTargets.length; elt++) {
             this._currentTarget = locTargets[elt];
             locCurrTarget = this._currentTarget;

cocos2d/actions/CCActionManager.js

@@ -39,6 +39,7 @@ function ClassManager(){
     return arguments.callee.name || (arguments.callee.toString()).match(/^function ([^(]+)/)[1];
 }
 ClassManager.id=(0|(Math.random()*998));
+ClassManager.instanceId=(0|(Math.random()*998));
 ClassManager.compileSuper=function(func, name, id){
     //make the func to a string
     var str = func.toString();
@@ -79,7 +80,9 @@ ClassManager.compileSuper.ClassManager = ClassManager;
 ClassManager.getNewID=function(){
     return this.id++;
 };
-
+ClassManager.getNewInstanceId=function(){
+    return this.instanceId++;
+};
 
 (function () {
     var initializing = false, fnTest = /\b_super\b/;
@@ -150,6 +153,7 @@ ClassManager.getNewID=function(){
             // All construction is actually done in the init method
             if (this.ctor)
                 this.ctor.apply(this, arguments);
+            this.__instanceId = ClassManager.getNewInstanceId();
         }
 
         Class.id = classId;