Merge branch 'photonstorm/097'

Author: pixelpicosean

Phaser/Game.ts

@@ -14,6 +14,7 @@
 /// <reference path="cameras/CameraManager.ts" />
 /// <reference path="gameobjects/GameObjectFactory.ts" />
 /// <reference path="sound/SoundManager.ts" />
+/// <reference path="sound/Sound.ts" />
 /// <reference path="Stage.ts" />
 /// <reference path="Time.ts" />
 /// <reference path="tweens/TweenManager.ts" />
@@ -298,12 +299,12 @@ module Phaser {
                 this.stage = new Stage(this, parent, width, height);
                 this.world = new World(this, width, height);
                 this.add = new GameObjectFactory(this);
-                this.sound = new SoundManager(this);
                 this.cache = new Cache(this);
                 this.load = new Loader(this, this.loadComplete);
                 this.time = new Time(this);
                 this.tweens = new TweenManager(this);
                 this.input = new Input(this);
+                this.sound = new SoundManager(this);
                 this.rnd = new RandomDataGenerator([(Date.now() * Math.random()).toString()]);
                 this.physics = new Physics.Manager(this);
 
@@ -391,6 +392,7 @@ module Phaser {
             this.tweens.update();
             this.input.update();
             this.stage.update();
+            this.sound.update();
 
             if (this.onPausedCallback !== null)
             {
@@ -407,6 +409,7 @@ module Phaser {
             this.tweens.update();
             this.input.update();
             this.stage.update();
+            this.sound.update();
             this.physics.update();
             this.world.update();
 
@@ -636,13 +639,15 @@ module Phaser {
             if (value == true && this._paused == false)
             {
                 this._paused = true;
+                this.sound.pauseAll();
                 this._raf.callback = this.pausedLoop;
             }
             else if (value == false && this._paused == true)
             {
                 this._paused = false;
                 //this.time.time = window.performance.now ? (performance.now() + performance.timing.navigationStart) : Date.now();
                 this.input.reset();
+                this.sound.resumeAll();
 
                 if (this.isRunning == false)
                 {

Phaser/Stage.ts

@@ -61,6 +61,8 @@ module Phaser {
 
             document.addEventListener('visibilitychange', (event) => this.visibilityChange(event), false);
             document.addEventListener('webkitvisibilitychange', (event) => this.visibilityChange(event), false);
+            document.addEventListener('pagehide', (event) => this.visibilityChange(event), false);
+            document.addEventListener('pageshow', (event) => this.visibilityChange(event), false);
             window.onblur = (event) => this.visibilityChange(event);
             window.onfocus = (event) => this.visibilityChange(event);
 
@@ -211,24 +213,27 @@ module Phaser {
          */
         private visibilityChange(event) {
 
-            if (this.disablePauseScreen)
+            if (event.type == 'pagehide' || event.type == 'blur' || document['hidden'] == true || document['webkitHidden'] == true)
             {
-                return;
-            }
-
-            if (event.type == 'blur' || document['hidden'] == true || document['webkitHidden'] == true)
-            {
-                if (this._game.paused == false)
+                if (this._game.paused == false && this.disablePauseScreen == false)
                 {
                     this.pauseGame();
                 }
+                else
+                {
+                    this._game.paused = true;
+                }
             }
             else
             {
-                if (this._game.paused == true)
+                if (this._game.paused == true && this.disablePauseScreen == false)
                 {
                     this.resumeGame();
                 }
+                else
+                {
+                    this._game.paused = false;
+                }
             }
 
         }

Phaser/Statics.ts

@@ -30,6 +30,10 @@ module Phaser {
         static BODY_KINETIC: number = 2;
         static BODY_DYNAMIC: number = 3;
 
+        static OUT_OF_BOUNDS_KILL: number = 0;
+        static OUT_OF_BOUNDS_DESTROY: number = 1;
+        static OUT_OF_BOUNDS_PERSIST: number = 2;
+
         /**
          * Flag used to allow GameObjects to collide on their left side
          * @type {number}

Phaser/components/sprite/Events.ts

@@ -23,6 +23,7 @@ module Phaser.Components.Sprite {
             this.onRemovedFromGroup = new Phaser.Signal;
             this.onKilled = new Phaser.Signal;
             this.onRevived = new Phaser.Signal;
+            this.onOutOfBounds = new Phaser.Signal;
 
         }
 
@@ -101,6 +102,9 @@ module Phaser.Components.Sprite {
          */
         public onAnimationLoop: Phaser.Signal;
 
+        /**
+         * Dispatched by the Sprite when it first leaves the world bounds
+         */
         public onOutOfBounds: Phaser.Signal;
 
     }

Phaser/gameobjects/Button.ts

@@ -19,9 +19,14 @@ module Phaser {
          * Create a new <code>Button</code> object.
          *
          * @param game {Phaser.Game} Current game instance.
-         * @param [x] {number} the initial x position of the button.
-         * @param [y] {number} the initial y position of the button.
-         * @param [key] {string} Key of the graphic you want to load for this button.
+         * @param [x] {number} X position of the button.
+         * @param [y] {number} Y position of the button.
+         * @param [key] {string} The image key as defined in the Game.Cache to use as the texture for this button.
+         * @param [callback] {function} The function to call when this button is pressed
+         * @param [callbackContext] {object} The context in which the callback will be called (usually 'this')
+         * @param [overFrame] {string|number} This is the frame or frameName that will be set when this button is in an over state. Give either a number to use a frame ID or a string for a frame name.
+         * @param [outFrame] {string|number} This is the frame or frameName that will be set when this button is in an out state. Give either a number to use a frame ID or a string for a frame name.
+         * @param [downFrame] {string|number} This is the frame or frameName that will be set when this button is in a down state. Give either a number to use a frame ID or a string for a frame name.
          */
         constructor(game: Game, x?: number = 0, y?: number = 0, key?: string = null, callback? = null, callbackContext? = null, overFrame? = null, outFrame? = null, downFrame? = null) {
 

Phaser/gameobjects/GameObjectFactory.ts

@@ -94,6 +94,10 @@ module Phaser {
             return <Sprite> this._world.group.add(new Sprite(this._game, x, y, key, frame, bodyType));
         }
 
+        public audio(key: string, volume?: number = 1, loop?: bool = false) {
+            return <Sound> this._game.sound.add(key, volume, loop);
+        }
+
         /**
          * Create a new Sprite with the physics automatically created and set to DYNAMIC. The Sprite position offset is set to its center.
          *
@@ -182,13 +186,14 @@ module Phaser {
         }
 
         /**
-         * Create a tween object for a specific object.
+         * Create a tween object for a specific object. The object can be any JavaScript object or Phaser object such as Sprite.
          *
-         * @param obj Object you wish the tween will affect.
+         * @param obj {object} Object the tween will be run on.
+         * @param [localReference] {bool} If true the tween will be stored in the object.tween property so long as it exists. If already set it'll be over-written.
          * @return {Phaser.Tween} The newly created tween object.
          */
-        public tween(obj): Tween {
-            return this._game.tweens.create(obj);
+        public tween(obj, localReference?:bool = false): Tween {
+            return this._game.tweens.create(obj, localReference);
         }
 
         /**
@@ -202,6 +207,17 @@ module Phaser {
             return this._world.group.add(sprite);
         }
 
+        /**
+         * Add an existing Button to the current world.
+         * Note: This doesn't check or update the objects reference to Game. If that is wrong, all kinds of things will break.
+         *
+         * @param button The Button to add to the Game World
+         * @return {Phaser.Button} The Button object
+         */
+        public existingButton(button: Button): Button {
+            return this._world.group.add(button);
+        }
+
         /**
          * Add an existing GeomSprite to the current world.
          * Note: This doesn't check or update the objects reference to Game. If that is wrong, all kinds of things will break.

Phaser/gameobjects/Sprite.ts

@@ -81,6 +81,9 @@ module Phaser {
 
             this.transform.setCache();
 
+            this.outOfBounds = false;
+            this.outOfBoundsAction = Phaser.Types.OUT_OF_BOUNDS_PERSIST;
+
             //  Handy proxies
             this.scale = this.transform.scale;
             this.alpha = this.texture.alpha;
@@ -128,6 +131,17 @@ module Phaser {
          */
         public alive: bool;
 
+        /**
+         * Is the Sprite out of the world bounds or not?
+         */
+        public outOfBounds: bool;
+
+        /**
+         * The action to be taken when the sprite is fully out of the world bounds
+         * Defaults to Phaser.Types.OUT_OF_BOUNDS_KILL
+         */
+        public outOfBoundsAction: number;
+
         /**
          * Sprite physics body.
          */
@@ -171,6 +185,11 @@ module Phaser {
          */
         public cameraView: Phaser.Rectangle;
 
+        /**
+         * A local tween variable. Used by the TweenManager when setting a tween on this sprite or a property of it.
+         */
+        public tween: Phaser.Tween;
+
         /**
          * A boolean representing if the Sprite has been modified in any way via a scale, rotate, flip or skew.
          */
@@ -314,44 +333,34 @@ module Phaser {
         }
 
         /**
-         * Automatically called after update() by the game loop.
+         * Automatically called after update() by the game loop for all 'alive' objects.
          */
         public postUpdate() {
 
             this.animations.update();
 
-            /*
-            if (this.worldBounds != null)
+            if (Phaser.RectangleUtils.intersects(this.worldView, this.game.world.bounds))
             {
-                if (this.outOfBoundsAction == GameObject.OUT_OF_BOUNDS_KILL)
+                this.outOfBounds = false;
+            }
+            else
+            {
+                if (this.outOfBounds == false)
                 {
-                    if (this.x < this.worldBounds.x || this.x > this.worldBounds.right || this.y < this.worldBounds.y || this.y > this.worldBounds.bottom)
-                    {
-                        this.kill();
-                    }
+                    this.events.onOutOfBounds.dispatch(this);
                 }
-                else
+
+                this.outOfBounds = true;
+
+                if (this.outOfBoundsAction == Phaser.Types.OUT_OF_BOUNDS_KILL)
+                {
+                    this.kill();
+                }
+                else if (this.outOfBoundsAction == Phaser.Types.OUT_OF_BOUNDS_DESTROY)
                 {
-                    if (this.x < this.worldBounds.x)
-                    {
-                        this.x = this.worldBounds.x;
-                    }
-                    else if (this.x > this.worldBounds.right)
-                    {
-                        this.x = this.worldBounds.right;
-                    }
-
-                    if (this.y < this.worldBounds.y)
-                    {
-                        this.y = this.worldBounds.y;
-                    }
-                    else if (this.y > this.worldBounds.bottom)
-                    {
-                        this.y = this.worldBounds.bottom;
-                    }
+                    this.destroy();
                 }
             }
-            */
 
             if (this.modified == true && this.transform.scale.equals(1) && this.transform.skew.equals(0) && this.transform.rotation == 0 && this.transform.rotationOffset == 0 && this.texture.flippedX == false && this.texture.flippedY == false)
             {

Phaser/input/Input.ts

@@ -275,7 +275,7 @@ module Phaser {
         * @property recordPointerHistory
         * @type {Boolean}
         **/
-        public recordPointerHistory: bool = true;
+        public recordPointerHistory: bool = false;
 
         /**
         * The rate in milliseconds at which the Pointer objects should update their tracking history
@@ -286,7 +286,7 @@ module Phaser {
 
         /**
         * The total number of entries that can be recorded into the Pointer objects tracking history.
-        * The the Pointer is tracking one event every 100ms, then a trackLimit of 100 would store the last 10 seconds worth of history.
+        * If the Pointer is tracking one event every 100ms, then a trackLimit of 100 would store the last 10 seconds worth of history.
         * @property recordLimit
         * @type {Number}
         */

Phaser/input/Pointer.ts

@@ -33,6 +33,10 @@ module Phaser {
 
         }
 
+        private _highestRenderOrderID: number;
+        private _highestRenderObject: number;
+        private _highestInputPriorityID: number;
+
         /**
         * Local private reference to game.
         * @property game
@@ -239,6 +243,13 @@ module Phaser {
         **/
         public totalTouches: number = 0;
 
+        /**
+        * The number of miliseconds since the last click
+        * @property msSinceLastClick
+        * @type {Number}
+        **/
+        public msSinceLastClick: number = Number.MAX_VALUE;
+
         /**
         * How long the Pointer has been depressed on the touchscreen. If not currently down it returns -1.
         * @property duration
@@ -306,7 +317,12 @@ module Phaser {
             this.withinGame = true;
             this.isDown = true;
             this.isUp = false;
+
+            //  Work out how long it has been since the last click
+            this.msSinceLastClick = this.game.time.now - this.timeDown;
+
             this.timeDown = this.game.time.now;
+
             this._holdSent = false;
 
             //  This sets the x/y and other local values
@@ -371,10 +387,6 @@ module Phaser {
 
         }
 
-        private _highestRenderOrderID: number;
-        private _highestRenderObject: number;
-        private _highestInputPriorityID: number;
-
         /**
         * Called when the Pointer is moved on the touchscreen
         * @method move

Phaser/input/Touch.ts

@@ -79,9 +79,7 @@ module Phaser {
         * @param {Any} event
         **/
         private consumeTouchMove(event) {
-
             event.preventDefault();
-
         }
 
         /**