Replaced "sharedXXX" with "getInstance"

cocos2d · Jul 23, 2012 · 61aba1c · 61aba1c
1 parent fc7ebe2
commit 61aba1c
Show file tree

Hide file tree

Showing 129 changed files with 990 additions and 983 deletions.
diff --git a/CocosDenshion/SimpleAudioEngine.js b/CocosDenshion/SimpleAudioEngine.js
@@ -45,7 +45,7 @@ cc.capabilities = {
  * @class
  * @extends   cc.Class
  */
-cc.AudioManager = cc.Class.extend(/** @lends cc.AudioManager# */{
+cc.AudioEngine = cc.Class.extend(/** @lends cc.AudioEngine# */{
     _initialized:false,
     _supportedFormat:[ "mp3", "ogg", "wav" ],
     _requestedFormat:null,
@@ -86,7 +86,7 @@ cc.AudioManager = cc.Class.extend(/** @lends cc.AudioManager# */{
      * @return {Boolean}
      * @example
      * //example
-     * cc.AudioManager.sharedEngine().init("mp3,ogg");
+     * cc.AudioEngine.getInstance().init("mp3,ogg");
      */
     init:function (audioType) {
         if (audioType) {
@@ -167,7 +167,7 @@ cc.AudioManager = cc.Class.extend(/** @lends cc.AudioManager# */{
      * @param {Boolean} loop Whether the background music loop or not.
      * @example
      * //example
-     * cc.AudioManager.sharedEngine().playBackgroundMusic(path, false);
+     * cc.AudioEngine.getInstance().playBackgroundMusic(path, false);
      */
     playBackgroundMusic:function (path, loop) {
         if (this._bgmList[this._playingBgm]) {
@@ -184,7 +184,7 @@ cc.AudioManager = cc.Class.extend(/** @lends cc.AudioManager# */{
      * @param {Boolean} releaseData If release the background music data or not.As default value is false.
      * @example
      * //example
-     * cc.AudioManager.sharedEngine().stopBackgroundMusic();
+     * cc.AudioEngine.getInstance().stopBackgroundMusic();
      */
     stopBackgroundMusic:function (releaseData) {
         if (this._bgmList[this._playingBgm]) {
@@ -199,7 +199,7 @@ cc.AudioManager = cc.Class.extend(/** @lends cc.AudioManager# */{
      * Pause playing background music.
      * @example
      * //example
-     * cc.AudioManager.sharedEngine().pauseBackgroundMusic();
+     * cc.AudioEngine.getInstance().pauseBackgroundMusic();
      */
     pauseBackgroundMusic:function () {
         if (this._bgmList[this._playingBgm]) {
@@ -210,7 +210,7 @@ cc.AudioManager = cc.Class.extend(/** @lends cc.AudioManager# */{
      * Resume playing background music.
      * @example
      * //example
-     * cc.AudioManager.sharedEngine().resumeBackgroundMusic();
+     * cc.AudioEngine.getInstance().resumeBackgroundMusic();
      */
     resumeBackgroundMusic:function () {
         if (this._bgmList[this._playingBgm]) {
@@ -222,7 +222,7 @@ cc.AudioManager = cc.Class.extend(/** @lends cc.AudioManager# */{
      * Rewind playing background music.
      * @example
      * //example
-     * cc.AudioManager.sharedEngine().rewindBackgroundMusic();
+     * cc.AudioEngine.getInstance().rewindBackgroundMusic();
      */
     rewindBackgroundMusic:function () {
         if (this._bgmList[this._playingBgm]) {
@@ -239,7 +239,7 @@ cc.AudioManager = cc.Class.extend(/** @lends cc.AudioManager# */{
      * @return {Boolean} If is playing return true,or return false.
      * @example
      * //example
-     *  if (cc.AudioManager.sharedEngine().isBackgroundMusicPlaying()) {
+     *  if (cc.AudioEngine.getInstance().isBackgroundMusicPlaying()) {
      *      cc.Log("background music is playing");
      *  }
      *  else {
@@ -255,7 +255,7 @@ cc.AudioManager = cc.Class.extend(/** @lends cc.AudioManager# */{
      * @return {Number}
      * @example
      * //example
-     * var volume = cc.AudioManager.sharedEngine().getBackgroundMusicVolume();
+     * var volume = cc.AudioEngine.getInstance().getBackgroundMusicVolume();
      */
     getBackgroundMusicVolume:function () {
         if (this._bgmList[this._playingBgm]) {
@@ -271,7 +271,7 @@ cc.AudioManager = cc.Class.extend(/** @lends cc.AudioManager# */{
      * @param {Number} volume Volume must be in 0.0~1.0 .
      * @example
      * //example
-     * cc.AudioManager.sharedEngine().setBackgroundMusicVolume(0.5);
+     * cc.AudioEngine.getInstance().setBackgroundMusicVolume(0.5);
      */
     setBackgroundMusicVolume:function (volume) {
         if (this._bgmList[this._playingBgm]) {
@@ -292,7 +292,7 @@ cc.AudioManager = cc.Class.extend(/** @lends cc.AudioManager# */{
      * @return {Number}
      * @example
      * //example
-     * var effectVolume = cc.AudioManager.sharedEngine().getEffectsVolume();
+     * var effectVolume = cc.AudioEngine.getInstance().getEffectsVolume();
      */
     getEffectsVolume:function () {
         return this._effectsVolume;
@@ -303,7 +303,7 @@ cc.AudioManager = cc.Class.extend(/** @lends cc.AudioManager# */{
      * @param {Number} volume Volume must be in 0.0~1.0 .
      * @example
      * //example
-     * cc.AudioManager.sharedEngine().setEffectsVolume(0.5);
+     * cc.AudioEngine.getInstance().setEffectsVolume(0.5);
      */
     setEffectsVolume:function (volume) {
         if (volume > 1) {
@@ -328,7 +328,7 @@ cc.AudioManager = cc.Class.extend(/** @lends cc.AudioManager# */{
      * @param {Boolean} loop Whether to loop the effect playing, default value is false
      * @example
      * //example
-     * var soundId = cc.AudioManager.sharedEngine().playEffect(path);
+     * var soundId = cc.AudioEngine.getInstance().playEffect(path);
      */
     playEffect:function (path, loop) {
         var soundCache = this._getEffectList(path);
@@ -344,7 +344,7 @@ cc.AudioManager = cc.Class.extend(/** @lends cc.AudioManager# */{
      * @param {String} path The return value of function playEffect.
      * @example
      * //example
-     * cc.AudioManager.sharedEngine().pauseEffect(path);
+     * cc.AudioEngine.getInstance().pauseEffect(path);
      */
     pauseEffect:function (path) {
         if (this._audioList[path]) {
@@ -356,7 +356,7 @@ cc.AudioManager = cc.Class.extend(/** @lends cc.AudioManager# */{
      * Pause all playing sound effect.
      * @example
      * //example
-     * cc.AudioManager.sharedEngine().pauseAllEffects();
+     * cc.AudioEngine.getInstance().pauseAllEffects();
      */
     pauseAllEffects:function () {
         if (this._audioList) {
@@ -371,7 +371,7 @@ cc.AudioManager = cc.Class.extend(/** @lends cc.AudioManager# */{
      * @param {String} path The return value of function playEffect.
      * @example
      * //example
-     * cc.AudioManager.sharedEngine().resumeEffect(path);
+     * cc.AudioEngine.getInstance().resumeEffect(path);
      */
     resumeEffect:function (path) {
         if (this._audioList[path]) {
@@ -383,7 +383,7 @@ cc.AudioManager = cc.Class.extend(/** @lends cc.AudioManager# */{
      * Resume all playing sound effect
      * @example
      * //example
-     * cc.AudioManager.sharedEngine().resumeAllEffects();
+     * cc.AudioEngine.getInstance().resumeAllEffects();
      */
     resumeAllEffects:function () {
         if (this._audioList) {
@@ -398,7 +398,7 @@ cc.AudioManager = cc.Class.extend(/** @lends cc.AudioManager# */{
      * @param {String} path The return value of function playEffect.
      * @example
      * //example
-     * cc.AudioManager.sharedEngine().stopEffect(path);
+     * cc.AudioEngine.getInstance().stopEffect(path);
      */
     stopEffect:function (path) {
         if (this._audioList[path]) {
@@ -411,7 +411,7 @@ cc.AudioManager = cc.Class.extend(/** @lends cc.AudioManager# */{
      * Stop all playing sound effects.
      * @example
      * //example
-     * cc.AudioManager.sharedEngine().stopAllEffects();
+     * cc.AudioEngine.getInstance().stopAllEffects();
      */
     stopAllEffects:function () {
         if (this._audioList) {
@@ -454,7 +454,7 @@ cc.AudioManager = cc.Class.extend(/** @lends cc.AudioManager# */{
      * @param {String} path
      * @example
      * //example
-     * cc.AudioManager.sharedEngine().unloadEffect(EFFECT_FILE);
+     * cc.AudioEngine.getInstance().unloadEffect(EFFECT_FILE);
      */
     unloadEffect:function (path) {
         if (this._audioList.hasOwnProperty(path)) {
@@ -473,7 +473,7 @@ cc.AudioManager = cc.Class.extend(/** @lends cc.AudioManager# */{
      *  Stop all background music and sound effects
      * @example
      * //example
-     * cc.AudioManager.sharedEngine().end();
+     * cc.AudioEngine.getInstance().end();
      */
     end:function () {
         this.stopBackgroundMusic();
@@ -483,11 +483,11 @@ cc.AudioManager = cc.Class.extend(/** @lends cc.AudioManager# */{
 
 /**
  * Get the shared Engine object, it will new one when first time be called.
- * @return {cc.AudioManager}
+ * @return {cc.AudioEngine}
  */
-cc.AudioManager.sharedEngine = function () {
+cc.AudioEngine.getInstance = function () {
     if (!cc.sharedEngine) {
-        cc.sharedEngine = new cc.AudioManager();
+        cc.sharedEngine = new cc.AudioEngine();
     }
     return cc.sharedEngine;
-};
+};
diff --git a/Demo/HelloDomMenu/Classes/AppDelegate.js b/Demo/HelloDomMenu/Classes/AppDelegate.js
@@ -49,7 +49,7 @@ cc.AppDelegate = cc.Application.extend({
      */
     applicationDidFinishLaunching:function () {
         // initialize director
-        var director = cc.Director.sharedDirector();
+        var director = cc.Director.getInstance();
 
         // enable High Resource Mode(2x, such as iphone4) and maintains low resource on other devices.
 //     director->enableRetinaDisplay(true);
@@ -74,14 +74,14 @@ cc.AppDelegate = cc.Application.extend({
      @param  the pointer of the application
      */
     applicationDidEnterBackground:function () {
-        cc.Director.sharedDirector().pause();
+        cc.Director.getInstance().pause();
     },
 
     /**
      @brief  The function be called when the application enter foreground
      @param  the pointer of the application
      */
     applicationWillEnterForeground:function () {
-        cc.Director.sharedDirector().resume();
+        cc.Director.getInstance().resume();
     }
-});
+});
diff --git a/Demo/HelloDomMenu/HelloDom.js b/Demo/HelloDomMenu/HelloDom.js
@@ -61,11 +61,11 @@ var Helloworld = cc.Layer.extend({
         // 1. super init first
         this._super();
 
-        var size = cc.Director.sharedDirector().getWinSize();
+        var size = cc.Director.getInstance().getWinSize();
 
         //this.helloLb = cc.LabelTTF.create("Hello World", "Arial", 24);
         // position the label on the center of the screen
-        //this.helloLb.setPosition(cc.ccp(cc.Director.sharedDirector().getWinSize().width / 2, 0));
+        //this.helloLb.setPosition(cc.ccp(cc.Director.getInstance().getWinSize().width / 2, 0));
         // add the label as a child to this layer
         //this.addChild(this.helloLb, 5);
 

diff --git a/Demo/NativeClientDemo/cocos2d.js b/Demo/NativeClientDemo/cocos2d.js
@@ -45,4 +45,4 @@
         s.id = 'cocos2d-html5';
         //else if single file specified, load singlefile
     });
-})();
+})();
diff --git a/Demo/NativeClientDemo/main.js b/Demo/NativeClientDemo/main.js
@@ -31,7 +31,7 @@ var cocos2dApp = cc.Application.extend({
         this.startScene = scene;
         cc.COCOS2D_DEBUG = this.config['COCOS2D_DEBUG'];
         cc.setup(this.config['tag']);
-        cc.AudioManager.sharedEngine().init("mp3,ogg");
+        cc.AudioEngine.getInstance().init("mp3,ogg");
         cc.Loader.shareLoader().onloading = function () {
             cc.LoaderScene.shareLoaderScene().draw();
         };
@@ -46,7 +46,7 @@ var cocos2dApp = cc.Application.extend({
     },
     applicationDidFinishLaunching:function () {
         // initialize director
-        var director = cc.Director.sharedDirector();
+        var director = cc.Director.getInstance();
 
         // enable High Resource Mode(2x, such as iphone4) and maintains low resource on other devices.
 //     director->enableRetinaDisplay(true);
@@ -65,4 +65,4 @@ var cocos2dApp = cc.Application.extend({
         return true;
     }
 });
-var myApp = new cocos2dApp(HelloWorldScene);
+var myApp = new cocos2dApp(HelloWorldScene);
diff --git a/Demo/NativeClientDemo/src/NativeClient.js b/Demo/NativeClientDemo/src/NativeClient.js
@@ -158,7 +158,7 @@ var Helloworld = cc.Layer.extend({
          "CloseSelected.png",
          this,
          cc.menu_selector(Helloworld.menuCloseCallback) );
-         closeItem.setPosition( cc.ccp(cc.Director.sharedDirector().getWinSize().width - 20, 20) );
+         closeItem.setPosition( cc.ccp(cc.Director.getInstance().getWinSize().width - 20, 20) );
 
          // create menu, it's an autorelease object
          var menu = cc.Menu.create(closeItem, null);
@@ -172,7 +172,7 @@ var Helloworld = cc.Layer.extend({
         // create and initialize a label
         //var pLabel = cc.LabelTTF.create("Hello World", "Arial", 24);
         // ask director the window size
-        var size = cc.Director.sharedDirector().getWinSize();
+        var size = cc.Director.getInstance().getWinSize();
 
         // position the label on the center of the screen
         //pLabel.setPosition( cc.ccp(size.width / 2, size.height - 50) );
@@ -194,11 +194,11 @@ var Helloworld = cc.Layer.extend({
             //this.addChild(helloSprite,0);
 
         this.helloLb = cc.LabelTTF.create("Hello World", "Arial", 24);
-        this.helloLb.setPosition(cc.ccp(cc.Director.sharedDirector().getWinSize().width / 2, 0));
+        this.helloLb.setPosition(cc.ccp(cc.Director.getInstance().getWinSize().width / 2, 0));
         this.addChild(this.helloLb, 5);
 
         this.sprite = cc.Sprite.create("res/HelloWorld.png");
-        this.sprite.setPosition(cc.ccp(cc.Director.sharedDirector().getWinSize().width / 2, cc.Director.sharedDirector().getWinSize().height / 2));
+        this.sprite.setPosition(cc.ccp(cc.Director.getInstance().getWinSize().width / 2, cc.Director.getInstance().getWinSize().height / 2));
         this.sprite.setVisible(true);
         this.sprite.setAnchorPoint(cc.ccp(0.5, 0.5));
         this.sprite.setScale(0.5);
@@ -284,19 +284,19 @@ var Helloworld = cc.Layer.extend({
         cc.canvas.height = 320 * xScale;
         cc.renderContext.translate(0, cc.canvas.height);
         cc.renderContext.scale(xScale, xScale);
-        cc.Director.sharedDirector().setContentScaleFactor(xScale);
+        cc.Director.getInstance().setContentScaleFactor(xScale);
     },
     // a selector callback
     menuCloseCallback:function (sender) {
-        cc.Director.sharedDirector().end();
+        cc.Director.getInstance().end();
     },
     ccTouchesBegan:function (touches, event) {
         this.isMouseDown = true;
     },
     ccTouchesMoved:function (touches, event) {
         if (this.isMouseDown) {
             if (touches) {
-                this.circle.setPosition(new cc.Point(touches[0].locationInView().x, touches[0].locationInView().y));
+                this.circle.setPosition(new cc.Point(touches[0].getLocation().x, touches[0].getLocation().y));
             }
         }
     },

diff --git a/HelloHTML5World/cocos2d.js b/HelloHTML5World/cocos2d.js
@@ -45,4 +45,4 @@
         s.id = 'cocos2d-html5';
         //else if single file specified, load singlefile
     });
-})();
+})();
diff --git a/HelloHTML5World/main.js b/HelloHTML5World/main.js
@@ -31,7 +31,7 @@ var cocos2dApp = cc.Application.extend({
         this.startScene = scene;
         cc.COCOS2D_DEBUG = this.config['COCOS2D_DEBUG'];
         cc.setup(this.config['tag']);
-        cc.AudioManager.sharedEngine().init("mp3,ogg");
+        cc.AudioEngine.getInstance().init("mp3,ogg");
         cc.Loader.shareLoader().onloading = function () {
             cc.LoaderScene.shareLoaderScene().draw();
         };
@@ -46,7 +46,7 @@ var cocos2dApp = cc.Application.extend({
     },
     applicationDidFinishLaunching:function () {
         // initialize director
-        var director = cc.Director.sharedDirector();
+        var director = cc.Director.getInstance();
 
         // enable High Resource Mode(2x, such as iphone4) and maintains low resource on other devices.
 //     director->enableRetinaDisplay(true);
@@ -65,4 +65,4 @@ var cocos2dApp = cc.Application.extend({
         return true;
     }
 });
-var myApp = new cocos2dApp(HelloWorldScene);
+var myApp = new cocos2dApp(HelloWorldScene);
diff --git a/HelloHTML5World/src/myApp.js b/HelloHTML5World/src/myApp.js
@@ -61,7 +61,7 @@ var Helloworld = cc.Layer.extend({
         // 2. add a menu item with "X" image, which is clicked to quit the program
         //    you may modify it.
         // ask director the window size
-        var size = cc.Director.sharedDirector().getWinSize();
+        var size = cc.Director.getInstance().getWinSize();
 
         // add a "close" icon to exit the progress. it's an autorelease object
         var closeItem = cc.MenuItemImage.create(
@@ -143,19 +143,19 @@ var Helloworld = cc.Layer.extend({
         cc.canvas.height = cc.originalCanvasSize.height * xScale;
         cc.renderContext.translate(0, cc.canvas.height);
         cc.renderContext.scale(xScale, xScale);
-        cc.Director.sharedDirector().setContentScaleFactor(xScale);
+        cc.Director.getInstance().setContentScaleFactor(xScale);
     },
     // a selector callback
     menuCloseCallback:function (sender) {
-        cc.Director.sharedDirector().end();
+        cc.Director.getInstance().end();
     },
     ccTouchesBegan:function (touches, event) {
         this.isMouseDown = true;
     },
     ccTouchesMoved:function (touches, event) {
         if (this.isMouseDown) {
             if (touches) {
-                //this.circle.setPosition(new cc.Point(touches[0].locationInView().x, touches[0].locationInView().y));
+                //this.circle.setPosition(new cc.Point(touches[0].getLocation().x, touches[0].getLocation().y));
             }
         }
     },