Merge pull request cocos2d#1221 from dingpinglv/Iss3151_ReduceDependency

Closed cocos2d#3151: Reducing Some classes' dependency in cc.Director for Performance
dingpinglv · Nov 12, 2013 · ad1d0b4 · ad1d0b4
2 parents c038ab7 + 33ffb9c
commit ad1d0b4
Show file tree

Hide file tree

Showing 16 changed files with 219 additions and 354 deletions.
diff --git a/HelloHTML5World/build.xml b/HelloHTML5World/build.xml
@@ -28,7 +28,6 @@
                 <file name="platform/CCImage.js"/>
                 <file name="platform/zlib.min.js"/>
                 <file name="cocoa/CCNS.js"/>
-                <file name="cocoa/CCSet.js"/>
                 <file name="kazmath/vec2.js"/>
                 <file name="kazmath/vec3.js"/>
                 <file name="kazmath/vec4.js"/>

diff --git a/cocos2d/CCDirector.js b/cocos2d/CCDirector.js
@@ -245,14 +245,18 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
         this._touchDispatcher.init();
 
         //KeyboardDispatcher
-        this._keyboardDispatcher = cc.KeyboardDispatcher.getInstance();
+        if(cc.KeyboardDispatcher)
+            this._keyboardDispatcher = cc.KeyboardDispatcher.getInstance();
 
         //accelerometer
-        this._accelerometer = new cc.Accelerometer();
+        if(cc.Accelerometer)
+            this._accelerometer = new cc.Accelerometer();
 
         //MouseDispatcher
-        this._mouseDispatcher = new cc.MouseDispatcher();
-        this._mouseDispatcher.init();
+        if(cc.MouseDispatcher){
+            this._mouseDispatcher = new cc.MouseDispatcher();
+            this._mouseDispatcher.init();
+        }
 
         return true;
     },
@@ -1057,30 +1061,41 @@ cc.Director = cc.Class.extend(/** @lends cc.Director# */{
     },
 
     getKeyboardDispatcher:function () {
+        if(!cc.KeyboardDispatcher)
+            throw "cc.KeyboardDispatcher is undefined, maybe it has been removed from js loading list.";
         return this._keyboardDispatcher;
     },
     setKeyboardDispatcher:function (keyboardDispatcher) {
+        if(!cc.KeyboardDispatcher)
+            throw "cc.KeyboardDispatcher is undefined, maybe it has been removed from js loading list.";
         this._keyboardDispatcher = keyboardDispatcher;
     },
 
     getAccelerometer:function () {
+        if(!cc.Accelerometer)
+            throw "cc.Accelerometer is undefined, maybe it has been removed from js loading list.";
         return this._accelerometer;
     },
     setAccelerometer:function (accelerometer) {
-        if (this._accelerometer != accelerometer) {
+        if(!cc.Accelerometer)
+            throw "cc.Accelerometer is undefined, maybe it has been removed from js loading list.";
+        if (this._accelerometer != accelerometer)
             this._accelerometer = accelerometer;
-        }
     },
 
     getDeltaTime:function(){
         return this._deltaTime;
     },
 
     getMouseDispatcher:function () {
+        if(!cc.MouseDispatcher)
+            throw "cc.MouseDispatcher is undefined, maybe it has been removed from js loading list.";
         return this._mouseDispatcher;
     },
 
     setMouseDispatcher:function (mouseDispatcher) {
+        if(!cc.MouseDispatcher)
+            throw "cc.MouseDispatcher is undefined, maybe it has been removed from js loading list.";
         if (this._mouseDispatcher != mouseDispatcher)
             this._mouseDispatcher = mouseDispatcher;
     },

diff --git a/cocos2d/CCScheduler.js b/cocos2d/CCScheduler.js
@@ -164,7 +164,7 @@ cc.ArrayGetIndexOfObject = function (arr, findObj) {
  * @return {Boolean}
  */
 cc.ArrayContainsObject = function (arr, findObj) {
-    return cc.ArrayGetIndexOfObject(arr, findObj) != -1;
+    return arr.indexOf(findObj) != -1;
 };
 
 /**

diff --git a/cocos2d/base_nodes/CCNode.js b/cocos2d/base_nodes/CCNode.js
@@ -790,7 +790,7 @@ cc.Node = cc.Class.extend(/** @lends cc.Node# */{
     /**
      * Changes the tag that is used to identify the node easily. <br/>
      * Please refer to getTag for the sample code.
-     * @param {Number} Var A interger that indentifies the node.
+     * @param {Number} Var A integer that identifies the node.
      */
     setTag:function (Var) {
         this._tag = Var;

diff --git a/cocos2d/build.xml b/cocos2d/build.xml
@@ -28,7 +28,6 @@
                 <file name="platform/CCImage.js"/>
                 <file name="platform/zlib.min.js"/>
                 <file name="cocoa/CCNS.js"/>
-                <file name="cocoa/CCSet.js"/>
                 <file name="kazmath/vec2.js"/>
                 <file name="kazmath/vec3.js"/>
                 <file name="kazmath/vec4.js"/>

diff --git a/cocos2d/cocoa/CCSet.js b/cocos2d/cocoa/CCSet.js