diff --git a/docs2/out/Animation.js.html b/docs/Animation.js.html similarity index 96% rename from docs2/out/Animation.js.html rename to docs/Animation.js.html index 10581936..9e79967b 100644 --- a/docs2/out/Animation.js.html +++ b/docs/Animation.js.html @@ -382,6 +382,11 @@ Phaser.Animation = function (game, parent, name, frameData, frames, delay, loope */ this.looped = looped; + /** + * @property {boolean} looped - The loop state of the Animation. + */ + this.killOnComplete = false; + /** * @property {boolean} isFinished - The finished state of the Animation. Set to true once playback completes, false during playback. * @default @@ -443,10 +448,11 @@ Phaser.Animation.prototype = { * @method Phaser.Animation#play * @memberof Phaser.Animation * @param {number} [frameRate=null] - The framerate to play the animation at. The speed is given in frames per second. If not provided the previously set frameRate of the Animation is used. - * @param {boolean} [loop=null] - Should the animation be looped after playback. If not provided the previously set loop value of the Animation is used. + * @param {boolean} [loop=false] - Should the animation be looped after playback. If not provided the previously set loop value of the Animation is used. + * @param {boolean} [killOnComplete=false] - If set to true when the animation completes (only happens if loop=false) the parent Sprite will be killed. * @return {Phaser.Animation} - A reference to this Animation instance. */ - play: function (frameRate, loop) { + play: function (frameRate, loop, killOnComplete) { if (typeof frameRate === 'number') { @@ -460,6 +466,12 @@ Phaser.Animation.prototype = { this.looped = loop; } + if (typeof killOnComplete !== 'undefined') + { + // Remove the parent sprite once the animation has finished? + this.killOnComplete = killOnComplete; + } + this.isPlaying = true; this.isFinished = false; @@ -621,6 +633,11 @@ Phaser.Animation.prototype = { this._parent.events.onAnimationComplete.dispatch(this._parent, this); } + if (this.killOnComplete) + { + this._parent.kill(); + } + } }; @@ -765,7 +782,7 @@ Phaser.Animation.generateFrameNames = function (prefix, min, max, suffix, zeroPa Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/AnimationManager.js.html b/docs/AnimationManager.js.html similarity index 92% rename from docs2/out/AnimationManager.js.html rename to docs/AnimationManager.js.html index 2bc72698..e6f07a55 100644 --- a/docs2/out/AnimationManager.js.html +++ b/docs/AnimationManager.js.html @@ -359,6 +359,12 @@ Phaser.AnimationManager = function (sprite) { */ this.updateIfVisible = true; + /** + * @property {boolean} isLoaded - Set to true once animation data has been loaded. + * @default + */ + this.isLoaded = false; + /** * @property {Phaser.FrameData} _frameData - A temp. var for holding the currently playing Animations FrameData. * @private @@ -394,6 +400,7 @@ Phaser.AnimationManager.prototype = { this._frameData = frameData; this.frame = 0; + this.isLoaded = true; }, @@ -420,7 +427,19 @@ Phaser.AnimationManager.prototype = { frameRate = frameRate || 60; if (typeof loop === 'undefined') { loop = false; } - if (typeof useNumericIndex === 'undefined') { useNumericIndex = true; } + + // If they didn't set the useNumericIndex then let's at least try and guess it + if (typeof useNumericIndex === 'undefined') + { + if (frames && typeof frames[0] === 'number') + { + useNumericIndex = true; + } + else + { + useNumericIndex = false; + } + } // Create the signals the AnimationManager will emit if (this.sprite.events.onAnimationStart == null) @@ -484,10 +503,11 @@ Phaser.AnimationManager.prototype = { * @method Phaser.AnimationManager#play * @param {string} name - The name of the animation to be played, e.g. "fire", "walk", "jump". * @param {number} [frameRate=null] - The framerate to play the animation at. The speed is given in frames per second. If not provided the previously set frameRate of the Animation is used. - * @param {boolean} [loop=null] - Should the animation be looped after playback. If not provided the previously set loop value of the Animation is used. + * @param {boolean} [loop=false] - Should the animation be looped after playback. If not provided the previously set loop value of the Animation is used. + * @param {boolean} [killOnComplete=false] - If set to true when the animation completes (only happens if loop=false) the parent Sprite will be killed. * @return {Phaser.Animation} A reference to playing Animation instance. */ - play: function (name, frameRate, loop) { + play: function (name, frameRate, loop, killOnComplete) { if (this._anims[name]) { @@ -495,13 +515,13 @@ Phaser.AnimationManager.prototype = { { if (this.currentAnim.isPlaying == false) { - return this.currentAnim.play(frameRate, loop); + return this.currentAnim.play(frameRate, loop, killOnComplete); } } else { this.currentAnim = this._anims[name]; - return this.currentAnim.play(frameRate, loop); + return this.currentAnim.play(frameRate, loop, killOnComplete); } } @@ -562,6 +582,18 @@ Phaser.AnimationManager.prototype = { }, + /** + * Refreshes the current frame data back to the parent Sprite and also resets the texture data. + * + * @method Phaser.AnimationManager#refreshFrame + */ + refreshFrame: function () { + + this.sprite.currentFrame = this.currentFrame; + this.sprite.setTexture(PIXI.TextureCache[this.currentFrame.uuid]); + + }, + /** * Destroys all references this AnimationManager contains. Sets the _anims to a new object and nulls the current animation. * @@ -650,7 +682,7 @@ Object.defineProperty(Phaser.AnimationManager.prototype, "frame", { set: function (value) { - if (this._frameData && this._frameData.getFrame(value) !== null) + if (typeof value === 'number' && this._frameData && this._frameData.getFrame(value) !== null) { this.currentFrame = this._frameData.getFrame(value); this._frameIndex = value; @@ -679,7 +711,7 @@ Object.defineProperty(Phaser.AnimationManager.prototype, "frameName", { set: function (value) { - if (this._frameData && this._frameData.getFrameByName(value) !== null) + if (typeof value === 'string' && this._frameData && this._frameData.getFrameByName(value) !== null) { this.currentFrame = this._frameData.getFrameByName(value); this._frameIndex = this.currentFrame.index; @@ -714,7 +746,7 @@ Object.defineProperty(Phaser.AnimationManager.prototype, "frameName", { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/AnimationParser.js.html b/docs/AnimationParser.js.html similarity index 99% rename from docs2/out/AnimationParser.js.html rename to docs/AnimationParser.js.html index 7bd92100..ebf468ab 100644 --- a/docs2/out/AnimationParser.js.html +++ b/docs/AnimationParser.js.html @@ -660,7 +660,7 @@ Phaser.AnimationParser = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Cache.js.html b/docs/Cache.js.html similarity index 88% rename from docs2/out/Cache.js.html rename to docs/Cache.js.html index cbdf8a80..07ba77c1 100644 --- a/docs2/out/Cache.js.html +++ b/docs/Cache.js.html @@ -379,6 +379,11 @@ Phaser.Cache = function (game) { */ this._tilemaps = {}; + /** + * @property {object} _tilesets - Tileset key-value container. + * @private + */ + this._tilesets = {}; this.addDefaultImage(); @@ -441,22 +446,44 @@ Phaser.Cache.prototype = { }, + /** + * Add a new tile set in to the cache. + * + * @method Phaser.Cache#addTileset + * @param {string} key - The unique key by which you will reference this object. + * @param {string} url - URL of this tile set file. + * @param {object} data - Extra tile set data. + * @param {number} tileWidth - Width of the sprite sheet. + * @param {number} tileHeight - Height of the sprite sheet. + * @param {number} tileMax - How many tiles stored in the sprite sheet. + * @param {number} [tileMargin=0] - If the tiles have been drawn with a margin, specify the amount here. + * @param {number} [tileSpacing=0] - If the tiles have been drawn with spacing between them, specify the amount here. + */ + addTileset: function (key, url, data, tileWidth, tileHeight, tileMax, tileMargin, tileSpacing) { + + this._tilesets[key] = { url: url, data: data, tileWidth: tileWidth, tileHeight: tileHeight, tileMargin: tileMargin, tileSpacing: tileSpacing }; + + PIXI.BaseTextureCache[key] = new PIXI.BaseTexture(data); + PIXI.TextureCache[key] = new PIXI.Texture(PIXI.BaseTextureCache[key]); + + this._tilesets[key].tileData = Phaser.TilemapParser.tileset(this.game, key, tileWidth, tileHeight, tileMax, tileMargin, tileSpacing); + + }, + /** * Add a new tilemap. * * @method Phaser.Cache#addTilemap * @param {string} key - The unique key by which you will reference this object. * @param {string} url - URL of the tilemap image. - * @param {object} data - Tilemap data. * @param {object} mapData - The tilemap data object. * @param {number} format - The format of the tilemap data. */ - addTilemap: function (key, url, data, mapData, format) { + addTilemap: function (key, url, mapData, format) { - this._tilemaps[key] = { url: url, data: data, spriteSheet: true, mapData: mapData, format: format }; + this._tilemaps[key] = { url: url, data: mapData, format: format }; - PIXI.BaseTextureCache[key] = new PIXI.BaseTexture(data); - PIXI.TextureCache[key] = new PIXI.Texture(PIXI.BaseTextureCache[key]); + this._tilemaps[key].layers = Phaser.TilemapParser.parse(this.game, mapData, format); }, @@ -520,16 +547,31 @@ Phaser.Cache.prototype = { */ addDefaultImage: function () { - this._images['__default'] = { url: null, data: null, spriteSheet: false }; + var img = new Image(); + img.src = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAJ9JREFUeNq01ssOwyAMRFG46v//Mt1ESmgh+DFmE2GPOBARKb2NVjo+17PXLD8a1+pl5+A+wSgFygymWYHBb0FtsKhJDdZlncG2IzJ4ayoMDv20wTmSMzClEgbWYNTAkQ0Z+OJ+A/eWnAaR9+oxCF4Os0H8htsMUp+pwcgBBiMNnAwF8GqIgL2hAzaGFFgZauDPKABmowZ4GL369/0rwACp2yA/ttmvsQAAAABJRU5ErkJggg=="; + + this._images['__default'] = { url: null, data: img, spriteSheet: false }; this._images['__default'].frame = new Phaser.Frame(0, 0, 0, 32, 32, '', ''); - var base = new PIXI.BaseTexture(); - base.width = 32; - base.height = 32; - base.hasLoaded = true; // avoids a hanging event listener + PIXI.BaseTextureCache['__default'] = new PIXI.BaseTexture(img); + PIXI.TextureCache['__default'] = new PIXI.Texture(PIXI.BaseTextureCache['__default']); - PIXI.BaseTextureCache['__default'] = base; - PIXI.TextureCache['__default'] = new PIXI.Texture(base); + }, + + /** + * Add a new text data. + * + * @method Phaser.Cache#addText + * @param {string} key - Asset key for the text data. + * @param {string} url - URL of this text data file. + * @param {object} data - Extra text data. + */ + addText: function (key, url, data) { + + this._text[key] = { + url: url, + data: data + }; }, @@ -641,23 +683,6 @@ Phaser.Cache.prototype = { this._sounds[key].decoded = true; this._sounds[key].isDecoding = false; - }, - - /** - * Add a new text data. - * - * @method Phaser.Cache#addText - * @param {string} key - Asset key for the text data. - * @param {string} url - URL of this text data file. - * @param {object} data - Extra text data. - */ - addText: function (key, url, data) { - - this._text[key] = { - url: url, - data: data - }; - }, /** @@ -712,14 +737,50 @@ Phaser.Cache.prototype = { return null; }, + /** + * Get tile set image data by key. + * + * @method Phaser.Cache#getTileSetImage + * @param {string} key - Asset key of the image you want. + * @return {object} The image data you want. + */ + getTilesetImage: function (key) { + + if (this._tilesets[key]) + { + return this._tilesets[key].data; + } + + return null; + + }, + + /** + * Get tile set image data by key. + * + * @method Phaser.Cache#getTileset + * @param {string} key - Asset key of the image you want. + * @return {Phaser.Tileset} The tileset data. The tileset image is in the data property, the tile data in tileData. + */ + getTileset: function (key) { + + if (this._tilesets[key]) + { + return this._tilesets[key].tileData; + } + + return null; + + }, + /** * Get tilemap data by key. * * @method Phaser.Cache#getTilemap * @param {string} key - Asset key of the tilemap you want. - * @return {Phaser.Tilemap} The tilemap data. The tileset image is in the data property, the map data in mapData. + * @return {Object} The tilemap data. The tileset image is in the data property, the map data in mapData. */ - getTilemap: function (key) { + getTilemapData: function (key) { if (this._tilemaps[key]) { @@ -1077,7 +1138,7 @@ Phaser.Cache.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Camera.js.html b/docs/Camera.js.html similarity index 81% rename from docs2/out/Camera.js.html rename to docs/Camera.js.html index b627c6fc..df9a44e3 100644 --- a/docs2/out/Camera.js.html +++ b/docs/Camera.js.html @@ -340,7 +340,6 @@ * @param {number} width - The width of the view rectangle * @param {number} height - The height of the view rectangle */ - Phaser.Camera = function (game, id, x, y, width, height) { /** @@ -373,6 +372,14 @@ Phaser.Camera = function (game, id, x, y, width, height) { */ this.screenView = new Phaser.Rectangle(x, y, width, height); + /** + * The Camera is bound to this Rectangle and cannot move outside of it. By default it is enabled and set to the size of the World. + * The Rectangle can be located anywhere in the world and updated as often as you like. If you don't wish the Camera to be bound + * at all then set this to null. The values can be anything and are in World coordinates, with 0,0 being the center of the world. + * @property {Phaser.Rectangle} bounds - The Rectangle in which the Camera is bounded. Set to null to allow for movement anywhere. + */ + this.bounds = new Phaser.Rectangle(x, y, width, height); + /** * @property {Phaser.Rectangle} deadzone - Moving inside this Rectangle will not cause camera moving. */ @@ -401,6 +408,8 @@ Phaser.Camera = function (game, id, x, y, width, height) { * @default */ this._edge = 0; + + this.displayObject = null; }; @@ -468,18 +477,28 @@ Phaser.Camera.prototype = { break; } + }, + + /** + * Move the camera focus on a display object instantly. + * @method Phaser.Camera#focusOn + * @param {any} displayObject - The display object to focus the camera on. Must have visible x/y properties. + */ + focusOn: function (displayObject) { + + this.setPosition(Math.round(displayObject.x - this.view.halfWidth), Math.round(displayObject.y - this.view.halfHeight)); + }, /** - * Move the camera focus to a location instantly. + * Move the camera focus on a location instantly. * @method Phaser.Camera#focusOnXY * @param {number} x - X position. * @param {number} y - Y position. */ focusOnXY: function (x, y) { - this.view.x = Math.round(x - this.view.halfWidth); - this.view.y = Math.round(y - this.view.halfHeight); + this.setPosition(Math.round(x - this.view.halfWidth), Math.round(y - this.view.halfHeight)); }, @@ -489,47 +508,70 @@ Phaser.Camera.prototype = { */ update: function () { - // Add dirty flag - - if (this.target !== null) + if (this.target) { - if (this.deadzone) - { - this._edge = this.target.x - this.deadzone.x; - - if (this.view.x > this._edge) - { - this.view.x = this._edge; - } - - this._edge = this.target.x + this.target.width - this.deadzone.x - this.deadzone.width; - - if (this.view.x < this._edge) - { - this.view.x = this._edge; - } - - this._edge = this.target.y - this.deadzone.y; - - if (this.view.y > this._edge) - { - this.view.y = this._edge; - } - - this._edge = this.target.y + this.target.height - this.deadzone.y - this.deadzone.height; - - if (this.view.y < this._edge) - { - this.view.y = this._edge; - } - } - else - { - this.focusOnXY(this.target.x, this.target.y); - } + this.updateTarget(); } - this.checkWorldBounds(); + if (this.bounds) + { + this.checkBounds(); + } + + if (this.view.x !== -this.displayObject.position.x) + { + this.displayObject.position.x = -this.view.x; + } + + if (this.view.y !== -this.displayObject.position.y) + { + this.displayObject.position.y = -this.view.y; + } + + }, + + updateTarget: function () { + + if (this.deadzone) + { + this._edge = this.target.x - this.deadzone.x; + + if (this.view.x > this._edge) + { + this.view.x = this._edge; + } + + this._edge = this.target.x + this.target.width - this.deadzone.x - this.deadzone.width; + + if (this.view.x < this._edge) + { + this.view.x = this._edge; + } + + this._edge = this.target.y - this.deadzone.y; + + if (this.view.y > this._edge) + { + this.view.y = this._edge; + } + + this._edge = this.target.y + this.target.height - this.deadzone.y - this.deadzone.height; + + if (this.view.y < this._edge) + { + this.view.y = this._edge; + } + } + else + { + this.focusOnXY(this.target.x, this.target.y); + } + + }, + + setBoundsToWorld: function () { + + this.bounds.setTo(this.game.world.x, this.game.world.y, this.game.world.width, this.game.world.height); }, @@ -537,34 +579,34 @@ Phaser.Camera.prototype = { * Method called to ensure the camera doesn't venture outside of the game world. * @method Phaser.Camera#checkWorldBounds */ - checkWorldBounds: function () { + checkBounds: function () { this.atLimit.x = false; this.atLimit.y = false; - // Make sure we didn't go outside the cameras worldBounds - if (this.view.x < this.world.bounds.left) + // Make sure we didn't go outside the cameras bounds + if (this.view.x < this.bounds.x) { this.atLimit.x = true; - this.view.x = this.world.bounds.left; + this.view.x = this.bounds.x; } - if (this.view.x > this.world.bounds.right - this.width) + if (this.view.x > this.bounds.right - this.width) { this.atLimit.x = true; - this.view.x = (this.world.bounds.right - this.width) + 1; + this.view.x = (this.bounds.right - this.width) + 1; } - if (this.view.y < this.world.bounds.top) + if (this.view.y < this.bounds.top) { this.atLimit.y = true; - this.view.y = this.world.bounds.top; + this.view.y = this.bounds.top; } - if (this.view.y > this.world.bounds.bottom - this.height) + if (this.view.y > this.bounds.bottom - this.height) { this.atLimit.y = true; - this.view.y = (this.world.bounds.bottom - this.height) + 1; + this.view.y = (this.bounds.bottom - this.height) + 1; } this.view.floor(); @@ -583,7 +625,11 @@ Phaser.Camera.prototype = { this.view.x = x; this.view.y = y; - this.checkWorldBounds(); + + if (this.bounds) + { + this.checkBounds(); + } }, @@ -615,8 +661,13 @@ Object.defineProperty(Phaser.Camera.prototype, "x", { }, set: function (value) { + this.view.x = value; - this.checkWorldBounds(); + + if (this.bounds) + { + this.checkBounds(); + } } }); @@ -633,8 +684,13 @@ Object.defineProperty(Phaser.Camera.prototype, "y", { }, set: function (value) { + this.view.y = value; - this.checkWorldBounds(); + + if (this.bounds) + { + this.checkBounds(); + } } }); @@ -693,7 +749,7 @@ Object.defineProperty(Phaser.Camera.prototype, "height", { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Canvas.js.html b/docs/Canvas.js.html similarity index 99% rename from docs2/out/Canvas.js.html rename to docs/Canvas.js.html index 331f0b84..8132f1f0 100644 --- a/docs2/out/Canvas.js.html +++ b/docs/Canvas.js.html @@ -344,6 +344,7 @@ Phaser.Canvas = { * @return {HTMLCanvasElement} The newly created <canvas> tag. */ create: function (width, height) { + width = width || 256; height = height || 256; @@ -597,7 +598,7 @@ Phaser.Canvas = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Circle.js.html b/docs/Circle.js.html similarity index 99% rename from docs2/out/Circle.js.html rename to docs/Circle.js.html index 930cf7fa..e4a6e022 100644 --- a/docs2/out/Circle.js.html +++ b/docs/Circle.js.html @@ -812,7 +812,7 @@ Phaser.Circle.intersectsRectangle = function (c, r) { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Color.js.html b/docs/Color.js.html similarity index 99% rename from docs2/out/Color.js.html rename to docs/Color.js.html index d1472e35..6604f3e7 100644 --- a/docs2/out/Color.js.html +++ b/docs/Color.js.html @@ -669,7 +669,7 @@ Phaser.Color = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Debug.js.html b/docs/Debug.js.html similarity index 94% rename from docs2/out/Debug.js.html rename to docs/Debug.js.html index 70765275..b6aa73f6 100644 --- a/docs2/out/Debug.js.html +++ b/docs/Debug.js.html @@ -399,17 +399,14 @@ Phaser.Utils.Debug.prototype = { return; } - x = x || null; - y = y || null; + if (typeof x !== 'number') { x = 0; } + if (typeof y !== 'number') { y = 0; } + color = color || 'rgb(255,255,255)'; - if (x && y) - { - this.currentX = x; - this.currentY = y; - this.currentColor = color; - } - + this.currentX = x; + this.currentY = y; + this.currentColor = color; this.currentAlpha = this.context.globalAlpha; this.context.save(); @@ -426,6 +423,7 @@ Phaser.Utils.Debug.prototype = { */ stop: function () { + this.context.restore(); this.context.globalAlpha = this.currentAlpha; @@ -621,6 +619,8 @@ Phaser.Utils.Debug.prototype = { this.start(x, y, color); this.line('Camera (' + camera.width + ' x ' + camera.height + ')'); this.line('X: ' + camera.x + ' Y: ' + camera.y); + this.line('Bounds x: ' + camera.bounds.x + ' Y: ' + camera.bounds.y + ' w: ' + camera.bounds.width + ' h: ' + camera.bounds.height); + this.line('View x: ' + camera.view.x + ' Y: ' + camera.view.y + ' w: ' + camera.view.width + ' h: ' + camera.view.height); this.stop(); }, @@ -777,9 +777,9 @@ Phaser.Utils.Debug.prototype = { this.start(x, y, color); this.line('Sprite: ' + ' (' + sprite.width + ' x ' + sprite.height + ') anchor: ' + sprite.anchor.x + ' x ' + sprite.anchor.y); - this.line('x: ' + sprite.x.toFixed(1) + ' y: ' + sprite.y.toFixed(1) + ' rotation: ' + sprite.rotation.toFixed(1)); - this.line('visible: ' + sprite.visible); - this.line('in camera: ' + sprite.inCamera); + this.line('x: ' + sprite.x.toFixed(1) + ' y: ' + sprite.y.toFixed(1)); + this.line('angle: ' + sprite.angle.toFixed(1) + ' rotation: ' + sprite.rotation.toFixed(1)); + this.line('visible: ' + sprite.visible + ' in camera: ' + sprite.inCamera); this.line('body x: ' + sprite.body.x.toFixed(1) + ' y: ' + sprite.body.y.toFixed(1)); // 0 = scaleX @@ -789,7 +789,6 @@ Phaser.Utils.Debug.prototype = { // 4 = scaleY // 5 = translateY - // this.line('id: ' + sprite._id); // this.line('scale x: ' + sprite.worldTransform[0]); // this.line('scale y: ' + sprite.worldTransform[4]); @@ -797,12 +796,13 @@ Phaser.Utils.Debug.prototype = { // this.line('ty: ' + sprite.worldTransform[5]); // this.line('skew x: ' + sprite.worldTransform[3]); // this.line('skew y: ' + sprite.worldTransform[1]); - this.line('dx: ' + sprite.body.deltaX()); - this.line('dy: ' + sprite.body.deltaY()); - this.line('sdx: ' + sprite.deltaX()); - this.line('sdy: ' + sprite.deltaY()); + this.line('deltaX: ' + sprite.body.deltaX()); + this.line('deltaY: ' + sprite.body.deltaY()); + // this.line('sdx: ' + sprite.deltaX()); + // this.line('sdy: ' + sprite.deltaY()); // this.line('inCamera: ' + this.game.renderer.spriteRenderer.inCamera(this.game.camera, sprite)); + this.stop(); }, @@ -832,6 +832,7 @@ Phaser.Utils.Debug.prototype = { this.line('scaleY: ' + sprite.worldTransform[4]); this.line('transX: ' + sprite.worldTransform[2]); this.line('transY: ' + sprite.worldTransform[5]); + this.stop(); }, @@ -861,8 +862,49 @@ Phaser.Utils.Debug.prototype = { this.line('scaleY: ' + sprite.localTransform[4]); this.line('transX: ' + sprite.localTransform[2]); this.line('transY: ' + sprite.localTransform[5]); - this.line('sX: ' + sprite._sx); - this.line('sY: ' + sprite._sy); + this.stop(); + + }, + + renderSpriteCoords: function (sprite, x, y, color) { + + if (this.context == null) + { + return; + } + + color = color || 'rgb(255, 255, 255)'; + + this.start(x, y, color); + + this.line(sprite.name); + this.line('x: ' + sprite.x); + this.line('y: ' + sprite.y); + this.line('local x: ' + sprite.localTransform[2]); + this.line('local y: ' + sprite.localTransform[5]); + this.line('world x: ' + sprite.worldTransform[2]); + this.line('world y: ' + sprite.worldTransform[5]); + + this.stop(); + + }, + + renderGroupInfo: function (group, x, y, color) { + + if (this.context == null) + { + return; + } + + color = color || 'rgb(255, 255, 255)'; + + this.start(x, y, color); + + this.line('Group (size: ' + group.length + ')'); + this.line('x: ' + group.x); + this.line('y: ' + group.y); + + this.stop(); }, @@ -907,8 +949,7 @@ Phaser.Utils.Debug.prototype = { this.start(0, 0, color); this.context.fillStyle = color; - // this.context.fillRect(sprite.body.x - sprite.body.deltaX(), sprite.body.y - sprite.body.deltaY(), sprite.body.width, sprite.body.height); - this.context.fillRect(sprite.body.x, sprite.body.y, sprite.body.width, sprite.body.height); + this.context.fillRect(sprite.body.screenX, sprite.body.screenY, sprite.body.width, sprite.body.height); this.stop(); @@ -1171,7 +1212,7 @@ Phaser.Utils.Debug.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Device.js.html b/docs/Device.js.html similarity index 98% rename from docs2/out/Device.js.html rename to docs/Device.js.html index d098e87b..87b2e6e7 100644 --- a/docs2/out/Device.js.html +++ b/docs/Device.js.html @@ -646,8 +646,7 @@ Phaser.Device.prototype = { this.file = !!window['File'] && !!window['FileReader'] && !!window['FileList'] && !!window['Blob']; this.fileSystem = !!window['requestFileSystem']; - this.webGL = ( function () { try { return !! window.WebGLRenderingContext && !! document.createElement( 'canvas' ).getContext( 'experimental-webgl' ); } catch( e ) { return false; } } )(); - // this.webGL = !!window['WebGLRenderingContext']; + this.webGL = ( function () { try { var canvas = document.createElement( 'canvas' ); return !! window.WebGLRenderingContext && ( canvas.getContext( 'webgl' ) || canvas.getContext( 'experimental-webgl' ) ); } catch( e ) { return false; } } )(); this.worker = !!window['Worker']; if ('ontouchstart' in document.documentElement || window.navigator.msPointerEnabled) { @@ -876,7 +875,7 @@ Phaser.Device.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Easing.js.html b/docs/Easing.js.html similarity index 99% rename from docs2/out/Easing.js.html rename to docs/Easing.js.html index 4f6714d1..d4c4e4b6 100644 --- a/docs2/out/Easing.js.html +++ b/docs/Easing.js.html @@ -903,7 +903,7 @@ Phaser.Easing = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Emitter.js.html b/docs/Emitter.js.html similarity index 99% rename from docs2/out/Emitter.js.html rename to docs/Emitter.js.html index 58892cf8..27495dba 100644 --- a/docs2/out/Emitter.js.html +++ b/docs/Emitter.js.html @@ -1017,7 +1017,7 @@ Object.defineProperty(Phaser.Particles.Arcade.Emitter.prototype, "bottom", { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Frame.js.html b/docs/Frame.js.html similarity index 99% rename from docs2/out/Frame.js.html rename to docs/Frame.js.html index 50966e30..2eb620b6 100644 --- a/docs2/out/Frame.js.html +++ b/docs/Frame.js.html @@ -502,7 +502,7 @@ Phaser.Frame.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/FrameData.js.html b/docs/FrameData.js.html similarity index 98% rename from docs2/out/FrameData.js.html rename to docs/FrameData.js.html index 7651fbad..28919f5e 100644 --- a/docs2/out/FrameData.js.html +++ b/docs/FrameData.js.html @@ -383,7 +383,7 @@ Phaser.FrameData.prototype = { */ getFrame: function (index) { - if (this._frames[index]) + if (this._frames.length > index) { return this._frames[index]; } @@ -532,7 +532,10 @@ Phaser.FrameData.prototype = { } else { - output.push(this.getFrameByName(frames[i]).index); + if (this.getFrameByName(frames[i])) + { + output.push(this.getFrameByName(frames[i]).index); + } } } } @@ -576,7 +579,7 @@ Object.defineProperty(Phaser.FrameData.prototype, "total", { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Game.js.html b/docs/Game.js.html similarity index 99% rename from docs2/out/Game.js.html rename to docs/Game.js.html index e1d8aa56..d0dc6451 100644 --- a/docs2/out/Game.js.html +++ b/docs/Game.js.html @@ -352,8 +352,9 @@ Phaser.Game = function (width, height, renderer, parent, state, transparent, ant renderer = renderer || Phaser.AUTO; parent = parent || ''; state = state || null; + if (typeof transparent == 'undefined') { transparent = false; } - if (typeof antialias == 'undefined') { antialias = false; } + if (typeof antialias == 'undefined') { antialias = true; } /** * @property {number} id - Phaser Game ID (for when Pixi supports multiple instances). @@ -620,14 +621,14 @@ Phaser.Game.prototype = { this.net = new Phaser.Net(this); this.debug = new Phaser.Utils.Debug(this); - this.load.onLoadComplete.add(this.loadComplete, this); - this.stage.boot(); this.world.boot(); this.input.boot(); this.sound.boot(); this.state.boot(); + this.load.onLoadComplete.add(this.loadComplete, this); + if (this.renderType == Phaser.CANVAS) { console.log('%cPhaser ' + Phaser.VERSION + ' initialized. Rendering to Canvas', 'color: #ffff33; background: #000000'); @@ -796,6 +797,9 @@ Object.defineProperty(Phaser.Game.prototype, "paused", { }); +/** +* "Deleted code is debugged code." - Jeff Sickel +*/ @@ -817,7 +821,7 @@ Object.defineProperty(Phaser.Game.prototype, "paused", { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Group.js.html b/docs/Group.js.html similarity index 94% rename from docs2/out/Group.js.html rename to docs/Group.js.html index a291b5a3..a351026c 100644 --- a/docs2/out/Group.js.html +++ b/docs/Group.js.html @@ -335,13 +335,16 @@ * @param {Phaser.Game} game - A reference to the currently running game. * @param {*} parent - The parent Group or DisplayObjectContainer that will hold this group, if any. * @param {string} [name=group] - A name for this Group. Not used internally but useful for debugging. -* @param {boolean} [useStage=false] - Only the root World Group should use this value. +* @param {boolean} [useStage=false] - Should the DisplayObjectContainer this Group creates be added to the World (default, false) or direct to the Stage (true). */ Phaser.Group = function (game, parent, name, useStage) { - parent = parent || null; + if (typeof parent === 'undefined') + { + parent = game.world; + } - if (typeof useStage == 'undefined') + if (typeof useStage === 'undefined') { useStage = false; } @@ -393,7 +396,12 @@ Phaser.Group = function (game, parent, name, useStage) { * @default */ this.exists = true; - + + /** + * @property {Phaser.Point} scale - Replaces the PIXI.Point with a slightly more flexible one. + */ + this.scale = new Phaser.Point(1, 1); + }; Phaser.Group.prototype = { @@ -477,7 +485,7 @@ Phaser.Group.prototype = { * @param {number} y - The y coordinate to display the newly created Sprite at. The value is in relation to the Group.y point. * @param {string} key - The Game.cache key of the image that this Sprite will use. * @param {number|string} [frame] - If the Sprite image contains multiple frames you can specify which one to use here. - * @param {boolean} [exists] - The default exists state of the Sprite. + * @param {boolean} [exists=true] - The default exists state of the Sprite. * @return {Phaser.Sprite} The child that was created. */ create: function (x, y, key, frame, exists) { @@ -488,6 +496,8 @@ Phaser.Group.prototype = { child.group = this; child.exists = exists; + child.visible = exists; + child.alive = exists; if (child.events) { @@ -500,6 +510,40 @@ Phaser.Group.prototype = { }, + /** + * Automatically creates multiple Phaser.Sprite objects and adds them to the top of this Group. + * Useful if you need to quickly generate a pool of identical sprites, such as bullets. By default the sprites will be set to not exist + * and will be positioned at 0, 0 (relative to the Group.x/y) + * + * @method Phaser.Group#createMultiple + * @param {number} quantity - The number of Sprites to create. + * @param {string} key - The Game.cache key of the image that this Sprite will use. + * @param {number|string} [frame] - If the Sprite image contains multiple frames you can specify which one to use here. + * @param {boolean} [exists=false] - The default exists state of the Sprite. + */ + createMultiple: function (quantity, key, frame, exists) { + + if (typeof exists == 'undefined') { exists = false; } + + for (var i = 0; i < quantity; i++) + { + var child = new Phaser.Sprite(this.game, 0, 0, key, frame); + + child.group = this; + child.exists = exists; + child.visible = exists; + child.alive = exists; + + if (child.events) + { + child.events.onAddedToGroup.dispatch(child, this); + } + + this._container.addChild(child); + } + + }, + /** * Swaps the position of two children in this Group. * @@ -1125,7 +1169,7 @@ Phaser.Group.prototype = { */ countLiving: function () { - var total = -1; + var total = 0; if (this._container.children.length > 0 && this._container.first._iNext) { @@ -1142,6 +1186,10 @@ Phaser.Group.prototype = { } while (currentNode != this._container.last._iNext); } + else + { + total = -1; + } return total; @@ -1155,7 +1203,7 @@ Phaser.Group.prototype = { */ countDead: function () { - var total = -1; + var total = 0; if (this._container.children.length > 0 && this._container.first._iNext) { @@ -1172,6 +1220,10 @@ Phaser.Group.prototype = { } while (currentNode != this._container.last._iNext); } + else + { + total = -1; + } return total; @@ -1207,8 +1259,13 @@ Phaser.Group.prototype = { */ remove: function (child) { - child.events.onRemovedFromGroup.dispatch(child, this); + if (child.events) + { + child.events.onRemovedFromGroup.dispatch(child, this); + } + this._container.removeChild(child); + child.group = null; }, @@ -1377,6 +1434,19 @@ Phaser.Group.prototype = { }; +/** +* @name Phaser.Group#total +* @property {number} total - The total number of children in this Group, regardless of their alive state. +* @readonly +*/ +Object.defineProperty(Phaser.Group.prototype, "total", { + + get: function () { + return this._container.children.length; + } + +}); + /** * @name Phaser.Group#length * @property {number} length - The number of children in this Group. @@ -1476,6 +1546,22 @@ Object.defineProperty(Phaser.Group.prototype, "visible", { this._container.visible = value; } +}); + +/** +* @name Phaser.Group#alpha +* @property {number} alpha - The alpha value of the Group container. +*/ +Object.defineProperty(Phaser.Group.prototype, "alpha", { + + get: function () { + return this._container.alpha; + }, + + set: function (value) { + this._container.alpha = value; + } + }); @@ -1498,7 +1584,7 @@ Object.defineProperty(Phaser.Group.prototype, "visible", { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Input.js.html b/docs/Input.js.html similarity index 99% rename from docs2/out/Input.js.html rename to docs/Input.js.html index 396c2a03..0b479b45 100644 --- a/docs2/out/Input.js.html +++ b/docs/Input.js.html @@ -1163,7 +1163,7 @@ Object.defineProperty(Phaser.Input.prototype, "worldY", { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/InputHandler.js.html b/docs/InputHandler.js.html similarity index 99% rename from docs2/out/InputHandler.js.html rename to docs/InputHandler.js.html index 73c3b1f4..f83af112 100644 --- a/docs2/out/InputHandler.js.html +++ b/docs/InputHandler.js.html @@ -1050,8 +1050,8 @@ Phaser.InputHandler.prototype = { if (this.snapOnDrag) { - this.sprite.x = Math.floor(this.sprite.x / this.snapX) * this.snapX; - this.sprite.y = Math.floor(this.sprite.y / this.snapY) * this.snapY; + this.sprite.x = Math.round(this.sprite.x / this.snapX) * this.snapX; + this.sprite.y = Math.round(this.sprite.y / this.snapY) * this.snapY; } return true; @@ -1264,8 +1264,8 @@ Phaser.InputHandler.prototype = { if (this.snapOnRelease) { - this.sprite.x = Math.floor(this.sprite.x / this.snapX) * this.snapX; - this.sprite.y = Math.floor(this.sprite.y / this.snapY) * this.snapY; + this.sprite.x = Math.round(this.sprite.x / this.snapX) * this.snapX; + this.sprite.y = Math.round(this.sprite.y / this.snapY) * this.snapY; } this.sprite.events.onDragStop.dispatch(this.sprite, pointer); @@ -1394,7 +1394,7 @@ Phaser.InputHandler.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Intro.js.html b/docs/Intro.js.html similarity index 99% rename from docs2/out/Intro.js.html rename to docs/Intro.js.html index 0dc48941..c9eb4020 100644 --- a/docs2/out/Intro.js.html +++ b/docs/Intro.js.html @@ -371,7 +371,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Key.js.html b/docs/Key.js.html similarity index 99% rename from docs2/out/Key.js.html rename to docs/Key.js.html index 95bfed53..606b4622 100644 --- a/docs2/out/Key.js.html +++ b/docs/Key.js.html @@ -513,7 +513,7 @@ Phaser.Key.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Keyboard.js.html b/docs/Keyboard.js.html similarity index 95% rename from docs2/out/Keyboard.js.html rename to docs/Keyboard.js.html index fdde4632..28178681 100644 --- a/docs2/out/Keyboard.js.html +++ b/docs/Keyboard.js.html @@ -446,6 +446,23 @@ Phaser.Keyboard.prototype = { }, + /** + * Creates and returns an object containing 4 hotkeys for Up, Down, Left and Right. + * + * @method Phaser.Keyboard#createCursorKeys + * @return {object} An object containing properties: up, down, left and right. Which can be polled like any other Phaser.Key object. + */ + createCursorKeys: function () { + + return { + up: this.addKey(Phaser.Keyboard.UP), + down: this.addKey(Phaser.Keyboard.DOWN), + left: this.addKey(Phaser.Keyboard.LEFT), + right: this.addKey(Phaser.Keyboard.RIGHT) + } + + }, + /** * Starts the Keyboard event listeners running (keydown and keyup). They are attached to the document.body. * This is called automatically by Phaser.Input and should not normally be invoked directly. @@ -609,8 +626,21 @@ Phaser.Keyboard.prototype = { this._hotkeys[event.keyCode].processKeyUp(event); } - this._keys[event.keyCode].isDown = false; - this._keys[event.keyCode].timeUp = this.game.time.now; + if (this._keys[event.keyCode]) + { + this._keys[event.keyCode].isDown = false; + this._keys[event.keyCode].timeUp = this.game.time.now; + } + else + { + // Not used this key before, so register it + this._keys[event.keyCode] = { + isDown: false, + timeDown: this.game.time.now, + timeUp: this.game.time.now, + duration: 0 + }; + } }, @@ -805,7 +835,7 @@ Phaser.Keyboard.NUM_LOCK = 144; Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/LinkedList.js.html b/docs/LinkedList.js.html similarity index 99% rename from docs2/out/LinkedList.js.html rename to docs/LinkedList.js.html index 3f82b5c7..ea65f1cf 100644 --- a/docs2/out/LinkedList.js.html +++ b/docs/LinkedList.js.html @@ -495,7 +495,7 @@ Phaser.LinkedList.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Loader.js.html b/docs/Loader.js.html similarity index 91% rename from docs2/out/Loader.js.html rename to docs/Loader.js.html index 24bcb861..1bbd6580 100644 --- a/docs2/out/Loader.js.html +++ b/docs/Loader.js.html @@ -574,6 +574,8 @@ Phaser.Loader.prototype = { this.addToFileList('image', key, url); } + return this; + }, /** @@ -593,6 +595,8 @@ Phaser.Loader.prototype = { this.addToFileList('text', key, url); } + return this; + }, /** @@ -603,7 +607,7 @@ Phaser.Loader.prototype = { * @param {string} url - URL of the sheet file. * @param {number} frameWidth - Width of each single frame. * @param {number} frameHeight - Height of each single frame. - * @param {number} frameMax - How many frames in this sprite sheet. + * @param {number} [frameMax=-1] - How many frames in this sprite sheet. If not specified it will divide the whole image into frames. */ spritesheet: function (key, url, frameWidth, frameHeight, frameMax) { @@ -614,6 +618,35 @@ Phaser.Loader.prototype = { this.addToFileList('spritesheet', key, url, { frameWidth: frameWidth, frameHeight: frameHeight, frameMax: frameMax }); } + return this; + + }, + + /** + * Add a new tile set to the loader. These are used in the rendering of tile maps. + * + * @method Phaser.Loader#tileset + * @param {string} key - Unique asset key of the tileset file. + * @param {string} url - URL of the tileset. + * @param {number} tileWidth - Width of each single tile in pixels. + * @param {number} tileHeight - Height of each single tile in pixels. + * @param {number} [tileMax=-1] - How many tiles in this tileset. If not specified it will divide the whole image into tiles. + * @param {number} [tileMargin=0] - If the tiles have been drawn with a margin, specify the amount here. + * @param {number} [tileSpacing=0] - If the tiles have been drawn with spacing between them, specify the amount here. + */ + tileset: function (key, url, tileWidth, tileHeight, tileMax, tileMargin, tileSpacing) { + + if (typeof tileMax === "undefined") { tileMax = -1; } + if (typeof tileMargin === "undefined") { tileMargin = 0; } + if (typeof tileSpacing === "undefined") { tileSpacing = 0; } + + if (this.checkKeyExists(key) === false) + { + this.addToFileList('tileset', key, url, { tileWidth: tileWidth, tileHeight: tileHeight, tileMax: tileMax, tileMargin: tileMargin, tileSpacing: tileSpacing }); + } + + return this; + }, /** @@ -633,6 +666,8 @@ Phaser.Loader.prototype = { this.addToFileList('audio', key, urls, { buffer: null, autoDecode: autoDecode }); } + return this; + }, /** @@ -645,18 +680,25 @@ Phaser.Loader.prototype = { * @param {object} [mapData] - An optional JSON data object (can be given in place of a URL). * @param {string} [format] - The format of the map data. */ - tilemap: function (key, tilesetURL, mapDataURL, mapData, format) { + tilemap: function (key, mapDataURL, mapData, format) { if (typeof mapDataURL === "undefined") { mapDataURL = null; } if (typeof mapData === "undefined") { mapData = null; } if (typeof format === "undefined") { format = Phaser.Tilemap.CSV; } + if (mapDataURL == null && mapData == null) + { + console.warn('Phaser.Loader.tilemap - Both mapDataURL and mapData are null. One must be set.'); + + return this; + } + if (this.checkKeyExists(key) === false) { // A URL to a json/csv file has been given if (mapDataURL) { - this.addToFileList('tilemap', key, tilesetURL, { mapDataURL: mapDataURL, format: format }); + this.addToFileList('tilemap', key, mapDataURL, { format: format }); } else { @@ -667,7 +709,7 @@ Phaser.Loader.prototype = { break; // An xml string or object has been given - case Phaser.Tilemap.JSON: + case Phaser.Tilemap.TILED_JSON: if (typeof mapData === 'string') { @@ -676,11 +718,13 @@ Phaser.Loader.prototype = { break; } - this.addToFileList('tilemap', key, tilesetURL, { mapDataURL: null, mapData: mapData, format: format }); + this.game.cache.addTilemap(key, null, mapData, format); } } + return this; + }, /** @@ -741,6 +785,8 @@ Phaser.Loader.prototype = { } } + return this; + }, /** @@ -753,7 +799,7 @@ Phaser.Loader.prototype = { */ atlasJSONArray: function (key, textureURL, atlasURL, atlasData) { - this.atlas(key, textureURL, atlasURL, atlasData, Phaser.Loader.TEXTURE_ATLAS_JSON_ARRAY); + return this.atlas(key, textureURL, atlasURL, atlasData, Phaser.Loader.TEXTURE_ATLAS_JSON_ARRAY); }, @@ -767,7 +813,7 @@ Phaser.Loader.prototype = { */ atlasJSONHash: function (key, textureURL, atlasURL, atlasData) { - this.atlas(key, textureURL, atlasURL, atlasData, Phaser.Loader.TEXTURE_ATLAS_JSON_HASH); + return this.atlas(key, textureURL, atlasURL, atlasData, Phaser.Loader.TEXTURE_ATLAS_JSON_HASH); }, @@ -781,7 +827,7 @@ Phaser.Loader.prototype = { */ atlasXML: function (key, textureURL, atlasURL, atlasData) { - this.atlas(key, textureURL, atlasURL, atlasData, Phaser.Loader.TEXTURE_ATLAS_XML_STARLING); + return this.atlas(key, textureURL, atlasURL, atlasData, Phaser.Loader.TEXTURE_ATLAS_XML_STARLING); }, @@ -864,6 +910,8 @@ Phaser.Loader.prototype = { } + return this; + }, /** @@ -939,7 +987,7 @@ Phaser.Loader.prototype = { case 'spritesheet': case 'textureatlas': case 'bitmapfont': - case 'tilemap': + case 'tileset': file.data = new Image(); file.data.name = file.key; file.data.onload = function () { @@ -1002,6 +1050,29 @@ Phaser.Loader.prototype = { break; + case 'tilemap': + this._xhr.open("GET", this.baseURL + file.url, true); + this._xhr.responseType = "text"; + + if (file.format == Phaser.Tilemap.TILED_JSON) + { + this._xhr.onload = function () { + return _this.jsonLoadComplete(file.key); + }; + } + else if (file.format == Phaser.Tilemap.CSV) + { + this._xhr.onload = function () { + return _this.csvLoadComplete(file.key); + }; + } + + this._xhr.onerror = function () { + return _this.dataLoadError(file.key); + }; + this._xhr.send(); + break; + case 'text': this._xhr.open("GET", this.baseURL + file.url, true); this._xhr.responseType = "text"; @@ -1056,7 +1127,7 @@ Phaser.Loader.prototype = { this.onFileError.dispatch(key); - console.warn("Phaser.Loader error loading file: " + key); + console.warn("Phaser.Loader error loading file: " + key + ' from URL ' + this._fileList[key].url); this.nextFile(key, false); @@ -1094,37 +1165,9 @@ Phaser.Loader.prototype = { this.game.cache.addSpriteSheet(file.key, file.url, file.data, file.frameWidth, file.frameHeight, file.frameMax); break; - case 'tilemap': + case 'tileset': - if (file.mapDataURL == null) - { - this.game.cache.addTilemap(file.key, file.url, file.data, file.mapData, file.format); - } - else - { - // Load the JSON or CSV before carrying on with the next file - loadNext = false; - this._xhr.open("GET", this.baseURL + file.mapDataURL, true); - this._xhr.responseType = "text"; - - if (file.format == Phaser.Tilemap.JSON) - { - this._xhr.onload = function () { - return _this.jsonLoadComplete(file.key); - }; - } - else if (file.format == Phaser.Tilemap.CSV) - { - this._xhr.onload = function () { - return _this.csvLoadComplete(file.key); - }; - } - - this._xhr.onerror = function () { - return _this.dataLoadError(file.key); - }; - this._xhr.send(); - } + this.game.cache.addTileset(file.key, file.url, file.data, file.tileWidth, file.tileHeight, file.tileMax, file.tileMargin, file.tileSpacing); break; case 'textureatlas': @@ -1240,7 +1283,7 @@ Phaser.Loader.prototype = { if (file.type == 'tilemap') { - this.game.cache.addTilemap(file.key, file.url, file.data, data, file.format); + this.game.cache.addTilemap(file.key, file.url, data, file.format); } else { @@ -1262,7 +1305,7 @@ Phaser.Loader.prototype = { var data = this._xhr.response; var file = this._fileList[key]; - this.game.cache.addTilemap(file.key, file.url, file.data, data, file.format); + this.game.cache.addTilemap(file.key, file.url, data, file.format); this.nextFile(key, true); @@ -1405,7 +1448,7 @@ Phaser.Loader.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/LoaderParser.js.html b/docs/LoaderParser.js.html similarity index 99% rename from docs2/out/LoaderParser.js.html rename to docs/LoaderParser.js.html index 954aa275..d3378850 100644 --- a/docs2/out/LoaderParser.js.html +++ b/docs/LoaderParser.js.html @@ -424,7 +424,7 @@ Phaser.LoaderParser = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/MSPointer.js.html b/docs/MSPointer.js.html similarity index 99% rename from docs2/out/MSPointer.js.html rename to docs/MSPointer.js.html index b35087e0..86456654 100644 --- a/docs2/out/MSPointer.js.html +++ b/docs/MSPointer.js.html @@ -524,7 +524,7 @@ Phaser.MSPointer.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Math.js.html b/docs/Math.js.html similarity index 97% rename from docs2/out/Math.js.html rename to docs/Math.js.html index 2e64859e..4bc3ca48 100644 --- a/docs2/out/Math.js.html +++ b/docs/Math.js.html @@ -845,16 +845,21 @@ Phaser.Math = { wrap: function (value, min, max) { var range = max - min; + if (range <= 0) { return 0; } + var result = (value - min) % range; + if (result < 0) { result += range; } + return result + min; + }, /** @@ -1005,13 +1010,20 @@ Phaser.Math = { * @return {number} The new angle value, returns the same as the input angle if it was within bounds */ angleLimit: function (angle, min, max) { + var result = angle; - if (angle > max) { + + if (angle > max) + { result = max; - } else if (angle < min) { + } + else if (angle < min) + { result = min; } + return result; + }, /** @@ -1022,16 +1034,23 @@ Phaser.Math = { * @return {number} */ linearInterpolation: function (v, k) { + var m = v.length - 1; var f = m * k; var i = Math.floor(f); - if (k < 0) { + + if (k < 0) + { return this.linear(v[0], v[1], f); } - if (k > 1) { + + if (k > 1) + { return this.linear(v[m], v[m - 1], m - f); } + return this.linear(v[i], v[i + 1 > m ? m : i + 1], f - i); + }, /** @@ -1042,12 +1061,17 @@ Phaser.Math = { * @return {number} */ bezierInterpolation: function (v, k) { + var b = 0; var n = v.length - 1; - for (var i = 0; i <= n; i++) { + + for (var i = 0; i <= n; i++) + { b += Math.pow(1 - k, n - i) * Math.pow(k, i) * v[i] * this.bernstein(n, i); } + return b; + }, /** @@ -1063,20 +1087,31 @@ Phaser.Math = { var f = m * k; var i = Math.floor(f); - if (v[0] === v[m]) { - if (k < 0) { + if (v[0] === v[m]) + { + if (k < 0) + { i = Math.floor(f = m * (1 + k)); } + return this.catmullRom(v[(i - 1 + m) % m], v[i], v[(i + 1) % m], v[(i + 2) % m], f - i); - } else { - if (k < 0) { + + } + else + { + if (k < 0) + { return v[0] - (this.catmullRom(v[0], v[0], v[1], v[1], -f) - v[0]); } - if (k > 1) { + + if (k > 1) + { return v[m] - (this.catmullRom(v[m], v[m], v[m - 1], v[m - 1], f - m) - v[m]); } + return this.catmullRom(v[i ? i - 1 : 0], v[i], v[m < i + 1 ? m : i + 1], v[m < i + 2 ? m : i + 2], f - i); } + }, /** @@ -1112,8 +1147,11 @@ Phaser.Math = { * @return {number} */ catmullRom: function (p0, p1, p2, p3, t) { + var v0 = (p2 - p0) * 0.5, v1 = (p3 - p1) * 0.5, t2 = t * t, t3 = t * t2; + return (2 * p1 - 2 * p2 + v0 + v1) * t3 + (-3 * p1 + 3 * p2 - 2 * v0 - v1) * t2 + v0 * t + p1; + }, /** @@ -1328,6 +1366,21 @@ Phaser.Math = { return x < a ? a : x; }, + + /** + * Checks if two values are within the given tolerance of each other. + * + * @method Phaser.Math#within + * @param {number} a - The first number to check + * @param {number} b - The second number to check + * @param {number} tolerance - The tolerance. Anything equal to or less than this is considered within the range. + * @return {boolean} True if a is <= tolerance of b. + */ + within: function ( a, b, tolerance ) { + + return (Math.abs(a - b) <= tolerance); + + }, /** * Linear mapping from range <a1, a2> to range <b1, b2> @@ -1459,7 +1512,7 @@ Phaser.Math = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Mouse.js.html b/docs/Mouse.js.html similarity index 99% rename from docs2/out/Mouse.js.html rename to docs/Mouse.js.html index 9c2ac90e..9bc49546 100644 --- a/docs2/out/Mouse.js.html +++ b/docs/Mouse.js.html @@ -600,7 +600,7 @@ Phaser.Mouse.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Net.js.html b/docs/Net.js.html similarity index 99% rename from docs2/out/Net.js.html rename to docs/Net.js.html index fdf53fe8..0b179d32 100644 --- a/docs2/out/Net.js.html +++ b/docs/Net.js.html @@ -510,7 +510,7 @@ Phaser.Net.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Particles.js.html b/docs/Particles.js.html similarity index 99% rename from docs2/out/Particles.js.html rename to docs/Particles.js.html index 4b2c691a..32c12ac0 100644 --- a/docs2/out/Particles.js.html +++ b/docs/Particles.js.html @@ -415,7 +415,7 @@ Phaser.Particles.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Animation.html b/docs/Phaser.Animation.html similarity index 92% rename from docs2/out/Phaser.Animation.html rename to docs/Phaser.Animation.html index d2b20340..1e3288db 100644 --- a/docs2/out/Phaser.Animation.html +++ b/docs/Phaser.Animation.html @@ -698,7 +698,7 @@ It is created by the AnimationManager, consists of Animation.Frame objects and b
Source:
@@ -902,7 +902,7 @@ It is created by the AnimationManager, consists of Animation.Frame objects and b
Source:
@@ -1004,7 +1004,7 @@ It is created by the AnimationManager, consists of Animation.Frame objects and b
Source:
@@ -1211,7 +1211,7 @@ It is created by the AnimationManager, consists of Animation.Frame objects and b
Source:
@@ -1316,7 +1316,7 @@ It is created by the AnimationManager, consists of Animation.Frame objects and b
Source:
@@ -1421,7 +1421,109 @@ It is created by the AnimationManager, consists of Animation.Frame objects and b
Source:
+ + + + + + + + + + + + + + + +
+

killOnComplete

+ + +
+
+ + + + + +
+ + +
Properties:
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDescription
looped + + +boolean + + + +

The loop state of the Animation.

+
+ + + + + + + + + + + + + + + + + + + + +
Source:
+
@@ -1727,7 +1829,7 @@ It is created by the AnimationManager, consists of Animation.Frame objects and b
Source:
@@ -2007,7 +2109,7 @@ You could use this function to generate those by doing: Phaser.Animation.generat
Source:
@@ -2076,7 +2178,7 @@ You could use this function to generate those by doing: Phaser.Animation.generat
Source:
@@ -2145,7 +2247,7 @@ You could use this function to generate those by doing: Phaser.Animation.generat
Source:
@@ -2173,7 +2275,7 @@ You could use this function to generate those by doing: Phaser.Animation.generat
-

play(frameRate, loop) → {Phaser.Animation}

+

play(frameRate, loop, killOnComplete) → {Phaser.Animation}

@@ -2285,7 +2387,7 @@ You could use this function to generate those by doing: Phaser.Animation.generat - null + false @@ -2294,6 +2396,45 @@ You could use this function to generate those by doing: Phaser.Animation.generat + + + + killOnComplete + + + + + +boolean + + + + + + + + + <optional>
+ + + + + + + + + + + + false + + + + +

If set to true when the animation completes (only happens if loop=false) the parent Sprite will be killed.

+ + + @@ -2322,7 +2463,7 @@ You could use this function to generate those by doing: Phaser.Animation.generat
Source:
@@ -2416,7 +2557,7 @@ You could use this function to generate those by doing: Phaser.Animation.generat
Source:
@@ -2554,7 +2695,7 @@ You could use this function to generate those by doing: Phaser.Animation.generat
Source:
@@ -2623,7 +2764,7 @@ You could use this function to generate those by doing: Phaser.Animation.generat
Source:
@@ -2674,7 +2815,7 @@ You could use this function to generate those by doing: Phaser.Animation.generat Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:45 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.AnimationManager.html b/docs/Phaser.AnimationManager.html similarity index 91% rename from docs2/out/Phaser.AnimationManager.html rename to docs/Phaser.AnimationManager.html index 92c33b28..cc33f1bc 100644 --- a/docs2/out/Phaser.AnimationManager.html +++ b/docs/Phaser.AnimationManager.html @@ -662,7 +662,7 @@ Any Game Object such as Phaser.Sprite that supports animation contains a single
Source:
@@ -764,7 +764,7 @@ Any Game Object such as Phaser.Sprite that supports animation contains a single
Source:
@@ -866,7 +866,7 @@ Any Game Object such as Phaser.Sprite that supports animation contains a single
Source:
@@ -968,7 +968,7 @@ Any Game Object such as Phaser.Sprite that supports animation contains a single
Source:
@@ -1079,6 +1079,111 @@ Any Game Object such as Phaser.Sprite that supports animation contains a single +
+ + + +
+ + + +
+

isLoaded

+ + +
+
+ + + + + +
+ + +
Properties:
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDescription
isLoaded + + +boolean + + + +

Set to true once animation data has been loaded.

+
+ + + + + + + + + + + + + + + + + + +
Default Value:
+
  • false
+ + + +
Source:
+
+ + + + + + +
@@ -1172,7 +1277,7 @@ Any Game Object such as Phaser.Sprite that supports animation contains a single
Source:
@@ -1666,7 +1771,7 @@ Animations added in this way are played back with the play function.

Source:
@@ -1758,7 +1863,7 @@ Animations added in this way are played back with the play function.

Source:
@@ -1786,7 +1891,7 @@ Animations added in this way are played back with the play function.

-

play(name, frameRate, loop) → {Phaser.Animation}

+

play(name, frameRate, loop, killOnComplete) → {Phaser.Animation}

@@ -1934,7 +2039,7 @@ If the requested animation is already playing this request will be ignored. If y - null + false @@ -1943,6 +2048,45 @@ If the requested animation is already playing this request will be ignored. If y + + + + killOnComplete + + + + + +boolean + + + + + + + + + <optional>
+ + + + + + + + + + + + false + + + + +

If set to true when the animation completes (only happens if loop=false) the parent Sprite will be killed.

+ + + @@ -1971,7 +2115,7 @@ If the requested animation is already playing this request will be ignored. If y
Source:
@@ -2017,6 +2161,75 @@ If the requested animation is already playing this request will be ignored. If y + + + + +
+

refreshFrame()

+ + +
+
+ + +
+

Refreshes the current frame data back to the parent Sprite and also resets the texture data.

+
+ + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
Source:
+
+ + + + + + + +
+ + + + + + + + + + + + +
@@ -2172,7 +2385,7 @@ The currentAnim property of the AnimationManager is automatically set to the ani
Source:
@@ -2241,7 +2454,7 @@ The currentAnim property of the AnimationManager is automatically set to the ani
Source:
@@ -2437,7 +2650,7 @@ The currentAnim property of the AnimationManager is automatically set to the ani
Source:
@@ -2511,7 +2724,7 @@ The currentAnim property of the AnimationManager is automatically set to the ani Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:45 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.AnimationParser.html b/docs/Phaser.AnimationParser.html similarity index 99% rename from docs2/out/Phaser.AnimationParser.html rename to docs/Phaser.AnimationParser.html index 0b069c2f..4e3a2f84 100644 --- a/docs2/out/Phaser.AnimationParser.html +++ b/docs/Phaser.AnimationParser.html @@ -1308,7 +1308,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:45 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:59 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Cache.html b/docs/Phaser.Cache.html similarity index 87% rename from docs2/out/Phaser.Cache.html rename to docs/Phaser.Cache.html index e3e38b52..475edfe1 100644 --- a/docs2/out/Phaser.Cache.html +++ b/docs/Phaser.Cache.html @@ -659,7 +659,7 @@ as images, sounds and data files as a result of Loader calls. Cache items use st
Source:
@@ -842,7 +842,7 @@ as images, sounds and data files as a result of Loader calls. Cache items use st
Source:
@@ -1006,7 +1006,7 @@ as images, sounds and data files as a result of Loader calls. Cache items use st
Source:
@@ -1075,7 +1075,7 @@ as images, sounds and data files as a result of Loader calls. Cache items use st
Source:
@@ -1239,7 +1239,7 @@ as images, sounds and data files as a result of Loader calls. Cache items use st
Source:
@@ -1380,7 +1380,7 @@ as images, sounds and data files as a result of Loader calls. Cache items use st
Source:
@@ -1590,7 +1590,7 @@ as images, sounds and data files as a result of Loader calls. Cache items use st
Source:
@@ -1823,7 +1823,7 @@ as images, sounds and data files as a result of Loader calls. Cache items use st
Source:
@@ -1987,7 +1987,7 @@ as images, sounds and data files as a result of Loader calls. Cache items use st
Source:
@@ -2197,7 +2197,7 @@ as images, sounds and data files as a result of Loader calls. Cache items use st
Source:
@@ -2225,7 +2225,7 @@ as images, sounds and data files as a result of Loader calls. Cache items use st
-

addTilemap(key, url, data, mapData, format)

+

addTilemap(key, url, mapData, format)

@@ -2311,29 +2311,6 @@ as images, sounds and data files as a result of Loader calls. Cache items use st - - - data - - - - - -object - - - - - - - - - -

Tilemap data.

- - - - mapData @@ -2407,7 +2384,394 @@ as images, sounds and data files as a result of Loader calls. Cache items use st
Source:
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+

addTileset(key, url, data, tileWidth, tileHeight, tileMax, tileMargin, tileSpacing)

+ + +
+
+ + +
+

Add a new tile set in to the cache.

+
+ + + + + + + +
Parameters:
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeArgumentDefaultDescription
key + + +string + + + + + + + + + + + +

The unique key by which you will reference this object.

url + + +string + + + + + + + + + + + +

URL of this tile set file.

data + + +object + + + + + + + + + + + +

Extra tile set data.

tileWidth + + +number + + + + + + + + + + + +

Width of the sprite sheet.

tileHeight + + +number + + + + + + + + + + + +

Height of the sprite sheet.

tileMax + + +number + + + + + + + + + + + +

How many tiles stored in the sprite sheet.

tileMargin + + +number + + + + + + <optional>
+ + + + + + 		+ + 0 + +

If the tiles have been drawn with a margin, specify the amount here.

tileSpacing + + +number + + + + + + <optional>
+ + + + + + 		+ + 0 + +

If the tiles have been drawn with spacing between them, specify the amount here.

+ + + + +
+ + + + + + + + + + + + + + + + + + + +
Source:
+
@@ -2525,7 +2889,7 @@ as images, sounds and data files as a result of Loader calls. Cache items use st
Source:
@@ -2689,7 +3053,7 @@ as images, sounds and data files as a result of Loader calls. Cache items use st
Source:
@@ -2758,7 +3122,7 @@ as images, sounds and data files as a result of Loader calls. Cache items use st
Source:
@@ -2876,7 +3240,7 @@ as images, sounds and data files as a result of Loader calls. Cache items use st
Source:
@@ -3017,7 +3381,7 @@ as images, sounds and data files as a result of Loader calls. Cache items use st
Source:
@@ -3158,7 +3522,7 @@ as images, sounds and data files as a result of Loader calls. Cache items use st
Source:
@@ -3299,7 +3663,7 @@ as images, sounds and data files as a result of Loader calls. Cache items use st
Source:
@@ -3440,7 +3804,7 @@ as images, sounds and data files as a result of Loader calls. Cache items use st
Source:
@@ -3581,7 +3945,7 @@ as images, sounds and data files as a result of Loader calls. Cache items use st
Source:
@@ -3673,7 +4037,7 @@ as images, sounds and data files as a result of Loader calls. Cache items use st
Source:
@@ -3815,7 +4179,7 @@ Normally you don't call this directly but instead use getImageKeys, getSoundKeys
Source:
@@ -3956,7 +4320,7 @@ Normally you don't call this directly but instead use getImageKeys, getSoundKeys
Source:
@@ -4097,7 +4461,7 @@ Normally you don't call this directly but instead use getImageKeys, getSoundKeys
Source:
@@ -4189,7 +4553,7 @@ Normally you don't call this directly but instead use getImageKeys, getSoundKeys
Source:
@@ -4330,7 +4694,7 @@ Normally you don't call this directly but instead use getImageKeys, getSoundKeys
Source:
@@ -4422,7 +4786,7 @@ Normally you don't call this directly but instead use getImageKeys, getSoundKeys
Source:
@@ -4563,7 +4927,7 @@ Normally you don't call this directly but instead use getImageKeys, getSoundKeys
Source:
@@ -4704,7 +5068,7 @@ Normally you don't call this directly but instead use getImageKeys, getSoundKeys
Source:
@@ -4755,7 +5119,7 @@ Normally you don't call this directly but instead use getImageKeys, getSoundKeys
-

getTilemap(key) → {Phaser.Tilemap}

+

getTilemap(key) → {Object}

@@ -4845,7 +5209,7 @@ Normally you don't call this directly but instead use getImageKeys, getSoundKeys
Source:
@@ -4881,7 +5245,289 @@ Normally you don't call this directly but instead use getImageKeys, getSoundKeys
-Phaser.Tilemap +Object + + +
+
+ + + + + +
+ + + +
+

getTileset(key) → {Phaser.Tileset}

+ + +
+
+ + +
+

Get tile set image data by key.

+
+ + + + + + + +
Parameters:
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDescription
key + + +string + + + +

Asset key of the image you want.

+ + + + +
+ + + + + + + + + + + + + + + + + + + +
Source:
+
+ + + + + + + +
+ + + + + + + + + + + +
Returns:
+ + +
+

The tileset data. The tileset image is in the data property, the tile data in tileData.

+
+ + + +
+
+ Type +
+
+ +Phaser.Tileset + + +
+
+ + + + + +
+ + + +
+

getTileSetImage(key) → {object}

+ + +
+
+ + +
+

Get tile set image data by key.

+
+ + + + + + + +
Parameters:
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDescription
key + + +string + + + +

Asset key of the image you want.

+ + + + +
+ + + + + + + + + + + + + + + + + + + +
Source:
+
+ + + + + + + +
+ + + + + + + + + + + +
Returns:
+ + +
+

The image data you want.

+
+ + + +
+
+ Type +
+
+ +object
@@ -4986,7 +5632,7 @@ Normally you don't call this directly but instead use getImageKeys, getSoundKeys
Source:
@@ -5127,7 +5773,7 @@ Normally you don't call this directly but instead use getImageKeys, getSoundKeys
Source:
@@ -5268,7 +5914,7 @@ Normally you don't call this directly but instead use getImageKeys, getSoundKeys
Source:
@@ -5409,7 +6055,7 @@ Normally you don't call this directly but instead use getImageKeys, getSoundKeys
Source:
@@ -5527,7 +6173,7 @@ Normally you don't call this directly but instead use getImageKeys, getSoundKeys
Source:
@@ -5645,7 +6291,7 @@ Normally you don't call this directly but instead use getImageKeys, getSoundKeys
Source:
@@ -5763,7 +6409,7 @@ Normally you don't call this directly but instead use getImageKeys, getSoundKeys
Source:
@@ -5881,7 +6527,7 @@ Normally you don't call this directly but instead use getImageKeys, getSoundKeys
Source:
@@ -5999,7 +6645,7 @@ Normally you don't call this directly but instead use getImageKeys, getSoundKeys
Source:
@@ -6117,7 +6763,7 @@ Normally you don't call this directly but instead use getImageKeys, getSoundKeys
Source:
@@ -6168,7 +6814,7 @@ Normally you don't call this directly but instead use getImageKeys, getSoundKeys Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:45 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:59 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Camera.html b/docs/Phaser.Camera.html similarity index 90% rename from docs2/out/Phaser.Camera.html rename to docs/Phaser.Camera.html index 629b1cc2..af7ae150 100644 --- a/docs2/out/Phaser.Camera.html +++ b/docs/Phaser.Camera.html @@ -544,7 +544,7 @@ The game automatically creates a single Stage sized camera on boot. Move the cam
Source:
@@ -630,7 +630,7 @@ The game automatically creates a single Stage sized camera on boot. Move the cam
Source:
@@ -690,7 +690,7 @@ The game automatically creates a single Stage sized camera on boot. Move the cam
Source:
@@ -750,7 +750,7 @@ The game automatically creates a single Stage sized camera on boot. Move the cam
Source:
@@ -810,7 +810,7 @@ The game automatically creates a single Stage sized camera on boot. Move the cam
Source:
@@ -912,7 +912,115 @@ The game automatically creates a single Stage sized camera on boot. Move the cam
Source:
+ + + + + + + +
+ + + +
+ + + +
+

bounds

+ + +
+
+ +
+

The Camera is bound to this Rectangle and cannot move outside of it. By default it is enabled and set to the size of the World. +The Rectangle can be located anywhere in the world and updated as often as you like. If you don't wish the Camera to be bound +at all then set this to null. The values can be anything and are in World coordinates, with 0,0 being the center of the world.

+
+ + + + + +
+ + +
Properties:
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDescription
bounds + + +Phaser.Rectangle + + + +

The Rectangle in which the Camera is bounded. Set to null to allow for movement anywhere.

+
+ + + + + + + + + + + + + + + + + + + + +
Source:
+
@@ -1014,7 +1122,7 @@ The game automatically creates a single Stage sized camera on boot. Move the cam
Source:
@@ -1116,7 +1224,7 @@ The game automatically creates a single Stage sized camera on boot. Move the cam
Source:
@@ -1222,7 +1330,7 @@ The game automatically creates a single Stage sized camera on boot. Move the cam
Source:
@@ -1327,7 +1435,7 @@ The game automatically creates a single Stage sized camera on boot. Move the cam
Source:
@@ -1429,7 +1537,7 @@ The game automatically creates a single Stage sized camera on boot. Move the cam
Source:
@@ -1534,7 +1642,7 @@ The game automatically creates a single Stage sized camera on boot. Move the cam
Source:
@@ -1643,7 +1751,7 @@ Objects outside of this view are not rendered (unless set to ignore the Camera,
Source:
@@ -1748,7 +1856,7 @@ Objects outside of this view are not rendered (unless set to ignore the Camera,
Source:
@@ -1854,7 +1962,7 @@ Objects outside of this view are not rendered (unless set to ignore the Camera,
Source:
@@ -1956,7 +2064,7 @@ Objects outside of this view are not rendered (unless set to ignore the Camera,
Source:
@@ -2062,7 +2170,7 @@ Objects outside of this view are not rendered (unless set to ignore the Camera,
Source:
@@ -2168,7 +2276,7 @@ Objects outside of this view are not rendered (unless set to ignore the Camera,
Source:
@@ -2233,7 +2341,125 @@ Objects outside of this view are not rendered (unless set to ignore the Camera,
Source:
+ + + + + + + +
+ + + + + + + + + + + + + +
+ + + +
+

focusOn(displayObject)

+ + +
+
+ + +
+

Move the camera focus on a display object instantly.

+
+ + + + + + + +
Parameters:
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDescription
displayObject + + +any + + + +

The display object to focus the camera on. Must have visible x/y properties.

+ + + + +
+ + + + + + + + + + + + + + + + + + + +
Source:
+
@@ -2269,7 +2495,7 @@ Objects outside of this view are not rendered (unless set to ignore the Camera,
-

Move the camera focus to a location instantly.

+

Move the camera focus on a location instantly.

@@ -2374,7 +2600,7 @@ Objects outside of this view are not rendered (unless set to ignore the Camera,
Source:
@@ -2535,7 +2761,7 @@ Objects outside of this view are not rendered (unless set to ignore the Camera,
Source:
@@ -2677,7 +2903,7 @@ without having to use game.camera.x and game.camera.y.

Source:
@@ -2818,7 +3044,7 @@ without having to use game.camera.x and game.camera.y.

Source:
@@ -2887,7 +3113,7 @@ without having to use game.camera.x and game.camera.y.

Source:
@@ -2938,7 +3164,7 @@ without having to use game.camera.x and game.camera.y.

Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:45 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:59 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Canvas.html b/docs/Phaser.Canvas.html similarity index 98% rename from docs2/out/Phaser.Canvas.html rename to docs/Phaser.Canvas.html index 2718c62a..14daba08 100644 --- a/docs2/out/Phaser.Canvas.html +++ b/docs/Phaser.Canvas.html @@ -560,7 +560,7 @@ If no parent is given it will be added as a child of the document.body.

Source:
@@ -865,7 +865,7 @@ If no parent is given it will be added as a child of the document.body.

Source:
@@ -1049,7 +1049,7 @@ If no parent is given it will be added as a child of the document.body.

Source:
@@ -1235,7 +1235,7 @@ If no parent is given it will be added as a child of the document.body.

Source:
@@ -1377,7 +1377,7 @@ Note that if this doesn't given the desired result then see the CanvasUtils.setS
Source:
@@ -1519,7 +1519,7 @@ Note that if this doesn't given the desired result then see the setSmoothingEnab
Source:
@@ -1687,7 +1687,7 @@ patchy on earlier browsers, especially on mobile.

Source:
@@ -1871,7 +1871,7 @@ patchy on earlier browsers, especially on mobile.

Source:
@@ -2150,7 +2150,7 @@ patchy on earlier browsers, especially on mobile.

Source:
@@ -2334,7 +2334,7 @@ patchy on earlier browsers, especially on mobile.

Source:
@@ -2408,7 +2408,7 @@ patchy on earlier browsers, especially on mobile.

Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:45 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:59 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Circle.html b/docs/Phaser.Circle.html similarity index 99% rename from docs2/out/Phaser.Circle.html rename to docs/Phaser.Circle.html index eee8dab7..46e4a9eb 100644 --- a/docs2/out/Phaser.Circle.html +++ b/docs/Phaser.Circle.html @@ -4188,7 +4188,7 @@ This method checks the radius distances between the two Circle objects to see if Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:45 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:59 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Color.html b/docs/Phaser.Color.html similarity index 99% rename from docs2/out/Phaser.Color.html rename to docs/Phaser.Color.html index 98a6f65b..484476f6 100644 --- a/docs2/out/Phaser.Color.html +++ b/docs/Phaser.Color.html @@ -3517,7 +3517,7 @@ RGB format information and HSL information. Each section starts on a newline, 3 Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:45 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:59 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Device.html b/docs/Phaser.Device.html similarity index 99% rename from docs2/out/Phaser.Device.html rename to docs/Phaser.Device.html index 75999d0f..f3bf6fd1 100644 --- a/docs2/out/Phaser.Device.html +++ b/docs/Phaser.Device.html @@ -4727,7 +4727,7 @@
Source:
@@ -4819,7 +4819,7 @@
Source:
@@ -4893,7 +4893,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:45 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:59 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Easing.Back.html b/docs/Phaser.Easing.Back.html similarity index 99% rename from docs2/out/Phaser.Easing.Back.html rename to docs/Phaser.Easing.Back.html index 2631979f..aea252ef 100644 --- a/docs2/out/Phaser.Easing.Back.html +++ b/docs/Phaser.Easing.Back.html @@ -869,7 +869,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:46 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:59 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Easing.Bounce.html b/docs/Phaser.Easing.Bounce.html similarity index 99% rename from docs2/out/Phaser.Easing.Bounce.html rename to docs/Phaser.Easing.Bounce.html index bcd2ea9f..23715df7 100644 --- a/docs2/out/Phaser.Easing.Bounce.html +++ b/docs/Phaser.Easing.Bounce.html @@ -869,7 +869,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:46 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:59 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Easing.Circular.html b/docs/Phaser.Easing.Circular.html similarity index 99% rename from docs2/out/Phaser.Easing.Circular.html rename to docs/Phaser.Easing.Circular.html index b257f4fe..58fba0c0 100644 --- a/docs2/out/Phaser.Easing.Circular.html +++ b/docs/Phaser.Easing.Circular.html @@ -869,7 +869,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:46 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:59 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Easing.Cubic.html b/docs/Phaser.Easing.Cubic.html similarity index 99% rename from docs2/out/Phaser.Easing.Cubic.html rename to docs/Phaser.Easing.Cubic.html index 26938598..892d2a19 100644 --- a/docs2/out/Phaser.Easing.Cubic.html +++ b/docs/Phaser.Easing.Cubic.html @@ -869,7 +869,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:46 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:00 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Easing.Elastic.html b/docs/Phaser.Easing.Elastic.html similarity index 99% rename from docs2/out/Phaser.Easing.Elastic.html rename to docs/Phaser.Easing.Elastic.html index 874d16c6..a346c298 100644 --- a/docs2/out/Phaser.Easing.Elastic.html +++ b/docs/Phaser.Easing.Elastic.html @@ -869,7 +869,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:46 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:00 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Easing.Exponential.html b/docs/Phaser.Easing.Exponential.html similarity index 99% rename from docs2/out/Phaser.Easing.Exponential.html rename to docs/Phaser.Easing.Exponential.html index cf97a610..6c07b7bf 100644 --- a/docs2/out/Phaser.Easing.Exponential.html +++ b/docs/Phaser.Easing.Exponential.html @@ -869,7 +869,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:46 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:00 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Easing.Linear.html b/docs/Phaser.Easing.Linear.html similarity index 99% rename from docs2/out/Phaser.Easing.Linear.html rename to docs/Phaser.Easing.Linear.html index bec902b2..d9790bea 100644 --- a/docs2/out/Phaser.Easing.Linear.html +++ b/docs/Phaser.Easing.Linear.html @@ -587,7 +587,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:46 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:00 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Easing.Quadratic.html b/docs/Phaser.Easing.Quadratic.html similarity index 99% rename from docs2/out/Phaser.Easing.Quadratic.html rename to docs/Phaser.Easing.Quadratic.html index 762c25e8..b1e44d6f 100644 --- a/docs2/out/Phaser.Easing.Quadratic.html +++ b/docs/Phaser.Easing.Quadratic.html @@ -869,7 +869,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:46 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:00 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Easing.Quartic.html b/docs/Phaser.Easing.Quartic.html similarity index 99% rename from docs2/out/Phaser.Easing.Quartic.html rename to docs/Phaser.Easing.Quartic.html index b5769b92..491b3306 100644 --- a/docs2/out/Phaser.Easing.Quartic.html +++ b/docs/Phaser.Easing.Quartic.html @@ -869,7 +869,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:46 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:00 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Easing.Quintic.html b/docs/Phaser.Easing.Quintic.html similarity index 99% rename from docs2/out/Phaser.Easing.Quintic.html rename to docs/Phaser.Easing.Quintic.html index fe8003c6..64fa5f1f 100644 --- a/docs2/out/Phaser.Easing.Quintic.html +++ b/docs/Phaser.Easing.Quintic.html @@ -869,7 +869,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:46 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:00 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Easing.Sinusoidal.html b/docs/Phaser.Easing.Sinusoidal.html similarity index 99% rename from docs2/out/Phaser.Easing.Sinusoidal.html rename to docs/Phaser.Easing.Sinusoidal.html index be21a206..61b78478 100644 --- a/docs2/out/Phaser.Easing.Sinusoidal.html +++ b/docs/Phaser.Easing.Sinusoidal.html @@ -869,7 +869,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:46 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:00 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Easing.html b/docs/Phaser.Easing.html similarity index 99% rename from docs2/out/Phaser.Easing.html rename to docs/Phaser.Easing.html index d3b194c9..9ba392f2 100644 --- a/docs2/out/Phaser.Easing.html +++ b/docs/Phaser.Easing.html @@ -479,7 +479,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:46 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:59 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Frame.html b/docs/Phaser.Frame.html similarity index 99% rename from docs2/out/Phaser.Frame.html rename to docs/Phaser.Frame.html index 78174ce0..9f0ca9aa 100644 --- a/docs2/out/Phaser.Frame.html +++ b/docs/Phaser.Frame.html @@ -2854,7 +2854,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:46 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:00 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.FrameData.html b/docs/Phaser.FrameData.html similarity index 99% rename from docs2/out/Phaser.FrameData.html rename to docs/Phaser.FrameData.html index f1016736..b64379a2 100644 --- a/docs2/out/Phaser.FrameData.html +++ b/docs/Phaser.FrameData.html @@ -507,7 +507,7 @@
Source:
@@ -1801,7 +1801,7 @@ The frames are returned in the output array, or if none is provided in a new Arr Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:47 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:00 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Game.html b/docs/Phaser.Game.html similarity index 97% rename from docs2/out/Phaser.Game.html rename to docs/Phaser.Game.html index bfa2b6bc..704bea9a 100644 --- a/docs2/out/Phaser.Game.html +++ b/docs/Phaser.Game.html @@ -701,7 +701,7 @@ providing quick access to common functions and handling the boot process.

Source:
@@ -803,7 +803,7 @@ providing quick access to common functions and handling the boot process.

Source:
@@ -908,7 +908,7 @@ providing quick access to common functions and handling the boot process.

Source:
@@ -1013,7 +1013,7 @@ providing quick access to common functions and handling the boot process.

Source:
@@ -1118,7 +1118,7 @@ providing quick access to common functions and handling the boot process.

Source:
@@ -1223,7 +1223,7 @@ providing quick access to common functions and handling the boot process.

Source:
@@ -1328,7 +1328,7 @@ providing quick access to common functions and handling the boot process.

Source:
@@ -1433,7 +1433,7 @@ providing quick access to common functions and handling the boot process.

Source:
@@ -1535,7 +1535,7 @@ providing quick access to common functions and handling the boot process.

Source:
@@ -1637,7 +1637,7 @@ providing quick access to common functions and handling the boot process.

Source:
@@ -1742,7 +1742,7 @@ providing quick access to common functions and handling the boot process.

Source:
@@ -1847,7 +1847,7 @@ providing quick access to common functions and handling the boot process.

Source:
@@ -1952,7 +1952,7 @@ providing quick access to common functions and handling the boot process.

Source:
@@ -2057,7 +2057,7 @@ providing quick access to common functions and handling the boot process.

Source:
@@ -2162,7 +2162,7 @@ providing quick access to common functions and handling the boot process.

Source:
@@ -2267,7 +2267,7 @@ providing quick access to common functions and handling the boot process.

Source:
@@ -2369,7 +2369,7 @@ providing quick access to common functions and handling the boot process.

Source:
@@ -2474,7 +2474,7 @@ providing quick access to common functions and handling the boot process.

Source:
@@ -2581,7 +2581,7 @@ When a game is paused the onPause event is dispatched. When it is resumed the on
Source:
@@ -2686,7 +2686,7 @@ When a game is paused the onPause event is dispatched. When it is resumed the on
Source:
@@ -2791,7 +2791,7 @@ When a game is paused the onPause event is dispatched. When it is resumed the on
Source:
@@ -2896,7 +2896,7 @@ When a game is paused the onPause event is dispatched. When it is resumed the on
Source:
@@ -2998,7 +2998,7 @@ When a game is paused the onPause event is dispatched. When it is resumed the on
Source:
@@ -3103,7 +3103,7 @@ When a game is paused the onPause event is dispatched. When it is resumed the on
Source:
@@ -3208,7 +3208,7 @@ When a game is paused the onPause event is dispatched. When it is resumed the on
Source:
@@ -3313,7 +3313,7 @@ When a game is paused the onPause event is dispatched. When it is resumed the on
Source:
@@ -3415,7 +3415,7 @@ When a game is paused the onPause event is dispatched. When it is resumed the on
Source:
@@ -3520,7 +3520,7 @@ When a game is paused the onPause event is dispatched. When it is resumed the on
Source:
@@ -3622,7 +3622,7 @@ When a game is paused the onPause event is dispatched. When it is resumed the on
Source:
@@ -3727,7 +3727,7 @@ When a game is paused the onPause event is dispatched. When it is resumed the on
Source:
@@ -3829,7 +3829,7 @@ When a game is paused the onPause event is dispatched. When it is resumed the on
Source:
@@ -3934,7 +3934,7 @@ When a game is paused the onPause event is dispatched. When it is resumed the on
Source:
@@ -3999,7 +3999,7 @@ When a game is paused the onPause event is dispatched. When it is resumed the on
Source:
@@ -4068,7 +4068,7 @@ When a game is paused the onPause event is dispatched. When it is resumed the on
Source:
@@ -4137,7 +4137,7 @@ When a game is paused the onPause event is dispatched. When it is resumed the on
Source:
@@ -4206,7 +4206,7 @@ When a game is paused the onPause event is dispatched. When it is resumed the on
Source:
@@ -4324,7 +4324,7 @@ When a game is paused the onPause event is dispatched. When it is resumed the on
Source:
@@ -4375,7 +4375,7 @@ When a game is paused the onPause event is dispatched. When it is resumed the on Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:47 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:00 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Group.html b/docs/Phaser.Group.html similarity index 89% rename from docs2/out/Phaser.Group.html rename to docs/Phaser.Group.html index d6c1443b..2c75ea5e 100644 --- a/docs2/out/Phaser.Group.html +++ b/docs/Phaser.Group.html @@ -525,7 +525,7 @@ -

Only the root World Group should use this value.

+

Should the DisplayObjectContainer this Group creates be added to the World (default, false) or direct to the Stage (true).

@@ -600,6 +600,108 @@
+
+

alpha

+ + +
+
+ + + + + +
+ + +
Properties:
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDescription
alpha + + +number + + + +

The alpha value of the Group container.

+
+ + + + + + + + + + + + + + + + + + + + +
Source:
+
+ + + + + + + +
+ + + +
+ + +

angle

@@ -690,7 +792,7 @@ This will have no impact on the rotation value of its children, but it will upda
Source:
@@ -795,7 +897,7 @@ This will have no impact on the rotation value of its children, but it will upda
Source:
@@ -897,7 +999,7 @@ This will have no impact on the rotation value of its children, but it will upda
Source:
@@ -999,7 +1101,7 @@ This will have no impact on the rotation value of its children, but it will upda
Source:
@@ -1101,7 +1203,7 @@ This will have no impact on the rotation value of its children, but it will upda
Source:
@@ -1208,7 +1310,211 @@ This will have no impact on the rotation value of its children, but it will upda
Source:
+ + + + + + + +
+ + + +
+ + + +
+

scale

+ + +
+
+ + + + + +
+ + +
Properties:
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDescription
scale + + +Phaser.Point + + + +

Replaces the PIXI.Point with a slightly more flexible one.

+
+ + + + + + + + + + + + + + + + + + + + +
Source:
+
+ + + + + + + +
+ + + +
+ + + +
+

<readonly> total

+ + +
+
+ + + + + +
+ + +
Properties:
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDescription
total + + +number + + + +

The total number of children in this Group, regardless of their alive state.

+
+ + + + + + + + + + + + + + + + + + + + +
Source:
+
@@ -1310,7 +1616,7 @@ This will have no impact on the rotation value of its children, but it will upda
Source:
@@ -1412,7 +1718,7 @@ This will have no impact on the rotation value of its children, but it will upda
Source:
@@ -1519,7 +1825,7 @@ This will have no impact on the x/y coordinates of its children, but it will upd
Source:
@@ -1626,7 +1932,7 @@ This will have no impact on the x/y coordinates of its children, but it will upd
Source:
@@ -1742,7 +2048,7 @@ that then see the addAt method.

Source:
@@ -1962,7 +2268,7 @@ Group.addAll('x', 10) will add 10 to the child.x value.

Source:
@@ -2104,7 +2410,7 @@ The child is added to the Group at the location specified by the index value, th
Source:
@@ -2245,7 +2551,7 @@ The child is added to the Group at the location specified by the index value, th
Source:
@@ -2430,7 +2736,7 @@ After the callback parameter you can add as many extra parameters as you like, w
Source:
@@ -2623,7 +2929,7 @@ After the existsValue parameter you can add as many parameters as you like, whic
Source:
@@ -2692,7 +2998,7 @@ After the existsValue parameter you can add as many parameters as you like, whic
Source:
@@ -2784,7 +3090,7 @@ After the existsValue parameter you can add as many parameters as you like, whic
Source:
@@ -2870,6 +3176,8 @@ Useful if you don't need to create the Sprite instances before-hand.

+ Default + Description @@ -2903,6 +3211,10 @@ Useful if you don't need to create the Sprite instances before-hand.

+ + + +

The x coordinate to display the newly created Sprite at. The value is in relation to the Group.x point.

@@ -2934,6 +3246,10 @@ Useful if you don't need to create the Sprite instances before-hand.

+ + + +

The y coordinate to display the newly created Sprite at. The value is in relation to the Group.y point.

@@ -2965,6 +3281,10 @@ Useful if you don't need to create the Sprite instances before-hand.

+ + + +

The Game.cache key of the image that this Sprite will use.

@@ -3001,6 +3321,10 @@ Useful if you don't need to create the Sprite instances before-hand.

+ + + +

If the Sprite image contains multiple frames you can specify which one to use here.

@@ -3034,6 +3358,12 @@ Useful if you don't need to create the Sprite instances before-hand.

+ + + true + + +

The default exists state of the Sprite.

@@ -3067,7 +3397,7 @@ Useful if you don't need to create the Sprite instances before-hand.

Source:
@@ -3113,6 +3443,256 @@ Useful if you don't need to create the Sprite instances before-hand.

+
+ + + +
+

createMultiple(quantity, key, frame, exists)

+ + +
+
+ + +
+

Automatically creates multiple Phaser.Sprite objects and adds them to the top of this Group. +Useful if you need to quickly generate a pool of identical sprites, such as bullets. By default the sprites will be set to not exist +and will be positioned at 0, 0 (relative to the Group.x/y)

+
+ + + + + + + +
Parameters:
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeArgumentDefaultDescription
quantity + + +number + + + + + + + + + + + +

The number of Sprites to create.

key + + +string + + + + + + + + + + + +

The Game.cache key of the image that this Sprite will use.

frame + + +number +| + +string + + + + + + <optional>
+ + + + + + 		+ +

If the Sprite image contains multiple frames you can specify which one to use here.

exists + + +boolean + + + + + + <optional>
+ + + + + + 		+ + false + +

The default exists state of the Sprite.

+ + + + +
+ + + + + + + + + + + + + + + + + + + +
Source:
+
+ + + + + + + +
+ + + + + + + + + + + + +
@@ -3159,7 +3739,7 @@ Useful if you don't need to create the Sprite instances before-hand.

Source:
@@ -3347,7 +3927,7 @@ Group.divideAll('x', 2) will half the child.x value.

Source:
@@ -3485,7 +4065,7 @@ Group.divideAll('x', 2) will half the child.x value.

Source:
@@ -3651,7 +4231,7 @@ For example: Group.forEach(awardBonusGold, this, true, 100, 500)

Source:
@@ -3794,7 +4374,7 @@ For example: Group.forEachAlive(causeDamage, this, 500)

Source:
@@ -3937,7 +4517,7 @@ For example: Group.forEachDead(bringToLife, this)

Source:
@@ -4055,7 +4635,7 @@ For example: Group.forEachDead(bringToLife, this)

Source:
@@ -4148,7 +4728,7 @@ This is handy for checking if everything has been wiped out, or choosing a squad
Source:
@@ -4241,7 +4821,7 @@ This is handy for checking if everything has been wiped out, or choosing a squad
Source:
@@ -4382,7 +4962,7 @@ This is handy for checking if everything has been wiped out, or choosing a squad
Source:
@@ -4523,7 +5103,7 @@ This is handy for checking if everything has been wiped out, or choosing a squad
Source:
@@ -4687,7 +5267,7 @@ This is handy for checking if everything has been wiped out, or choosing a squad
Source:
@@ -4898,7 +5478,7 @@ Group.multiplyAll('x', 2) will x2 the child.x value.

Source:
@@ -5016,7 +5596,7 @@ Group.multiplyAll('x', 2) will x2 the child.x value.

Source:
@@ -5086,7 +5666,7 @@ The Group container remains on the display list.

Source:
@@ -5227,7 +5807,7 @@ The Group container remains on the display list.

Source:
@@ -5368,7 +5948,7 @@ The Group container remains on the display list.

Source:
@@ -5655,7 +6235,7 @@ The operation parameter controls how the new value is assigned to the property,
Source:
@@ -5898,7 +6478,7 @@ The operation parameter controls how the new value is assigned to the property,
Source:
@@ -6086,7 +6666,7 @@ Group.subAll('x', 10) will minus 10 from the child.x value.

Source:
@@ -6227,7 +6807,7 @@ Group.subAll('x', 10) will minus 10 from the child.x value.

Source:
@@ -6301,7 +6881,7 @@ Group.subAll('x', 10) will minus 10 from the child.x value.

Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:47 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:00 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Input.html b/docs/Phaser.Input.html similarity index 99% rename from docs2/out/Phaser.Input.html rename to docs/Phaser.Input.html index 4db98bf2..8b99dbb3 100644 --- a/docs2/out/Phaser.Input.html +++ b/docs/Phaser.Input.html @@ -7473,7 +7473,7 @@ If you need more then use this to create a new one, up to a maximum of 10.

Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:47 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:01 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.InputHandler.html b/docs/Phaser.InputHandler.html similarity index 99% rename from docs2/out/Phaser.InputHandler.html rename to docs/Phaser.InputHandler.html index 3c78611a..d69deb50 100644 --- a/docs2/out/Phaser.InputHandler.html +++ b/docs/Phaser.InputHandler.html @@ -7389,7 +7389,7 @@ This value is only set when the pointer is over this Sprite.

Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:47 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:01 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Key.html b/docs/Phaser.Key.html similarity index 99% rename from docs2/out/Phaser.Key.html rename to docs/Phaser.Key.html index d457c4b8..564ecb42 100644 --- a/docs2/out/Phaser.Key.html +++ b/docs/Phaser.Key.html @@ -2436,7 +2436,7 @@ If the key is up it holds the duration of the previous down session.

Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:47 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:01 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Keyboard.html b/docs/Phaser.Keyboard.html similarity index 95% rename from docs2/out/Phaser.Keyboard.html rename to docs/Phaser.Keyboard.html index 353ab542..ab37d5cd 100644 --- a/docs2/out/Phaser.Keyboard.html +++ b/docs/Phaser.Keyboard.html @@ -1438,7 +1438,7 @@ Pass in either a single keycode or an array/hash of keycodes.

Source:
@@ -1507,7 +1507,7 @@ Pass in either a single keycode or an array/hash of keycodes.

Source:
@@ -1530,6 +1530,98 @@ Pass in either a single keycode or an array/hash of keycodes.

+ + + + +
+

createCursorKeys() → {object}

+ + +
+
+ + +
+

Creates and returns an object containing 4 hotkeys for Up, Down, Left and Right.

+
+ + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
Source:
+
+ + + + + + + +
+ + + + + + + + + + + +
Returns:
+ + +
+

An object containing properties: up, down, left and right. Which can be polled like any other Phaser.Key object.

+
+ + + +
+
+ Type +
+
+ +object + + +
+
+ + + + +
@@ -1625,7 +1717,7 @@ Pass in either a single keycode or an array/hash of keycodes.

Source:
@@ -1821,7 +1913,7 @@ Pass in either a single keycode or an array/hash of keycodes.

Source:
@@ -2017,7 +2109,7 @@ Pass in either a single keycode or an array/hash of keycodes.

Source:
@@ -2158,7 +2250,7 @@ Pass in either a single keycode or an array/hash of keycodes.

Source:
@@ -2276,7 +2368,7 @@ Pass in either a single keycode or an array/hash of keycodes.

Source:
@@ -2512,7 +2604,7 @@ Pass in either a single keycode or an array/hash of keycodes.

Source:
@@ -2581,7 +2673,7 @@ Pass in either a single keycode or an array/hash of keycodes.

Source:
@@ -2651,7 +2743,7 @@ This is called automatically by Phaser.Input and should not normally be invoked
Source:
@@ -2720,7 +2812,7 @@ This is called automatically by Phaser.Input and should not normally be invoked
Source:
@@ -2771,7 +2863,7 @@ This is called automatically by Phaser.Input and should not normally be invoked Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:47 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:01 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.LinkedList.html b/docs/Phaser.LinkedList.html similarity index 99% rename from docs2/out/Phaser.LinkedList.html rename to docs/Phaser.LinkedList.html index 05060e49..c67232b5 100644 --- a/docs2/out/Phaser.LinkedList.html +++ b/docs/Phaser.LinkedList.html @@ -1355,7 +1355,7 @@ The function must exist on the member.

Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:48 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:01 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Loader.html b/docs/Phaser.Loader.html similarity index 89% rename from docs2/out/Phaser.Loader.html rename to docs/Phaser.Loader.html index c566fd56..000cf34b 100644 --- a/docs2/out/Phaser.Loader.html +++ b/docs/Phaser.Loader.html @@ -2324,7 +2324,7 @@ If you do so the Sprite's width or height will be cropped based on the percentag
Source:
@@ -2488,7 +2488,7 @@ If you do so the Sprite's width or height will be cropped based on the percentag
Source:
@@ -2652,7 +2652,7 @@ If you do so the Sprite's width or height will be cropped based on the percentag
Source:
@@ -2816,7 +2816,7 @@ If you do so the Sprite's width or height will be cropped based on the percentag
Source:
@@ -2980,7 +2980,7 @@ If you do so the Sprite's width or height will be cropped based on the percentag
Source:
@@ -3205,7 +3205,7 @@ If you do so the Sprite's width or height will be cropped based on the percentag
Source:
@@ -3464,7 +3464,7 @@ If you do so the Sprite's width or height will be cropped based on the percentag
Source:
@@ -3582,7 +3582,7 @@ If you do so the Sprite's width or height will be cropped based on the percentag
Source:
@@ -3700,7 +3700,7 @@ If you do so the Sprite's width or height will be cropped based on the percentag
Source:
@@ -3818,7 +3818,7 @@ If you do so the Sprite's width or height will be cropped based on the percentag
Source:
@@ -4100,7 +4100,7 @@ If you do so the Sprite's width or height will be cropped based on the percentag
Source:
@@ -4169,7 +4169,7 @@ If you do so the Sprite's width or height will be cropped based on the percentag
Source:
@@ -4287,7 +4287,7 @@ If you do so the Sprite's width or height will be cropped based on the percentag
Source:
@@ -4559,7 +4559,7 @@ This allows you to easily make loading bars for games.

-

spritesheet(key, url, frameWidth, frameHeight, frameMax)

+

spritesheet(key, url, frameWidth, frameHeight, frameMax)

@@ -4589,8 +4589,12 @@ This allows you to easily make loading bars for games.

Type + Argument + + Default + Description @@ -4614,7 +4618,19 @@ This allows you to easily make loading bars for games.

+ + + + + + + + + + + +

Unique asset key of the sheet file.

@@ -4637,7 +4653,19 @@ This allows you to easily make loading bars for games.

+ + + + + + + + + + + +

URL of the sheet file.

@@ -4660,7 +4688,19 @@ This allows you to easily make loading bars for games.

+ + + + + + + + + + + +

Width of each single frame.

@@ -4683,7 +4723,19 @@ This allows you to easily make loading bars for games.

+ + + + + + + + + + + +

Height of each single frame.

@@ -4706,10 +4758,26 @@ This allows you to easily make loading bars for games.

+ + + <optional>
+ + + + + -

How many frames in this sprite sheet.

+ + + + -1 + + + + +

How many frames in this sprite sheet. If not specified it will divide the whole image into frames.

@@ -4741,7 +4809,7 @@ This allows you to easily make loading bars for games.

Source:
@@ -4810,7 +4878,7 @@ This allows you to easily make loading bars for games.

Source:
@@ -4974,7 +5042,7 @@ This allows you to easily make loading bars for games.

Source:
@@ -5232,7 +5300,363 @@ This allows you to easily make loading bars for games.

Source:
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+

tileset(key, url, tileWidth, tileHeight, tileMax, tileMargin, tileSpacing)

+ + +
+
+ + +
+

Add a new tile set to the loader. These are used in the rendering of tile maps.

+
+ + + + + + + +
Parameters:
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeArgumentDefaultDescription
key + + +string + + + + + + + + + + + +

Unique asset key of the tileset file.

url + + +string + + + + + + + + + + + +

URL of the tileset.

tileWidth + + +number + + + + + + + + + + + +

Width of each single tile in pixels.

tileHeight + + +number + + + + + + + + + + + +

Height of each single tile in pixels.

tileMax + + +number + + + + + + <optional>
+ + + + + + 		+ + -1 + +

How many tiles in this tileset. If not specified it will divide the whole image into tiles.

tileMargin + + +number + + + + + + <optional>
+ + + + + + 		+ + 0 + +

If the tiles have been drawn with a margin, specify the amount here.

tileSpacing + + +number + + + + + + <optional>
+ + + + + + 		+ + 0 + +

If the tiles have been drawn with spacing between them, specify the amount here.

+ + + + +
+ + + + + + + + + + + + + + + + + + + +
Source:
+
@@ -5350,7 +5774,7 @@ This allows you to easily make loading bars for games.

Source:
@@ -5401,7 +5825,7 @@ This allows you to easily make loading bars for games.

Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:48 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:01 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.LoaderParser.html b/docs/Phaser.LoaderParser.html similarity index 99% rename from docs2/out/Phaser.LoaderParser.html rename to docs/Phaser.LoaderParser.html index 249b200f..ec747435 100644 --- a/docs2/out/Phaser.LoaderParser.html +++ b/docs/Phaser.LoaderParser.html @@ -587,7 +587,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:48 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:01 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.MSPointer.html b/docs/Phaser.MSPointer.html similarity index 99% rename from docs2/out/Phaser.MSPointer.html rename to docs/Phaser.MSPointer.html index b0be4c20..d3a56e77 100644 --- a/docs2/out/Phaser.MSPointer.html +++ b/docs/Phaser.MSPointer.html @@ -1620,7 +1620,7 @@ It will work only in Internet Explorer 10 and Windows Store or Windows Phone 8 a Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:48 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:02 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Math.html b/docs/Phaser.Math.html similarity index 97% rename from docs2/out/Phaser.Math.html rename to docs/Phaser.Math.html index b7bac697..499a808e 100644 --- a/docs2/out/Phaser.Math.html +++ b/docs/Phaser.Math.html @@ -765,7 +765,7 @@
Source:
@@ -1017,7 +1017,7 @@
Source:
@@ -1177,7 +1177,7 @@
Source:
@@ -1406,7 +1406,7 @@
Source:
@@ -1566,7 +1566,7 @@
Source:
@@ -1703,7 +1703,7 @@
Source:
@@ -2215,7 +2215,7 @@ Clamp value to range <a, b>

Source:
@@ -2375,7 +2375,7 @@ Clamp value to range <a, b>

Source:
@@ -2463,7 +2463,7 @@ Clamp value to range <a, b>

Source:
@@ -2619,7 +2619,7 @@ Clamp value to range <a, b>

Source:
@@ -2825,7 +2825,7 @@ Clamp value to range <a, b>

Source:
@@ -3035,7 +3035,7 @@ Clamp value to range <a, b>

Source:
@@ -3176,7 +3176,7 @@ Clamp value to range <a, b>

Source:
@@ -4424,7 +4424,7 @@ Will return null if random selection is missing, or array has no entries.

Source:
@@ -4977,7 +4977,7 @@ Will return null if random selection is missing, or array has no entries.

Source:
@@ -5118,7 +5118,7 @@ Will return null if random selection is missing, or array has no entries.

Source:
@@ -5305,7 +5305,7 @@ Will return null if random selection is missing, or array has no entries.

Source:
@@ -5465,7 +5465,7 @@ Will return null if random selection is missing, or array has no entries.

Source:
@@ -5717,7 +5717,7 @@ Will return null if random selection is missing, or array has no entries.

Source:
@@ -5806,7 +5806,7 @@ See http://jsperf.com/m
Source:
@@ -6082,7 +6082,7 @@ See http://jsperf.com/m
Source:
@@ -6938,7 +6938,7 @@ absolute value the return for exact angle

Source:
@@ -7026,7 +7026,7 @@ absolute value the return for exact angle

Source:
@@ -7511,7 +7511,7 @@ The original stack is modified in the process. This effectively moves the positi
Source:
@@ -7652,7 +7652,7 @@ The original stack is modified in the process. This effectively moves the positi
Source:
@@ -7794,7 +7794,7 @@ The original stack is modified in the process. This effectively moves the positi
Source:
@@ -8004,7 +8004,7 @@ you should get the results via getSinTable() and getCosTable(). This generator i
Source:
@@ -8191,7 +8191,7 @@ you should get the results via getSinTable() and getCosTable(). This generator i
Source:
@@ -8374,7 +8374,7 @@ you should get the results via getSinTable() and getCosTable(). This generator i
Source:
@@ -9368,6 +9368,193 @@ you should get the results via getSinTable() and getCosTable(). This generator i +
+ + + +
+

within(a, b, tolerance) → {boolean}

+ + +
+
+ + +
+

Checks if two values are within the given tolerance of each other.

+
+ + + + + + + +
Parameters:
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDescription
a + + +number + + + +

The first number to check

b + + +number + + + +

The second number to check

tolerance + + +number + + + +

The tolerance. Anything equal to or less than this is considered within the range.

+ + + + +
+ + + + + + + + + + + + + + + + + + + +
Source:
+
+ + + + + + + +
+ + + + + + + + + + + +
Returns:
+ + +
+

True if a is <= tolerance of b.

+
+ + + +
+
+ Type +
+
+ +boolean + + +
+
+ + + + +
@@ -9637,7 +9824,7 @@ Should be called whenever the angle is updated on the Sprite to stop it from goi
Source:
@@ -9825,7 +10012,7 @@ Should be called whenever the angle is updated on the Sprite to stop it from goi
Source:
@@ -9899,7 +10086,7 @@ Should be called whenever the angle is updated on the Sprite to stop it from goi Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:48 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:01 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Mouse.html b/docs/Phaser.Mouse.html similarity index 99% rename from docs2/out/Phaser.Mouse.html rename to docs/Phaser.Mouse.html index 59e78675..1527a2b5 100644 --- a/docs2/out/Phaser.Mouse.html +++ b/docs/Phaser.Mouse.html @@ -2166,7 +2166,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:48 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:02 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Net.html b/docs/Phaser.Net.html similarity index 99% rename from docs2/out/Phaser.Net.html rename to docs/Phaser.Net.html index 2a6eeb0d..368ad77b 100644 --- a/docs2/out/Phaser.Net.html +++ b/docs/Phaser.Net.html @@ -1245,7 +1245,7 @@ Optionally you can redirect to the new url, or just return it as a string.

Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:48 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:02 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Particles.Arcade.Emitter.html b/docs/Phaser.Particles.Arcade.Emitter.html similarity index 94% rename from docs2/out/Phaser.Particles.Arcade.Emitter.html rename to docs/Phaser.Particles.Arcade.Emitter.html index ba5e1e19..4851dc76 100644 --- a/docs2/out/Phaser.Particles.Arcade.Emitter.html +++ b/docs/Phaser.Particles.Arcade.Emitter.html @@ -811,7 +811,7 @@ This will have no impact on the rotation value of its children, but it will upda
Source:
@@ -1669,7 +1669,7 @@ Emitter.emitX and Emitter.emitY control the emission location relative to the x/
Source:
@@ -2092,7 +2092,7 @@ Emitter.emitX and Emitter.emitY control the emission location relative to the x/
Source:
@@ -3598,7 +3598,114 @@ This will have no impact on the rotation value of its children, but it will upda
Source:
+ + + + + + + + + + + + + + + +
+

scale

+ + +
+
+ + + + + +
+ + +
Properties:
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDescription
scale + + +Phaser.Point + + + +

Replaces the PIXI.Point with a slightly more flexible one.

+
+ + + + + + + + +
Inherited From:
+
+ + + + + + + + + + + + + +
Source:
+
@@ -3709,6 +3816,113 @@ This will have no impact on the rotation value of its children, but it will upda +
+ + + +
+ + + +
+

<readonly> total

+ + +
+
+ + + + + +
+ + +
Properties:
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDescription
total + + +number + + + +

The total number of children in this Group, regardless of their alive state.

+
+ + + + + + + + +
Inherited From:
+
+ + + + + + + + + + + + + +
Source:
+
+ + + + + + +
@@ -4548,7 +4762,7 @@ that then see the addAt method.

Source:
@@ -4773,7 +4987,7 @@ Group.addAll('x', 10) will add 10 to the child.x value.

Source:
@@ -4920,7 +5134,7 @@ The child is added to the Group at the location specified by the index value, th
Source:
@@ -5184,7 +5398,7 @@ The child is added to the Group at the location specified by the index value, th
Source:
@@ -5374,7 +5588,7 @@ After the callback parameter you can add as many extra parameters as you like, w
Source:
@@ -5572,7 +5786,7 @@ After the existsValue parameter you can add as many parameters as you like, whic
Source:
@@ -5646,7 +5860,7 @@ After the existsValue parameter you can add as many parameters as you like, whic
Source:
@@ -5743,7 +5957,7 @@ After the existsValue parameter you can add as many parameters as you like, whic
Source:
@@ -5829,6 +6043,8 @@ Useful if you don't need to create the Sprite instances before-hand.

+ Default + Description @@ -5862,6 +6078,10 @@ Useful if you don't need to create the Sprite instances before-hand.

+ + + +

The x coordinate to display the newly created Sprite at. The value is in relation to the Group.x point.

@@ -5893,6 +6113,10 @@ Useful if you don't need to create the Sprite instances before-hand.

+ + + +

The y coordinate to display the newly created Sprite at. The value is in relation to the Group.y point.

@@ -5924,6 +6148,10 @@ Useful if you don't need to create the Sprite instances before-hand.

+ + + +

The Game.cache key of the image that this Sprite will use.

@@ -5960,6 +6188,10 @@ Useful if you don't need to create the Sprite instances before-hand.

+ + + +

If the Sprite image contains multiple frames you can specify which one to use here.

@@ -5993,6 +6225,12 @@ Useful if you don't need to create the Sprite instances before-hand.

+ + + true + + +

The default exists state of the Sprite.

@@ -6031,7 +6269,7 @@ Useful if you don't need to create the Sprite instances before-hand.

Source:
@@ -6077,6 +6315,261 @@ Useful if you don't need to create the Sprite instances before-hand.

+ + + + +
+

createMultiple(quantity, key, frame, exists)

+ + +
+
+ + +
+

Automatically creates multiple Phaser.Sprite objects and adds them to the top of this Group. +Useful if you need to quickly generate a pool of identical sprites, such as bullets. By default the sprites will be set to not exist +and will be positioned at 0, 0 (relative to the Group.x/y)

+
+ + + + + + + +
Parameters:
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeArgumentDefaultDescription
quantity + + +number + + + + + + + + + + + +

The number of Sprites to create.

key + + +string + + + + + + + + + + + +

The Game.cache key of the image that this Sprite will use.

frame + + +number +| + +string + + + + + + <optional>
+ + + + + + 		+ +

If the Sprite image contains multiple frames you can specify which one to use here.

exists + + +boolean + + + + + + <optional>
+ + + + + + 		+ + false + +

The default exists state of the Sprite.

+ + + + +
+ + + + + + + +
Inherited From:
+
+ + + + + + + + + + + + + +
Source:
+
+ + + + + + + +
+ + + + + + + + + + + + +
@@ -6128,7 +6621,7 @@ Useful if you don't need to create the Sprite instances before-hand.

Source:
@@ -6321,7 +6814,7 @@ Group.divideAll('x', 2) will half the child.x value.

Source:
@@ -6464,7 +6957,7 @@ Group.divideAll('x', 2) will half the child.x value.

Source:
@@ -6704,7 +7197,7 @@ For example: Group.forEach(awardBonusGold, this, true, 100, 500)

Source:
@@ -6852,7 +7345,7 @@ For example: Group.forEachAlive(causeDamage, this, 500)

Source:
@@ -7000,7 +7493,7 @@ For example: Group.forEachDead(bringToLife, this)

Source:
@@ -7123,7 +7616,7 @@ For example: Group.forEachDead(bringToLife, this)

Source:
@@ -7221,7 +7714,7 @@ This is handy for checking if everything has been wiped out, or choosing a squad
Source:
@@ -7319,7 +7812,7 @@ This is handy for checking if everything has been wiped out, or choosing a squad
Source:
@@ -7465,7 +7958,7 @@ This is handy for checking if everything has been wiped out, or choosing a squad
Source:
@@ -7611,7 +8104,7 @@ This is handy for checking if everything has been wiped out, or choosing a squad
Source:
@@ -7780,7 +8273,7 @@ This is handy for checking if everything has been wiped out, or choosing a squad
Source:
@@ -8286,7 +8779,7 @@ Group.multiplyAll('x', 2) will x2 the child.x value.

Source:
@@ -8409,7 +8902,7 @@ Group.multiplyAll('x', 2) will x2 the child.x value.

Source:
@@ -8484,7 +8977,7 @@ The Group container remains on the display list.

Source:
@@ -8630,7 +9123,7 @@ The Group container remains on the display list.

Source:
@@ -8776,7 +9269,7 @@ The Group container remains on the display list.

Source:
@@ -9138,7 +9631,7 @@ The operation parameter controls how the new value is assigned to the property,
Source:
@@ -9386,7 +9879,7 @@ The operation parameter controls how the new value is assigned to the property,
Source:
@@ -10330,7 +10823,7 @@ Group.subAll('x', 10) will minus 10 from the child.x value.

Source:
@@ -10476,7 +10969,7 @@ Group.subAll('x', 10) will minus 10 from the child.x value.

Source:
@@ -10619,7 +11112,7 @@ Group.subAll('x', 10) will minus 10 from the child.x value.

Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:48 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:02 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Particles.html b/docs/Phaser.Particles.html similarity index 99% rename from docs2/out/Phaser.Particles.html rename to docs/Phaser.Particles.html index bdc6602f..bbe241c6 100644 --- a/docs2/out/Phaser.Particles.html +++ b/docs/Phaser.Particles.html @@ -1036,7 +1036,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:48 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:02 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Plugin.html b/docs/Phaser.Plugin.html similarity index 99% rename from docs2/out/Phaser.Plugin.html rename to docs/Phaser.Plugin.html index 23a58ab1..2366b40d 100644 --- a/docs2/out/Phaser.Plugin.html +++ b/docs/Phaser.Plugin.html @@ -1707,7 +1707,7 @@ It is only called if active is set to true.

Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:49 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:02 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.PluginManager.html b/docs/Phaser.PluginManager.html similarity index 99% rename from docs2/out/Phaser.PluginManager.html rename to docs/Phaser.PluginManager.html index c4e1f416..f6c39dea 100644 --- a/docs2/out/Phaser.PluginManager.html +++ b/docs/Phaser.PluginManager.html @@ -1337,7 +1337,7 @@ It only calls plugins who have active=true.

Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:49 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:02 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Point.html b/docs/Phaser.Point.html similarity index 98% rename from docs2/out/Phaser.Point.html rename to docs/Phaser.Point.html index ecfa3d57..12cb2824 100644 --- a/docs2/out/Phaser.Point.html +++ b/docs/Phaser.Point.html @@ -869,7 +869,7 @@
Source:
@@ -1084,7 +1084,7 @@
Source:
@@ -1299,7 +1299,7 @@
Source:
@@ -1463,7 +1463,7 @@
Source:
@@ -1678,7 +1678,7 @@
Source:
@@ -1934,7 +1934,7 @@
Source:
@@ -2149,7 +2149,7 @@
Source:
@@ -2313,7 +2313,7 @@
Source:
@@ -2477,7 +2477,7 @@
Source:
@@ -2641,7 +2641,7 @@
Source:
@@ -2805,7 +2805,7 @@
Source:
@@ -2958,7 +2958,7 @@
Source:
@@ -3240,7 +3240,7 @@
Source:
@@ -3381,7 +3381,7 @@
Source:
@@ -3565,7 +3565,7 @@
Source:
@@ -3729,7 +3729,7 @@
Source:
@@ -3870,7 +3870,7 @@
Source:
@@ -4126,7 +4126,7 @@
Source:
@@ -4403,7 +4403,7 @@
Source:
@@ -4731,7 +4731,7 @@
Source:
@@ -4823,7 +4823,7 @@
Source:
@@ -4897,7 +4897,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:49 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:02 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Pointer.html b/docs/Phaser.Pointer.html similarity index 99% rename from docs2/out/Phaser.Pointer.html rename to docs/Phaser.Pointer.html index 3fa406db..7a88f5b7 100644 --- a/docs2/out/Phaser.Pointer.html +++ b/docs/Phaser.Pointer.html @@ -1120,7 +1120,7 @@ Default size of 44px (Apple's recommended "finger tip" size).

Source:
@@ -3375,7 +3375,7 @@ Default size of 44px (Apple's recommended "finger tip" size).

Source:
@@ -3481,7 +3481,7 @@ Default size of 44px (Apple's recommended "finger tip" size).

Source:
@@ -3819,7 +3819,7 @@ Default size of 44px (Apple's recommended "finger tip" size).

Source:
@@ -3968,7 +3968,7 @@ Default size of 44px (Apple's recommended "finger tip" size).

Source:
@@ -4105,7 +4105,7 @@ Default size of 44px (Apple's recommended "finger tip" size).

Source:
@@ -4292,7 +4292,7 @@ Default size of 44px (Apple's recommended "finger tip" size).

Source:
@@ -4528,7 +4528,7 @@ Default size of 44px (Apple's recommended "finger tip" size).

Source:
@@ -4597,7 +4597,7 @@ Default size of 44px (Apple's recommended "finger tip" size).

Source:
@@ -4740,7 +4740,7 @@ Default size of 44px (Apple's recommended "finger tip" size).

Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:49 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:02 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.QuadTree.html b/docs/Phaser.QuadTree.html similarity index 99% rename from docs2/out/Phaser.QuadTree.html rename to docs/Phaser.QuadTree.html index 671356f3..524130d1 100644 --- a/docs2/out/Phaser.QuadTree.html +++ b/docs/Phaser.QuadTree.html @@ -1206,7 +1206,7 @@ Split the node into 4 subnodes

Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:49 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:02 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.RandomDataGenerator.html b/docs/Phaser.RandomDataGenerator.html similarity index 98% rename from docs2/out/Phaser.RandomDataGenerator.html rename to docs/Phaser.RandomDataGenerator.html index 2dfefa0a..ff2e4bdc 100644 --- a/docs2/out/Phaser.RandomDataGenerator.html +++ b/docs/Phaser.RandomDataGenerator.html @@ -517,7 +517,7 @@ Random number generator from Source:
@@ -605,7 +605,7 @@ Random number generator from Source:
@@ -693,7 +693,7 @@ Random number generator from Source:
@@ -853,7 +853,7 @@ Random number generator from Source:
@@ -941,7 +941,7 @@ Random number generator from Source:
@@ -1078,7 +1078,7 @@ Random number generator from Source:
@@ -1166,7 +1166,7 @@ Random number generator from Source:
@@ -1326,7 +1326,7 @@ Random number generator from Source:
@@ -1604,7 +1604,7 @@ Random number generator from Source:
@@ -1692,7 +1692,7 @@ Random number generator from Source:
@@ -1829,7 +1829,7 @@ Random number generator from Source:
@@ -1899,7 +1899,7 @@ Random number generator from Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:49 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:03 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Rectangle.html b/docs/Phaser.Rectangle.html similarity index 99% rename from docs2/out/Phaser.Rectangle.html rename to docs/Phaser.Rectangle.html index ad97a39e..7f14f162 100644 --- a/docs2/out/Phaser.Rectangle.html +++ b/docs/Phaser.Rectangle.html @@ -3777,7 +3777,7 @@ This method compares the x, y, width and height properties of each Rectangle.

-

<static> intersects(a, b, tolerance) → {boolean}

+

<static> intersects(a, b) → {boolean}

@@ -3863,29 +3863,6 @@ This method checks the x, y, width, and height properties of the Rectangles.

- - - - tolerance - - - - - -number - - - - - - - - - -

A tolerance value to allow for an intersection test with padding, default to 0

- - - @@ -4147,7 +4124,7 @@ This method checks the x, y, width, and height properties of the Rectangles.

Source:
@@ -4546,7 +4523,7 @@ This method checks the x, y, width, and height properties of the Rectangles.

Source:
@@ -7238,7 +7215,7 @@ This method checks the x, y, width, and height properties of the Rectangles.

Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:49 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:03 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.RequestAnimationFrame.html b/docs/Phaser.RequestAnimationFrame.html similarity index 99% rename from docs2/out/Phaser.RequestAnimationFrame.html rename to docs/Phaser.RequestAnimationFrame.html index 662a17be..1dc5fb53 100644 --- a/docs2/out/Phaser.RequestAnimationFrame.html +++ b/docs/Phaser.RequestAnimationFrame.html @@ -1209,7 +1209,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:49 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:03 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Signal.html b/docs/Phaser.Signal.html similarity index 99% rename from docs2/out/Phaser.Signal.html rename to docs/Phaser.Signal.html index dc498ed8..e1014a0b 100644 --- a/docs2/out/Phaser.Signal.html +++ b/docs/Phaser.Signal.html @@ -2194,7 +2194,7 @@ already dispatched before.

Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:49 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:03 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Sound.html b/docs/Phaser.Sound.html similarity index 99% rename from docs2/out/Phaser.Sound.html rename to docs/Phaser.Sound.html index 5b5f8c1c..0b3a284a 100644 --- a/docs2/out/Phaser.Sound.html +++ b/docs/Phaser.Sound.html @@ -5418,7 +5418,7 @@ This allows you to bundle multiple sounds together into a single audio file and Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:49 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:03 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.SoundManager.html b/docs/Phaser.SoundManager.html similarity index 99% rename from docs2/out/Phaser.SoundManager.html rename to docs/Phaser.SoundManager.html index 6e62d2b9..475e87b7 100644 --- a/docs2/out/Phaser.SoundManager.html +++ b/docs/Phaser.SoundManager.html @@ -2326,7 +2326,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:49 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:03 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Stage.html b/docs/Phaser.Stage.html similarity index 99% rename from docs2/out/Phaser.Stage.html rename to docs/Phaser.Stage.html index ba75184b..5adc7e26 100644 --- a/docs2/out/Phaser.Stage.html +++ b/docs/Phaser.Stage.html @@ -1383,7 +1383,7 @@ focus handling, game resizing, scaling and the pause, boot and orientation scree Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:50 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:03 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.StageScaleMode.html b/docs/Phaser.StageScaleMode.html similarity index 99% rename from docs2/out/Phaser.StageScaleMode.html rename to docs/Phaser.StageScaleMode.html index 72c3c1eb..afb56453 100644 --- a/docs2/out/Phaser.StageScaleMode.html +++ b/docs/Phaser.StageScaleMode.html @@ -2470,7 +2470,7 @@ If null it will scale to whatever width the browser can handle.

-

pageAlignVeritcally

+

pageAlignVertically

@@ -2509,7 +2509,7 @@ If null it will scale to whatever width the browser can handle.

- pageAlignVeritcally + pageAlignVertically @@ -3720,7 +3720,7 @@ Please note that this needs to be supported by the web browser and isn't the sam Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:50 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:03 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.State.html b/docs/Phaser.State.html similarity index 99% rename from docs2/out/Phaser.State.html rename to docs/Phaser.State.html index 1885f076..44b1f3a4 100644 --- a/docs2/out/Phaser.State.html +++ b/docs/Phaser.State.html @@ -2474,7 +2474,7 @@ If you need to use the loader, you may need to use them here.

Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:50 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:03 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.StateManager.html b/docs/Phaser.StateManager.html similarity index 99% rename from docs2/out/Phaser.StateManager.html rename to docs/Phaser.StateManager.html index 06fbce89..95db2d55 100644 --- a/docs2/out/Phaser.StateManager.html +++ b/docs/Phaser.StateManager.html @@ -3331,7 +3331,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:50 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:03 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Time.html b/docs/Phaser.Time.html similarity index 99% rename from docs2/out/Phaser.Time.html rename to docs/Phaser.Time.html index 5f84d403..ef62d104 100644 --- a/docs2/out/Phaser.Time.html +++ b/docs/Phaser.Time.html @@ -2795,7 +2795,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:50 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:04 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Touch.html b/docs/Phaser.Touch.html similarity index 99% rename from docs2/out/Phaser.Touch.html rename to docs/Phaser.Touch.html index 9250159d..f0030245 100644 --- a/docs2/out/Phaser.Touch.html +++ b/docs/Phaser.Touch.html @@ -2446,7 +2446,7 @@ Doesn't appear to be supported by most browsers on a canvas element yet.

Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:50 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:04 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Tween.html b/docs/Phaser.Tween.html similarity index 97% rename from docs2/out/Phaser.Tween.html rename to docs/Phaser.Tween.html index d017c164..43e8bc3b 100644 --- a/docs2/out/Phaser.Tween.html +++ b/docs/Phaser.Tween.html @@ -1060,7 +1060,7 @@ You can pass as many tweens as you like to this function, they will each be chai
Source:
@@ -1201,7 +1201,7 @@ You can pass as many tweens as you like to this function, they will each be chai
Source:
@@ -1342,7 +1342,7 @@ You can pass as many tweens as you like to this function, they will each be chai
Source:
@@ -1483,7 +1483,7 @@ You can pass as many tweens as you like to this function, they will each be chai
Source:
@@ -1534,7 +1534,7 @@ You can pass as many tweens as you like to this function, they will each be chai
-

loop() → {Tween}

+

loop() → {Phaser.Tween}

@@ -1581,7 +1581,7 @@ game.add.tween(p).to({ x: 700 }, 1000, Phaser.Easing.Linear.None, true)
Source:
@@ -1617,7 +1617,7 @@ game.add.tween(p).to({ x: 700 }, 1000, Phaser.Easing.Linear.None, true)
-Tween +Phaser.Tween
@@ -1722,7 +1722,7 @@ game.add.tween(p).to({ x: 700 }, 1000, Phaser.Easing.Linear.None, true)
Source:
@@ -1863,7 +1863,7 @@ game.add.tween(p).to({ x: 700 }, 1000, Phaser.Easing.Linear.None, true)
Source:
@@ -2004,7 +2004,7 @@ game.add.tween(p).to({ x: 700 }, 1000, Phaser.Easing.Linear.None, true)
Source:
@@ -2096,7 +2096,7 @@ game.add.tween(p).to({ x: 700 }, 1000, Phaser.Easing.Linear.None, true)
Source:
@@ -2214,7 +2214,7 @@ game.add.tween(p).to({ x: 700 }, 1000, Phaser.Easing.Linear.None, true)
Source:
@@ -2306,7 +2306,7 @@ game.add.tween(p).to({ x: 700 }, 1000, Phaser.Easing.Linear.None, true)
Source:
@@ -2424,7 +2424,7 @@ game.add.tween(p).to({ x: 700 }, 1000, Phaser.Easing.Linear.None, true)
Source:
@@ -2516,7 +2516,7 @@ game.add.tween(p).to({ x: 700 }, 1000, Phaser.Easing.Linear.None, true)
Source:
@@ -2936,7 +2936,7 @@ game.add.tween(p).to({ x: 700 }, 1000, Phaser.Easing.Linear.None, true)
Source:
@@ -3078,7 +3078,7 @@ Used in combination with repeat you can create endless loops.

Source:
@@ -3152,7 +3152,7 @@ Used in combination with repeat you can create endless loops.

Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:50 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:04 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.TweenManager.html b/docs/Phaser.TweenManager.html similarity index 99% rename from docs2/out/Phaser.TweenManager.html rename to docs/Phaser.TweenManager.html index 5af078a5..19e57da6 100644 --- a/docs2/out/Phaser.TweenManager.html +++ b/docs/Phaser.TweenManager.html @@ -1508,7 +1508,7 @@ Please see https://github.com/sole/tw Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:50 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:04 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Utils.Debug.html b/docs/Phaser.Utils.Debug.html similarity index 99% rename from docs2/out/Phaser.Utils.Debug.html rename to docs/Phaser.Utils.Debug.html index fc7a472d..efc59fd1 100644 --- a/docs2/out/Phaser.Utils.Debug.html +++ b/docs/Phaser.Utils.Debug.html @@ -1443,7 +1443,7 @@ your game set to use Phaser.AUTO then swap it for Phaser.CANVAS to ensure WebGL
Source:
@@ -1686,7 +1686,7 @@ your game set to use Phaser.AUTO then swap it for Phaser.CANVAS to ensure WebGL
Source:
@@ -1847,7 +1847,7 @@ your game set to use Phaser.AUTO then swap it for Phaser.CANVAS to ensure WebGL
Source:
@@ -2588,7 +2588,7 @@ your game set to use Phaser.AUTO then swap it for Phaser.CANVAS to ensure WebGL
Source:
@@ -2780,7 +2780,7 @@ your game set to use Phaser.AUTO then swap it for Phaser.CANVAS to ensure WebGL
Source:
@@ -2941,7 +2941,7 @@ your game set to use Phaser.AUTO then swap it for Phaser.CANVAS to ensure WebGL
Source:
@@ -3184,7 +3184,7 @@ your game set to use Phaser.AUTO then swap it for Phaser.CANVAS to ensure WebGL
Source:
@@ -3325,7 +3325,7 @@ your game set to use Phaser.AUTO then swap it for Phaser.CANVAS to ensure WebGL
Source:
@@ -3486,7 +3486,7 @@ your game set to use Phaser.AUTO then swap it for Phaser.CANVAS to ensure WebGL
Source:
@@ -3729,7 +3729,7 @@ your game set to use Phaser.AUTO then swap it for Phaser.CANVAS to ensure WebGL
Source:
@@ -3890,7 +3890,7 @@ your game set to use Phaser.AUTO then swap it for Phaser.CANVAS to ensure WebGL
Source:
@@ -4100,7 +4100,7 @@ your game set to use Phaser.AUTO then swap it for Phaser.CANVAS to ensure WebGL
Source:
@@ -4594,7 +4594,7 @@ your game set to use Phaser.AUTO then swap it for Phaser.CANVAS to ensure WebGL
Source:
@@ -5334,7 +5334,7 @@ your game set to use Phaser.AUTO then swap it for Phaser.CANVAS to ensure WebGL
Source:
@@ -5810,7 +5810,7 @@ your game set to use Phaser.AUTO then swap it for Phaser.CANVAS to ensure WebGL
Source:
@@ -5861,7 +5861,7 @@ your game set to use Phaser.AUTO then swap it for Phaser.CANVAS to ensure WebGL Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:50 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:04 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.Utils.html b/docs/Phaser.Utils.html similarity index 92% rename from docs2/out/Phaser.Utils.html rename to docs/Phaser.Utils.html index 08a0b7a2..29af7947 100644 --- a/docs2/out/Phaser.Utils.html +++ b/docs/Phaser.Utils.html @@ -426,7 +426,7 @@
-

<static> extend() → {object}

+

<static> extend(deep, target) → {object}

@@ -443,6 +443,78 @@ +
Parameters:
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDescription
deep + + +boolean + + + +

Perform a deep copy?

target + + +object + + + +

The target object to copy to.

+ +
@@ -467,7 +539,7 @@
Source:
@@ -608,7 +680,7 @@
Source:
@@ -878,7 +950,7 @@ dir = 1 (left), 2 (right), 3 (both)

Source:
@@ -948,7 +1020,7 @@ dir = 1 (left), 2 (right), 3 (both)

Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:50 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:04 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.World.html b/docs/Phaser.World.html similarity index 91% rename from docs2/out/Phaser.World.html rename to docs/Phaser.World.html index de9146f6..51a398a0 100644 --- a/docs2/out/Phaser.World.html +++ b/docs/Phaser.World.html @@ -347,8 +347,7 @@

"This world is but a canvas to our imagination." - Henry David Thoreau

-

<p> -A game has only one world. The world is an abstract place in which all game objects live. It is not bound +

A game has only one world. The world is an abstract place in which all game objects live. It is not bound by stage limits and can be any size. You look into the world via cameras. All game objects live within the world at world-based coordinates. By default a world is created the same size as your Stage.

@@ -482,6 +481,13 @@ the world at world-based coordinates. By default a world is created the same siz
+
+

The World has no fixed size, but it does have a bounds outside of which objects are no longer considered as being "in world" and you should use this to clean-up the display list and purge dead objects. +By default we set the Bounds to be from 0,0 to Game.width,Game.height. I.e. it will match the size given to the game constructor with 0,0 representing the top-left of the display. +However 0,0 is actually the center of the world, and if you rotate or scale the world all of that will happen from 0,0. +So if you want to make a game in which the world itself will rotate you should adjust the bounds so that 0,0 is the center point, i.e. set them to -1000,-1000,2000,2000 for a 2000x2000 sized world centered around 0,0.

+
+ @@ -560,7 +566,7 @@ the world at world-based coordinates. By default a world is created the same siz
Source:
@@ -662,7 +668,7 @@ the world at world-based coordinates. By default a world is created the same siz
Source:
@@ -968,211 +974,7 @@ the world at world-based coordinates. By default a world is created the same siz
Source:
- - - - - - - -
- - - - - - - -
-

game

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
game - - -Phaser.Game - - - -

A reference to the currently running Game.

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

group

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
group - - -Phaser.Group - - - -

Object container stores every object created with create* methods.

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
@@ -1478,7 +1280,109 @@ the world at world-based coordinates. By default a world is created the same siz
Source:
+ + + + + + + +
+ + + +
+ + + +
+

scale

+ + +
+
+ + + + + +
+ + +
Properties:
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameTypeDescription
scale + + +Phaser.Point + + + +

Replaces the PIXI.Point with a slightly more flexible one.

+
+ + + + + + + + + + + + + + + + + + + + +
Source:
+
@@ -1645,7 +1549,7 @@ the world at world-based coordinates. By default a world is created the same siz
Source:
@@ -1714,7 +1618,7 @@ the world at world-based coordinates. By default a world is created the same siz
Source:
@@ -1811,7 +1715,7 @@ the world at world-based coordinates. By default a world is created the same siz
-

setSize(width, height)

+

setBounds(x, y, width, height)

@@ -1819,7 +1723,8 @@ the world at world-based coordinates. By default a world is created the same siz
-

Updates the size of this world.

+

Updates the size of this world. Note that this doesn't modify the world x/y coordinates, just the width and height. +If you need to adjust the bounds of the world

@@ -1851,6 +1756,52 @@ the world at world-based coordinates. By default a world is created the same siz + + + x + + + + + +number + + + + + + + + + +

Top left most corner of the world.

+ + + + + + + y + + + + + +number + + + + + + + + + +

Top left most corner of the world.

+ + + + width @@ -1924,7 +1875,7 @@ the world at world-based coordinates. By default a world is created the same siz
Source:
@@ -1993,7 +1944,7 @@ the world at world-based coordinates. By default a world is created the same siz
Source:
@@ -2044,7 +1995,7 @@ the world at world-based coordinates. By default a world is created the same siz Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:50 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:04 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.html b/docs/Phaser.html similarity index 99% rename from docs2/out/Phaser.html rename to docs/Phaser.html index 37f7c00c..61ee9adf 100644 --- a/docs2/out/Phaser.html +++ b/docs/Phaser.html @@ -555,7 +555,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:45 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Phaser.js.html b/docs/Phaser.js.html similarity index 98% rename from docs2/out/Phaser.js.html rename to docs/Phaser.js.html index fb8766ac..c2f516bb 100644 --- a/docs2/out/Phaser.js.html +++ b/docs/Phaser.js.html @@ -332,7 +332,7 @@ */ var Phaser = Phaser || { - VERSION: '1.0.7-beta', + VERSION: '1.1.0', GAMES: [], AUTO: 0, CANVAS: 1, @@ -383,7 +383,7 @@ PIXI.InteractionManager = function (dummy) { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Plugin.js.html b/docs/Plugin.js.html similarity index 99% rename from docs2/out/Plugin.js.html rename to docs/Plugin.js.html index 25527f23..d781cc54 100644 --- a/docs2/out/Plugin.js.html +++ b/docs/Plugin.js.html @@ -457,7 +457,7 @@ Phaser.Plugin.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/PluginManager.js.html b/docs/PluginManager.js.html similarity index 99% rename from docs2/out/PluginManager.js.html rename to docs/PluginManager.js.html index 35fbc1c0..32e281f1 100644 --- a/docs2/out/PluginManager.js.html +++ b/docs/PluginManager.js.html @@ -574,7 +574,7 @@ Phaser.PluginManager.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Point.js.html b/docs/Point.js.html similarity index 99% rename from docs2/out/Point.js.html rename to docs/Point.js.html index 82b1f646..6c893032 100644 --- a/docs2/out/Point.js.html +++ b/docs/Point.js.html @@ -381,9 +381,11 @@ Phaser.Point.prototype = { * @return {Point} This Point object. Useful for chaining method calls. **/ setTo: function (x, y) { + this.x = x; this.y = y; return this; + }, /** @@ -737,7 +739,7 @@ Phaser.Point.rotate = function (a, x, y, angle, asDegrees, distance) { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Pointer.js.html b/docs/Pointer.js.html similarity index 99% rename from docs2/out/Pointer.js.html rename to docs/Pointer.js.html index 84fd2bcf..f8a4d99f 100644 --- a/docs2/out/Pointer.js.html +++ b/docs/Pointer.js.html @@ -570,7 +570,7 @@ Phaser.Pointer.prototype = { this.identifier = event.identifier; this.target = event.target; - if (event.button) + if (typeof event.button !== 'undefined') { this.button = event.button; } @@ -674,7 +674,7 @@ Phaser.Pointer.prototype = { return; } - if (event.button) + if (typeof event.button !== 'undefined') { this.button = event.button; } @@ -753,8 +753,6 @@ Phaser.Pointer.prototype = { if (this._highestRenderObject == null) { - // console.log("HRO null"); - // The pointer isn't currently over anything, check if we've got a lingering previous target if (this.targetObject) { @@ -1033,7 +1031,7 @@ Object.defineProperty(Phaser.Pointer.prototype, "worldY", { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/QuadTree.js.html b/docs/QuadTree.js.html similarity index 99% rename from docs2/out/QuadTree.js.html rename to docs/QuadTree.js.html index c9dcf1a9..715c8d09 100644 --- a/docs2/out/QuadTree.js.html +++ b/docs/QuadTree.js.html @@ -606,7 +606,7 @@ Phaser.QuadTree.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/RandomDataGenerator.js.html b/docs/RandomDataGenerator.js.html similarity index 98% rename from docs2/out/RandomDataGenerator.js.html rename to docs/RandomDataGenerator.js.html index c224b404..75430b32 100644 --- a/docs2/out/RandomDataGenerator.js.html +++ b/docs/RandomDataGenerator.js.html @@ -403,10 +403,12 @@ Phaser.RandomDataGenerator.prototype = { this.s0 = this.hash(' '); this.s1 = this.hash(this.s0); this.s2 = this.hash(this.s1); + this.c = 1; var seed; - for (var i = 0; seed = seeds[i++]; ) { + for (var i = 0; seed = seeds[i++]; ) + { this.s0 -= this.hash(seed); this.s0 += ~~(this.s0 < 0); this.s1 -= this.hash(seed); @@ -492,9 +494,6 @@ Phaser.RandomDataGenerator.prototype = { */ realInRange: function (min, max) { - min = min || 0; - max = max || 0; - return this.frac() * (max - min) + min; }, @@ -589,7 +588,7 @@ Phaser.RandomDataGenerator.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Rectangle.js.html b/docs/Rectangle.js.html similarity index 98% rename from docs2/out/Rectangle.js.html rename to docs/Rectangle.js.html index 2fa30312..658e1ade 100644 --- a/docs2/out/Rectangle.js.html +++ b/docs/Rectangle.js.html @@ -941,14 +941,16 @@ Phaser.Rectangle.intersection = function (a, b, out) { * @method Phaser.Rectangle.intersects * @param {Phaser.Rectangle} a - The first Rectangle object. * @param {Phaser.Rectangle} b - The second Rectangle object. -* @param {number} tolerance - A tolerance value to allow for an intersection test with padding, default to 0 * @return {boolean} A value of true if the specified object intersects with this Rectangle object; otherwise false. */ -Phaser.Rectangle.intersects = function (a, b, tolerance) { +Phaser.Rectangle.intersects = function (a, b) { - tolerance = tolerance || 0; + return (a.x < b.right && b.x < a.right && a.y < b.bottom && b.y < a.bottom); - return !(a.x > b.right + tolerance || a.right < b.x - tolerance || a.y > b.bottom + tolerance || a.bottom < b.y - tolerance); + // return (a.x <= b.right && b.x <= a.right && a.y <= b.bottom && b.y <= a.bottom); + + // return (a.left <= b.right && b.left <= a.right && a.top <= b.bottom && b.top <= a.bottom); + // return !(a.x > b.right + tolerance || a.right < b.x - tolerance || a.y > b.bottom + tolerance || a.bottom < b.y - tolerance); }; @@ -982,7 +984,7 @@ Phaser.Rectangle.union = function (a, b, out) { if (typeof out === "undefined") { out = new Phaser.Rectangle(); } - return out.setTo(Math.min(a.x, b.x), Math.min(a.y, b.y), Math.max(a.right, b.right), Math.max(a.bottom, b.bottom)); + return out.setTo(Math.min(a.x, b.x), Math.min(a.y, b.y), Math.max(a.right, b.right) - Math.min(a.left, b.left), Math.max(a.bottom, b.bottom) - Math.min(a.top, b.top)); }; @@ -1006,7 +1008,7 @@ Phaser.Rectangle.union = function (a, b, out) { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/RequestAnimationFrame.js.html b/docs/RequestAnimationFrame.js.html similarity index 99% rename from docs2/out/RequestAnimationFrame.js.html rename to docs/RequestAnimationFrame.js.html index 0442a6d6..1c29f775 100644 --- a/docs2/out/RequestAnimationFrame.js.html +++ b/docs/RequestAnimationFrame.js.html @@ -494,7 +494,7 @@ Phaser.RequestAnimationFrame.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Signal.js.html b/docs/Signal.js.html similarity index 99% rename from docs2/out/Signal.js.html rename to docs/Signal.js.html index 2e7088d9..9fbe233d 100644 --- a/docs2/out/Signal.js.html +++ b/docs/Signal.js.html @@ -639,7 +639,7 @@ Phaser.Signal.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/SignalBinding.html b/docs/SignalBinding.html similarity index 99% rename from docs2/out/SignalBinding.html rename to docs/SignalBinding.html index 43738708..c8bb1cf0 100644 --- a/docs2/out/SignalBinding.html +++ b/docs/SignalBinding.html @@ -639,7 +639,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:51 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:52:04 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/SignalBinding.js.html b/docs/SignalBinding.js.html similarity index 99% rename from docs2/out/SignalBinding.js.html rename to docs/SignalBinding.js.html index 09bf658a..2f5557d3 100644 --- a/docs2/out/SignalBinding.js.html +++ b/docs/SignalBinding.js.html @@ -504,7 +504,7 @@ Phaser.SignalBinding.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Sound.js.html b/docs/Sound.js.html similarity index 99% rename from docs2/out/Sound.js.html rename to docs/Sound.js.html index a7a0c4f5..94c710f3 100644 --- a/docs2/out/Sound.js.html +++ b/docs/Sound.js.html @@ -1148,7 +1148,7 @@ Object.defineProperty(Phaser.Sound.prototype, "volume", { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/SoundManager.js.html b/docs/SoundManager.js.html similarity index 99% rename from docs2/out/SoundManager.js.html rename to docs/SoundManager.js.html index fb3a6ba9..df2a0748 100644 --- a/docs2/out/SoundManager.js.html +++ b/docs/SoundManager.js.html @@ -791,7 +791,7 @@ Object.defineProperty(Phaser.SoundManager.prototype, "volume", { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Stage.js.html b/docs/Stage.js.html similarity index 99% rename from docs2/out/Stage.js.html rename to docs/Stage.js.html index ec57fcf1..eeb07873 100644 --- a/docs2/out/Stage.js.html +++ b/docs/Stage.js.html @@ -488,7 +488,7 @@ Object.defineProperty(Phaser.Stage.prototype, "backgroundColor", { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/StageScaleMode.js.html b/docs/StageScaleMode.js.html similarity index 99% rename from docs2/out/StageScaleMode.js.html rename to docs/StageScaleMode.js.html index cf64c588..6bcc2c42 100644 --- a/docs2/out/StageScaleMode.js.html +++ b/docs/StageScaleMode.js.html @@ -373,12 +373,12 @@ Phaser.StageScaleMode = function (game, width, height) { this.pageAlignHorizontally = false; /** - * @property {boolean} pageAlignVeritcally - If you wish to align your game in the middle of the page then you can set this value to true. + * @property {boolean} pageAlignVertically - If you wish to align your game in the middle of the page then you can set this value to true. <ul><li>It will place a re-calculated margin-left pixel value onto the canvas element which is updated on orientation/resizing. <li>It doesn't care about any other DOM element that may be on the page, it literally just sets the margin.</li></ul> * @default */ - this.pageAlignVeritcally = false; + this.pageAlignVertically = false; /** * @property {number} minWidth - Minimum width the canvas should be scaled to (in pixels). @@ -767,7 +767,7 @@ Phaser.StageScaleMode.prototype = { } } - if (this.pageAlignVeritcally) + if (this.pageAlignVertically) { if (this.height < window.innerHeight && this.incorrectOrientation == false) { @@ -913,7 +913,7 @@ Object.defineProperty(Phaser.StageScaleMode.prototype, "isLandscape", { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/State.js.html b/docs/State.js.html similarity index 99% rename from docs2/out/State.js.html rename to docs/State.js.html index 3b440932..14226299 100644 --- a/docs2/out/State.js.html +++ b/docs/State.js.html @@ -511,7 +511,7 @@ Phaser.State.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/StateManager.js.html b/docs/StateManager.js.html similarity index 99% rename from docs2/out/StateManager.js.html rename to docs/StateManager.js.html index 78442321..eef04b6b 100644 --- a/docs2/out/StateManager.js.html +++ b/docs/StateManager.js.html @@ -867,7 +867,7 @@ Phaser.StateManager.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Time.js.html b/docs/Time.js.html similarity index 99% rename from docs2/out/Time.js.html rename to docs/Time.js.html index fca332d6..1748e42f 100644 --- a/docs2/out/Time.js.html +++ b/docs/Time.js.html @@ -607,7 +607,7 @@ Phaser.Time.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Touch.js.html b/docs/Touch.js.html similarity index 99% rename from docs2/out/Touch.js.html rename to docs/Touch.js.html index 74e26b48..1a8af421 100644 --- a/docs2/out/Touch.js.html +++ b/docs/Touch.js.html @@ -675,7 +675,7 @@ Phaser.Touch.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Tween.js.html b/docs/Tween.js.html similarity index 98% rename from docs2/out/Tween.js.html rename to docs/Tween.js.html index a7520358..2bc8905d 100644 --- a/docs2/out/Tween.js.html +++ b/docs/Tween.js.html @@ -526,13 +526,14 @@ Phaser.Tween.prototype = { if (this._parent) { self = this._manager.create(this._object); - self._parent = this._parent; - this.chain(self); + this._lastChild.chain(self); + this._lastChild = self; } else { self = this; - self._parent = self; + this._parent = this; + this._lastChild = this; } self._repeat = repeat; @@ -552,9 +553,9 @@ Phaser.Tween.prototype = { self._yoyo = yoyo; if (autoStart) { - return self.start(); + return this.start(); } else { - return self; + return this; } }, @@ -722,11 +723,11 @@ Phaser.Tween.prototype = { * .to({ y: 0 }, 1000, Phaser.Easing.Linear.None) * .loop(); * @method Phaser.Tween#loop - * @return {Tween} Itself. + * @return {Phaser.Tween} Itself. */ loop: function() { - if (this._parent) this.chain(this._parent); + this._lastChild.chain(this); return this; }, @@ -780,6 +781,7 @@ Phaser.Tween.prototype = { */ pause: function () { this._paused = true; + this._pausedTime = this.game.time.now; }, /** @@ -789,7 +791,7 @@ Phaser.Tween.prototype = { */ resume: function () { this._paused = false; - this._startTime += this.game.time.pauseDuration; + this._startTime += (this.game.time.now - this._pausedTime); }, /** @@ -949,7 +951,7 @@ Phaser.Tween.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/TweenManager.js.html b/docs/TweenManager.js.html similarity index 99% rename from docs2/out/TweenManager.js.html rename to docs/TweenManager.js.html index ee805c09..fd001a9f 100644 --- a/docs2/out/TweenManager.js.html +++ b/docs/TweenManager.js.html @@ -528,7 +528,7 @@ Phaser.TweenManager.prototype = { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/Utils.js.html b/docs/Utils.js.html similarity index 96% rename from docs2/out/Utils.js.html rename to docs/Utils.js.html index 29698418..64a886ee 100644 --- a/docs2/out/Utils.js.html +++ b/docs/Utils.js.html @@ -333,6 +333,20 @@ */ Phaser.Utils = { + shuffle: function (array) { + + for (var i = array.length - 1; i > 0; i--) + { + var j = Math.floor(Math.random() * (i + 1)); + var temp = array[i]; + array[i] = array[j]; + array[j] = temp; + } + + return array; + + }, + /** * Javascript string pad http://www.webtoolkit.info/. * pad = the string to pad it out with (defaults to a space)<br> @@ -419,6 +433,8 @@ Phaser.Utils = { /** * This is a slightly modified version of http://api.jquery.com/jQuery.extend/ * @method Phaser.Utils.extend + * @param {boolean} deep - Perform a deep copy? + * @param {object} target - The target object to copy to. * @return {object} The extended object. */ extend: function () { @@ -553,7 +569,7 @@ if (typeof Function.prototype.bind != 'function') { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/World.js.html b/docs/World.js.html similarity index 70% rename from docs2/out/World.js.html rename to docs/World.js.html index a3a6d123..8e0f1301 100644 --- a/docs2/out/World.js.html +++ b/docs/World.js.html @@ -328,24 +328,30 @@ */ /** - * "This world is but a canvas to our imagination." - Henry David Thoreau - * <p> - * A game has only one world. The world is an abstract place in which all game objects live. It is not bound - * by stage limits and can be any size. You look into the world via cameras. All game objects live within - * the world at world-based coordinates. By default a world is created the same size as your Stage. - * - * @class Phaser.World - * @constructor - * @param {Phaser.Game} game - Reference to the current game instance. - */ +* "This world is but a canvas to our imagination." - Henry David Thoreau +* +* A game has only one world. The world is an abstract place in which all game objects live. It is not bound +* by stage limits and can be any size. You look into the world via cameras. All game objects live within +* the world at world-based coordinates. By default a world is created the same size as your Stage. +* +* @class Phaser.World +* @constructor +* @param {Phaser.Game} game - Reference to the current game instance. +*/ Phaser.World = function (game) { - /** - * @property {Phaser.Game} game - A reference to the currently running Game. - */ - this.game = game; + Phaser.Group.call(this, game, null, '__world', false); /** + * @property {Phaser.Point} scale - Replaces the PIXI.Point with a slightly more flexible one. + */ + this.scale = new Phaser.Point(1, 1); + + /** + * The World has no fixed size, but it does have a bounds outside of which objects are no longer considered as being "in world" and you should use this to clean-up the display list and purge dead objects. + * By default we set the Bounds to be from 0,0 to Game.width,Game.height. I.e. it will match the size given to the game constructor with 0,0 representing the top-left of the display. + * However 0,0 is actually the center of the world, and if you rotate or scale the world all of that will happen from 0,0. + * So if you want to make a game in which the world itself will rotate you should adjust the bounds so that 0,0 is the center point, i.e. set them to -1000,-1000,2000,2000 for a 2000x2000 sized world centered around 0,0. * @property {Phaser.Rectangle} bounds - Bound of this world that objects can not escape from. */ this.bounds = new Phaser.Rectangle(0, 0, game.width, game.height); @@ -360,125 +366,119 @@ Phaser.World = function (game) { */ this.currentRenderOrderID = 0; - /** - * @property {Phaser.Group} group - Object container stores every object created with `create*` methods. - */ - this.group = null; - }; -Phaser.World.prototype = { +Phaser.World.prototype = Object.create(Phaser.Group.prototype); +Phaser.World.prototype.constructor = Phaser.World; - /** - * Initialises the game world. - * - * @method Phaser.World#boot - * @protected - */ - boot: function () { +/** +* Initialises the game world. +* +* @method Phaser.World#boot +* @protected +*/ +Phaser.World.prototype.boot = function () { - this.camera = new Phaser.Camera(this.game, 0, 0, 0, this.game.width, this.game.height); + this.camera = new Phaser.Camera(this.game, 0, 0, 0, this.game.width, this.game.height); - this.game.camera = this.camera; + this.camera.displayObject = this._container; - this.group = new Phaser.Group(this.game, null, '__world', true); + this.game.camera = this.camera; - }, +} - /** - * This is called automatically every frame, and is where main logic happens. - * - * @method Phaser.World#update - */ - update: function () { +/** +* This is called automatically every frame, and is where main logic happens. +* +* @method Phaser.World#update +*/ +Phaser.World.prototype.update = function () { - this.camera.update(); + this.currentRenderOrderID = 0; - this.currentRenderOrderID = 0; - - if (this.game.stage._stage.first._iNext) + if (this.game.stage._stage.first._iNext) + { + var currentNode = this.game.stage._stage.first._iNext; + + do { - var currentNode = this.game.stage._stage.first._iNext; - - do + if (currentNode['preUpdate']) { - if (currentNode['preUpdate']) - { - currentNode.preUpdate(); - } - - if (currentNode['update']) - { - currentNode.update(); - } - - currentNode = currentNode._iNext; + currentNode.preUpdate(); } - while (currentNode != this.game.stage._stage.last._iNext) + + if (currentNode['update']) + { + currentNode.update(); + } + + currentNode = currentNode._iNext; } + while (currentNode != this.game.stage._stage.last._iNext) + } - }, +} - /** - * This is called automatically every frame, and is where main logic happens. - * @method Phaser.World#postUpdate - */ - postUpdate: function () { +/** +* This is called automatically every frame, and is where main logic happens. +* @method Phaser.World#postUpdate +*/ +Phaser.World.prototype.postUpdate = function () { - if (this.game.stage._stage.first._iNext) + this.camera.update(); + + if (this.game.stage._stage.first._iNext) + { + var currentNode = this.game.stage._stage.first._iNext; + + do { - var currentNode = this.game.stage._stage.first._iNext; - - do + if (currentNode['postUpdate']) { - if (currentNode['postUpdate']) - { - currentNode.postUpdate(); - } - - currentNode = currentNode._iNext; + currentNode.postUpdate(); } - while (currentNode != this.game.stage._stage.last._iNext) + + currentNode = currentNode._iNext; } - - }, - - /** - * Updates the size of this world. - * @method Phaser.World#setSize - * @param {number} width - New width of the world. - * @param {number} height - New height of the world. - */ - setSize: function (width, height) { - - if (width >= this.game.width) - { - this.bounds.width = width; - } - - if (height >= this.game.height) - { - this.bounds.height = height; - } - - }, - - /** - * Destroyer of worlds. - * @method Phaser.World#destroy - */ - destroy: function () { - - this.camera.x = 0; - this.camera.y = 0; - - this.game.input.reset(true); - - this.group.removeAll(); - + while (currentNode != this.game.stage._stage.last._iNext) } - -}; + +} + +/** +* Updates the size of this world. Note that this doesn't modify the world x/y coordinates, just the width and height. +* If you need to adjust the bounds of the world +* @method Phaser.World#setBounds +* @param {number} x - Top left most corner of the world. +* @param {number} y - Top left most corner of the world. +* @param {number} width - New width of the world. +* @param {number} height - New height of the world. +*/ +Phaser.World.prototype.setBounds = function (x, y, width, height) { + + this.bounds.setTo(x, y, width, height); + + if (this.camera.bounds) + { + this.camera.bounds.setTo(x, y, width, height); + } + +} + +/** +* Destroyer of worlds. +* @method Phaser.World#destroy +*/ +Phaser.World.prototype.destroy = function () { + + this.camera.x = 0; + this.camera.y = 0; + + this.game.input.reset(true); + + this.removeAll(); + +} /** * @name Phaser.World#width @@ -546,7 +546,16 @@ Object.defineProperty(Phaser.World.prototype, "centerY", { Object.defineProperty(Phaser.World.prototype, "randomX", { get: function () { - return Math.round(Math.random() * this.bounds.width); + + if (this.bounds.x < 0) + { + return this.game.rnd.integerInRange(this.bounds.x, (this.bounds.width - Math.abs(this.bounds.x))); + } + else + { + return this.game.rnd.integerInRange(this.bounds.x, this.bounds.width); + } + } }); @@ -559,7 +568,16 @@ Object.defineProperty(Phaser.World.prototype, "randomX", { Object.defineProperty(Phaser.World.prototype, "randomY", { get: function () { - return Math.round(Math.random() * this.bounds.height); + + if (this.bounds.y < 0) + { + return this.game.rnd.integerInRange(this.bounds.y, (this.bounds.height - Math.abs(this.bounds.y))); + } + else + { + return this.game.rnd.integerInRange(this.bounds.y, this.bounds.height); + } + } }); @@ -584,7 +602,7 @@ Object.defineProperty(Phaser.World.prototype, "randomY", { Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs/build/build dev.bat b/docs/build/build dev.bat new file mode 100644 index 00000000..144602f1 --- /dev/null +++ b/docs/build/build dev.bat @@ -0,0 +1 @@ +jsdoc -c conf_dev.json \ No newline at end of file diff --git a/docs/build/build master.bat b/docs/build/build master.bat new file mode 100644 index 00000000..25b9d2c4 --- /dev/null +++ b/docs/build/build master.bat @@ -0,0 +1 @@ +jsdoc -c conf.json \ No newline at end of file diff --git a/docs/build/conf.json b/docs/build/conf.json new file mode 100644 index 00000000..6bd6894c --- /dev/null +++ b/docs/build/conf.json @@ -0,0 +1,58 @@ +{ + "tags": { + "allowUnknownTags": true + }, + "source": { + "include": [ + "../../src/Phaser.js", + "../../src/Intro.js", + "../../src/animation/", + "../../src/core/", + "../../src/gameobjects/", + "../../src/geom/", + "../../src/input/", + "../../src/loader/", + "../../src/math/", + "../../src/net/", + "../../src/particles/", + "../../src/physics/", + "../../src/sound/", + "../../src/system/", + "../../src/tilemap/", + "../../src/time/", + "../../src/tween/", + "../../src/utils/" + ], + "exclude": [], + "includePattern": ".+\\.js(doc)?$", + "excludePattern": "(^|\\/|\\\\)_" + }, + "plugins" : ["plugins/markdown"], + "templates": { + "cleverLinks" : false, + "monospaceLinks" : false, + "default" : { + "outputSourceFiles" : true + }, + "systemName" : "Phaser", + "footer" : "", + "copyright" : "Phaser Copyright © 2012-2013 Photon Storm Ltd.", + "navType" : "vertical", + "theme" : "cerulean", + "linenums" : true, + "collapseSymbols" : false, + "inverseNav" : true + }, + "markdown" : { + "parser" : "gfm", + "hardwrap" : true + }, + "opts": { + "template": "docstrap-master/template/", + "encoding": "utf8", + "destination": "../", + "recurse": true, + "private": false, + "lenient": true + } +} \ No newline at end of file diff --git a/docs2/conf.json b/docs/build/conf_dev.json similarity index 63% rename from docs2/conf.json rename to docs/build/conf_dev.json index 92674fb8..2a8fc1b4 100644 --- a/docs2/conf.json +++ b/docs/build/conf_dev.json @@ -3,7 +3,23 @@ "allowUnknownTags": true }, "source": { - "include": [ "../src/Phaser.js", "../src/Intro.js", "../src/animation/", "../src/core/", "../src/geom/", "../src/input/", "../src/loader/", "../src/math/", "../src/net/", "../src/particles/", "../src/sound/", "../src/system/", "../src/time/", "../src/tween/", "../src/utils/" ], + "include": [ + "../../src/Phaser.js", + "../../src/Intro.js", + "../../src/animation/", + "../../src/core/", + "../../src/geom/", + "../../src/input/", + "../../src/loader/", + "../../src/math/", + "../../src/net/", + "../../src/particles/", + "../../src/sound/", + "../../src/system/", + "../../src/time/", + "../../src/tween/", + "../../src/utils/" + ], "exclude": [], "includePattern": ".+\\.js(doc)?$", "excludePattern": "(^|\\/|\\\\)_" @@ -31,7 +47,7 @@ "opts": { "template": "docstrap-master/template/", "encoding": "utf8", - "destination": "./out/", + "destination": "../", "recurse": true, "private": false, "lenient": true diff --git a/docs2/docstrap-master/.gitignore b/docs/build/docstrap-master/.gitignore similarity index 100% rename from docs2/docstrap-master/.gitignore rename to docs/build/docstrap-master/.gitignore diff --git a/docs2/docstrap-master/.npmignore b/docs/build/docstrap-master/.npmignore similarity index 100% rename from docs2/docstrap-master/.npmignore rename to docs/build/docstrap-master/.npmignore diff --git a/docs2/docstrap-master/Gruntfile.js b/docs/build/docstrap-master/Gruntfile.js similarity index 100% rename from docs2/docstrap-master/Gruntfile.js rename to docs/build/docstrap-master/Gruntfile.js diff --git a/docs2/docstrap-master/LICENSE.md b/docs/build/docstrap-master/LICENSE.md similarity index 100% rename from docs2/docstrap-master/LICENSE.md rename to docs/build/docstrap-master/LICENSE.md diff --git a/docs2/docstrap-master/README.md b/docs/build/docstrap-master/README.md similarity index 100% rename from docs2/docstrap-master/README.md rename to docs/build/docstrap-master/README.md diff --git a/docs2/docstrap-master/bower.json b/docs/build/docstrap-master/bower.json similarity index 100% rename from docs2/docstrap-master/bower.json rename to docs/build/docstrap-master/bower.json diff --git a/docs2/docstrap-master/component.json b/docs/build/docstrap-master/component.json similarity index 100% rename from docs2/docstrap-master/component.json rename to docs/build/docstrap-master/component.json diff --git a/docs2/docstrap-master/fixtures/car.js b/docs/build/docstrap-master/fixtures/car.js similarity index 100% rename from docs2/docstrap-master/fixtures/car.js rename to docs/build/docstrap-master/fixtures/car.js diff --git a/docs2/docstrap-master/fixtures/example.conf.json b/docs/build/docstrap-master/fixtures/example.conf.json similarity index 100% rename from docs2/docstrap-master/fixtures/example.conf.json rename to docs/build/docstrap-master/fixtures/example.conf.json diff --git a/docs2/docstrap-master/fixtures/other.js b/docs/build/docstrap-master/fixtures/other.js similarity index 100% rename from docs2/docstrap-master/fixtures/other.js rename to docs/build/docstrap-master/fixtures/other.js diff --git a/docs2/docstrap-master/fixtures/person.js b/docs/build/docstrap-master/fixtures/person.js similarity index 100% rename from docs2/docstrap-master/fixtures/person.js rename to docs/build/docstrap-master/fixtures/person.js diff --git a/docs2/docstrap-master/fixtures/tutorials/Brush Teeth.md b/docs/build/docstrap-master/fixtures/tutorials/Brush Teeth.md similarity index 100% rename from docs2/docstrap-master/fixtures/tutorials/Brush Teeth.md rename to docs/build/docstrap-master/fixtures/tutorials/Brush Teeth.md diff --git a/docs2/docstrap-master/fixtures/tutorials/Drive Car.md b/docs/build/docstrap-master/fixtures/tutorials/Drive Car.md similarity index 100% rename from docs2/docstrap-master/fixtures/tutorials/Drive Car.md rename to docs/build/docstrap-master/fixtures/tutorials/Drive Car.md diff --git a/docs2/docstrap-master/package.json b/docs/build/docstrap-master/package.json similarity index 100% rename from docs2/docstrap-master/package.json rename to docs/build/docstrap-master/package.json diff --git a/docs2/docstrap-master/styles/bootswatch.less b/docs/build/docstrap-master/styles/bootswatch.less similarity index 100% rename from docs2/docstrap-master/styles/bootswatch.less rename to docs/build/docstrap-master/styles/bootswatch.less diff --git a/docs2/docstrap-master/styles/main.less b/docs/build/docstrap-master/styles/main.less similarity index 100% rename from docs2/docstrap-master/styles/main.less rename to docs/build/docstrap-master/styles/main.less diff --git a/docs2/docstrap-master/styles/variables.less b/docs/build/docstrap-master/styles/variables.less similarity index 100% rename from docs2/docstrap-master/styles/variables.less rename to docs/build/docstrap-master/styles/variables.less diff --git a/docs2/docstrap-master/template/jsdoc.conf.json b/docs/build/docstrap-master/template/jsdoc.conf.json similarity index 100% rename from docs2/docstrap-master/template/jsdoc.conf.json rename to docs/build/docstrap-master/template/jsdoc.conf.json diff --git a/docs2/docstrap-master/template/publish.js b/docs/build/docstrap-master/template/publish.js similarity index 100% rename from docs2/docstrap-master/template/publish.js rename to docs/build/docstrap-master/template/publish.js diff --git a/docs2/docstrap-master/template/static/img/glyphicons-halflings-white.png b/docs/build/docstrap-master/template/static/img/glyphicons-halflings-white.png similarity index 100% rename from docs2/docstrap-master/template/static/img/glyphicons-halflings-white.png rename to docs/build/docstrap-master/template/static/img/glyphicons-halflings-white.png diff --git a/docs2/docstrap-master/template/static/img/glyphicons-halflings.png b/docs/build/docstrap-master/template/static/img/glyphicons-halflings.png similarity index 100% rename from docs2/docstrap-master/template/static/img/glyphicons-halflings.png rename to docs/build/docstrap-master/template/static/img/glyphicons-halflings.png diff --git a/docs2/docstrap-master/template/static/scripts/URI.js b/docs/build/docstrap-master/template/static/scripts/URI.js similarity index 100% rename from docs2/docstrap-master/template/static/scripts/URI.js rename to docs/build/docstrap-master/template/static/scripts/URI.js diff --git a/docs2/docstrap-master/template/static/scripts/bootstrap-dropdown.js b/docs/build/docstrap-master/template/static/scripts/bootstrap-dropdown.js similarity index 100% rename from docs2/docstrap-master/template/static/scripts/bootstrap-dropdown.js rename to docs/build/docstrap-master/template/static/scripts/bootstrap-dropdown.js diff --git a/docs2/docstrap-master/template/static/scripts/bootstrap-tab.js b/docs/build/docstrap-master/template/static/scripts/bootstrap-tab.js similarity index 100% rename from docs2/docstrap-master/template/static/scripts/bootstrap-tab.js rename to docs/build/docstrap-master/template/static/scripts/bootstrap-tab.js diff --git a/docs2/docstrap-master/template/static/scripts/jquery.localScroll.js b/docs/build/docstrap-master/template/static/scripts/jquery.localScroll.js similarity index 100% rename from docs2/docstrap-master/template/static/scripts/jquery.localScroll.js rename to docs/build/docstrap-master/template/static/scripts/jquery.localScroll.js diff --git a/docs2/docstrap-master/template/static/scripts/jquery.min.js b/docs/build/docstrap-master/template/static/scripts/jquery.min.js similarity index 100% rename from docs2/docstrap-master/template/static/scripts/jquery.min.js rename to docs/build/docstrap-master/template/static/scripts/jquery.min.js diff --git a/docs2/docstrap-master/template/static/scripts/jquery.scrollTo.js b/docs/build/docstrap-master/template/static/scripts/jquery.scrollTo.js similarity index 100% rename from docs2/docstrap-master/template/static/scripts/jquery.scrollTo.js rename to docs/build/docstrap-master/template/static/scripts/jquery.scrollTo.js diff --git a/docs2/docstrap-master/template/static/scripts/jquery.sunlight.js b/docs/build/docstrap-master/template/static/scripts/jquery.sunlight.js similarity index 100% rename from docs2/docstrap-master/template/static/scripts/jquery.sunlight.js rename to docs/build/docstrap-master/template/static/scripts/jquery.sunlight.js diff --git a/docs2/docstrap-master/template/static/scripts/prettify/Apache-License-2.0.txt b/docs/build/docstrap-master/template/static/scripts/prettify/Apache-License-2.0.txt similarity index 100% rename from docs2/docstrap-master/template/static/scripts/prettify/Apache-License-2.0.txt rename to docs/build/docstrap-master/template/static/scripts/prettify/Apache-License-2.0.txt diff --git a/docs2/docstrap-master/template/static/scripts/prettify/jquery.min.js b/docs/build/docstrap-master/template/static/scripts/prettify/jquery.min.js similarity index 100% rename from docs2/docstrap-master/template/static/scripts/prettify/jquery.min.js rename to docs/build/docstrap-master/template/static/scripts/prettify/jquery.min.js diff --git a/docs2/docstrap-master/template/static/scripts/prettify/lang-css.js b/docs/build/docstrap-master/template/static/scripts/prettify/lang-css.js similarity index 100% rename from docs2/docstrap-master/template/static/scripts/prettify/lang-css.js rename to docs/build/docstrap-master/template/static/scripts/prettify/lang-css.js diff --git a/docs2/docstrap-master/template/static/scripts/prettify/prettify.js b/docs/build/docstrap-master/template/static/scripts/prettify/prettify.js similarity index 100% rename from docs2/docstrap-master/template/static/scripts/prettify/prettify.js rename to docs/build/docstrap-master/template/static/scripts/prettify/prettify.js diff --git a/docs2/docstrap-master/template/static/scripts/sunlight-plugin.doclinks.js b/docs/build/docstrap-master/template/static/scripts/sunlight-plugin.doclinks.js similarity index 100% rename from docs2/docstrap-master/template/static/scripts/sunlight-plugin.doclinks.js rename to docs/build/docstrap-master/template/static/scripts/sunlight-plugin.doclinks.js diff --git a/docs2/docstrap-master/template/static/scripts/sunlight-plugin.linenumbers.js b/docs/build/docstrap-master/template/static/scripts/sunlight-plugin.linenumbers.js similarity index 100% rename from docs2/docstrap-master/template/static/scripts/sunlight-plugin.linenumbers.js rename to docs/build/docstrap-master/template/static/scripts/sunlight-plugin.linenumbers.js diff --git a/docs2/docstrap-master/template/static/scripts/sunlight-plugin.menu.js b/docs/build/docstrap-master/template/static/scripts/sunlight-plugin.menu.js similarity index 100% rename from docs2/docstrap-master/template/static/scripts/sunlight-plugin.menu.js rename to docs/build/docstrap-master/template/static/scripts/sunlight-plugin.menu.js diff --git a/docs2/docstrap-master/template/static/scripts/sunlight.javascript.js b/docs/build/docstrap-master/template/static/scripts/sunlight.javascript.js similarity index 100% rename from docs2/docstrap-master/template/static/scripts/sunlight.javascript.js rename to docs/build/docstrap-master/template/static/scripts/sunlight.javascript.js diff --git a/docs2/docstrap-master/template/static/scripts/sunlight.js b/docs/build/docstrap-master/template/static/scripts/sunlight.js similarity index 100% rename from docs2/docstrap-master/template/static/scripts/sunlight.js rename to docs/build/docstrap-master/template/static/scripts/sunlight.js diff --git a/docs2/docstrap-master/template/static/scripts/toc.js b/docs/build/docstrap-master/template/static/scripts/toc.js similarity index 100% rename from docs2/docstrap-master/template/static/scripts/toc.js rename to docs/build/docstrap-master/template/static/scripts/toc.js diff --git a/docs2/docstrap-master/template/static/styles/darkstrap.css b/docs/build/docstrap-master/template/static/styles/darkstrap.css similarity index 100% rename from docs2/docstrap-master/template/static/styles/darkstrap.css rename to docs/build/docstrap-master/template/static/styles/darkstrap.css diff --git a/docs2/docstrap-master/template/static/styles/prettify-tomorrow.css b/docs/build/docstrap-master/template/static/styles/prettify-tomorrow.css similarity index 100% rename from docs2/docstrap-master/template/static/styles/prettify-tomorrow.css rename to docs/build/docstrap-master/template/static/styles/prettify-tomorrow.css diff --git a/docs2/docstrap-master/template/static/styles/site.amelia.css b/docs/build/docstrap-master/template/static/styles/site.amelia.css similarity index 100% rename from docs2/docstrap-master/template/static/styles/site.amelia.css rename to docs/build/docstrap-master/template/static/styles/site.amelia.css diff --git a/docs2/docstrap-master/template/static/styles/site.cerulean.css b/docs/build/docstrap-master/template/static/styles/site.cerulean.css similarity index 100% rename from docs2/docstrap-master/template/static/styles/site.cerulean.css rename to docs/build/docstrap-master/template/static/styles/site.cerulean.css diff --git a/docs2/docstrap-master/template/static/styles/site.cosmo.css b/docs/build/docstrap-master/template/static/styles/site.cosmo.css similarity index 100% rename from docs2/docstrap-master/template/static/styles/site.cosmo.css rename to docs/build/docstrap-master/template/static/styles/site.cosmo.css diff --git a/docs2/docstrap-master/template/static/styles/site.cyborg.css b/docs/build/docstrap-master/template/static/styles/site.cyborg.css similarity index 100% rename from docs2/docstrap-master/template/static/styles/site.cyborg.css rename to docs/build/docstrap-master/template/static/styles/site.cyborg.css diff --git a/docs2/docstrap-master/template/static/styles/site.darkstrap.css b/docs/build/docstrap-master/template/static/styles/site.darkstrap.css similarity index 100% rename from docs2/docstrap-master/template/static/styles/site.darkstrap.css rename to docs/build/docstrap-master/template/static/styles/site.darkstrap.css diff --git a/docs2/docstrap-master/template/static/styles/site.flatly.css b/docs/build/docstrap-master/template/static/styles/site.flatly.css similarity index 100% rename from docs2/docstrap-master/template/static/styles/site.flatly.css rename to docs/build/docstrap-master/template/static/styles/site.flatly.css diff --git a/docs2/docstrap-master/template/static/styles/site.journal.css b/docs/build/docstrap-master/template/static/styles/site.journal.css similarity index 100% rename from docs2/docstrap-master/template/static/styles/site.journal.css rename to docs/build/docstrap-master/template/static/styles/site.journal.css diff --git a/docs2/docstrap-master/template/static/styles/site.readable.css b/docs/build/docstrap-master/template/static/styles/site.readable.css similarity index 100% rename from docs2/docstrap-master/template/static/styles/site.readable.css rename to docs/build/docstrap-master/template/static/styles/site.readable.css diff --git a/docs2/docstrap-master/template/static/styles/site.simplex.css b/docs/build/docstrap-master/template/static/styles/site.simplex.css similarity index 100% rename from docs2/docstrap-master/template/static/styles/site.simplex.css rename to docs/build/docstrap-master/template/static/styles/site.simplex.css diff --git a/docs2/docstrap-master/template/static/styles/site.slate.css b/docs/build/docstrap-master/template/static/styles/site.slate.css similarity index 100% rename from docs2/docstrap-master/template/static/styles/site.slate.css rename to docs/build/docstrap-master/template/static/styles/site.slate.css diff --git a/docs2/docstrap-master/template/static/styles/site.spacelab.css b/docs/build/docstrap-master/template/static/styles/site.spacelab.css similarity index 100% rename from docs2/docstrap-master/template/static/styles/site.spacelab.css rename to docs/build/docstrap-master/template/static/styles/site.spacelab.css diff --git a/docs2/docstrap-master/template/static/styles/site.spruce.css b/docs/build/docstrap-master/template/static/styles/site.spruce.css similarity index 100% rename from docs2/docstrap-master/template/static/styles/site.spruce.css rename to docs/build/docstrap-master/template/static/styles/site.spruce.css diff --git a/docs2/docstrap-master/template/static/styles/site.superhero.css b/docs/build/docstrap-master/template/static/styles/site.superhero.css similarity index 100% rename from docs2/docstrap-master/template/static/styles/site.superhero.css rename to docs/build/docstrap-master/template/static/styles/site.superhero.css diff --git a/docs2/docstrap-master/template/static/styles/site.united.css b/docs/build/docstrap-master/template/static/styles/site.united.css similarity index 100% rename from docs2/docstrap-master/template/static/styles/site.united.css rename to docs/build/docstrap-master/template/static/styles/site.united.css diff --git a/docs2/docstrap-master/template/static/styles/sunlight.dark.css b/docs/build/docstrap-master/template/static/styles/sunlight.dark.css similarity index 100% rename from docs2/docstrap-master/template/static/styles/sunlight.dark.css rename to docs/build/docstrap-master/template/static/styles/sunlight.dark.css diff --git a/docs2/docstrap-master/template/static/styles/sunlight.default.css b/docs/build/docstrap-master/template/static/styles/sunlight.default.css similarity index 100% rename from docs2/docstrap-master/template/static/styles/sunlight.default.css rename to docs/build/docstrap-master/template/static/styles/sunlight.default.css diff --git a/docs2/docstrap-master/template/tmpl/container.tmpl b/docs/build/docstrap-master/template/tmpl/container.tmpl similarity index 100% rename from docs2/docstrap-master/template/tmpl/container.tmpl rename to docs/build/docstrap-master/template/tmpl/container.tmpl diff --git a/docs2/docstrap-master/template/tmpl/details.tmpl b/docs/build/docstrap-master/template/tmpl/details.tmpl similarity index 100% rename from docs2/docstrap-master/template/tmpl/details.tmpl rename to docs/build/docstrap-master/template/tmpl/details.tmpl diff --git a/docs2/docstrap-master/template/tmpl/example.tmpl b/docs/build/docstrap-master/template/tmpl/example.tmpl similarity index 100% rename from docs2/docstrap-master/template/tmpl/example.tmpl rename to docs/build/docstrap-master/template/tmpl/example.tmpl diff --git a/docs2/docstrap-master/template/tmpl/examples.tmpl b/docs/build/docstrap-master/template/tmpl/examples.tmpl similarity index 100% rename from docs2/docstrap-master/template/tmpl/examples.tmpl rename to docs/build/docstrap-master/template/tmpl/examples.tmpl diff --git a/docs2/docstrap-master/template/tmpl/exceptions.tmpl b/docs/build/docstrap-master/template/tmpl/exceptions.tmpl similarity index 100% rename from docs2/docstrap-master/template/tmpl/exceptions.tmpl rename to docs/build/docstrap-master/template/tmpl/exceptions.tmpl diff --git a/docs2/docstrap-master/template/tmpl/fires.tmpl b/docs/build/docstrap-master/template/tmpl/fires.tmpl similarity index 100% rename from docs2/docstrap-master/template/tmpl/fires.tmpl rename to docs/build/docstrap-master/template/tmpl/fires.tmpl diff --git a/docs2/docstrap-master/template/tmpl/layout.tmpl b/docs/build/docstrap-master/template/tmpl/layout.tmpl similarity index 100% rename from docs2/docstrap-master/template/tmpl/layout.tmpl rename to docs/build/docstrap-master/template/tmpl/layout.tmpl diff --git a/docs2/docstrap-master/template/tmpl/mainpage.tmpl b/docs/build/docstrap-master/template/tmpl/mainpage.tmpl similarity index 100% rename from docs2/docstrap-master/template/tmpl/mainpage.tmpl rename to docs/build/docstrap-master/template/tmpl/mainpage.tmpl diff --git a/docs2/docstrap-master/template/tmpl/members.tmpl b/docs/build/docstrap-master/template/tmpl/members.tmpl similarity index 100% rename from docs2/docstrap-master/template/tmpl/members.tmpl rename to docs/build/docstrap-master/template/tmpl/members.tmpl diff --git a/docs2/docstrap-master/template/tmpl/method.tmpl b/docs/build/docstrap-master/template/tmpl/method.tmpl similarity index 100% rename from docs2/docstrap-master/template/tmpl/method.tmpl rename to docs/build/docstrap-master/template/tmpl/method.tmpl diff --git a/docs2/docstrap-master/template/tmpl/params.tmpl b/docs/build/docstrap-master/template/tmpl/params.tmpl similarity index 100% rename from docs2/docstrap-master/template/tmpl/params.tmpl rename to docs/build/docstrap-master/template/tmpl/params.tmpl diff --git a/docs2/docstrap-master/template/tmpl/properties.tmpl b/docs/build/docstrap-master/template/tmpl/properties.tmpl similarity index 100% rename from docs2/docstrap-master/template/tmpl/properties.tmpl rename to docs/build/docstrap-master/template/tmpl/properties.tmpl diff --git a/docs2/docstrap-master/template/tmpl/returns.tmpl b/docs/build/docstrap-master/template/tmpl/returns.tmpl similarity index 100% rename from docs2/docstrap-master/template/tmpl/returns.tmpl rename to docs/build/docstrap-master/template/tmpl/returns.tmpl diff --git a/docs2/docstrap-master/template/tmpl/sections.tmpl b/docs/build/docstrap-master/template/tmpl/sections.tmpl similarity index 100% rename from docs2/docstrap-master/template/tmpl/sections.tmpl rename to docs/build/docstrap-master/template/tmpl/sections.tmpl diff --git a/docs2/docstrap-master/template/tmpl/source.tmpl b/docs/build/docstrap-master/template/tmpl/source.tmpl similarity index 100% rename from docs2/docstrap-master/template/tmpl/source.tmpl rename to docs/build/docstrap-master/template/tmpl/source.tmpl diff --git a/docs2/docstrap-master/template/tmpl/tutorial.tmpl b/docs/build/docstrap-master/template/tmpl/tutorial.tmpl similarity index 100% rename from docs2/docstrap-master/template/tmpl/tutorial.tmpl rename to docs/build/docstrap-master/template/tmpl/tutorial.tmpl diff --git a/docs2/docstrap-master/template/tmpl/type.tmpl b/docs/build/docstrap-master/template/tmpl/type.tmpl similarity index 100% rename from docs2/docstrap-master/template/tmpl/type.tmpl rename to docs/build/docstrap-master/template/tmpl/type.tmpl diff --git a/docs2/out/classes.list.html b/docs/classes.list.html similarity index 99% rename from docs2/out/classes.list.html rename to docs/classes.list.html index 5dee7711..2d5f8a17 100644 --- a/docs2/out/classes.list.html +++ b/docs/classes.list.html @@ -599,7 +599,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/global.html b/docs/global.html similarity index 98% rename from docs2/out/global.html rename to docs/global.html index 1841e238..10ffb391 100644 --- a/docs2/out/global.html +++ b/docs/global.html @@ -476,7 +476,7 @@
Source:
@@ -546,7 +546,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/img/glyphicons-halflings-white.png b/docs/img/glyphicons-halflings-white.png similarity index 100% rename from docs2/out/img/glyphicons-halflings-white.png rename to docs/img/glyphicons-halflings-white.png diff --git a/docs2/out/img/glyphicons-halflings.png b/docs/img/glyphicons-halflings.png similarity index 100% rename from docs2/out/img/glyphicons-halflings.png rename to docs/img/glyphicons-halflings.png diff --git a/docs2/out/index.html b/docs/index.html similarity index 99% rename from docs2/out/index.html rename to docs/index.html index 53a62a9e..a0ec9616 100644 --- a/docs2/out/index.html +++ b/docs/index.html @@ -453,7 +453,7 @@ and my love of game development originate.

Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/namespaces.list.html b/docs/namespaces.list.html similarity index 99% rename from docs2/out/namespaces.list.html rename to docs/namespaces.list.html index 47164408..7bdb5b06 100644 --- a/docs2/out/namespaces.list.html +++ b/docs/namespaces.list.html @@ -599,7 +599,7 @@ Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:35:44 GMT+0100 (BST) using the DocStrap template. + on Wed Oct 23 2013 13:51:58 GMT+0100 (BST) using the DocStrap template. diff --git a/docs2/out/scripts/URI.js b/docs/scripts/URI.js similarity index 100% rename from docs2/out/scripts/URI.js rename to docs/scripts/URI.js diff --git a/docs2/out/scripts/bootstrap-dropdown.js b/docs/scripts/bootstrap-dropdown.js similarity index 100% rename from docs2/out/scripts/bootstrap-dropdown.js rename to docs/scripts/bootstrap-dropdown.js diff --git a/docs2/out/scripts/bootstrap-tab.js b/docs/scripts/bootstrap-tab.js similarity index 100% rename from docs2/out/scripts/bootstrap-tab.js rename to docs/scripts/bootstrap-tab.js diff --git a/docs2/out/scripts/jquery.localScroll.js b/docs/scripts/jquery.localScroll.js similarity index 100% rename from docs2/out/scripts/jquery.localScroll.js rename to docs/scripts/jquery.localScroll.js diff --git a/docs2/out/scripts/jquery.min.js b/docs/scripts/jquery.min.js similarity index 100% rename from docs2/out/scripts/jquery.min.js rename to docs/scripts/jquery.min.js diff --git a/docs2/out/scripts/jquery.scrollTo.js b/docs/scripts/jquery.scrollTo.js similarity index 100% rename from docs2/out/scripts/jquery.scrollTo.js rename to docs/scripts/jquery.scrollTo.js diff --git a/docs2/out/scripts/jquery.sunlight.js b/docs/scripts/jquery.sunlight.js similarity index 100% rename from docs2/out/scripts/jquery.sunlight.js rename to docs/scripts/jquery.sunlight.js diff --git a/docs2/out/scripts/prettify/Apache-License-2.0.txt b/docs/scripts/prettify/Apache-License-2.0.txt similarity index 100% rename from docs2/out/scripts/prettify/Apache-License-2.0.txt rename to docs/scripts/prettify/Apache-License-2.0.txt diff --git a/docs2/out/scripts/prettify/jquery.min.js b/docs/scripts/prettify/jquery.min.js similarity index 100% rename from docs2/out/scripts/prettify/jquery.min.js rename to docs/scripts/prettify/jquery.min.js diff --git a/docs2/out/scripts/prettify/lang-css.js b/docs/scripts/prettify/lang-css.js similarity index 100% rename from docs2/out/scripts/prettify/lang-css.js rename to docs/scripts/prettify/lang-css.js diff --git a/docs2/out/scripts/prettify/prettify.js b/docs/scripts/prettify/prettify.js similarity index 100% rename from docs2/out/scripts/prettify/prettify.js rename to docs/scripts/prettify/prettify.js diff --git a/docs2/out/scripts/sunlight-plugin.doclinks.js b/docs/scripts/sunlight-plugin.doclinks.js similarity index 100% rename from docs2/out/scripts/sunlight-plugin.doclinks.js rename to docs/scripts/sunlight-plugin.doclinks.js diff --git a/docs2/out/scripts/sunlight-plugin.linenumbers.js b/docs/scripts/sunlight-plugin.linenumbers.js similarity index 100% rename from docs2/out/scripts/sunlight-plugin.linenumbers.js rename to docs/scripts/sunlight-plugin.linenumbers.js diff --git a/docs2/out/scripts/sunlight-plugin.menu.js b/docs/scripts/sunlight-plugin.menu.js similarity index 100% rename from docs2/out/scripts/sunlight-plugin.menu.js rename to docs/scripts/sunlight-plugin.menu.js diff --git a/docs2/out/scripts/sunlight.javascript.js b/docs/scripts/sunlight.javascript.js similarity index 100% rename from docs2/out/scripts/sunlight.javascript.js rename to docs/scripts/sunlight.javascript.js diff --git a/docs2/out/scripts/sunlight.js b/docs/scripts/sunlight.js similarity index 100% rename from docs2/out/scripts/sunlight.js rename to docs/scripts/sunlight.js diff --git a/docs2/out/scripts/toc.js b/docs/scripts/toc.js similarity index 100% rename from docs2/out/scripts/toc.js rename to docs/scripts/toc.js diff --git a/docs2/out/styles/darkstrap.css b/docs/styles/darkstrap.css similarity index 100% rename from docs2/out/styles/darkstrap.css rename to docs/styles/darkstrap.css diff --git a/docs2/out/styles/prettify-tomorrow.css b/docs/styles/prettify-tomorrow.css similarity index 100% rename from docs2/out/styles/prettify-tomorrow.css rename to docs/styles/prettify-tomorrow.css diff --git a/docs2/out/styles/site.amelia.css b/docs/styles/site.amelia.css similarity index 100% rename from docs2/out/styles/site.amelia.css rename to docs/styles/site.amelia.css diff --git a/docs2/out/styles/site.cerulean.css b/docs/styles/site.cerulean.css similarity index 100% rename from docs2/out/styles/site.cerulean.css rename to docs/styles/site.cerulean.css diff --git a/docs2/out/styles/site.cosmo.css b/docs/styles/site.cosmo.css similarity index 100% rename from docs2/out/styles/site.cosmo.css rename to docs/styles/site.cosmo.css diff --git a/docs2/out/styles/site.cyborg.css b/docs/styles/site.cyborg.css similarity index 100% rename from docs2/out/styles/site.cyborg.css rename to docs/styles/site.cyborg.css diff --git a/docs2/out/styles/site.darkstrap.css b/docs/styles/site.darkstrap.css similarity index 100% rename from docs2/out/styles/site.darkstrap.css rename to docs/styles/site.darkstrap.css diff --git a/docs2/out/styles/site.flatly.css b/docs/styles/site.flatly.css similarity index 100% rename from docs2/out/styles/site.flatly.css rename to docs/styles/site.flatly.css diff --git a/docs2/out/styles/site.journal.css b/docs/styles/site.journal.css similarity index 100% rename from docs2/out/styles/site.journal.css rename to docs/styles/site.journal.css diff --git a/docs2/out/styles/site.readable.css b/docs/styles/site.readable.css similarity index 100% rename from docs2/out/styles/site.readable.css rename to docs/styles/site.readable.css diff --git a/docs2/out/styles/site.simplex.css b/docs/styles/site.simplex.css similarity index 100% rename from docs2/out/styles/site.simplex.css rename to docs/styles/site.simplex.css diff --git a/docs2/out/styles/site.slate.css b/docs/styles/site.slate.css similarity index 100% rename from docs2/out/styles/site.slate.css rename to docs/styles/site.slate.css diff --git a/docs2/out/styles/site.spacelab.css b/docs/styles/site.spacelab.css similarity index 100% rename from docs2/out/styles/site.spacelab.css rename to docs/styles/site.spacelab.css diff --git a/docs2/out/styles/site.spruce.css b/docs/styles/site.spruce.css similarity index 100% rename from docs2/out/styles/site.spruce.css rename to docs/styles/site.spruce.css diff --git a/docs2/out/styles/site.superhero.css b/docs/styles/site.superhero.css similarity index 100% rename from docs2/out/styles/site.superhero.css rename to docs/styles/site.superhero.css diff --git a/docs2/out/styles/site.united.css b/docs/styles/site.united.css similarity index 100% rename from docs2/out/styles/site.united.css rename to docs/styles/site.united.css diff --git a/docs2/out/styles/sunlight.dark.css b/docs/styles/sunlight.dark.css similarity index 100% rename from docs2/out/styles/sunlight.dark.css rename to docs/styles/sunlight.dark.css diff --git a/docs2/out/styles/sunlight.default.css b/docs/styles/sunlight.default.css similarity index 100% rename from docs2/out/styles/sunlight.default.css rename to docs/styles/sunlight.default.css diff --git a/docs2/Documentation Checklist.xlsx b/docs2/Documentation Checklist.xlsx deleted file mode 100644 index 292dcd33..00000000 Binary files a/docs2/Documentation Checklist.xlsx and /dev/null differ diff --git a/docs2/Hello Phaser/index.html b/docs2/Hello Phaser/index.html deleted file mode 100644 index 2f1124bb..00000000 --- a/docs2/Hello Phaser/index.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - phaser - hello world - - - - - - - - \ No newline at end of file diff --git a/docs2/Hello Phaser/logo.png b/docs2/Hello Phaser/logo.png deleted file mode 100644 index a37a23af..00000000 Binary files a/docs2/Hello Phaser/logo.png and /dev/null differ diff --git a/docs2/Hello Phaser/phaser-min.js b/docs2/Hello Phaser/phaser-min.js deleted file mode 100644 index 048fae73..00000000 --- a/docs2/Hello Phaser/phaser-min.js +++ /dev/null @@ -1 +0,0 @@ -var PIXI=PIXI||{};var Phaser=Phaser||{VERSION:"1.0.0",GAMES:[],AUTO:0,CANVAS:1,WEBGL:2,SPRITE:0,BUTTON:1,BULLET:2,GRAPHICS:3,TEXT:4,TILESPRITE:5,BITMAPTEXT:6,GROUP:7,RENDERTEXTURE:8,TILEMAP:9,TILEMAPLAYER:10,EMITTER:11};PIXI.InteractionManager=function(b){};Phaser.Utils={pad:function(g,b,f,c){if(typeof(b)=="undefined"){var b=0}if(typeof(f)=="undefined"){var f=" "}if(typeof(c)=="undefined"){var c=3}if(b+1>=g.length){switch(c){case 1:g=Array(b+1-g.length).join(f)+g;break;case 3:var d=Math.ceil((padlen=b-g.length)/2);var e=padlen-d;g=Array(e+1).join(f)+g+Array(d+1).join(f);break;default:g=g+Array(b+1-g.length).join(f);break}}return g},isPlainObject:function(c){if(typeof(c)!=="object"||c.nodeType||c===c.window){return false}try{if(c.constructor&&!hasOwn.call(c.constructor.prototype,"isPrototypeOf")){return false}}catch(b){return false}return true},extend:function(){var l,d,b,c,h,j,g=arguments[0]||{},f=1,e=arguments.length,k=false;if(typeof g==="boolean"){k=g;g=arguments[1]||{};f=2}if(e===f){g=this;--f}for(;f>16&255)/255,(b>>8&255)/255,(b&255)/255]}if(typeof Function.prototype.bind!="function"){Function.prototype.bind=(function(){var b=Array.prototype.slice;return function(c){var f=this,g=b.call(arguments,1);if(typeof f!="function"){throw new TypeError()}function d(){var h=g.concat(b.call(arguments));f.apply(this instanceof d?this:c,h)}d.prototype=(function e(h){h&&(e.prototype=h);if(!(this instanceof e)){return new e}})(f.prototype);return d}})()}function determineMatrixArrayType(){PIXI.Matrix=(typeof Float32Array!=="undefined")?Float32Array:Array;return PIXI.Matrix}determineMatrixArrayType();PIXI.mat3={};PIXI.mat3.create=function(){var b=new PIXI.Matrix(9);b[0]=1;b[1]=0;b[2]=0;b[3]=0;b[4]=1;b[5]=0;b[6]=0;b[7]=0;b[8]=1;return b};PIXI.mat3.identity=function(b){b[0]=1;b[1]=0;b[2]=0;b[3]=0;b[4]=1;b[5]=0;b[6]=0;b[7]=0;b[8]=1;return b};PIXI.mat4={};PIXI.mat4.create=function(){var b=new PIXI.Matrix(16);b[0]=1;b[1]=0;b[2]=0;b[3]=0;b[4]=0;b[5]=1;b[6]=0;b[7]=0;b[8]=0;b[9]=0;b[10]=1;b[11]=0;b[12]=0;b[13]=0;b[14]=0;b[15]=1;return b};PIXI.mat3.multiply=function(q,h,i){if(!i){i=q}var v=q[0],u=q[1],t=q[2],g=q[3],f=q[4],e=q[5],o=q[6],n=q[7],m=q[8],l=h[0],k=h[1],j=h[2],s=h[3],r=h[4],p=h[5],d=h[6],c=h[7],b=h[8];i[0]=l*v+k*g+j*o;i[1]=l*u+k*f+j*n;i[2]=l*t+k*e+j*m;i[3]=s*v+r*g+p*o;i[4]=s*u+r*f+p*n;i[5]=s*t+r*e+p*m;i[6]=d*v+c*g+b*o;i[7]=d*u+c*f+b*n;i[8]=d*t+c*e+b*m;return i};PIXI.mat3.clone=function(c){var b=new PIXI.Matrix(9);b[0]=c[0];b[1]=c[1];b[2]=c[2];b[3]=c[3];b[4]=c[4];b[5]=c[5];b[6]=c[6];b[7]=c[7];b[8]=c[8];return b};PIXI.mat3.transpose=function(d,c){if(!c||d===c){var f=d[1],e=d[2],b=d[5];d[1]=d[3];d[2]=d[6];d[3]=f;d[5]=d[7];d[6]=e;d[7]=b;return d}c[0]=d[0];c[1]=d[3];c[2]=d[6];c[3]=d[1];c[4]=d[4];c[5]=d[7];c[6]=d[2];c[7]=d[5];c[8]=d[8];return c};PIXI.mat3.toMat4=function(c,b){if(!b){b=PIXI.mat4.create()}b[15]=1;b[14]=0;b[13]=0;b[12]=0;b[11]=0;b[10]=c[8];b[9]=c[7];b[8]=c[6];b[7]=0;b[6]=c[5];b[5]=c[4];b[4]=c[3];b[3]=0;b[2]=c[2];b[1]=c[1];b[0]=c[0];return b};PIXI.mat4.create=function(){var b=new PIXI.Matrix(16);b[0]=1;b[1]=0;b[2]=0;b[3]=0;b[4]=0;b[5]=1;b[6]=0;b[7]=0;b[8]=0;b[9]=0;b[10]=1;b[11]=0;b[12]=0;b[13]=0;b[14]=0;b[15]=1;return b};PIXI.mat4.transpose=function(e,d){if(!d||e===d){var i=e[1],g=e[2],f=e[3],b=e[6],h=e[7],c=e[11];e[1]=e[4];e[2]=e[8];e[3]=e[12];e[4]=i;e[6]=e[9];e[7]=e[13];e[8]=g;e[9]=b;e[11]=e[14];e[12]=f;e[13]=h;e[14]=c;return e}d[0]=e[0];d[1]=e[4];d[2]=e[8];d[3]=e[12];d[4]=e[1];d[5]=e[5];d[6]=e[9];d[7]=e[13];d[8]=e[2];d[9]=e[6];d[10]=e[10];d[11]=e[14];d[12]=e[3];d[13]=e[7];d[14]=e[11];d[15]=e[15];return d};PIXI.mat4.multiply=function(p,i,k){if(!k){k=p}var v=p[0],u=p[1],s=p[2],q=p[3];var h=p[4],f=p[5],d=p[6],b=p[7];var o=p[8],n=p[9],m=p[10],l=p[11];var z=p[12],w=p[13],t=p[14],r=p[15];var j=i[0],g=i[1],e=i[2],c=i[3];k[0]=j*v+g*h+e*o+c*z;k[1]=j*u+g*f+e*n+c*w;k[2]=j*s+g*d+e*m+c*t;k[3]=j*q+g*b+e*l+c*r;j=i[4];g=i[5];e=i[6];c=i[7];k[4]=j*v+g*h+e*o+c*z;k[5]=j*u+g*f+e*n+c*w;k[6]=j*s+g*d+e*m+c*t;k[7]=j*q+g*b+e*l+c*r;j=i[8];g=i[9];e=i[10];c=i[11];k[8]=j*v+g*h+e*o+c*z;k[9]=j*u+g*f+e*n+c*w;k[10]=j*s+g*d+e*m+c*t;k[11]=j*q+g*b+e*l+c*r;j=i[12];g=i[13];e=i[14];c=i[15];k[12]=j*v+g*h+e*o+c*z;k[13]=j*u+g*f+e*n+c*w;k[14]=j*s+g*d+e*m+c*t;k[15]=j*q+g*b+e*l+c*r;return k};PIXI.Point=function(b,c){this.x=b||0;this.y=c||0};PIXI.Point.prototype.clone=function(){return new PIXI.Point(this.x,this.y)};PIXI.Point.prototype.constructor=PIXI.Point;PIXI.Rectangle=function(c,e,d,b){this.x=c||0;this.y=e||0;this.width=d||0;this.height=b||0};PIXI.Rectangle.prototype.clone=function(){return new PIXI.Rectangle(this.x,this.y,this.width,this.height)};PIXI.Rectangle.prototype.contains=function(b,e){if(this.width<=0||this.height<=0){return false}var c=this.x;if(b>=c&&b<=c+this.width){var d=this.y;if(e>=d&&e<=d+this.height){return true}}return false};PIXI.Rectangle.prototype.constructor=PIXI.Rectangle;PIXI.DisplayObject=function(){this.last=this;this.first=this;this.position=new PIXI.Point();this.scale=new PIXI.Point(1,1);this.pivot=new PIXI.Point(0,0);this.rotation=0;this.alpha=1;this.visible=true;this.hitArea=null;this.buttonMode=false;this.renderable=false;this.parent=null;this.stage=null;this.worldAlpha=1;this._interactive=false;this.worldTransform=PIXI.mat3.create();this.localTransform=PIXI.mat3.create();this.color=[];this.dynamic=true;this._sr=0;this._cr=1};PIXI.DisplayObject.prototype.constructor=PIXI.DisplayObject;PIXI.DisplayObject.prototype.setInteractive=function(b){this.interactive=b};Object.defineProperty(PIXI.DisplayObject.prototype,"interactive",{get:function(){return this._interactive},set:function(b){this._interactive=b;if(this.stage){this.stage.dirty=true}}});Object.defineProperty(PIXI.DisplayObject.prototype,"mask",{get:function(){return this._mask},set:function(b){this._mask=b;if(b){this.addFilter(b)}else{this.removeFilter()}}});PIXI.DisplayObject.prototype.addFilter=function(j){if(this.filter){return}this.filter=true;var b=new PIXI.FilterBlock();var e=new PIXI.FilterBlock();b.mask=j;e.mask=j;b.first=b.last=this;e.first=e.last=this;b.open=true;var d=b;var f=b;var i;var h;h=this.first._iPrev;if(h){i=h._iNext;d._iPrev=h;h._iNext=d}else{i=this}if(i){i._iPrev=f;f._iNext=i}var d=e;var f=e;var i=null;var h=null;h=this.last;i=h._iNext;if(i){i._iPrev=f;f._iNext=i}d._iPrev=h;h._iNext=d;var c=this;var g=this.last;while(c){if(c.last==g){c.last=e}c=c.parent}this.first=b;if(this.__renderGroup){this.__renderGroup.addFilterBlocks(b,e)}j.renderable=false};PIXI.DisplayObject.prototype.removeFilter=function(){if(!this.filter){return}this.filter=false;var d=this.first;var g=d._iNext;var h=d._iPrev;if(g){g._iPrev=h}if(h){h._iNext=g}this.first=d._iNext;var e=this.last;var g=e._iNext;var h=e._iPrev;if(g){g._iPrev=h}h._iNext=g;var f=e._iPrev;var c=this;while(c.last==e){c.last=f;c=c.parent;if(!c){break}}var b=d.mask;b.renderable=true;if(this.__renderGroup){this.__renderGroup.removeFilterBlocks(d,e)}};PIXI.DisplayObject.prototype.updateTransform=function(){if(this.rotation!==this.rotationCache){this.rotationCache=this.rotation;this._sr=Math.sin(this.rotation);this._cr=Math.cos(this.rotation)}var r=this.localTransform;var f=this.parent.worldTransform;var b=this.worldTransform;r[0]=this._cr*this.scale.x;r[1]=-this._sr*this.scale.y;r[3]=this._sr*this.scale.x;r[4]=this._cr*this.scale.y;var n=this.pivot.x;var m=this.pivot.y;var i=r[0],h=r[1],g=this.position.x-r[0]*n-m*r[1],q=r[3],p=r[4],o=this.position.y-r[4]*m-n*r[3],l=f[0],k=f[1],j=f[2],e=f[3],d=f[4],c=f[5];r[2]=g;r[5]=o;b[0]=l*i+k*q;b[1]=l*h+k*p;b[2]=l*g+k*o+j;b[3]=e*i+d*q;b[4]=e*h+d*p;b[5]=e*g+d*o+c;this.worldAlpha=this.alpha*this.parent.worldAlpha;this.vcount=PIXI.visibleCount};PIXI.visibleCount=0;PIXI.DisplayObjectContainer=function(){PIXI.DisplayObject.call(this);this.children=[]};PIXI.DisplayObjectContainer.prototype=Object.create(PIXI.DisplayObject.prototype);PIXI.DisplayObjectContainer.prototype.constructor=PIXI.DisplayObjectContainer;PIXI.DisplayObjectContainer.prototype.addChild=function(i){if(i.parent!=undefined){i.parent.removeChild(i)}i.parent=this;this.children.push(i);if(this.stage){var f=i;do{if(f.interactive){this.stage.dirty=true}f.stage=this.stage;f=f._iNext}while(f)}var e=i.first;var d=i.last;var g;var h;if(this.filter){h=this.last._iPrev}else{h=this.last}g=h._iNext;var c=this;var b=h;while(c){if(c.last==b){c.last=i.last}c=c.parent}if(g){g._iPrev=d;d._iNext=g}e._iPrev=h;h._iNext=e;if(this.__renderGroup){if(i.__renderGroup){i.__renderGroup.removeDisplayObjectAndChildren(i)}this.__renderGroup.addDisplayObjectAndChildren(i)}};PIXI.DisplayObjectContainer.prototype.addChildAt=function(c,f){if(f>=0&&f<=this.children.length){if(c.parent!=undefined){c.parent.removeChild(c)}c.parent=this;if(this.stage){var e=c;do{if(e.interactive){this.stage.dirty=true}e.stage=this.stage;e=e._iNext}while(e)}var d=c.first;var g=c.last;var j;var i;if(f==this.children.length){i=this.last;var b=this;var h=this.last;while(b){if(b.last==h){b.last=c.last}b=b.parent}}else{if(f==0){i=this}else{i=this.children[f-1].last}}j=i._iNext;if(j){j._iPrev=g;g._iNext=j}d._iPrev=i;i._iNext=d;this.children.splice(f,0,c);if(this.__renderGroup){if(c.__renderGroup){c.__renderGroup.removeDisplayObjectAndChildren(c)}this.__renderGroup.addDisplayObjectAndChildren(c)}}else{throw new Error(c+" The index "+f+" supplied is out of bounds "+this.children.length)}};PIXI.DisplayObjectContainer.prototype.swapChildren=function(c,b){return};PIXI.DisplayObjectContainer.prototype.getChildAt=function(b){if(b>=0&&b1){h=1}var d=Math.sqrt(c.x*c.x+c.y*c.y);var f=this.texture.height/2;c.x/=d;c.y/=d;c.x*=f;c.y*=f;b[g]=m.x+c.x;b[g+1]=m.y+c.y;b[g+2]=m.x-c.x;b[g+3]=m.y-c.y;l=m}PIXI.DisplayObjectContainer.prototype.updateTransform.call(this)};PIXI.Rope.prototype.setTexture=function(b){this.texture=b;this.updateFrame=true};PIXI.TilingSprite=function(d,c,b){PIXI.DisplayObjectContainer.call(this);this.texture=d;this.width=c;this.height=b;this.tileScale=new PIXI.Point(1,1);this.tilePosition=new PIXI.Point(0,0);this.renderable=true;this.blendMode=PIXI.blendModes.NORMAL};PIXI.TilingSprite.prototype=Object.create(PIXI.DisplayObjectContainer.prototype);PIXI.TilingSprite.prototype.constructor=PIXI.TilingSprite;PIXI.TilingSprite.prototype.setTexture=function(b){this.texture=b;this.updateFrame=true};PIXI.TilingSprite.prototype.onTextureUpdate=function(b){this.updateFrame=true};PIXI.FilterBlock=function(b){this.graphics=b;this.visible=true;this.renderable=true};PIXI.MaskFilter=function(b){this.graphics};PIXI.Graphics=function(){PIXI.DisplayObjectContainer.call(this);this.renderable=true;this.fillAlpha=1;this.lineWidth=0;this.lineColor="black";this.graphicsData=[];this.currentPath={points:[]}};PIXI.Graphics.prototype=Object.create(PIXI.DisplayObjectContainer.prototype);PIXI.Graphics.prototype.constructor=PIXI.Graphics;PIXI.Graphics.prototype.lineStyle=function(b,c,d){if(this.currentPath.points.length==0){this.graphicsData.pop()}this.lineWidth=b||0;this.lineColor=c||0;this.lineAlpha=(d==undefined)?1:d;this.currentPath={lineWidth:this.lineWidth,lineColor:this.lineColor,lineAlpha:this.lineAlpha,fillColor:this.fillColor,fillAlpha:this.fillAlpha,fill:this.filling,points:[],type:PIXI.Graphics.POLY};this.graphicsData.push(this.currentPath)};PIXI.Graphics.prototype.moveTo=function(b,c){if(this.currentPath.points.length==0){this.graphicsData.pop()}this.currentPath=this.currentPath={lineWidth:this.lineWidth,lineColor:this.lineColor,lineAlpha:this.lineAlpha,fillColor:this.fillColor,fillAlpha:this.fillAlpha,fill:this.filling,points:[],type:PIXI.Graphics.POLY};this.currentPath.points.push(b,c);this.graphicsData.push(this.currentPath)};PIXI.Graphics.prototype.lineTo=function(b,c){this.currentPath.points.push(b,c);this.dirty=true};PIXI.Graphics.prototype.beginFill=function(b,c){this.filling=true;this.fillColor=b||0;this.fillAlpha=(c==undefined)?1:c};PIXI.Graphics.prototype.endFill=function(){this.filling=false;this.fillColor=null;this.fillAlpha=1};PIXI.Graphics.prototype.drawRect=function(c,e,d,b){if(this.currentPath.points.length==0){this.graphicsData.pop()}this.currentPath={lineWidth:this.lineWidth,lineColor:this.lineColor,lineAlpha:this.lineAlpha,fillColor:this.fillColor,fillAlpha:this.fillAlpha,fill:this.filling,points:[c,e,d,b],type:PIXI.Graphics.RECT};this.graphicsData.push(this.currentPath);this.dirty=true};PIXI.Graphics.prototype.drawCircle=function(c,d,b){if(this.currentPath.points.length==0){this.graphicsData.pop()}this.currentPath={lineWidth:this.lineWidth,lineColor:this.lineColor,lineAlpha:this.lineAlpha,fillColor:this.fillColor,fillAlpha:this.fillAlpha,fill:this.filling,points:[c,d,b,b],type:PIXI.Graphics.CIRC};this.graphicsData.push(this.currentPath);this.dirty=true};PIXI.Graphics.prototype.drawElipse=function(c,e,d,b){if(this.currentPath.points.length==0){this.graphicsData.pop()}this.currentPath={lineWidth:this.lineWidth,lineColor:this.lineColor,lineAlpha:this.lineAlpha,fillColor:this.fillColor,fillAlpha:this.fillAlpha,fill:this.filling,points:[c,e,d,b],type:PIXI.Graphics.ELIP};this.graphicsData.push(this.currentPath);this.dirty=true};PIXI.Graphics.prototype.clear=function(){this.lineWidth=0;this.filling=false;this.dirty=true;this.clearDirty=true;this.graphicsData=[]};PIXI.Graphics.POLY=0;PIXI.Graphics.RECT=1;PIXI.Graphics.CIRC=2;PIXI.Graphics.ELIP=3;PIXI.CanvasGraphics=function(){};PIXI.CanvasGraphics.renderGraphics=function(u,c){var p=u.worldAlpha;for(var s=0;s1){t=1;console.log("Pixi.js warning: masks in canvas can only mask using the first path in the graphics object")}for(var s=0;s<1;s++){var A=v.graphicsData[s];var r=A.points;if(A.type==PIXI.Graphics.POLY){c.beginPath();c.moveTo(r[0],r[1]);for(var q=1;q0){PIXI.Texture.frameUpdates=[]}};PIXI.CanvasRenderer.prototype.resize=function(c,b){this.width=c;this.height=b;this.view.width=c;this.view.height=b};PIXI.CanvasRenderer.prototype.renderDisplayObject=function(h){var e;var f=this.context;f.globalCompositeOperation="source-over";var d=h.last._iNext;h=h.first;do{e=h.worldTransform;if(!h.visible){h=h.last._iNext;continue}if(!h.renderable){h=h._iNext;continue}if(h instanceof PIXI.Sprite){var g=h.texture.frame;if(g){f.globalAlpha=h.worldAlpha;f.setTransform(e[0],e[3],e[1],e[4],e[2],e[5]);f.drawImage(h.texture.baseTexture.source,g.x,g.y,g.width,g.height,(h.anchor.x)*-g.width,(h.anchor.y)*-g.height,g.width,g.height)}}else{if(h instanceof PIXI.Strip){f.setTransform(e[0],e[3],e[1],e[4],e[2],e[5]);this.renderStrip(h)}else{if(h instanceof PIXI.TilingSprite){f.setTransform(e[0],e[3],e[1],e[4],e[2],e[5]);this.renderTilingSprite(h)}else{if(h instanceof PIXI.CustomRenderable){h.renderCanvas(this)}else{if(h instanceof PIXI.Graphics){f.setTransform(e[0],e[3],e[1],e[4],e[2],e[5]);PIXI.CanvasGraphics.renderGraphics(h,f)}else{if(h instanceof PIXI.FilterBlock){if(h.open){f.save();var c=h.mask.alpha;var b=h.mask.worldTransform;f.setTransform(b[0],b[3],b[1],b[4],b[2],b[5]);h.mask.worldAlpha=0.5;f.worldAlpha=0;PIXI.CanvasGraphics.renderGraphicsMask(h.mask,f);f.clip();h.mask.worldAlpha=c}else{f.restore()}}}}}}}h=h._iNext}while(h!=d)};PIXI.CanvasRenderer.prototype.renderStripFlat=function(d){var e=this.context;var f=d.verticies;var j=d.uvs;var g=f.length/2;this.count++;e.beginPath();for(var k=1;k3){PIXI.WebGLGraphics.buildPoly(d,b._webGL)}}if(d.lineWidth>0){PIXI.WebGLGraphics.buildLine(d,b._webGL)}}else{if(d.type==PIXI.Graphics.RECT){PIXI.WebGLGraphics.buildRectangle(d,b._webGL)}else{if(d.type==PIXI.Graphics.CIRC||d.type==PIXI.Graphics.ELIP){PIXI.WebGLGraphics.buildCircle(d,b._webGL)}}}}b._webGL.lastIndex=b.graphicsData.length;var e=PIXI.gl;b._webGL.glPoints=new Float32Array(b._webGL.points);e.bindBuffer(e.ARRAY_BUFFER,b._webGL.buffer);e.bufferData(e.ARRAY_BUFFER,b._webGL.glPoints,e.STATIC_DRAW);b._webGL.glIndicies=new Uint16Array(b._webGL.indices);e.bindBuffer(e.ELEMENT_ARRAY_BUFFER,b._webGL.indexBuffer);e.bufferData(e.ELEMENT_ARRAY_BUFFER,b._webGL.glIndicies,e.STATIC_DRAW)};PIXI.WebGLGraphics.buildRectangle=function(s,i){var f=s.points;var n=f[0];var m=f[1];var d=f[2];var q=f[3];if(s.fill){var h=HEXtoRGB(s.fillColor);var e=s.fillAlpha;var c=h[0]*e;var j=h[1]*e;var l=h[2]*e;var o=i.points;var p=i.indices;var k=o.length/6;o.push(n,m);o.push(c,j,l,e);o.push(n+d,m);o.push(c,j,l,e);o.push(n,m+q);o.push(c,j,l,e);o.push(n+d,m+q);o.push(c,j,l,e);p.push(k,k,k+1,k+2,k+3,k+3)}if(s.lineWidth){s.points=[n,m,n+d,m,n+d,m+q,n,m+q,n,m];PIXI.WebGLGraphics.buildLine(s,i)}};PIXI.WebGLGraphics.buildCircle=function(k,w){var f=k.points;var j=f[0];var h=f[1];var o=f[2];var n=f[3];var l=40;var t=(Math.PI*2)/l;if(k.fill){var p=HEXtoRGB(k.fillColor);var d=k.fillAlpha;var m=p[0]*d;var s=p[1]*d;var u=p[2]*d;var v=w.points;var e=w.indices;var c=v.length/6;e.push(c);for(var q=0;q140*140){h=L-z;f=K-w;m=Math.sqrt(h*h+f*f);h/=m;f/=m;h*=c;f*=c;S.push(B-h,A-f);S.push(M,T,W,Q);S.push(B+h,A+f);S.push(M,T,W,Q);S.push(B-h,A-f);S.push(M,T,W,Q);q++}else{S.push(px,py);S.push(M,T,W,Q);S.push(B-(px-B),A-(py-A));S.push(M,T,W,Q)}}J=H[(u-2)*2];I=H[(u-2)*2+1];B=H[(u-1)*2];A=H[(u-1)*2+1];L=-(I-A);K=J-B;m=Math.sqrt(L*L+K*K);L/=m;K/=m;L*=c;K*=c;S.push(B-L,A-K);S.push(M,T,W,Q);S.push(B+L,A+K);S.push(M,T,W,Q);l.push(U);for(var R=0;R>16&255)/255,(b>>8&255)/255,(b&255)/255]}PIXI._defaultFrame=new PIXI.Rectangle(0,0,1,1);PIXI.gl;PIXI.WebGLRenderer=function(g,b,d,j,c){this.transparent=!!j;this.width=g||800;this.height=b||600;this.view=d||document.createElement("canvas");this.view.width=this.width;this.view.height=this.height;var f=this;this.view.addEventListener("webglcontextlost",function(e){f.handleContextLost(e)},false);this.view.addEventListener("webglcontextrestored",function(e){f.handleContextRestored(e)},false);this.batchs=[];try{PIXI.gl=this.gl=this.view.getContext("experimental-webgl",{alpha:this.transparent,antialias:!!c,premultipliedAlpha:false,stencil:true})}catch(h){throw new Error(" This browser does not support webGL. Try using the canvas renderer"+this)}PIXI.initPrimitiveShader();PIXI.initDefaultShader();PIXI.initDefaultStripShader();PIXI.activateDefaultShader();var i=this.gl;PIXI.WebGLRenderer.gl=i;this.batch=new PIXI.WebGLBatch(i);i.disable(i.DEPTH_TEST);i.disable(i.CULL_FACE);i.enable(i.BLEND);i.colorMask(true,true,true,this.transparent);PIXI.projection=new PIXI.Point(400,300);this.resize(this.width,this.height);this.contextLost=false;this.stageRenderGroup=new PIXI.WebGLRenderGroup(this.gl)};PIXI.WebGLRenderer.prototype.constructor=PIXI.WebGLRenderer;PIXI.WebGLRenderer.getBatch=function(){if(PIXI._batchs.length==0){return new PIXI.WebGLBatch(PIXI.WebGLRenderer.gl)}else{return PIXI._batchs.pop()}};PIXI.WebGLRenderer.returnBatch=function(b){b.clean();PIXI._batchs.push(b)};PIXI.WebGLRenderer.prototype.render=function(b){if(this.contextLost){return}if(this.__stage!==b){this.__stage=b;this.stageRenderGroup.setRenderable(b)}PIXI.WebGLRenderer.updateTextures();PIXI.visibleCount++;b.updateTransform();var d=this.gl;d.colorMask(true,true,true,this.transparent);d.viewport(0,0,this.width,this.height);d.bindFramebuffer(d.FRAMEBUFFER,null);d.clearColor(b.backgroundColorSplit[0],b.backgroundColorSplit[1],b.backgroundColorSplit[2],!this.transparent);d.clear(d.COLOR_BUFFER_BIT);this.stageRenderGroup.backgroundColor=b.backgroundColorSplit;this.stageRenderGroup.render(PIXI.projection);if(b.interactive){if(!b._interactiveEventsAdded){b._interactiveEventsAdded=true;b.interactionManager.setTarget(this)}}if(PIXI.Texture.frameUpdates.length>0){for(var c=0;c0){n=n.children[n.children.length-1];if(n.renderable){b=n}}if(b instanceof PIXI.Sprite){c=b.batch;var l=c.head;if(l==b){h=0}else{h=1;while(l.__next!=b){h++;l=l.__next}}}else{c=b}if(m==c){if(m instanceof PIXI.WebGLBatch){m.render(p,h+1)}else{this.renderSpecial(m,j)}return}d=this.batchs.indexOf(m);q=this.batchs.indexOf(c);if(m instanceof PIXI.WebGLBatch){m.render(p)}else{this.renderSpecial(m,j)}for(var e=d+1;e=2?parseInt(b[b.length-2],10):PIXI.BitmapText.fonts[this.fontName].size;this.dirty=true};PIXI.BitmapText.prototype.updateText=function(){var h=PIXI.BitmapText.fonts[this.fontName];var m=new PIXI.Point();var j=null;var l=[];var q=0;var e=[];var p=0;var f=this.fontSize/h.size;for(var g=0;g0){this.removeChild(this.getChildAt(0))}this.updateText();this.dirty=false}PIXI.DisplayObjectContainer.prototype.updateTransform.call(this)};PIXI.BitmapText.fonts={};PIXI.Text=function(c,b){this.canvas=document.createElement("canvas");this.context=this.canvas.getContext("2d");PIXI.Sprite.call(this,PIXI.Texture.fromCanvas(this.canvas));this.setText(c);this.setStyle(b);this.updateText();this.dirty=false};PIXI.Text.prototype=Object.create(PIXI.Sprite.prototype);PIXI.Text.prototype.constructor=PIXI.Text;PIXI.Text.prototype.setStyle=function(b){b=b||{};b.font=b.font||"bold 20pt Arial";b.fill=b.fill||"black";b.align=b.align||"left";b.stroke=b.stroke||"black";b.strokeThickness=b.strokeThickness||0;b.wordWrap=b.wordWrap||false;b.wordWrapWidth=b.wordWrapWidth||100;this.style=b;this.dirty=true};PIXI.Sprite.prototype.setText=function(b){this.text=b.toString()||" ";this.dirty=true};PIXI.Text.prototype.updateText=function(){this.context.font=this.style.font;var g=this.text;if(this.style.wordWrap){g=this.wordWrap(this.text)}var f=g.split(/(?:\r\n|\r|\n)/);var d=[];var c=0;for(var h=0;hj){return k}else{return arguments.callee(i,l,k,h,j)}}else{return arguments.callee(i,l,m,k,j)}};var f=function(h,j,i){if(h.measureText(j).width<=i||j.length<1){return j}var k=e(h,j,0,j.length,i);return j.substring(0,k)+"\n"+arguments.callee(h,j.substring(k),i)};var b="";var c=g.split("\n");for(var d=0;dthis.baseTexture.width||b.y+b.height>this.baseTexture.height){throw new Error("Texture Error: frame does not fit inside the base Texture dimensions "+this)}this.updateFrame=true;PIXI.Texture.frameUpdates.push(this)};PIXI.Texture.fromImage=function(c,b){var d=PIXI.TextureCache[c];if(!d){d=new PIXI.Texture(PIXI.BaseTexture.fromImage(c,b));PIXI.TextureCache[c]=d}return d};PIXI.Texture.fromFrame=function(c){var b=PIXI.TextureCache[c];if(!b){throw new Error("The frameId '"+c+"' does not exist in the texture cache "+this)}return b};PIXI.Texture.fromCanvas=function(b){var c=new PIXI.BaseTexture(b);return new PIXI.Texture(c)};PIXI.Texture.addTextureToCache=function(b,c){PIXI.TextureCache[c]=b};PIXI.Texture.removeTextureFromCache=function(c){var b=PIXI.TextureCache[c];PIXI.TextureCache[c]=null;return b};PIXI.Texture.frameUpdates=[];PIXI.RenderTexture=function(c,b){PIXI.EventTarget.call(this);this.width=c||100;this.height=b||100;this.indetityMatrix=PIXI.mat3.create();this.frame=new PIXI.Rectangle(0,0,this.width,this.height);if(PIXI.gl){this.initWebGL()}else{this.initCanvas()}};PIXI.RenderTexture.prototype=Object.create(PIXI.Texture.prototype);PIXI.RenderTexture.prototype.constructor=PIXI.RenderTexture;PIXI.RenderTexture.prototype.initWebGL=function(){var b=PIXI.gl;this.glFramebuffer=b.createFramebuffer();b.bindFramebuffer(b.FRAMEBUFFER,this.glFramebuffer);this.glFramebuffer.width=this.width;this.glFramebuffer.height=this.height;this.baseTexture=new PIXI.BaseTexture();this.baseTexture.width=this.width;this.baseTexture.height=this.height;this.baseTexture._glTexture=b.createTexture();b.bindTexture(b.TEXTURE_2D,this.baseTexture._glTexture);b.texImage2D(b.TEXTURE_2D,0,b.RGBA,this.width,this.height,0,b.RGBA,b.UNSIGNED_BYTE,null);b.texParameteri(b.TEXTURE_2D,b.TEXTURE_MAG_FILTER,b.LINEAR);b.texParameteri(b.TEXTURE_2D,b.TEXTURE_MIN_FILTER,b.LINEAR);b.texParameteri(b.TEXTURE_2D,b.TEXTURE_WRAP_S,b.CLAMP_TO_EDGE);b.texParameteri(b.TEXTURE_2D,b.TEXTURE_WRAP_T,b.CLAMP_TO_EDGE);this.baseTexture.isRender=true;b.bindFramebuffer(b.FRAMEBUFFER,this.glFramebuffer);b.framebufferTexture2D(b.FRAMEBUFFER,b.COLOR_ATTACHMENT0,b.TEXTURE_2D,this.baseTexture._glTexture,0);this.projection=new PIXI.Point(this.width/2,this.height/2);this.render=this.renderWebGL};PIXI.RenderTexture.prototype.resize=function(c,b){this.width=c;this.height=b;if(PIXI.gl){this.projection.x=this.width/2;this.projection.y=this.height/2;var d=PIXI.gl;d.bindTexture(d.TEXTURE_2D,this.baseTexture._glTexture);d.texImage2D(d.TEXTURE_2D,0,d.RGBA,this.width,this.height,0,d.RGBA,d.UNSIGNED_BYTE,null)}else{this.frame.width=this.width;this.frame.height=this.height;this.renderer.resize(this.width,this.height)}};PIXI.RenderTexture.prototype.initCanvas=function(){this.renderer=new PIXI.CanvasRenderer(this.width,this.height,null,0);this.baseTexture=new PIXI.BaseTexture(this.renderer.view);this.frame=new PIXI.Rectangle(0,0,this.width,this.height);this.render=this.renderCanvas};PIXI.RenderTexture.prototype.renderWebGL=function(k,g,h){var f=PIXI.gl;f.colorMask(true,true,true,true);f.viewport(0,0,this.width,this.height);f.bindFramebuffer(f.FRAMEBUFFER,this.glFramebuffer);if(h){f.clearColor(0,0,0,0);f.clear(f.COLOR_BUFFER_BIT)}var c=k.children;var b=k.worldTransform;k.worldTransform=PIXI.mat3.create();k.worldTransform[4]=-1;k.worldTransform[5]=this.projection.y*2;if(g){k.worldTransform[2]=g.x;k.worldTransform[5]-=g.y}PIXI.visibleCount++;k.vcount=PIXI.visibleCount;for(var e=0,d=c.length;e>1;if(k<3){return[]}var u=[];var g=[];for(var s=0;s3){var q=g[(s+0)%o];var m=g[(s+1)%o];var l=g[(s+2)%o];var f=h[2*q],d=h[2*q+1];var v=h[2*m],t=h[2*m+1];var c=h[2*l],b=h[2*l+1];var e=false;if(PIXI.PolyK._convex(f,d,v,t,c,b,z)){e=true;for(var r=0;r3*o){if(z){var u=[];g=[];for(var s=0;s=0)&&(m>=0)&&(n+m<1)};PIXI.PolyK._convex=function(e,d,g,f,b,h,c){return((d-f)*(b-g)+(g-e)*(h-f)>=0)==c};Phaser.Camera=function(d,g,c,f,e,b){this.game=d;this.world=d.world;this.id=0;this.view=new Phaser.Rectangle(c,f,e,b);this.screenView=new Phaser.Rectangle(c,f,e,b);this.deadzone=null;this.visible=true;this.atLimit={x:false,y:false};this.target=null;this._edge=0};Phaser.Camera.FOLLOW_LOCKON=0;Phaser.Camera.FOLLOW_PLATFORMER=1;Phaser.Camera.FOLLOW_TOPDOWN=2;Phaser.Camera.FOLLOW_TOPDOWN_TIGHT=3;Phaser.Camera.prototype={follow:function(f,d){if(typeof d==="undefined"){d=Phaser.Camera.FOLLOW_LOCKON}this.target=f;var e;switch(d){case Phaser.Camera.FOLLOW_PLATFORMER:var b=this.width/8;var c=this.height/3;this.deadzone=new Phaser.Rectangle((this.width-b)/2,(this.height-c)/2-c*0.25,b,c);break;case Phaser.Camera.FOLLOW_TOPDOWN:e=Math.max(this.width,this.height)/4;this.deadzone=new Phaser.Rectangle((this.width-e)/2,(this.height-e)/2,e,e);break;case Phaser.Camera.FOLLOW_TOPDOWN_TIGHT:e=Math.max(this.width,this.height)/8;this.deadzone=new Phaser.Rectangle((this.width-e)/2,(this.height-e)/2,e,e);break;case Phaser.Camera.FOLLOW_LOCKON:default:this.deadzone=null;break}},focusOnXY:function(b,c){this.view.x=Math.round(b-this.view.halfWidth);this.view.y=Math.round(c-this.view.halfHeight)},update:function(){if(this.target!==null){if(this.deadzone){this._edge=this.target.x-this.deadzone.x;if(this.view.x>this._edge){this.view.x=this._edge}this._edge=this.target.x+this.target.width-this.deadzone.x-this.deadzone.width;if(this.view.xthis._edge){this.view.y=this._edge}this._edge=this.target.y+this.target.height-this.deadzone.y-this.deadzone.height;if(this.view.ythis.world.bounds.right-this.width){this.atLimit.x=true;this.view.x=(this.world.bounds.right-this.width)+1}if(this.view.ythis.world.bounds.bottom-this.height){this.atLimit.y=true;this.view.y=(this.world.bounds.bottom-this.height)+1}this.view.floor()},setPosition:function(b,c){this.view.x=b;this.view.y=c;this.checkWorldBounds()},setSize:function(c,b){this.view.width=c;this.view.height=b}};Object.defineProperty(Phaser.Camera.prototype,"x",{get:function(){return this.view.x},set:function(b){this.view.x=b;this.checkWorldBounds()}});Object.defineProperty(Phaser.Camera.prototype,"y",{get:function(){return this.view.y},set:function(b){this.view.y=b;this.checkWorldBounds()}});Object.defineProperty(Phaser.Camera.prototype,"width",{get:function(){return this.view.width},set:function(b){this.view.width=b}});Object.defineProperty(Phaser.Camera.prototype,"height",{get:function(){return this.view.height},set:function(b){this.view.height=b}});Phaser.State=function(){this.game=null;this.add=null;this.camera=null;this.cache=null;this.input=null;this.load=null;this.sound=null;this.stage=null;this.time=null;this.tweens=null;this.world=null;this.particles=null;this.physics=null};Phaser.State.prototype={link:function(b){this.game=b;this.add=b.add;this.camera=b.camera;this.cache=b.cache;this.input=b.input;this.load=b.load;this.sound=b.sound;this.stage=b.stage;this.time=b.time;this.tweens=b.tweens;this.world=b.world;this.particles=b.particles;this.physics=b.physics},preload:function(){},create:function(){},update:function(){},render:function(){},paused:function(){},destroy:function(){}};Phaser.StateManager=function(c,b){this.game=c;this.states={};if(b!==null){this._pendingState=b}};Phaser.StateManager.prototype={game:null,_pendingState:null,_created:false,states:{},current:"",onInitCallback:null,onPreloadCallback:null,onCreateCallback:null,onUpdateCallback:null,onRenderCallback:null,onPreRenderCallback:null,onLoadUpdateCallback:null,onLoadRenderCallback:null,onPausedCallback:null,onShutDownCallback:null,boot:function(){if(this._pendingState!==null){if(typeof this._pendingState==="string"){this.start(this._pendingState,false,false)}else{this.add("default",this._pendingState,true)}}},add:function(c,d,b){if(typeof b==="undefined"){b=false}var e;if(d instanceof Phaser.State){e=d;e.link(this.game)}else{if(typeof d==="object"){e=d}else{if(typeof d==="function"){e=new d(this.game)}}}this.states[c]=e;if(b){if(this.game.isBooted){this.start(c)}else{this._pendingState=c}}return e},remove:function(b){if(this.current==b){this.callbackContext=null;this.onInitCallback=null;this.onShutDownCallback=null;this.onPreloadCallback=null;this.onLoadRenderCallback=null;this.onLoadUpdateCallback=null;this.onCreateCallback=null;this.onUpdateCallback=null;this.onRenderCallback=null;this.onPausedCallback=null;this.onDestroyCallback=null}delete this.states[b]},start:function(c,b,d){if(typeof b==="undefined"){b=true}if(typeof d==="undefined"){d=false}if(this.game.isBooted==false){this._pendingState=c;return}if(this.checkState(c)==false){return}else{if(this.current){this.onShutDownCallback.call(this.callbackContext)}if(b){if(d==true){this.game.cache.destroy()}}this.setCurrentState(c)}if(this.onPreloadCallback){this.game.load.reset();this.onPreloadCallback.call(this.callbackContext);if(this.game.load.queueSize==0){this.game.loadComplete();if(this.onCreateCallback){this.onCreateCallback.call(this.callbackContext)}this._created=true}else{this.game.load.start()}}else{if(this.onCreateCallback){this.onCreateCallback.call(this.callbackContext)}this._created=true;this.game.loadComplete()}},dummy:function(){},checkState:function(b){if(this.states[b]){var c=false;if(this.states[b]["preload"]){c=true}if(c==false&&this.states[b]["loadRender"]){c=true}if(c==false&&this.states[b]["loadUpdate"]){c=true}if(c==false&&this.states[b]["create"]){c=true}if(c==false&&this.states[b]["update"]){c=true}if(c==false&&this.states[b]["preRender"]){c=true}if(c==false&&this.states[b]["render"]){c=true}if(c==false&&this.states[b]["paused"]){c=true}if(c==false){console.warn("Invalid Phaser State object given. Must contain at least a one of the required functions.");return false}return true}else{console.warn("Phaser.StateManager - No state found with the key: "+b);return false}},setCurrentState:function(b){this.callbackContext=this.states[b];this.onInitCallback=this.states[b]["init"]||this.dummy;this.onPreloadCallback=this.states[b]["preload"]||null;this.onLoadRenderCallback=this.states[b]["loadRender"]||null;this.onLoadUpdateCallback=this.states[b]["loadUpdate"]||null;this.onCreateCallback=this.states[b]["create"]||null;this.onUpdateCallback=this.states[b]["update"]||null;this.onPreRenderCallback=this.states[b]["preRender"]||null;this.onRenderCallback=this.states[b]["render"]||null;this.onPausedCallback=this.states[b]["paused"]||null;this.onShutDownCallback=this.states[b]["shutdown"]||this.dummy;this.current=b;this._created=false;this.onInitCallback.call(this.callbackContext)},loadComplete:function(){if(this._created==false&&this.onCreateCallback){this.onCreateCallback.call(this.callbackContext);this._created=true}},update:function(){if(this._created&&this.onUpdateCallback){this.onUpdateCallback.call(this.callbackContext)}else{if(this.onLoadUpdateCallback){this.onLoadUpdateCallback.call(this.callbackContext)}}},preRender:function(){if(this.onPreRenderCallback){this.onPreRenderCallback.call(this.callbackContext)}},render:function(){if(this._created&&this.onRenderCallback){this.onRenderCallback.call(this.callbackContext)}else{if(this.onLoadRenderCallback){this.onLoadRenderCallback.call(this.callbackContext)}}},destroy:function(){this.callbackContext=null;this.onInitCallback=null;this.onShutDownCallback=null;this.onPreloadCallback=null;this.onLoadRenderCallback=null;this.onLoadUpdateCallback=null;this.onCreateCallback=null;this.onUpdateCallback=null;this.onRenderCallback=null;this.onPausedCallback=null;this.onDestroyCallback=null;this.game=null;this.states={};this._pendingState=null}};Phaser.LinkedList=function(){this.next=null;this.prev=null;this.first=null;this.last=null;this.total=0};Phaser.LinkedList.prototype={add:function(b){if(this.total==0&&this.first==null&&this.last==null){this.first=b;this.last=b;this.next=b;b.prev=this;this.total++;return}this.last.next=b;b.prev=this.last;this.last=b;this.total++;return b},remove:function(c){if(this.first==null&&this.last==null){return}this.total--;if(this.first==c&&this.last==c){this.first=null;this.last=null;this.next=null;c.next=null;c.prev=null;return}var b=c.prev;if(c.next){c.next.prev=c.prev}b.next=c.next},callAll:function(c){var b=this.first;do{if(b[c]){b[c].call(b)}b=b.next}while(b!=this.last.next)},dump:function(){var j=20;var e="\n"+Phaser.Utils.pad("Node",j)+"|"+Phaser.Utils.pad("Next",j)+"|"+Phaser.Utils.pad("Previous",j)+"|"+Phaser.Utils.pad("First",j)+"|"+Phaser.Utils.pad("Last",j);console.log(e);var e=Phaser.Utils.pad("----------",j)+"|"+Phaser.Utils.pad("----------",j)+"|"+Phaser.Utils.pad("----------",j)+"|"+Phaser.Utils.pad("----------",j)+"|"+Phaser.Utils.pad("----------",j);console.log(e);var g=this;var c=g.last.next;g=g.first;do{var d=g.sprite.name||"*";var f="-";var b="-";var h="-";var i="-";if(g.next){f=g.next.sprite.name}if(g.prev){b=g.prev.sprite.name}if(g.first){h=g.first.sprite.name}if(g.last){i=g.last.sprite.name}if(typeof f==="undefined"){f="-"}if(typeof b==="undefined"){b="-"}if(typeof h==="undefined"){h="-"}if(typeof i==="undefined"){i="-"}var e=Phaser.Utils.pad(d,j)+"|"+Phaser.Utils.pad(f,j)+"|"+Phaser.Utils.pad(b,j)+"|"+Phaser.Utils.pad(h,j)+"|"+Phaser.Utils.pad(i,j);console.log(e);g=g.next}while(g!=c)}};Phaser.Signal=function(){this._bindings=[];this._prevParams=null;var b=this;this.dispatch=function(){Phaser.Signal.prototype.dispatch.apply(b,arguments)}};Phaser.Signal.prototype={memorize:false,_shouldPropagate:true,active:true,validateListener:function(b,c){if(typeof b!=="function"){throw new Error("listener is a required param of {fn}() and should be a Function.".replace("{fn}",c))}},_registerListener:function(f,d,e,c){var b=this._indexOfListener(f,e),g;if(b!==-1){g=this._bindings[b];if(g.isOnce()!==d){throw new Error("You cannot add"+(d?"":"Once")+"() then add"+(!d?"":"Once")+"() the same listener without removing the relationship first.")}}else{g=new Phaser.SignalBinding(this,f,d,e,c);this._addBinding(g)}if(this.memorize&&this._prevParams){g.execute(this._prevParams)}return g},_addBinding:function(b){var c=this._bindings.length;do{--c}while(this._bindings[c]&&b._priority<=this._bindings[c]._priority);this._bindings.splice(c+1,0,b)},_indexOfListener:function(c,b){var e=this._bindings.length,d;while(e--){d=this._bindings[e];if(d._listener===c&&d.context===b){return e}}return -1},has:function(c,b){return this._indexOfListener(c,b)!==-1},add:function(d,c,b){this.validateListener(d,"add");return this._registerListener(d,false,c,b)},addOnce:function(d,c,b){this.validateListener(d,"addOnce");return this._registerListener(d,true,c,b)},remove:function(d,c){this.validateListener(d,"remove");var b=this._indexOfListener(d,c);if(b!==-1){this._bindings[b]._destroy();this._bindings.splice(b,1)}return d},removeAll:function(){var b=this._bindings.length;while(b--){this._bindings[b]._destroy()}this._bindings.length=0},getNumListeners:function(){return this._bindings.length},halt:function(){this._shouldPropagate=false},dispatch:function(c){if(!this.active){return}var b=Array.prototype.slice.call(arguments),e=this._bindings.length,d;if(this.memorize){this._prevParams=b}if(!e){return}d=this._bindings.slice();this._shouldPropagate=true;do{e--}while(d[e]&&this._shouldPropagate&&d[e].execute(b)!==false)},forget:function(){this._prevParams=null},dispose:function(){this.removeAll();delete this._bindings;delete this._prevParams},toString:function(){return"[Phaser.Signal active:"+this.active+" numListeners:"+this.getNumListeners()+"]"}};Phaser.SignalBinding=function(f,e,c,d,b){this._listener=e;this._isOnce=c;this.context=d;this._signal=f;this._priority=b||0};Phaser.SignalBinding.prototype={active:true,params:null,execute:function(b){var d,c;if(this.active&&!!this._listener){c=this.params?this.params.concat(b):b;d=this._listener.apply(this.context,c);if(this._isOnce){this.detach()}}return d},detach:function(){return this.isBound()?this._signal.remove(this._listener,this.context):null},isBound:function(){return(!!this._signal&&!!this._listener)},isOnce:function(){return this._isOnce},getListener:function(){return this._listener},getSignal:function(){return this._signal},_destroy:function(){delete this._signal;delete this._listener;delete this.context},toString:function(){return"[Phaser.SignalBinding isOnce:"+this._isOnce+", isBound:"+this.isBound()+", active:"+this.active+"]"}};Phaser.Plugin=function(b,c){this.game=b;this.parent=c;this.active=false;this.visible=false;this.hasPreUpdate=false;this.hasUpdate=false;this.hasRender=false;this.hasPostRender=false};Phaser.Plugin.prototype={preUpdate:function(){},update:function(){},render:function(){},postRender:function(){},destroy:function(){this.game=null;this.parent=null;this.active=false;this.visible=false}};Phaser.PluginManager=function(b,c){this.game=b;this._parent=c;this.plugins=[];this._pluginsLength=0};Phaser.PluginManager.prototype={add:function(c){var b=false;if(typeof c==="function"){c=new c(this.game,this._parent)}else{c.game=this.game;c.parent=this._parent}if(typeof c.preUpdate==="function"){c.hasPreUpdate=true;b=true}if(typeof c.update==="function"){c.hasUpdate=true;b=true}if(typeof c.render==="function"){c.hasRender=true;b=true}if(typeof c.postRender==="function"){c.hasPostRender=true;b=true}if(b){if(c.hasPreUpdate||c.hasUpdate){c.active=true}if(c.hasRender||c.hasPostRender){c.visible=true}this._pluginsLength=this.plugins.push(c);return c}else{return null}},remove:function(b){this._pluginsLength--},preUpdate:function(){if(this._pluginsLength==0){return}for(this._p=0;this._p0)},removeBetween:function(d,c){if(d>c||d<0||c>this._container.children.length){return false}for(var b=d;b=this.game.width){this.bounds.width=c}if(b>=this.game.height){this.bounds.height=b}}};Object.defineProperty(Phaser.World.prototype,"width",{get:function(){return this.bounds.width},set:function(b){this.bounds.width=b}});Object.defineProperty(Phaser.World.prototype,"height",{get:function(){return this.bounds.height},set:function(b){this.bounds.height=b}});Object.defineProperty(Phaser.World.prototype,"centerX",{get:function(){return this.bounds.halfWidth}});Object.defineProperty(Phaser.World.prototype,"centerY",{get:function(){return this.bounds.halfHeight}});Object.defineProperty(Phaser.World.prototype,"randomX",{get:function(){return Math.round(Math.random()*this.bounds.width)}});Object.defineProperty(Phaser.World.prototype,"randomY",{get:function(){return Math.round(Math.random()*this.bounds.height)}});Phaser.Game=function(e,b,g,d,f,h,c){e=e||800;b=b||600;g=g||Phaser.AUTO;d=d||"";f=f||null;h=h||false;c=c||true;this.id=Phaser.GAMES.push(this)-1;this.parent=d;this.width=e;this.height=b;this.transparent=h;this.antialias=c;this.renderer=null;this.state=new Phaser.StateManager(this,f);this._paused=false;this.renderType=g;this._loadComplete=false;this.isBooted=false;this.isRunning=false;this.raf=null;this.add=null;this.cache=null;this.input=null;this.load=null;this.math=null;this.net=null;this.sound=null;this.stage=null;this.time=null;this.tweens=null;this.world=null;this.physics=null;this.rnd=null;this.device=null;this.camera=null;this.canvas=null;this.context=null;this.debug=null;this.particles=null;var i=this;this._onBoot=function(){return i.boot()};if(document.readyState==="complete"||document.readyState==="interactive"){window.setTimeout(this._onBoot,0)}else{document.addEventListener("DOMContentLoaded",this._onBoot,false);window.addEventListener("load",this._onBoot,false)}return this};Phaser.Game.prototype={boot:function(){if(this.isBooted){return}if(!document.body){window.setTimeout(this._onBoot,20)}else{document.removeEventListener("DOMContentLoaded",this._onBoot);window.removeEventListener("load",this._onBoot);this.onPause=new Phaser.Signal;this.onResume=new Phaser.Signal;this.isBooted=true;this.device=new Phaser.Device();this.math=Phaser.Math;this.rnd=new Phaser.RandomDataGenerator([(Date.now()*Math.random()).toString()]);this.stage=new Phaser.Stage(this,this.width,this.height);this.setUpRenderer();this.world=new Phaser.World(this);this.add=new Phaser.GameObjectFactory(this);this.cache=new Phaser.Cache(this);this.load=new Phaser.Loader(this);this.time=new Phaser.Time(this);this.tweens=new Phaser.TweenManager(this);this.input=new Phaser.Input(this);this.sound=new Phaser.SoundManager(this);this.physics=new Phaser.Physics.Arcade(this);this.particles=new Phaser.Particles(this);this.plugins=new Phaser.PluginManager(this,this);this.net=new Phaser.Net(this);this.debug=new Phaser.Utils.Debug(this);this.load.onLoadComplete.add(this.loadComplete,this);this.stage.boot();this.world.boot();this.state.boot();this.input.boot();this.sound.boot();if(this.renderType==Phaser.CANVAS){console.log("%cPhaser "+Phaser.VERSION+" initialized. Rendering to Canvas","color: #ffff33; background: #000000")}else{console.log("%cPhaser "+Phaser.VERSION+" initialized. Rendering to WebGL","color: #ffff33; background: #000000")}this.isRunning=true;this._loadComplete=false;this.raf=new Phaser.RequestAnimationFrame(this);this.raf.start()}},setUpRenderer:function(){if(this.renderType===Phaser.CANVAS||(this.renderType===Phaser.AUTO&&this.device.webGL==false)){if(this.device.canvas){this.renderType=Phaser.CANVAS;this.renderer=new PIXI.CanvasRenderer(this.width,this.height,this.stage.canvas,this.transparent);Phaser.Canvas.setSmoothingEnabled(this.renderer.context,this.antialias);this.canvas=this.renderer.view;this.context=this.renderer.context}else{throw new Error("Phaser.Game - cannot create Canvas or WebGL context, aborting.")}}else{this.renderType=Phaser.WEBGL;this.renderer=new PIXI.WebGLRenderer(this.width,this.height,this.stage.canvas,this.transparent,this.antialias);this.canvas=this.renderer.view;this.context=null}Phaser.Canvas.addToDOM(this.renderer.view,this.parent,true);Phaser.Canvas.setTouchAction(this.renderer.view)},loadComplete:function(){this._loadComplete=true;this.state.loadComplete()},update:function(b){this.time.update(b);if(!this._paused){this.plugins.preUpdate();this.physics.preUpdate();this.input.update();this.tweens.update();this.sound.update();this.world.update();this.particles.update();this.state.update();this.plugins.update();this.renderer.render(this.stage._stage);this.plugins.render();this.state.render();this.plugins.postRender()}},destroy:function(){this.state.destroy();this.state=null;this.cache=null;this.input=null;this.load=null;this.sound=null;this.stage=null;this.time=null;this.world=null;this.isBooted=false}};Object.defineProperty(Phaser.Game.prototype,"paused",{get:function(){return this._paused},set:function(b){if(b===true){if(this._paused==false){this._paused=true;this.onPause.dispatch(this)}}else{if(this._paused){this._paused=false;this.onResume.dispatch(this)}}}});Phaser.Input=function(b){this.game=b;this.hitCanvas=null;this.hitContext=null};Phaser.Input.MOUSE_OVERRIDES_TOUCH=0;Phaser.Input.TOUCH_OVERRIDES_MOUSE=1;Phaser.Input.MOUSE_TOUCH_COMBINE=2;Phaser.Input.prototype={game:null,pollRate:0,_pollCounter:0,_oldPosition:null,_x:0,_y:0,disabled:false,multiInputOverride:Phaser.Input.MOUSE_TOUCH_COMBINE,position:null,speed:null,circle:null,scale:null,maxPointers:10,currentPointers:0,tapRate:200,doubleTapRate:300,holdRate:2000,justPressedRate:200,justReleasedRate:200,recordPointerHistory:false,recordRate:100,recordLimit:100,pointer1:null,pointer2:null,pointer3:null,pointer4:null,pointer5:null,pointer6:null,pointer7:null,pointer8:null,pointer9:null,pointer10:null,activePointer:null,mousePointer:null,mouse:null,keyboard:null,touch:null,mspointer:null,onDown:null,onUp:null,onTap:null,onHold:null,interactiveItems:new Phaser.LinkedList(),boot:function(){this.mousePointer=new Phaser.Pointer(this.game,0);this.pointer1=new Phaser.Pointer(this.game,1);this.pointer2=new Phaser.Pointer(this.game,2);this.mouse=new Phaser.Mouse(this.game);this.keyboard=new Phaser.Keyboard(this.game);this.touch=new Phaser.Touch(this.game);this.mspointer=new Phaser.MSPointer(this.game);this.onDown=new Phaser.Signal();this.onUp=new Phaser.Signal();this.onTap=new Phaser.Signal();this.onHold=new Phaser.Signal();this.scale=new Phaser.Point(1,1);this.speed=new Phaser.Point();this.position=new Phaser.Point();this._oldPosition=new Phaser.Point();this.circle=new Phaser.Circle(0,0,44);this.activePointer=this.mousePointer;this.currentPointers=0;this.hitCanvas=document.createElement("canvas");this.hitCanvas.width=1;this.hitCanvas.height=1;this.hitContext=this.hitCanvas.getContext("2d");this.mouse.start();this.keyboard.start();this.touch.start();this.mspointer.start();this.mousePointer.active=true},addPointer:function(){var c=0;for(var b=10;b>0;b--){if(this["pointer"+b]===null){c=b}}if(c==0){console.warn("You can only have 10 Pointer objects");return null}else{this["pointer"+c]=new Phaser.Pointer(this.game,c);return this["pointer"+c]}},update:function(){if(this.pollRate>0&&this._pollCounter0&&this._pollCounter=this.game.input.holdRate){if(this.game.input.multiInputOverride==Phaser.Input.MOUSE_OVERRIDES_TOUCH||this.game.input.multiInputOverride==Phaser.Input.MOUSE_TOUCH_COMBINE||(this.game.input.multiInputOverride==Phaser.Input.TOUCH_OVERRIDES_MOUSE&&this.game.input.currentPointers==0)){this.game.input.onHold.dispatch(this)}this._holdSent=true}if(this.game.input.recordPointerHistory&&this.game.time.now>=this._nextDrop){this._nextDrop=this.game.time.now+this.game.input.recordRate;this._history.push({x:this.position.x,y:this.position.y});if(this._history.length>this.game.input.recordLimit){this._history.shift()}}}},move:function(c){if(this.game.input.pollLocked){return}if(c.button){this.button=c.button}this.clientX=c.clientX;this.clientY=c.clientY;this.pageX=c.pageX;this.pageY=c.pageY;this.screenX=c.screenX;this.screenY=c.screenY;this.x=(this.pageX-this.game.stage.offset.x)*this.game.input.scale.x;this.y=(this.pageY-this.game.stage.offset.y)*this.game.input.scale.y;this.position.setTo(this.x,this.y);this.circle.x=this.x;this.circle.y=this.y;if(this.game.input.multiInputOverride==Phaser.Input.MOUSE_OVERRIDES_TOUCH||this.game.input.multiInputOverride==Phaser.Input.MOUSE_TOUCH_COMBINE||(this.game.input.multiInputOverride==Phaser.Input.TOUCH_OVERRIDES_MOUSE&&this.game.input.currentPointers==0)){this.game.input.activePointer=this;this.game.input.x=this.x;this.game.input.y=this.y;this.game.input.position.setTo(this.game.input.x,this.game.input.y);this.game.input.circle.x=this.game.input.x;this.game.input.circle.y=this.game.input.y}if(this.game.paused){return this}if(this.targetObject!==null&&this.targetObject.isDragged==true){if(this.targetObject.update(this)==false){this.targetObject=null}return this}this._highestRenderOrderID=-1;this._highestRenderObject=null;this._highestInputPriorityID=-1;if(this.game.input.interactiveItems.total>0){var b=this.game.input.interactiveItems.next;do{if(b.priorityID>this._highestInputPriorityID||(b.priorityID==this._highestInputPriorityID&&b.sprite.renderOrderID>this._highestRenderOrderID)){if(b.checkPointerOver(this)){this._highestRenderOrderID=b.sprite.renderOrderID;this._highestInputPriorityID=b.priorityID;this._highestRenderObject=b}}b=b.next}while(b!=null)}if(this._highestRenderObject==null){if(this.targetObject){this.targetObject._pointerOutHandler(this);this.targetObject=null}}else{if(this.targetObject==null){this.targetObject=this._highestRenderObject;this._highestRenderObject._pointerOverHandler(this)}else{if(this.targetObject==this._highestRenderObject){if(this._highestRenderObject.update(this)==false){this.targetObject=null}}else{this.targetObject._pointerOutHandler(this);this.targetObject=this._highestRenderObject;this.targetObject._pointerOverHandler(this)}}}return this},leave:function(b){this.withinGame=false;this.move(b)},stop:function(c){if(this._stateReset){c.preventDefault();return}this.timeUp=this.game.time.now;if(this.game.input.multiInputOverride==Phaser.Input.MOUSE_OVERRIDES_TOUCH||this.game.input.multiInputOverride==Phaser.Input.MOUSE_TOUCH_COMBINE||(this.game.input.multiInputOverride==Phaser.Input.TOUCH_OVERRIDES_MOUSE&&this.game.input.currentPointers==0)){this.game.input.onUp.dispatch(this);if(this.duration>=0&&this.duration<=this.game.input.tapRate){if(this.timeUp-this.previousTapTime0){this.active=false}this.withinGame=false;this.isDown=false;this.isUp=true;if(this.isMouse==false){this.game.input.currentPointers--}if(this.game.input.interactiveItems.total>0){var b=this.game.input.interactiveItems.next;do{if(b){b._releasedHandler(this)}b=b.next}while(b!=null)}if(this.targetObject){this.targetObject._releasedHandler(this)}this.targetObject=null;return this},justPressed:function(b){b=b||this.game.input.justPressedRate;return(this.isDown===true&&(this.timeDown+b)>this.game.time.now)},justReleased:function(b){b=b||this.game.input.justReleasedRate;return(this.isUp===true&&(this.timeUp+b)>this.game.time.now)},reset:function(){if(this.isMouse==false){this.active=false}this.identifier=null;this.isDown=false;this.isUp=true;this.totalTouches=0;this._holdSent=false;this._history.length=0;this._stateReset=true;if(this.targetObject){this.targetObject._releasedHandler(this)}this.targetObject=null},toString:function(){return"[{Pointer (id="+this.id+" identifer="+this.identifier+" active="+this.active+" duration="+this.duration+" withinGame="+this.withinGame+" x="+this.x+" y="+this.y+" clientX="+this.clientX+" clientY="+this.clientY+" screenX="+this.screenX+" screenY="+this.screenY+" pageX="+this.pageX+" pageY="+this.pageY+")}]"}};Object.defineProperty(Phaser.Pointer.prototype,"duration",{get:function(){if(this.isUp){return -1}return this.game.time.now-this.timeDown}});Object.defineProperty(Phaser.Pointer.prototype,"worldX",{get:function(){return this.game.world.camera.x+this.x}});Object.defineProperty(Phaser.Pointer.prototype,"worldY",{get:function(){return this.game.world.camera.y+this.y}});Phaser.Touch=function(b){this.game=b;this.callbackContext=this.game;this.touchStartCallback=null;this.touchMoveCallback=null;this.touchEndCallback=null;this.touchEnterCallback=null;this.touchLeaveCallback=null;this.touchCancelCallback=null;this.preventDefault=true};Phaser.Touch.prototype={game:null,disabled:false,_onTouchStart:null,_onTouchMove:null,_onTouchEnd:null,_onTouchEnter:null,_onTouchLeave:null,_onTouchCancel:null,_onTouchMove:null,start:function(){var b=this;if(this.game.device.touch){this._onTouchStart=function(c){return b.onTouchStart(c)};this._onTouchMove=function(c){return b.onTouchMove(c)};this._onTouchEnd=function(c){return b.onTouchEnd(c)};this._onTouchEnter=function(c){return b.onTouchEnter(c)};this._onTouchLeave=function(c){return b.onTouchLeave(c)};this._onTouchCancel=function(c){return b.onTouchCancel(c)};this.game.renderer.view.addEventListener("touchstart",this._onTouchStart,false);this.game.renderer.view.addEventListener("touchmove",this._onTouchMove,false);this.game.renderer.view.addEventListener("touchend",this._onTouchEnd,false);this.game.renderer.view.addEventListener("touchenter",this._onTouchEnter,false);this.game.renderer.view.addEventListener("touchleave",this._onTouchLeave,false);this.game.renderer.view.addEventListener("touchcancel",this._onTouchCancel,false)}},consumeDocumentTouches:function(){this._documentTouchMove=function(b){b.preventDefault()};document.addEventListener("touchmove",this._documentTouchMove,false)},onTouchStart:function(c){if(this.touchStartCallback){this.touchStartCallback.call(this.callbackContext,c)}if(this.game.input.disabled||this.disabled){return}if(this.preventDefault){c.preventDefault()}for(var b=0;bb&&this._tempPoint.xc&&this._tempPoint.y=this.pixelPerfectAlpha){return true}}return false},update:function(b){if(this.enabled==false||this.sprite.visible==false){this._pointerOutHandler(b);return false}if(this.draggable&&this._draggedPointerID==b.id){return this.updateDrag(b)}else{if(this._pointerData[b.id].isOver==true){if(this.checkPointerOver(b)){this._pointerData[b.id].x=b.x-this.sprite.x;this._pointerData[b.id].y=b.y-this.sprite.y;return true}else{this._pointerOutHandler(b);return false}}}},_pointerOverHandler:function(b){if(this._pointerData[b.id].isOver==false){this._pointerData[b.id].isOver=true;this._pointerData[b.id].isOut=false;this._pointerData[b.id].timeOver=this.game.time.now;this._pointerData[b.id].x=b.x-this.sprite.x;this._pointerData[b.id].y=b.y-this.sprite.y;if(this.useHandCursor&&this._pointerData[b.id].isDragged==false){this.game.stage.canvas.style.cursor="pointer"}this.sprite.events.onInputOver.dispatch(this.sprite,b)}},_pointerOutHandler:function(b){this._pointerData[b.id].isOver=false;this._pointerData[b.id].isOut=true;this._pointerData[b.id].timeOut=this.game.time.now;if(this.useHandCursor&&this._pointerData[b.id].isDragged==false){this.game.stage.canvas.style.cursor="default"}this.sprite.events.onInputOut.dispatch(this.sprite,b)},_touchedHandler:function(b){if(this._pointerData[b.id].isDown==false&&this._pointerData[b.id].isOver==true){this._pointerData[b.id].isDown=true;this._pointerData[b.id].isUp=false;this._pointerData[b.id].timeDown=this.game.time.now;this.sprite.events.onInputDown.dispatch(this.sprite,b);if(this.draggable&&this.isDragged==false){this.startDrag(b)}if(this.bringToTop){this.sprite.bringToTop()}}return this.consumePointerEvent},_releasedHandler:function(b){if(this._pointerData[b.id].isDown&&b.isUp){this._pointerData[b.id].isDown=false;this._pointerData[b.id].isUp=true;this._pointerData[b.id].timeUp=this.game.time.now;this._pointerData[b.id].downDuration=this._pointerData[b.id].timeUp-this._pointerData[b.id].timeDown;if(this.checkPointerOver(b)){this.sprite.events.onInputUp.dispatch(this.sprite,b)}else{if(this.useHandCursor){this.game.stage.canvas.style.cursor="default"}}if(this.draggable&&this.isDragged&&this._draggedPointerID==b.id){this.stopDrag(b)}}},updateDrag:function(b){if(b.isUp){this.stopDrag(b);return false}if(this.allowHorizontalDrag){this.sprite.x=b.x+this._dragPoint.x+this.dragOffset.x}if(this.allowVerticalDrag){this.sprite.y=b.y+this._dragPoint.y+this.dragOffset.y}if(this.boundsRect){this.checkBoundsRect()}if(this.boundsSprite){this.checkBoundsSprite()}if(this.snapOnDrag){this.sprite.x=Math.floor(this.sprite.x/this.snapX)*this.snapX;this.sprite.y=Math.floor(this.sprite.y/this.snapY)*this.snapY}return true},justOver:function(c,b){c=c||0;b=b||500;return(this._pointerData[c].isOver&&this.overDuration(c)this.boundsRect.right){this.sprite.x=this.boundsRect.right-this.sprite.width}}if(this.sprite.ythis.boundsRect.bottom){this.sprite.y=this.boundsRect.bottom-this.sprite.height}}},checkBoundsSprite:function(){if(this.sprite.x(this.boundsSprite.x+this.boundsSprite.width)){this.sprite.x=(this.boundsSprite.x+this.boundsSprite.width)-this.sprite.width}}if(this.sprite.y(this.boundsSprite.y+this.boundsSprite.height)){this.sprite.y=(this.boundsSprite.y+this.boundsSprite.height)-this.sprite.height}}}};Phaser.Canvas={create:function(d,b){d=d||256;b=b||256;var c=document.createElement("canvas");c.width=d;c.height=b;c.style.display="block";return c},getOffset:function(c,b){b=b||new Phaser.Point;var d=c.getBoundingClientRect();var h=c.clientTop||document.body.clientTop||0;var g=c.clientLeft||document.body.clientLeft||0;var e=window.pageYOffset||c.scrollTop||document.body.scrollTop;var f=window.pageXOffset||c.scrollLeft||document.body.scrollLeft;b.x=d.left+f-g;b.y=d.top+e-h;return b},getAspectRatio:function(b){return b.width/b.height},setBackgroundColor:function(c,b){b=b||"rgb(0,0,0)";c.style.backgroundColor=b;return c},setTouchAction:function(b,c){c=c||"none";b.style.msTouchAction=c;b.style["ms-touch-action"]=c;b.style["touch-action"]=c;return b},addToDOM:function(b,c,d){c=c||"";d=d||true;if(c!==""){if(document.getElementById(c)){document.getElementById(c).appendChild(b)}else{document.body.appendChild(b)}if(d){document.getElementById(c).style.overflow="hidden"}}else{document.body.appendChild(b)}return b},setTransform:function(f,h,g,d,b,e,c){f.setTransform(d,e,c,b,h,g);return f},setSmoothingEnabled:function(b,c){b.imageSmoothingEnabled=c;b.mozImageSmoothingEnabled=c;b.oImageSmoothingEnabled=c;b.webkitImageSmoothingEnabled=c;b.msImageSmoothingEnabled=c;return b},setImageRenderingCrisp:function(b){b.style["image-rendering"]="crisp-edges";b.style["image-rendering"]="-moz-crisp-edges";b.style["image-rendering"]="-webkit-optimize-contrast";b.style.msInterpolationMode="nearest-neighbor";return b},setImageRenderingBicubic:function(b){b.style["image-rendering"]="auto";b.style.msInterpolationMode="bicubic";return b}};Phaser.Events=function(b){this.parent=b;this.onAddedToGroup=new Phaser.Signal;this.onRemovedFromGroup=new Phaser.Signal;this.onKilled=new Phaser.Signal;this.onRevived=new Phaser.Signal;this.onOutOfBounds=new Phaser.Signal;this.onInputOver=null;this.onInputOut=null;this.onInputDown=null;this.onInputUp=null;this.onDragStart=null;this.onDragStop=null;this.onAnimationStart=null;this.onAnimationComplete=null;this.onAnimationLoop=null};Phaser.GameObjectFactory=function(b){this.game=b;this.world=this.game.world};Phaser.GameObjectFactory.prototype={game:null,world:null,existing:function(b){return this.world.group.add(b)},sprite:function(b,e,c,d){return this.world.group.add(new Phaser.Sprite(this.game,b,e,c,d))},child:function(d,b,g,c,e){var f=this.world.group.add(new Phaser.Sprite(this.game,b,g,c,e));d.addChild(f);return f},tween:function(b){return this.game.tweens.create(b)},group:function(c,b){return new Phaser.Group(this.game,c,b)},audio:function(c,d,b){return this.game.sound.add(c,d,b)},tileSprite:function(c,g,e,b,d,f){return this.world.group.add(new Phaser.TileSprite(this.game,c,g,e,b,d,f))},text:function(b,e,d,c){return this.world.group.add(new Phaser.Text(this.game,b,e,d,c))},button:function(b,i,g,h,e,d,f,c){return this.world.group.add(new Phaser.Button(this.game,b,i,g,h,e,d,f,c))},graphics:function(b,c){return this.world.group.add(new Phaser.Graphics(this.game,b,c))},emitter:function(b,d,c){return this.game.particles.add(new Phaser.Particles.Arcade.Emitter(this.game,b,d,c))},bitmapText:function(b,e,d,c){return this.world.group.add(new Phaser.BitmapText(this.game,b,e,d,c))},tilemap:function(b,g,d,e,f,c){return this.world.group.add(new Phaser.Tilemap(this.game,d,b,g,e,f,c))},renderTexture:function(c,d,b){var e=new Phaser.RenderTexture(this.game,c,d,b);this.game.cache.addRenderTexture(c,e);return e}};Phaser.Sprite=function(c,b,f,d,e){b=b||0;f=f||0;d=d||null;e=e||null;this.game=c;this.exists=true;this.alive=true;this.group=null;this.name="";this.type=Phaser.SPRITE;this.renderOrderID=-1;this.lifespan=0;this.events=new Phaser.Events(this);this.animations=new Phaser.AnimationManager(this);this.input=new Phaser.InputHandler(this);this.key=d;if(d instanceof Phaser.RenderTexture){PIXI.Sprite.call(this,d);this.currentFrame=this.game.cache.getTextureFrame(d.name)}else{if(d==null||this.game.cache.checkImageKey(d)==false){d="__default"}PIXI.Sprite.call(this,PIXI.TextureCache[d]);if(this.game.cache.isSpriteSheet(d)){this.animations.loadFrameData(this.game.cache.getFrameData(d));if(e!==null){if(typeof e==="string"){this.frameName=e}else{this.frame=e}}}else{this.currentFrame=this.game.cache.getFrame(d)}}this.anchor=new Phaser.Point();this._cropUUID=null;this._cropRect=null;this.x=b;this.y=f;this.position.x=b;this.position.y=f;this.autoCull=false;this.scale=new Phaser.Point(1,1);this.scrollFactor=new Phaser.Point(1,1);this._cache={dirty:false,a00:1,a01:0,a02:b,a10:0,a11:1,a12:f,id:1,i01:0,i10:0,idi:1,left:null,right:null,top:null,bottom:null,x:-1,y:-1,scaleX:1,scaleY:1,width:this.currentFrame.sourceSizeW,height:this.currentFrame.sourceSizeH,halfWidth:Math.floor(this.currentFrame.sourceSizeW/2),halfHeight:Math.floor(this.currentFrame.sourceSizeH/2),frameID:this.currentFrame.uuid,frameWidth:this.currentFrame.width,frameHeight:this.currentFrame.height,boundsX:0,boundsY:0,cameraVisible:true};this.offset=new Phaser.Point;this.center=new Phaser.Point(b+Math.floor(this._cache.width/2),f+Math.floor(this._cache.height/2));this.topLeft=new Phaser.Point(b,f);this.topRight=new Phaser.Point(b+this._cache.width,f);this.bottomRight=new Phaser.Point(b+this._cache.width,f+this._cache.height);this.bottomLeft=new Phaser.Point(b,f+this._cache.height);this.bounds=new Phaser.Rectangle(b,f,this._cache.width,this._cache.height);this.body=new Phaser.Physics.Arcade.Body(this);this.velocity=this.body.velocity;this.acceleration=this.body.acceleration;this.inWorld=Phaser.Rectangle.intersects(this.bounds,this.game.world.bounds);this.inWorldThreshold=0;this._outOfBoundsFired=false};Phaser.Sprite.prototype=Object.create(PIXI.Sprite.prototype);Phaser.Sprite.prototype.constructor=Phaser.Sprite;Phaser.Sprite.prototype.preUpdate=function(){if(!this.exists){this.renderOrderID=-1;return}if(this.lifespan>0){this.lifespan-=this.game.time.elapsed;if(this.lifespan<=0){this.kill();return}}this._cache.dirty=false;if(this.animations.update()){this._cache.dirty=true}this._cache.x=this.x-(this.game.world.camera.x*this.scrollFactor.x);this._cache.y=this.y-(this.game.world.camera.y*this.scrollFactor.y);if(this.position.x!=this._cache.x||this.position.y!=this._cache.y){this.position.x=this._cache.x;this.position.y=this._cache.y;this._cache.dirty=true}if(this.visible){this.renderOrderID=this.game.world.currentRenderOrderID++;if(this.worldTransform[0]!=this._cache.a00||this.worldTransform[1]!=this._cache.a01){this._cache.a00=this.worldTransform[0];this._cache.a01=this.worldTransform[1];this._cache.i01=this.worldTransform[1];this._cache.scaleX=Math.sqrt((this._cache.a00*this._cache.a00)+(this._cache.a01*this._cache.a01));this._cache.a01*=-1;this._cache.dirty=true}if(this.worldTransform[3]!=this._cache.a10||this.worldTransform[4]!=this._cache.a11){this._cache.a10=this.worldTransform[3];this._cache.i10=this.worldTransform[3];this._cache.a11=this.worldTransform[4];this._cache.scaleY=Math.sqrt((this._cache.a10*this._cache.a10)+(this._cache.a11*this._cache.a11));this._cache.a10*=-1;this._cache.dirty=true}if(this.worldTransform[2]!=this._cache.a02||this.worldTransform[5]!=this._cache.a12){this._cache.a02=this.worldTransform[2];this._cache.a12=this.worldTransform[5];this._cache.dirty=true}if(this.currentFrame.uuid!=this._cache.frameID){this._cache.frameWidth=this.texture.frame.width;this._cache.frameHeight=this.texture.frame.height;this._cache.frameID=this.currentFrame.uuid;this._cache.dirty=true}if(this._cache.dirty){this._cache.width=Math.floor(this.currentFrame.sourceSizeW*this._cache.scaleX);this._cache.height=Math.floor(this.currentFrame.sourceSizeH*this._cache.scaleY);this._cache.halfWidth=Math.floor(this._cache.width/2);this._cache.halfHeight=Math.floor(this._cache.height/2);this._cache.id=1/(this._cache.a00*this._cache.a11+this._cache.a01*-this._cache.a10);this._cache.idi=1/(this._cache.a00*this._cache.a11+this._cache.i01*-this._cache.i10);this.updateBounds()}}else{if(this._cache.dirty&&this.visible==false){this.bounds.x-=this._cache.boundsX-this._cache.x;this._cache.boundsX=this._cache.x;this.bounds.y-=this._cache.boundsy-this._cache.y;this._cache.boundsY=this._cache.y}}if(this._cache.dirty){this._cache.cameraVisible=Phaser.Rectangle.intersects(this.game.world.camera.screenView,this.bounds,0);if(this.autoCull==true){this.visible=this._cache.cameraVisible}this.body.updateBounds(this.center.x,this.center.y,this._cache.scaleX,this._cache.scaleY)}this.body.update()};Phaser.Sprite.prototype.revive=function(){this.alive=true;this.exists=true;this.visible=true;this.events.onRevived.dispatch(this)};Phaser.Sprite.prototype.kill=function(){this.alive=false;this.exists=false;this.visible=false;this.events.onKilled.dispatch(this)};Phaser.Sprite.prototype.reset=function(b,c){this.x=b;this.y=c;this.position.x=b;this.position.y=c;this.alive=true;this.exists=true;this.visible=true;this._outOfBoundsFired=false;this.body.reset()};Phaser.Sprite.prototype.updateBounds=function(){this.offset.setTo(this._cache.a02-(this.anchor.x*this._cache.width),this._cache.a12-(this.anchor.y*this._cache.height));this.getLocalPosition(this.center,this.offset.x+this._cache.halfWidth,this.offset.y+this._cache.halfHeight);this.getLocalPosition(this.topLeft,this.offset.x,this.offset.y);this.getLocalPosition(this.topRight,this.offset.x+this._cache.width,this.offset.y);this.getLocalPosition(this.bottomLeft,this.offset.x,this.offset.y+this._cache.height);this.getLocalPosition(this.bottomRight,this.offset.x+this._cache.width,this.offset.y+this._cache.height);this._cache.left=Phaser.Math.min(this.topLeft.x,this.topRight.x,this.bottomLeft.x,this.bottomRight.x);this._cache.right=Phaser.Math.max(this.topLeft.x,this.topRight.x,this.bottomLeft.x,this.bottomRight.x);this._cache.top=Phaser.Math.min(this.topLeft.y,this.topRight.y,this.bottomLeft.y,this.bottomRight.y);this._cache.bottom=Phaser.Math.max(this.topLeft.y,this.topRight.y,this.bottomLeft.y,this.bottomRight.y);this.bounds.setTo(this._cache.left,this._cache.top,this._cache.right-this._cache.left,this._cache.bottom-this._cache.top);this._cache.boundsX=this._cache.x;this._cache.boundsY=this._cache.y;if(this.inWorld==false){this.inWorld=Phaser.Rectangle.intersects(this.bounds,this.game.world.bounds,this.inWorldThreshold);if(this.inWorld){this._outOfBoundsFired=false}}else{this.inWorld=Phaser.Rectangle.intersects(this.bounds,this.game.world.bounds,this.inWorldThreshold);if(this.inWorld==false){this.events.onOutOfBounds.dispatch(this);this._outOfBoundsFired=true}}};Phaser.Sprite.prototype.getLocalPosition=function(c,b,d){c.x=((this._cache.a11*this._cache.id*b+-this._cache.a01*this._cache.id*d+(this._cache.a12*this._cache.a01-this._cache.a02*this._cache.a11)*this._cache.id)*this._cache.scaleX)+this._cache.a02;c.y=((this._cache.a00*this._cache.id*d+-this._cache.a10*this._cache.id*b+(-this._cache.a12*this._cache.a00+this._cache.a02*this._cache.a10)*this._cache.id)*this._cache.scaleY)+this._cache.a12;return c};Phaser.Sprite.prototype.getLocalUnmodifiedPosition=function(c,b,d){c.x=this._cache.a11*this._cache.idi*b+-this._cache.i01*this._cache.idi*d+(this._cache.a12*this._cache.i01-this._cache.a02*this._cache.a11)*this._cache.idi;c.y=this._cache.a00*this._cache.idi*d+-this._cache.i10*this._cache.idi*b+(-this._cache.a12*this._cache.a00+this._cache.a02*this._cache.i10)*this._cache.idi;return c};Phaser.Sprite.prototype.bringToTop=function(){if(this.group){this.group.bringToTop(this)}else{this.game.world.bringToTop(this)}};Phaser.Sprite.prototype.getBounds=function(d){d=d||new Phaser.Rectangle;var f=Phaser.Math.min(this.topLeft.x,this.topRight.x,this.bottomLeft.x,this.bottomRight.x);var c=Phaser.Math.max(this.topLeft.x,this.topRight.x,this.bottomLeft.x,this.bottomRight.x);var e=Phaser.Math.min(this.topLeft.y,this.topRight.y,this.bottomLeft.y,this.bottomRight.y);var b=Phaser.Math.max(this.topLeft.y,this.topRight.y,this.bottomLeft.y,this.bottomRight.y);d.x=f;d.y=e;d.width=c-f;d.height=b-e;return d};Object.defineProperty(Phaser.Sprite.prototype,"angle",{get:function(){return Phaser.Math.radToDeg(this.rotation)},set:function(b){this.rotation=Phaser.Math.degToRad(b)}});Object.defineProperty(Phaser.Sprite.prototype,"frame",{get:function(){return this.animations.frame},set:function(b){this.animations.frame=b}});Object.defineProperty(Phaser.Sprite.prototype,"frameName",{get:function(){return this.animations.frameName},set:function(b){this.animations.frameName=b}});Object.defineProperty(Phaser.Sprite.prototype,"inCamera",{get:function(){return this._cache.cameraVisible}});Object.defineProperty(Phaser.Sprite.prototype,"crop",{get:function(){return this._cropRect},set:function(b){if(b instanceof Phaser.Rectangle){if(this._cropUUID==null){this._cropUUID=this.game.rnd.uuid();PIXI.TextureCache[this._cropUUID]=new PIXI.Texture(PIXI.BaseTextureCache[this.key],{x:b.x,y:b.y,width:b.width,height:b.height})}else{PIXI.TextureCache[this._cropUUID].frame=b}this._cropRect=b;this.setTexture(PIXI.TextureCache[this._cropUUID])}}});Object.defineProperty(Phaser.Sprite.prototype,"inputEnabled",{get:function(){return(this.input.enabled)},set:function(b){if(b){if(this.input.enabled==false){this.input.start()}}else{if(this.input.enabled){this.input.stop()}}}});Phaser.TileSprite=function(d,c,h,f,b,e,g){c=c||0;h=h||0;f=f||256;b=b||256;e=e||null;g=g||null;Phaser.Sprite.call(this,d,c,h,e,g);this.texture=PIXI.TextureCache[e];PIXI.TilingSprite.call(this,this.texture,f,b);this.type=Phaser.TILESPRITE;this.tileScale=new Phaser.Point(1,1);this.tilePosition=new Phaser.Point(0,0)};Phaser.TileSprite.prototype=Phaser.Utils.extend(true,PIXI.TilingSprite.prototype,Phaser.Sprite.prototype);Phaser.TileSprite.prototype.constructor=Phaser.TileSprite;Phaser.Text=function(c,b,g,f,d){b=b||0;g=g||0;f=f||"";d=d||"";this.canvas=document.createElement("canvas");this.context=this.canvas.getContext("2d");var e=c.rnd.uuid();PIXI.TextureCache[e]=new PIXI.Texture(new PIXI.BaseTexture(this.canvas));Phaser.Sprite.call(this,c,b,g,e);this.type=Phaser.TEXT;this.setText(f);this.setStyle(d);this.updateText();this.dirty=false};Phaser.Text.prototype=Phaser.Utils.extend(true,Phaser.Sprite.prototype,PIXI.Text.prototype);Phaser.Text.prototype.constructor=Phaser.Text;Phaser.Button=function(j,g,f,h,i,c,d,b,e){g=g||0;f=f||0;h=h||null;i=i||null;c=c||this;Phaser.Sprite.call(this,j,g,f,h,b);this.type=Phaser.BUTTON;this._onOverFrameName=null;this._onOutFrameName=null;this._onDownFrameName=null;this._onUpFrameName=null;this._onOverFrameID=null;this._onOutFrameID=null;this._onDownFrameID=null;this._onUpFrameID=null;this.onInputOver=new Phaser.Signal;this.onInputOut=new Phaser.Signal;this.onInputDown=new Phaser.Signal;this.onInputUp=new Phaser.Signal;this.setFrames(d,b,e);if(i!==null){this.onInputUp.add(i,c)}this.input.start(0,false,true);this.events.onInputOver.add(this.onInputOverHandler,this);this.events.onInputOut.add(this.onInputOutHandler,this);this.events.onInputDown.add(this.onInputDownHandler,this);this.events.onInputUp.add(this.onInputUpHandler,this)};Phaser.Button.prototype=Phaser.Utils.extend(true,Phaser.Sprite.prototype,PIXI.Sprite.prototype);Phaser.Button.prototype.constructor=Phaser.Button;Phaser.Button.prototype.setFrames=function(c,d,b){if(c!==null){if(typeof c==="string"){this._onOverFrameName=c}else{this._onOverFrameID=c}}if(d!==null){if(typeof d==="string"){this._onOutFrameName=d;this._onUpFrameName=d}else{this._onOutFrameID=d;this._onUpFrameID=d}}if(b!==null){if(typeof b==="string"){this._onDownFrameName=b}else{this._onDownFrameID=b}}};Phaser.Button.prototype.onInputOverHandler=function(b){if(this._onOverFrameName!=null){this.frameName=this._onOverFrameName}else{if(this._onOverFrameID!=null){this.frame=this._onOverFrameID}}if(this.onInputOver){this.onInputOver.dispatch(this,b)}};Phaser.Button.prototype.onInputOutHandler=function(b){if(this._onOutFrameName!=null){this.frameName=this._onOutFrameName}else{if(this._onOutFrameID!=null){this.frame=this._onOutFrameID}}if(this.onInputOut){this.onInputOut.dispatch(this,b)}};Phaser.Button.prototype.onInputDownHandler=function(b){if(this._onDownFrameName!=null){this.frameName=this._onDownFrameName}else{if(this._onDownFrameID!=null){this.frame=this._onDownFrameID}}if(this.onInputDown){this.onInputDown.dispatch(this,b)}};Phaser.Button.prototype.onInputUpHandler=function(b){if(this._onUpFrameName!=null){this.frameName=this._onUpFrameName}else{if(this._onUpFrameID!=null){this.frame=this._onUpFrameID}}if(this.onInputUp){this.onInputUp.dispatch(this,b)}};Phaser.Graphics=function(c,b,d){this.exists=true;this.alive=true;this.group=null;this.name="";this.game=c;PIXI.DisplayObjectContainer.call(this);this.type=Phaser.GRAPHICS;this.position.x=b;this.position.y=d;this.scale=new Phaser.Point(1,1);this.scrollFactor=new Phaser.Point(1,1);this._cache={dirty:false,a00:1,a01:0,a02:b,a10:0,a11:1,a12:d,id:1,x:-1,y:-1,scaleX:1,scaleY:1};this._cache.x=this.x-(this.game.world.camera.x*this.scrollFactor.x);this._cache.y=this.y-(this.game.world.camera.y*this.scrollFactor.y);this.renderable=true;this.fillAlpha=1;this.lineWidth=0;this.lineColor="black";this.graphicsData=[];this.currentPath={points:[]}};Phaser.Graphics.prototype=Phaser.Utils.extend(true,PIXI.Graphics.prototype,PIXI.DisplayObjectContainer.prototype,Phaser.Sprite.prototype);Phaser.Graphics.prototype.constructor=Phaser.Graphics;Phaser.Graphics.prototype.update=function(){if(!this.exists){return}this._cache.dirty=false;this._cache.x=this.x-(this.game.world.camera.x*this.scrollFactor.x);this._cache.y=this.y-(this.game.world.camera.y*this.scrollFactor.y);if(this.position.x!=this._cache.x||this.position.y!=this._cache.y){this.position.x=this._cache.x;this.position.y=this._cache.y;this._cache.dirty=true}};Object.defineProperty(Phaser.Graphics.prototype,"angle",{get:function(){return Phaser.Math.radToDeg(this.rotation)},set:function(b){this.rotation=Phaser.Math.degToRad(b)}});Object.defineProperty(Phaser.Graphics.prototype,"x",{get:function(){return this.position.x},set:function(b){this.position.x=b}});Object.defineProperty(Phaser.Graphics.prototype,"y",{get:function(){return this.position.y},set:function(b){this.position.y=b}});Phaser.RenderTexture=function(c,d,e,b){this.game=c;this.name=d;PIXI.EventTarget.call(this);this.width=e||100;this.height=b||100;this.indetityMatrix=PIXI.mat3.create();this.frame=new PIXI.Rectangle(0,0,this.width,this.height);this.type=Phaser.RENDERTEXTURE;if(PIXI.gl){this.initWebGL()}else{this.initCanvas()}};Phaser.RenderTexture.prototype=Phaser.Utils.extend(true,PIXI.RenderTexture.prototype);Phaser.RenderTexture.prototype.constructor=Phaser.RenderTexture;Phaser.BitmapText=function(c,b,f,e,d){b=b||0;f=f||0;e=e||"";d=d||"";this.exists=true;this.alive=true;this.group=null;this.name="";this.game=c;PIXI.BitmapText.call(this,e,d);this.position.x=b;this.position.y=f;this.scale=new Phaser.Point(1,1);this.scrollFactor=new Phaser.Point(1,1);this._cache={dirty:false,a00:1,a01:0,a02:b,a10:0,a11:1,a12:f,id:1,x:-1,y:-1,scaleX:1,scaleY:1};this._cache.x=this.x-(this.game.world.camera.x*this.scrollFactor.x);this._cache.y=this.y-(this.game.world.camera.y*this.scrollFactor.y);this.renderable=true};Phaser.BitmapText.prototype=Phaser.Utils.extend(true,PIXI.BitmapText.prototype);Phaser.BitmapText.prototype.constructor=Phaser.BitmapText;Phaser.BitmapText.prototype.update=function(){if(!this.exists){return}this._cache.dirty=false;this._cache.x=this.x-(this.game.world.camera.x*this.scrollFactor.x);this._cache.y=this.y-(this.game.world.camera.y*this.scrollFactor.y);if(this.position.x!=this._cache.x||this.position.y!=this._cache.y){this.position.x=this._cache.x;this.position.y=this._cache.y;this._cache.dirty=true}};Object.defineProperty(Phaser.BitmapText.prototype,"angle",{get:function(){return Phaser.Math.radToDeg(this.rotation)},set:function(b){this.rotation=Phaser.Math.degToRad(b)}});Object.defineProperty(Phaser.BitmapText.prototype,"x",{get:function(){return this.position.x},set:function(b){this.position.x=b}});Object.defineProperty(Phaser.BitmapText.prototype,"y",{get:function(){return this.position.y},set:function(b){this.position.y=b}});Phaser.Canvas={create:function(d,b){d=d||256;b=b||256;var c=document.createElement("canvas");c.width=d;c.height=b;c.style.display="block";return c},getOffset:function(c,b){b=b||new Phaser.Point;var d=c.getBoundingClientRect();var h=c.clientTop||document.body.clientTop||0;var g=c.clientLeft||document.body.clientLeft||0;var e=window.pageYOffset||c.scrollTop||document.body.scrollTop;var f=window.pageXOffset||c.scrollLeft||document.body.scrollLeft;b.x=d.left+f-g;b.y=d.top+e-h;return b},getAspectRatio:function(b){return b.width/b.height},setBackgroundColor:function(c,b){b=b||"rgb(0,0,0)";c.style.backgroundColor=b;return c},setTouchAction:function(b,c){c=c||"none";b.style.msTouchAction=c;b.style["ms-touch-action"]=c;b.style["touch-action"]=c;return b},addToDOM:function(b,c,d){c=c||"";d=d||true;if(c!==""){if(document.getElementById(c)){document.getElementById(c).appendChild(b)}else{document.body.appendChild(b)}if(d){document.getElementById(c).style.overflow="hidden"}}else{document.body.appendChild(b)}return b},setTransform:function(f,h,g,d,b,e,c){f.setTransform(d,e,c,b,h,g);return f},setSmoothingEnabled:function(b,c){b.imageSmoothingEnabled=c;b.mozImageSmoothingEnabled=c;b.oImageSmoothingEnabled=c;b.webkitImageSmoothingEnabled=c;b.msImageSmoothingEnabled=c;return b},setImageRenderingCrisp:function(b){b.style["image-rendering"]="crisp-edges";b.style["image-rendering"]="-moz-crisp-edges";b.style["image-rendering"]="-webkit-optimize-contrast";b.style.msInterpolationMode="nearest-neighbor";return b},setImageRenderingBicubic:function(b){b.style["image-rendering"]="auto";b.style.msInterpolationMode="bicubic";return b}};Phaser.StageScaleMode=function(c,d,b){this._startHeight=0;this.forceLandscape=false;this.forcePortrait=false;this.incorrectOrientation=false;this.pageAlignHorizontally=false;this.pageAlignVeritcally=false;this.minWidth=null;this.maxWidth=null;this.minHeight=null;this.maxHeight=null;this.width=0;this.height=0;this.maxIterations=5;this.game=c;this.enterLandscape=new Phaser.Signal();this.enterPortrait=new Phaser.Signal();if(window.orientation){this.orientation=window.orientation}else{if(window.outerWidth>window.outerHeight){this.orientation=90}else{this.orientation=0}}this.scaleFactor=new Phaser.Point(1,1);this.aspectRatio=0;var e=this;window.addEventListener("orientationchange",function(f){return e.checkOrientation(f)},false);window.addEventListener("resize",function(f){return e.checkResize(f)},false)};Phaser.StageScaleMode.EXACT_FIT=0;Phaser.StageScaleMode.NO_SCALE=1;Phaser.StageScaleMode.SHOW_ALL=2;Phaser.StageScaleMode.prototype={startFullScreen:function(){if(this.isFullScreen){return}var b=this.game.canvas;if(b.requestFullScreen){b.requestFullScreen()}else{if(b.mozRequestFullScreen){b.mozRequestFullScreen()}else{if(b.webkitRequestFullScreen){b.webkitRequestFullScreen(Element.ALLOW_KEYBOARD_INPUT)}}}this.game.stage.canvas.style.width="100%";this.game.stage.canvas.style.height="100%"},stopFullScreen:function(){if(document.cancelFullScreen){document.cancelFullScreen()}else{if(document.mozCancelFullScreen){document.mozCancelFullScreen()}else{if(document.webkitCancelFullScreen){document.webkitCancelFullScreen()}}}},checkOrientationState:function(){if(this.incorrectOrientation){if((this.forceLandscape&&window.innerWidth>window.innerHeight)||(this.forcePortrait&&window.innerHeight>window.innerWidth)){this.game.paused=false;this.incorrectOrientation=false;this.refresh()}}else{if((this.forceLandscape&&window.innerWidthwindow.outerHeight){this.orientation=90}else{this.orientation=0}if(this.isLandscape){this.enterLandscape.dispatch(this.orientation,true,false)}else{this.enterPortrait.dispatch(this.orientation,false,true)}if(this.game.stage.scaleMode!==Phaser.StageScaleMode.NO_SCALE){this.refresh()}},refresh:function(){var b=this;if(this.game.device.iPad==false&&this.game.device.webApp==false&&this.game.device.desktop==false){if(this.game.device.android&&this.game.device.chrome==false){window.scrollTo(0,1)}else{window.scrollTo(0,0)}}if(this._check==null&&this.maxIterations>0){this._iterations=this.maxIterations;this._check=window.setInterval(function(){return b.setScreenSize()},10);this.setScreenSize()}},setScreenSize:function(b){if(typeof b=="undefined"){b=false}if(this.game.device.iPad==false&&this.game.device.webApp==false&&this.game.device.desktop==false){if(this.game.device.android&&this.game.device.chrome==false){window.scrollTo(0,1)}else{window.scrollTo(0,0)}}this._iterations--;if(b||window.innerHeight>this._startHeight||this._iterations<0){document.documentElement.style.minHeight=window.innerHeight+"px";if(this.incorrectOrientation==true){this.setMaximum()}else{if(this.game.stage.scaleMode==Phaser.StageScaleMode.EXACT_FIT){this.setExactFit()}else{if(this.game.stage.scaleMode==Phaser.StageScaleMode.SHOW_ALL){this.setShowAll()}}}this.setSize();clearInterval(this._check);this._check=null}},setSize:function(){if(this.incorrectOrientation==false){if(this.maxWidth&&this.width>this.maxWidth){this.width=this.maxWidth}if(this.maxHeight&&this.height>this.maxHeight){this.height=this.maxHeight}if(this.minWidth&&this.widththis.maxWidth){this.width=this.maxWidth}else{this.width=b}if(this.maxHeight&&c>this.maxHeight){this.height=this.maxHeight}else{this.height=c}console.log("setExactFit",this.width,this.height,this.game.stage.offset)}};Object.defineProperty(Phaser.StageScaleMode.prototype,"isFullScreen",{get:function(){if(document.fullscreenElement===null||document.mozFullScreenElement===null||document.webkitFullscreenElement===null){return false}return true}});Object.defineProperty(Phaser.StageScaleMode.prototype,"isPortrait",{get:function(){return this.orientation==0||this.orientation==180}});Object.defineProperty(Phaser.StageScaleMode.prototype,"isLandscape",{get:function(){return this.orientation===90||this.orientation===-90}});Phaser.Device=function(){this.patchAndroidClearRectBug=false;this.desktop=false;this.iOS=false;this.android=false;this.chromeOS=false;this.linux=false;this.macOS=false;this.windows=false;this.canvas=false;this.file=false;this.fileSystem=false;this.localStorage=false;this.webGL=false;this.worker=false;this.touch=false;this.mspointer=false;this.css3D=false;this.pointerLock=false;this.arora=false;this.chrome=false;this.epiphany=false;this.firefox=false;this.ie=false;this.ieVersion=0;this.mobileSafari=false;this.midori=false;this.opera=false;this.safari=false;this.webApp=false;this.audioData=false;this.webAudio=false;this.ogg=false;this.opus=false;this.mp3=false;this.wav=false;this.m4a=false;this.webm=false;this.iPhone=false;this.iPhone4=false;this.iPad=false;this.pixelRatio=0;this._checkAudio();this._checkBrowser();this._checkCSS3D();this._checkDevice();this._checkFeatures();this._checkOS()};Phaser.Device.prototype={_checkOS:function(){var b=navigator.userAgent;if(/Android/.test(b)){this.android=true}else{if(/CrOS/.test(b)){this.chromeOS=true}else{if(/iP[ao]d|iPhone/i.test(b)){this.iOS=true}else{if(/Linux/.test(b)){this.linux=true}else{if(/Mac OS/.test(b)){this.macOS=true}else{if(/Windows/.test(b)){this.windows=true}}}}}}if(this.windows||this.macOS||this.linux){this.desktop=true}},_checkFeatures:function(){this.canvas=!!window.CanvasRenderingContext2D;try{this.localStorage=!!localStorage.getItem}catch(b){this.localStorage=false}this.file=!!window.File&&!!window.FileReader&&!!window.FileList&&!!window.Blob;this.fileSystem=!!window.requestFileSystem;this.webGL=(function(){try{return !!window.WebGLRenderingContext&&!!document.createElement("canvas").getContext("experimental-webgl")}catch(c){return false}})();this.worker=!!window.Worker;if("ontouchstart" in document.documentElement||window.navigator.msPointerEnabled){this.touch=true}if(window.navigator.msPointerEnabled){this.mspointer=true}this.pointerLock="pointerLockElement" in document||"mozPointerLockElement" in document||"webkitPointerLockElement" in document},_checkBrowser:function(){var b=navigator.userAgent;if(/Arora/.test(b)){this.arora=true}else{if(/Chrome/.test(b)){this.chrome=true}else{if(/Epiphany/.test(b)){this.epiphany=true}else{if(/Firefox/.test(b)){this.firefox=true}else{if(/Mobile Safari/.test(b)){this.mobileSafari=true}else{if(/MSIE (\d+\.\d+);/.test(b)){this.ie=true;this.ieVersion=parseInt(RegExp.$1)}else{if(/Midori/.test(b)){this.midori=true}else{if(/Opera/.test(b)){this.opera=true}else{if(/Safari/.test(b)){this.safari=true}}}}}}}}}if(navigator.standalone){this.webApp=true}},_checkAudio:function(){this.audioData=!!(window.Audio);this.webAudio=!!(window.webkitAudioContext||window.AudioContext);var d=document.createElement("audio");var b=false;try{if(b=!!d.canPlayType){if(d.canPlayType('audio/ogg; codecs="vorbis"').replace(/^no$/,"")){this.ogg=true}if(d.canPlayType('audio/ogg; codecs="opus"').replace(/^no$/,"")){this.opus=true}if(d.canPlayType("audio/mpeg;").replace(/^no$/,"")){this.mp3=true}if(d.canPlayType('audio/wav; codecs="1"').replace(/^no$/,"")){this.wav=true}if(d.canPlayType("audio/x-m4a;")||d.canPlayType("audio/aac;").replace(/^no$/,"")){this.m4a=true}if(d.canPlayType('audio/webm; codecs="vorbis"').replace(/^no$/,"")){this.webm=true}}}catch(c){}},_checkDevice:function(){this.pixelRatio=window.devicePixelRatio||1;this.iPhone=navigator.userAgent.toLowerCase().indexOf("iphone")!=-1;this.iPhone4=(this.pixelRatio==2&&this.iPhone);this.iPad=navigator.userAgent.toLowerCase().indexOf("ipad")!=-1},_checkCSS3D:function(){var d=document.createElement("p");var e;var c={webkitTransform:"-webkit-transform",OTransform:"-o-transform",msTransform:"-ms-transform",MozTransform:"-moz-transform",transform:"transform"};document.body.insertBefore(d,null);for(var b in c){if(d.style[b]!==undefined){d.style[b]="translate3d(1px,1px,1px)";e=window.getComputedStyle(d).getPropertyValue(c[b])}}document.body.removeChild(d);this.css3D=(e!==undefined&&e.length>0&&e!=="none")},canPlayAudio:function(b){if(b=="mp3"&&this.mp3){return true}else{if(b=="ogg"&&(this.ogg||this.opus)){return true}else{if(b=="m4a"&&this.m4a){return true}else{if(b=="wav"&&this.wav){return true}else{if(b=="webm"&&this.webm){return true}}}}}return false},isConsoleOpen:function(){if(window.console&&window.console.firebug){return true}if(window.console){console.profile();console.profileEnd();if(console.clear){console.clear()}return console.profiles.length>0}return false}};Phaser.RequestAnimationFrame=function(c){this.game=c;this._isSetTimeOut=false;this.isRunning=false;var d=["ms","moz","webkit","o"];for(var b=0;b>>0;c-=e;c*=e;e=c>>>0;c-=e;e+=c*4294967296}return(e>>>0)*2.3283064365386963e-10},integer:function(){return this.rnd.apply(this)*4294967296},frac:function(){return this.rnd.apply(this)+(this.rnd.apply(this)*2097152|0)*1.1102230246251565e-16},real:function(){return this.integer()+this.frac()},integerInRange:function(c,b){return Math.floor(this.realInRange(c,b))},realInRange:function(c,b){c=c||0;b=b||0;return this.frac()*(b-c)+c},normal:function(){return 1-2*this.frac()},uuid:function(){var d,c;for(c=d="";d++<36;c+=~d%5|d*3&4?(d^15?8^this.frac()*(d^20?16:4):4).toString(16):"-"){}return c},pick:function(b){return b[this.integerInRange(0,b.length)]},weightedPick:function(b){return b[~~(Math.pow(this.frac(),2)*b.length)]},timestamp:function(d,c){return this.realInRange(d||946684800000,c||1577862000000)},angle:function(){return this.integerInRange(-180,180)}};Phaser.Math={PI2:Math.PI*2,fuzzyEqual:function(d,c,e){if(typeof e==="undefined"){e=0.0001}return Math.abs(d-c)c-e},fuzzyCeil:function(b,c){if(typeof c==="undefined"){c=0.0001}return Math.ceil(b-c)},fuzzyFloor:function(b,c){if(typeof c==="undefined"){c=0.0001}return Math.floor(b+c)},average:function(){var b=[];for(var d=0;d<(arguments.length-0);d++){b[d]=arguments[d+0]}var e=0;for(var c=0;c0)?Math.floor(b):Math.ceil(b)},shear:function(b){return b%1},snapTo:function(b,d,c){if(typeof c==="undefined"){c=0}if(d==0){return b}b-=c;b=d*Math.round(b/d);return c+b},snapToFloor:function(b,d,c){if(typeof c==="undefined"){c=0}if(d==0){return b}b-=c;b=d*Math.floor(b/d);return c+b},snapToCeil:function(b,d,c){if(typeof c==="undefined"){c=0}if(d==0){return b}b-=c;b=d*Math.ceil(b/d);return c+b},snapToInArray:function(d,c,f){if(typeof f==="undefined"){f=true}if(f){c.sort()}if(dd/2){c+=d*2}if(b<-d/2&&c>d/2){b+=d*2}return b-c},interpolateAngles:function(c,b,d,e,f){if(typeof e==="undefined"){e=true}if(typeof f==="undefined"){f=null}c=this.normalizeAngle(c,e);b=this.normalizeAngleToAnother(b,c,e);return(typeof f==="function")?f(d,c,b-c,1):this.interpolateFloat(c,b,d)},chanceRoll:function(b){if(typeof b==="undefined"){b=50}if(b<=0){return false}else{if(b>=100){return true}else{if(Math.random()*100>=b){return false}else{return true}}}},maxAdd:function(d,c,b){d+=c;if(d>b){d=b}return d},minSub:function(d,c,b){d-=c;if(d0.5)?1:-1},isOdd:function(b){return(b&1)},isEven:function(b){if(b&1){return false}else{return true}},max:function(){for(var d=1,c=0,b=arguments.length;d=-180&&c<=180){return c}b=(c+180)%360;if(b<0){b+=360}return b-180},angleLimit:function(e,d,c){var b=e;if(e>c){b=c}else{if(e1){return this.linear(d[b],d[b-1],b-g)}return this.linear(d[e],d[e+1>b?b:e+1],g-e)},bezierInterpolation:function(e,d){var c=0;var g=e.length-1;for(var f=0;f<=g;f++){c+=Math.pow(1-d,g-f)*Math.pow(d,f)*e[f]*this.bernstein(g,f)}return c},catmullRomInterpolation:function(d,c){var b=d.length-1;var g=b*c;var e=Math.floor(g);if(d[0]===d[b]){if(c<0){e=Math.floor(g=b*(1+c))}return this.catmullRom(d[(e-1+b)%b],d[e],d[(e+1)%b],d[(e+2)%b],g-e)}else{if(c<0){return d[0]-(this.catmullRom(d[0],d[0],d[1],d[1],-g)-d[0])}if(c>1){return d[b]-(this.catmullRom(d[b],d[b],d[b-1],d[b-1],g-b)-d[b])}return this.catmullRom(d[e?e-1:0],d[e],d[bd.length-e)){b=d.length-e}if(b>0){return d[e+Math.floor(Math.random()*b)]}}return null},floor:function(b){var c=b|0;return(b>0)?(c):((c!=b)?(c-1):(c))},ceil:function(b){var c=b|0;return(b>0)?((c!=b)?(c+1):(c)):(c)},sinCosGenerator:function(b,j,d,h){if(typeof j==="undefined"){j=1}if(typeof d==="undefined"){d=1}if(typeof h==="undefined"){h=1}var i=j;var l=d;var f=h*Math.PI/b;var e=[];var k=[];for(var g=0;g0;d--){var c=Math.floor(Math.random()*(d+1));var b=e[d];e[d]=e[c];e[c]=b}return e},distance:function(e,g,d,f){var c=e-d;var b=g-f;return Math.sqrt(c*c+b*b)},distanceRounded:function(c,e,b,d){return Math.round(Phaser.Math.distance(c,e,b,d))},clamp:function(d,e,c){return(dc)?c:d)},clampBottom:function(b,c){return b=b){return 1}c=(c-d)/(b-d);return c*c*(3-2*c)},smootherstep:function(c,d,b){if(c<=d){return 0}if(c>=b){return 1}c=(c-d)/(b-d);return c*c*c*(c*(c*6-15)+10)},sign:function(b){return(b<0)?-1:((b>0)?1:0)},degToRad:function(){var b=Math.PI/180;return function(c){return c*b}}(),radToDeg:function(){var b=180/Math.PI;return function(c){return c*b}}()};Phaser.QuadTree=function(g,c,i,f,b,e,d,h){this.physicsManager=g;this.ID=g.quadTreeID;g.quadTreeID++;this.maxObjects=e||10;this.maxLevels=d||4;this.level=h||0;this.bounds={x:Math.round(c),y:Math.round(i),width:f,height:b,subWidth:Math.floor(f/2),subHeight:Math.floor(b/2),right:Math.round(c)+Math.floor(f/2),bottom:Math.round(i)+Math.floor(b/2)};this.objects=[];this.nodes=[]};Phaser.QuadTree.prototype={split:function(){this.level++;this.nodes[0]=new Phaser.QuadTree(this.physicsManager,this.bounds.right,this.bounds.y,this.bounds.subWidth,this.bounds.subHeight,this.maxObjects,this.maxLevels,this.level);this.nodes[1]=new Phaser.QuadTree(this.physicsManager,this.bounds.x,this.bounds.y,this.bounds.subWidth,this.bounds.subHeight,this.maxObjects,this.maxLevels,this.level);this.nodes[2]=new Phaser.QuadTree(this.physicsManager,this.bounds.x,this.bounds.bottom,this.bounds.subWidth,this.bounds.subHeight,this.maxObjects,this.maxLevels,this.level);this.nodes[3]=new Phaser.QuadTree(this.physicsManager,this.bounds.right,this.bounds.bottom,this.bounds.subWidth,this.bounds.subHeight,this.maxObjects,this.maxLevels,this.level)},insert:function(b){var d=0;var c;if(this.nodes[0]!=null){c=this.getIndex(b);if(c!==-1){this.nodes[c].insert(b);return}}this.objects.push(b);if(this.objects.length>this.maxObjects&&this.levelthis.bounds.bottom)){b=2}}}else{if(c.x>this.bounds.right){if((c.ythis.bounds.bottom)){b=3}}}}return b},retrieve:function(b){var c=this.objects;b.body.quadTreeIndex=this.getIndex(b.body);b.body.quadTreeIDs.push(this.ID);if(this.nodes[0]){if(b.body.quadTreeIndex!==-1){c=c.concat(this.nodes[b.body.quadTreeIndex].retrieve(b))}else{c=c.concat(this.nodes[0].retrieve(b));c=c.concat(this.nodes[1].retrieve(b));c=c.concat(this.nodes[2].retrieve(b));c=c.concat(this.nodes[3].retrieve(b))}}return c},clear:function(){this.objects=[];for(var c=0,b=this.nodes.length;c0){this._radius=c*0.5}else{this._radius=0}};Phaser.Circle.prototype={circumference:function(){return 2*(Math.PI*this._radius)},setTo:function(b,d,c){this.x=b;this.y=d;this._diameter=c;this._radius=c*0.5;return this},copyFrom:function(b){return this.setTo(b.x,b.y,b.diameter)},copyTo:function(b){b[x]=this.x;b[y]=this.y;b[diameter]=this._diameter;return b},distance:function(c,b){if(typeof b==="undefined"){b=false}if(b){return Phaser.Math.distanceRound(this.x,this.y,c.x,c.y)}else{return Phaser.Math.distance(this.x,this.y,c.x,c.y)}},clone:function(b){if(typeof b==="undefined"){b=new Phaser.Circle()}return b.setTo(a.x,a.y,a.diameter)},contains:function(b,c){return Phaser.Circle.contains(this,b,c)},circumferencePoint:function(d,c,b){return Phaser.Circle.circumferencePoint(this,d,c,b)},offset:function(c,b){this.x+=c;this.y+=b;return this},offsetPoint:function(b){return this.offset(b.x,b.y)},toString:function(){return"[{Phaser.Circle (x="+this.x+" y="+this.y+" diameter="+this.diameter+" radius="+this.radius+")}]"}};Object.defineProperty(Phaser.Circle.prototype,"diameter",{get:function(){return this._diameter},set:function(b){if(b>0){this._diameter=b;this._radius=b*0.5}}});Object.defineProperty(Phaser.Circle.prototype,"radius",{get:function(){return this._radius},set:function(b){if(b>0){this._radius=b;this._diameter=b*2}}});Object.defineProperty(Phaser.Circle.prototype,"left",{get:function(){return this.x-this._radius},set:function(b){if(b>this.x){this._radius=0;this._diameter=0}else{this.radius=this.x-b}}});Object.defineProperty(Phaser.Circle.prototype,"right",{get:function(){return this.x+this._radius},set:function(b){if(bthis.y){this._radius=0;this._diameter=0}else{this.radius=this.y-b}}});Object.defineProperty(Phaser.Circle.prototype,"bottom",{get:function(){return this.y+this._radius},set:function(b){if(b0){return Math.PI*this._radius*this._radius}else{return 0}}});Object.defineProperty(Phaser.Circle.prototype,"empty",{get:function(){return(this._diameter==0)},set:function(b){this.setTo(0,0,0)}});Phaser.Circle.contains=function(d,b,f){if(b>=d.left&&b<=d.right&&f>=d.top&&f<=d.bottom){var e=(d.x-b)*(d.x-b);var c=(d.y-f)*(d.y-f);return(e+c)<=(d.radius*d.radius)}return false};Phaser.Circle.equals=function(d,c){return(d.x==c.x&&d.y==c.y&&d.diameter==c.diameter)};Phaser.Circle.intersects=function(d,c){return(Phaser.Math.distance(d.x,d.y,c.x,c.y)<=(d.radius+c.radius))};Phaser.Circle.circumferencePoint=function(b,e,d,c){if(typeof d==="undefined"){d=false}if(typeof c==="undefined"){c=new Phaser.Point()}if(d===true){e=Phaser.Math.radToDeg(e)}c.x=b.x+b.radius*Math.cos(e);c.y=b.y+b.radius*Math.sin(e);return c};Phaser.Circle.intersectsRectangle=function(m,d){var g=Math.abs(m.x-d.x-d.halfWidth);var l=d.halfWidth+m.radius;if(g>l){return false}var f=Math.abs(m.y-d.y-d.halfHeight);var j=d.halfHeight+m.radius;if(f>j){return false}if(g<=d.halfWidth||f<=d.halfHeight){return true}var h=g-d.halfWidth;var e=f-d.halfHeight;var k=h*h;var b=e*e;var i=m.radius*m.radius;return k+b<=i};Phaser.Point=function(b,c){b=b||0;c=c||0;this.x=b;this.y=c};Phaser.Point.prototype={copyFrom:function(b){return this.setTo(b.x,b.y)},invert:function(){return this.setTo(this.y,this.x)},setTo:function(b,c){this.x=b;this.y=c;return this},add:function(b,c){this.x+=b;this.y+=c;return this},subtract:function(b,c){this.x-=b;this.y-=c;return this},multiply:function(b,c){this.x*=b;this.y*=c;return this},divide:function(b,c){this.x/=b;this.y/=c;return this},clampX:function(c,b){this.x=Phaser.Math.clamp(this.x,c,b);return this},clampY:function(c,b){this.y=Phaser.Math.clamp(this.y,c,b);return this},clamp:function(c,b){this.x=Phaser.Math.clamp(this.x,c,b);this.y=Phaser.Math.clamp(this.y,c,b);return this},clone:function(b){if(typeof b==="undefined"){b=new Phaser.Point}return b.setTo(this.x,this.y)},copyFrom:function(b){return this.setTo(b.x,b.y)},copyTo:function(b){b[x]=this.x;b[y]=this.y;return b},distance:function(c,b){return Phaser.Point.distance(this,c,b)},equals:function(b){return(b.x==this.x&&b.y==this.y)},rotate:function(b,f,d,c,e){return Phaser.Point.rotate(this,b,f,d,c,e)},toString:function(){return"[{Point (x="+this.x+" y="+this.y+")}]"}};Phaser.Point.add=function(d,c,e){if(typeof e==="undefined"){e=new Phaser.Point()}e.x=d.x+c.x;e.y=d.y+c.y;return e};Phaser.Point.subtract=function(d,c,e){if(typeof e==="undefined"){e=new Phaser.Point()}e.x=d.x-c.x;e.y=d.y-c.y;return e};Phaser.Point.multiply=function(d,c,e){if(typeof e==="undefined"){e=new Phaser.Point()}e.x=d.x*c.x;e.y=d.y*c.y;return e};Phaser.Point.divide=function(d,c,e){if(typeof e==="undefined"){e=new Phaser.Point()}e.x=d.x/c.x;e.y=d.y/c.y;return e};Phaser.Point.equals=function(d,c){return(d.x==c.x&&d.y==c.y)};Phaser.Point.distance=function(d,c,e){if(typeof e==="undefined"){e=false}if(e){return Phaser.Math.distanceRound(d.x,d.y,c.x,c.y)}else{return Phaser.Math.distance(d.x,d.y,c.x,c.y)}},Phaser.Point.rotate=function(c,b,g,e,d,f){d=d||false;f=f||null;if(d){e=Phaser.Math.radToDeg(e)}if(f===null){f=Math.sqrt(((b-c.x)*(b-c.x))+((g-c.y)*(g-c.y)))}return c.setTo(b+f*Math.cos(e),g+f*Math.sin(e))};Phaser.Rectangle=function(c,e,d,b){c=c||0;e=e||0;d=d||0;b=b||0;this.x=c;this.y=e;this.width=d;this.height=b};Phaser.Rectangle.prototype={offset:function(c,b){this.x+=c;this.y+=b;return this},offsetPoint:function(b){return this.offset(b.x,b.y)},setTo:function(c,e,d,b){this.x=c;this.y=e;this.width=d;this.height=b;return this},floor:function(){this.x=Math.floor(this.x);this.y=Math.floor(this.y)},copyFrom:function(b){return this.setTo(b.x,b.y,b.width,b.height)},copyTo:function(b){b.x=this.x;b.y=this.y;b.width=this.width;b.height=this.height;return b},inflate:function(c,b){return Phaser.Rectangle.inflate(this,c,b)},size:function(b){return Phaser.Rectangle.size(this,b)},clone:function(b){return Phaser.Rectangle.clone(this,b)},contains:function(b,c){return Phaser.Rectangle.contains(this,b,c)},containsRect:function(c){return Phaser.Rectangle.containsRect(this,c)},equals:function(c){return Phaser.Rectangle.equals(this,c)},intersection:function(c,d){return Phaser.Rectangle.intersection(this,c,output)},intersects:function(c,d){return Phaser.Rectangle.intersects(this,c,d)},intersectsRaw:function(f,d,e,c,b){return Phaser.Rectangle.intersectsRaw(this,f,d,e,c,b)},union:function(c,d){return Phaser.Rectangle.union(this,c,d)},toString:function(){return"[{Rectangle (x="+this.x+" y="+this.y+" width="+this.width+" height="+this.height+" empty="+this.empty+")}]"}};Object.defineProperty(Phaser.Rectangle.prototype,"halfWidth",{get:function(){return Math.round(this.width/2)}});Object.defineProperty(Phaser.Rectangle.prototype,"halfHeight",{get:function(){return Math.round(this.height/2)}});Object.defineProperty(Phaser.Rectangle.prototype,"bottom",{get:function(){return this.y+this.height},set:function(b){if(b<=this.y){this.height=0}else{this.height=(this.y-b)}}});Object.defineProperty(Phaser.Rectangle.prototype,"bottomRight",{get:function(){return new Phaser.Point(this.right,this.bottom)},set:function(b){this.right=b.x;this.bottom=b.y}});Object.defineProperty(Phaser.Rectangle.prototype,"left",{get:function(){return this.x},set:function(b){if(b>=this.right){this.width=0}else{this.width=this.right-b}this.x=b}});Object.defineProperty(Phaser.Rectangle.prototype,"right",{get:function(){return this.x+this.width},set:function(b){if(b<=this.x){this.width=0}else{this.width=this.x+b}}});Object.defineProperty(Phaser.Rectangle.prototype,"volume",{get:function(){return this.width*this.height}});Object.defineProperty(Phaser.Rectangle.prototype,"perimeter",{get:function(){return(this.width*2)+(this.height*2)}});Object.defineProperty(Phaser.Rectangle.prototype,"centerX",{get:function(){return this.x+this.halfWidth},set:function(b){this.x=b-this.halfWidth}});Object.defineProperty(Phaser.Rectangle.prototype,"centerY",{get:function(){return this.y+this.halfHeight},set:function(b){this.y=b-this.halfHeight}});Object.defineProperty(Phaser.Rectangle.prototype,"top",{get:function(){return this.y},set:function(b){if(b>=this.bottom){this.height=0;this.y=b}else{this.height=(this.bottom-b)}}});Object.defineProperty(Phaser.Rectangle.prototype,"topLeft",{get:function(){return new Phaser.Point(this.x,this.y)},set:function(b){this.x=b.x;this.y=b.y}});Object.defineProperty(Phaser.Rectangle.prototype,"empty",{get:function(){return(!this.width||!this.height)},set:function(b){this.setTo(0,0,0,0)}});Phaser.Rectangle.inflate=function(c,d,b){c.x-=d;c.width+=2*d;c.y-=b;c.height+=2*b;return c};Phaser.Rectangle.inflatePoint=function(c,b){return Phaser.Phaser.Rectangle.inflate(c,b.x,b.y)};Phaser.Rectangle.size=function(b,c){if(typeof c==="undefined"){c=new Phaser.Point()}return c.setTo(b.width,b.height)};Phaser.Rectangle.clone=function(b,c){if(typeof c==="undefined"){c=new Phaser.Rectangle()}return c.setTo(b.x,b.y,b.width,b.height)};Phaser.Rectangle.contains=function(c,b,d){return(b>=c.x&&b<=c.right&&d>=c.y&&d<=c.bottom)};Phaser.Rectangle.containsPoint=function(c,b){return Phaser.Phaser.Rectangle.contains(c,b.x,b.y)};Phaser.Rectangle.containsRect=function(d,c){if(d.volume>c.volume){return false}return(d.x>=c.x&&d.y>=c.y&&d.right<=c.right&&d.bottom<=c.bottom)};Phaser.Rectangle.equals=function(d,c){return(d.x==c.x&&d.y==c.y&&d.width==c.width&&d.height==c.height)};Phaser.Rectangle.intersection=function(d,c,e){e=e||new Phaser.Rectangle;if(Phaser.Rectangle.intersects(d,c)){e.x=Math.max(d.x,c.x);e.y=Math.max(d.y,c.y);e.width=Math.min(d.right,c.right)-e.x;e.height=Math.min(d.bottom,c.bottom)-e.y}return e};Phaser.Rectangle.intersects=function(d,c,e){e=e||0;return !(d.left>c.right+e||d.rightc.bottom+e||d.bottomb.right+c||eb.bottom+c||d1){if(f&&f==this.decodeURI(d[0])){return this.decodeURI(d[1])}else{c[this.decodeURI(d[0])]=this.decodeURI(d[1])}}}return c},decodeURI:function(b){return decodeURIComponent(b.replace(/\+/g," "))}};Phaser.TweenManager=function(b){this.game=b;this._tweens=[];this.game.onPause.add(this.pauseAll,this);this.game.onResume.add(this.resumeAll,this)};Phaser.TweenManager.prototype={REVISION:"11dev",getAll:function(){return this._tweens},removeAll:function(){this._tweens=[]},add:function(b){this._tweens.push(b)},create:function(b){return new Phaser.Tween(b,this.game)},remove:function(c){var b=this._tweens.indexOf(c);if(b!==-1){this._tweens.splice(b,1)}},update:function(){if(this._tweens.length===0){return false}var b=0,c=this._tweens.length;while(b=0;b--){this._tweens[b].pause()}},resumeAll:function(){for(var b=this._tweens.length-1;b>=0;b--){this._tweens[b].resume()}}};Phaser.Tween=function(c,b){this._object=c;this.game=b;this._manager=this.game.tweens;this._valuesStart={};this._valuesEnd={};this._valuesStartRepeat={};this._duration=1000;this._repeat=0;this._yoyo=false;this._reversed=false;this._delayTime=0;this._startTime=null;this._easingFunction=Phaser.Easing.Linear.None;this._interpolationFunction=Phaser.Math.linearInterpolation;this._chainedTweens=[];this._onStartCallback=null;this._onStartCallbackFired=false;this._onUpdateCallback=null;this._onCompleteCallback=null;this._pausedTime=0;for(var d in c){this._valuesStart[d]=parseFloat(c[d],10)}this.onStart=new Phaser.Signal();this.onComplete=new Phaser.Signal();this.isRunning=false};Phaser.Tween.prototype={to:function(d,g,h,c,b,f,e){g=g||1000;h=h||null;c=c||false;b=b||0;f=f||0;e=e||false;this._repeat=f;this._duration=g;this._valuesEnd=d;if(h!==null){this._easingFunction=h}if(b>0){this._delayTime=b}this._yoyo=e;if(c){return this.start()}else{return this}},start:function(c){if(this.game===null||this._object===null){return}this._manager.add(this);this.onStart.dispatch(this._object);this.isRunning=true;this._onStartCallbackFired=false;this._startTime=this.game.time.now+this._delayTime;for(var b in this._valuesEnd){if(this._valuesEnd[b] instanceof Array){if(this._valuesEnd[b].length===0){continue}this._valuesEnd[b]=[this._object[b]].concat(this._valuesEnd[b])}this._valuesStart[b]=this._object[b];if((this._valuesStart[b] instanceof Array)===false){this._valuesStart[b]*=1}this._valuesStartRepeat[b]=this._valuesStart[b]||0}return this},stop:function(){this._manager.remove(this);this.isRunning=false;return this},delay:function(b){this._delayTime=b;return this},repeat:function(b){this._repeat=b;return this},yoyo:function(b){this._yoyo=b;return this},easing:function(b){this._easingFunction=b;return this},interpolation:function(b){this._interpolationFunction=b;return this},chain:function(){this._chainedTweens=arguments;return this},onStart:function(b){this._onStartCallback=b;return this},onUpdate:function(b){this._onUpdateCallback=b;return this},onComplete:function(b){this._onCompleteCallback=b;return this},pause:function(){this._paused=true},resume:function(){this._paused=false;this._startTime+=this.game.time.pauseDuration},update:function(c){if(this._paused||c1?1:k;var h=this._easingFunction(k);for(j in this._valuesEnd){var b=this._valuesStart[j]||0;var d=this._valuesEnd[j];if(d instanceof Array){this._object[j]=this._interpolationFunction(d,h)}else{if(typeof(d)==="string"){d=b+parseFloat(d,10)}if(typeof(d)==="number"){this._object[j]=b+(d-b)*h}}}if(this._onUpdateCallback!==null){this._onUpdateCallback.call(this._object,h)}if(k==1){if(this._repeat>0){if(isFinite(this._repeat)){this._repeat--}for(j in this._valuesStartRepeat){if(typeof(this._valuesEnd[j])==="string"){this._valuesStartRepeat[j]=this._valuesStartRepeat[j]+parseFloat(this._valuesEnd[j],10)}if(this._yoyo){var e=this._valuesStartRepeat[j];this._valuesStartRepeat[j]=this._valuesEnd[j];this._valuesEnd[j]=e;this._reversed=!this._reversed}this._valuesStart[j]=this._valuesStartRepeat[j]}this._startTime=c+this._delayTime;this.onComplete.dispatch(this._object);if(this._onCompleteCallback!==null){this._onCompleteCallback.call(this._object)}return true}else{this.onComplete.dispatch(this._object);if(this._onCompleteCallback!==null){this._onCompleteCallback.call(this._object)}for(var f=0,g=this._chainedTweens.length;fthis._timeLastSecond+1000){this.fps=Math.round((this.frames*1000)/(this.now-this._timeLastSecond));this.fpsMin=this.game.math.min(this.fpsMin,this.fps);this.fpsMax=this.game.math.max(this.fpsMax,this.fps);this._timeLastSecond=this.now;this.frames=0}this.time=this.now;this.lastTime=b+this.timeToCall;this.physicsElapsed=1*(this.elapsed/1000);if(this.game.paused){this.pausedTime=this.now-this._pauseStarted}},gamePaused:function(){this._pauseStarted=this.now},gameResumed:function(){this.time=Date.now();this.pauseDuration=this.pausedTime;this._justResumed=true},elapsedSince:function(b){return this.now-b},elapsedSecondsSince:function(b){return(this.now-b)*0.001},reset:function(){this._started=this.now}};Phaser.AnimationManager=function(b){this._frameData=null;this.currentFrame=null;this.sprite=b;this.game=b.game;this._anims={};this.updateIfVisible=true};Phaser.AnimationManager.prototype={loadFrameData:function(b){this._frameData=b;this.frame=0},add:function(e,f,d,c,b){f=f||null;d=d||60;c=c||false;b=b||true;if(this._frameData==null){console.warn("No frameData available for Phaser.Animation "+e);return}if(this.sprite.events.onAnimationStart==null){this.sprite.events.onAnimationStart=new Phaser.Signal();this.sprite.events.onAnimationComplete=new Phaser.Signal();this.sprite.events.onAnimationLoop=new Phaser.Signal()}if(f==null){f=this._frameData.getFrameIndexes()}else{if(this.validateFrames(f,b)==false){console.warn("Invalid frames given to Phaser.Animation "+e);return}}if(b==false){f=this._frameData.getFrameIndexesByName(f)}this._anims[e]=new Phaser.Animation(this.game,this.sprite,this._frameData,e,f,d,c);this.currentAnim=this._anims[e];this.currentFrame=this.currentAnim.currentFrame;this.sprite.setTexture(PIXI.TextureCache[this.currentFrame.uuid]);return this._anims[e]},validateFrames:function(d,b){for(var c=0;cthis._frameData.total){return false}}else{if(this._frameData.checkFrameName(d[c])==false){return false}}}return true},play:function(d,c,b){c=c||null;b=b||null;if(this._anims[d]){if(this.currentAnim==this._anims[d]){if(this.currentAnim.isPlaying==false){return this.currentAnim.play(c,b)}}else{this.currentAnim=this._anims[d];return this.currentAnim.play(c,b)}}},stop:function(b){if(this._anims[b]){this.currentAnim=this._anims[b];this.currentAnim.stop()}},update:function(){if(this.updateIfVisible&&this.sprite.visible==false){return false}if(this.currentAnim&&this.currentAnim.update()==true){this.currentFrame=this.currentAnim.currentFrame;this.sprite.currentFrame=this.currentFrame;return true}return false},destroy:function(){this._anims={};this._frameData=null;this._frameIndex=0;this.currentAnim=null;this.currentFrame=null}};Object.defineProperty(Phaser.AnimationManager.prototype,"frameData",{get:function(){return this._frameData}});Object.defineProperty(Phaser.AnimationManager.prototype,"frameTotal",{get:function(){if(this._frameData){return this._frameData.total}else{return -1}}});Object.defineProperty(Phaser.AnimationManager.prototype,"frame",{get:function(){if(this.currentFrame){return this._frameIndex}},set:function(b){if(this._frameData&&this._frameData.getFrame(b)!==null){this.currentFrame=this._frameData.getFrame(b);this._frameIndex=b;this.sprite.currentFrame=this.currentFrame;this.sprite.setTexture(PIXI.TextureCache[this.currentFrame.uuid])}}});Object.defineProperty(Phaser.AnimationManager.prototype,"frameName",{get:function(){if(this.currentFrame){return this.currentFrame.name}},set:function(b){if(this._frameData&&this._frameData.getFrameByName(b)){this.currentFrame=this._frameData.getFrameByName(b);this._frameIndex=this.currentFrame.index;this.sprite.currentFrame=this.currentFrame;this.sprite.setTexture(PIXI.TextureCache[this.currentFrame.uuid])}else{console.warn("Cannot set frameName: "+b)}}});Phaser.Animation=function(c,g,f,e,h,d,b){this.game=c;this._parent=g;this._frames=h;this._frameData=f;this.name=e;this.delay=1000/d;this.looped=b;this.isFinished=false;this.isPlaying=false;this._frameIndex=0;this.currentFrame=this._frameData.getFrame(this._frames[this._frameIndex])};Phaser.Animation.prototype={play:function(c,b){c=c||null;b=b||null;if(c!==null){this.delay=1000/c}if(b!==null){this.looped=b}this.isPlaying=true;this.isFinished=false;this._timeLastFrame=this.game.time.now;this._timeNextFrame=this.game.time.now+this.delay;this._frameIndex=0;this.currentFrame=this._frameData.getFrame(this._frames[this._frameIndex]);this._parent.setTexture(PIXI.TextureCache[this.currentFrame.uuid]);this._parent.events.onAnimationStart.dispatch(this._parent,this);return this},restart:function(){this.isPlaying=true;this.isFinished=false;this._timeLastFrame=this.game.time.now;this._timeNextFrame=this.game.time.now+this.delay;this._frameIndex=0;this.currentFrame=this._frameData.getFrame(this._frames[this._frameIndex])},stop:function(){this.isPlaying=false;this.isFinished=true},update:function(){if(this.isPlaying==true&&this.game.time.now>=this._timeNextFrame){this._frameIndex++;if(this._frameIndex==this._frames.length){if(this.looped){this._frameIndex=0;this.currentFrame=this._frameData.getFrame(this._frames[this._frameIndex]);this._parent.setTexture(PIXI.TextureCache[this.currentFrame.uuid]);this._parent.events.onAnimationLoop.dispatch(this._parent,this)}else{this.onComplete()}}else{this.currentFrame=this._frameData.getFrame(this._frames[this._frameIndex]);this._parent.setTexture(PIXI.TextureCache[this.currentFrame.uuid])}this._timeLastFrame=this.game.time.now;this._timeNextFrame=this.game.time.now+this.delay;return true}return false},destroy:function(){this.game=null;this._parent=null;this._frames=null;this._frameData=null;this.currentFrame=null;this.isPlaying=false},onComplete:function(){this.isPlaying=false;this.isFinished=true;this._parent.events.onAnimationComplete.dispatch(this._parent,this)}};Object.defineProperty(Phaser.Animation.prototype,"frameTotal",{get:function(){return this._frames.length}});Object.defineProperty(Phaser.Animation.prototype,"frame",{get:function(){if(this.currentFrame!==null){return this.currentFrame.index}else{return this._frameIndex}},set:function(b){this.currentFrame=this._frameData.getFrame(b);if(this.currentFrame!==null){this._frameIndex=b;this._parent.setTexture(PIXI.TextureCache[this.currentFrame.uuid])}}});Phaser.Animation.Frame=function(c,g,f,b,d,e){this.x=c;this.y=g;this.width=f;this.height=b;this.centerX=Math.floor(f/2);this.centerY=Math.floor(b/2);this.index=0;this.name=d;this.uuid=e;this.distance=Phaser.Math.distance(0,0,f,b);this.rotated=false;this.rotationDirection="cw";this.trimmed=false;this.sourceSizeW=f;this.sourceSizeH=b;this.spriteSourceSizeX=0;this.spriteSourceSizeY=0;this.spriteSourceSizeW=0;this.spriteSourceSizeH=0};Phaser.Animation.Frame.prototype={setTrim:function(f,e,h,c,b,d,g){this.trimmed=f;if(f){this.width=e;this.height=h;this.sourceSizeW=e;this.sourceSizeH=h;this.centerX=Math.floor(e/2);this.centerY=Math.floor(h/2);this.spriteSourceSizeX=c;this.spriteSourceSizeY=b;this.spriteSourceSizeW=d;this.spriteSourceSizeH=g}}};Phaser.Animation.FrameData=function(){this._frames=[];this._frameNames=[]};Phaser.Animation.FrameData.prototype={addFrame:function(b){b.index=this._frames.length;this._frames.push(b);if(b.name!==""){this._frameNames[b.name]=b.index}return b},getFrame:function(b){if(this._frames[b]){return this._frames[b]}return null},getFrameByName:function(b){if(this._frameNames[b]!==""){return this._frames[this._frameNames[b]]}return null},checkFrameName:function(b){if(this._frameNames[b]==null){return false}return true},getFrameRange:function(e,b,c){if(typeof c==="undefined"){c=[]}for(var d=e;d<=b;d++){c.push(this._frames[d])}return c},getFrameIndexes:function(b){if(typeof b==="undefined"){b=[]}for(var c=0;c tag");return}var d=new Phaser.Animation.FrameData();var j=g.getElementsByTagName("SubTexture");var f;for(var e=0;e0){this._progressChunk=100/this._keys.length;this.loadFile()}else{this.progress=100;this.hasLoaded=true;this.onLoadComplete.dispatch()}},loadFile:function(){var b=this._fileList[this._keys.shift()];var c=this;switch(b.type){case"image":case"spritesheet":case"textureatlas":case"bitmapfont":case"tilemap":b.data=new Image();b.data.name=b.key;b.data.onload=function(){return c.fileComplete(b.key)};b.data.onerror=function(){return c.fileError(b.key)};b.data.crossOrigin=this.crossOrigin;b.data.src=this.baseURL+b.url;break;case"audio":b.url=this.getAudioURL(b.url);if(b.url!==null){if(this.game.sound.usingWebAudio){this._xhr.open("GET",this.baseURL+b.url,true);this._xhr.responseType="arraybuffer";this._xhr.onload=function(){return c.fileComplete(b.key)};this._xhr.onerror=function(){return c.fileError(b.key)};this._xhr.send()}else{if(this.game.sound.usingAudioTag){if(this.game.sound.touchLocked){b.data=new Audio();b.data.name=b.key;b.data.preload="auto";b.data.src=this.baseURL+b.url;this.fileComplete(b.key)}else{b.data=new Audio();b.data.name=b.key;b.data.onerror=function(){return c.fileError(b.key)};b.data.preload="auto";b.data.src=this.baseURL+b.url;b.data.addEventListener("canplaythrough",Phaser.GAMES[this.game.id].load.fileComplete(b.key),false);b.data.load()}}}}else{this.fileError(b.key)}break;case"text":this._xhr.open("GET",this.baseURL+b.url,true);this._xhr.responseType="text";this._xhr.onload=function(){return c.fileComplete(b.key)};this._xhr.onerror=function(){return c.fileError(b.key)};this._xhr.send();break}},getAudioURL:function(c){var d;for(var b=0;b100){this.progress=100}this.onFileComplete.dispatch(this.progress,b,c,this.queueSize-this._keys.length,this.queueSize);if(this._keys.length>0){this.loadFile()}else{this.hasLoaded=true;this.isLoading=false;this.removeAll();this.onLoadComplete.dispatch()}}};Phaser.Loader.Parser={bitmapFont:function(q,h,l){if(!h.getElementsByTagName("font")){console.warn("Phaser.Loader.Parser.bitmapFont: Invalid XML given, missing tag");return}var m=PIXI.TextureCache[l];var e={};var c=h.getElementsByTagName("info")[0];var j=h.getElementsByTagName("common")[0];e.font=c.attributes.getNamedItem("face").nodeValue;e.size=parseInt(c.attributes.getNamedItem("size").nodeValue,10);e.lineHeight=parseInt(j.attributes.getNamedItem("lineHeight").nodeValue,10);e.chars={};var k=h.getElementsByTagName("char");for(var d=0;d=this.duration){if(this.usingWebAudio){if(this.loop){this.onLoop.dispatch(this);if(this.currentMarker==""){this.currentTime=0;this.startTime=this.game.time.now}else{this.play(this.currentMarker,0,this.volume,true,true)}}else{this.stop()}}else{if(this.loop){this.onLoop.dispatch(this);this.play(this.currentMarker,0,this.volume,true,true)}else{this.stop()}}}}},play:function(d,b,f,c,e){d=d||"";b=b||0;f=f||1;c=c||false;e=e||false;if(this.isPlaying==true&&e==false&&this.override==false){return}if(this.isPlaying&&this.override){if(this.usingWebAudio){if(typeof this._sound.stop==="undefined"){this._sound.noteOff(0)}else{this._sound.stop(0)}}else{if(this.usingAudioTag){this._sound.pause();this._sound.currentTime=0}}}this.currentMarker=d;if(d!==""&&this.markers[d]){this.position=this.markers[d].start;this.volume=this.markers[d].volume;this.loop=this.markers[d].loop;this.duration=this.markers[d].duration*1000;this._tempMarker=d;this._tempPosition=this.position;this._tempVolume=this.volume;this._tempLoop=this.loop}else{this.position=b;this.volume=f;this.loop=c;this.duration=0;this._tempMarker=d;this._tempPosition=b;this._tempVolume=f;this._tempLoop=c}if(this.usingWebAudio){if(this.game.cache.isSoundDecoded(this.key)){if(this._buffer==null){this._buffer=this.game.cache.getSoundData(this.key)}this._sound=this.context.createBufferSource();this._sound.buffer=this._buffer;this._sound.connect(this.gainNode);this.totalDuration=this._sound.buffer.duration;if(this.duration==0){this.duration=this.totalDuration*1000}if(this.loop&&d==""){this._sound.loop=true}if(typeof this._sound.start==="undefined"){this._sound.noteGrainOn(0,this.position,this.duration/1000)}else{this._sound.start(0,this.position,this.duration/1000)}this.isPlaying=true;this.startTime=this.game.time.now;this.currentTime=0;this.stopTime=this.startTime+this.duration;this.onPlay.dispatch(this)}else{this.pendingPlayback=true;if(this.game.cache.getSound(this.key)&&this.game.cache.getSound(this.key).isDecoding==false){this.game.sound.decode(this.key,this)}}}else{if(this.game.cache.getSound(this.key)&&this.game.cache.getSound(this.key).locked){this.game.cache.reloadSound(this.key);this.pendingPlayback=true}else{if(this._sound&&this._sound.readyState==4){this._sound.play();this.totalDuration=this._sound.duration;if(this.duration==0){this.duration=this.totalDuration*1000}this._sound.currentTime=this.position;this._sound.muted=this._muted;if(this._muted){this._sound.volume=0}else{this._sound.volume=this._volume}this.isPlaying=true;this.startTime=this.game.time.now;this.currentTime=0;this.stopTime=this.startTime+this.duration;this.onPlay.dispatch(this)}else{this.pendingPlayback=true}}}},restart:function(d,b,e,c){d=d||"";b=b||0;e=e||1;c=c||false;this.play(d,b,e,c,true)},pause:function(){if(this.isPlaying&&this._sound){this.stop();this.isPlaying=false;this.paused=true;this.onPause.dispatch(this)}},resume:function(){if(this.paused&&this._sound){if(this.usingWebAudio){if(typeof this._sound.start==="undefined"){this._sound.noteGrainOn(0,this.position,this.duration)}else{this._sound.start(0,this.position,this.duration)}}else{this._sound.play()}this.isPlaying=true;this.paused=false;this.onResume.dispatch(this)}},stop:function(){if(this.isPlaying&&this._sound){if(this.usingWebAudio){if(typeof this._sound.stop==="undefined"){this._sound.noteOff(0)}else{this._sound.stop(0)}}else{if(this.usingAudioTag){this._sound.pause();this._sound.currentTime=0}}}this.isPlaying=false;var b=this.currentMarker;this.currentMarker="";this.onStop.dispatch(this,b)}};Object.defineProperty(Phaser.Sound.prototype,"isDecoding",{get:function(){return this.game.cache.getSound(this.key).isDecoding}});Object.defineProperty(Phaser.Sound.prototype,"isDecoded",{get:function(){return this.game.cache.isSoundDecoded(this.key)}});Object.defineProperty(Phaser.Sound.prototype,"mute",{get:function(){return this._muted},set:function(b){b=b||null;if(b){this._muted=true;if(this.usingWebAudio){this._muteVolume=this.gainNode.gain.value;this.gainNode.gain.value=0}else{if(this.usingAudioTag&&this._sound){this._muteVolume=this._sound.volume;this._sound.volume=0}}}else{this._muted=false;if(this.usingWebAudio){this.gainNode.gain.value=this._muteVolume}else{if(this.usingAudioTag&&this._sound){this._sound.volume=this._muteVolume}}}this.onMute.dispatch(this)}});Object.defineProperty(Phaser.Sound.prototype,"volume",{get:function(){return this._volume},set:function(b){if(this.usingWebAudio){this._volume=b;this.gainNode.gain.value=b}else{if(this.usingAudioTag&&this._sound){if(b>=0&&b<=1){this._volume=b;this._sound.volume=b}}}}});Phaser.SoundManager=function(b){this.game=b;this.onSoundDecode=new Phaser.Signal;this._muted=false;this._unlockSource=null;this._volume=1;this._muted=false;this._sounds=[];this.context=null;this.usingWebAudio=true;this.usingAudioTag=false;this.noAudio=false;this.touchLocked=false;this.channels=32};Phaser.SoundManager.prototype={boot:function(){if(this.game.device.iOS&&this.game.device.webAudio==false){this.channels=1}if(this.game.device.iOS||(window.PhaserGlobal&&window.PhaserGlobal.fakeiOSTouchLock)){this.game.input.touch.callbackContext=this;this.game.input.touch.touchStartCallback=this.unlock;this.game.input.mouse.callbackContext=this;this.game.input.mouse.mouseDownCallback=this.unlock;this.touchLocked=true}else{this.touchLocked=false}if(window.PhaserGlobal){if(window.PhaserGlobal.disableAudio==true){this.usingWebAudio=false;this.noAudio=true;return}if(window.PhaserGlobal.disableWebAudio==true){this.usingWebAudio=false;this.usingAudioTag=true;this.noAudio=false;return}}if(!!window.AudioContext){this.context=new window.AudioContext()}else{if(!!window.webkitAudioContext){this.context=new window.webkitAudioContext()}else{if(!!window.Audio){this.usingWebAudio=false;this.usingAudioTag=true}else{this.usingWebAudio=false;this.noAudio=true}}}if(this.context!==null){if(typeof this.context.createGain==="undefined"){this.masterGain=this.context.createGainNode()}else{this.masterGain=this.context.createGain()}this.masterGain.gain.value=1;this.masterGain.connect(this.context.destination)}},unlock:function(){if(this.touchLocked==false){return}if(this.game.device.webAudio==false||(window.PhaserGlobal&&window.PhaserGlobal.disableWebAudio==true)){this.touchLocked=false;this._unlockSource=null;this.game.input.touch.callbackContext=null;this.game.input.touch.touchStartCallback=null;this.game.input.mouse.callbackContext=null;this.game.input.mouse.mouseDownCallback=null}else{var b=this.context.createBuffer(1,1,22050);this._unlockSource=this.context.createBufferSource();this._unlockSource.buffer=b;this._unlockSource.connect(this.context.destination);this._unlockSource.noteOn(0)}},stopAll:function(){for(var b=0;b255){return Phaser.Color.getColor(255,255,255)}if(d>c){return Phaser.Color.getColor(255,255,255)}var f=d+Math.round(Math.random()*(c-d));var e=d+Math.round(Math.random()*(c-d));var b=d+Math.round(Math.random()*(c-d));return Phaser.Color.getColor32(g,f,e,b)},getRGB:function(b){return{alpha:b>>>24,red:b>>16&255,green:b>>8&255,blue:b&255}},getWebRGB:function(c){var f=(c>>>24)/255;var e=c>>16&255;var d=c>>8&255;var b=c&255;return"rgba("+e.toString()+","+d.toString()+","+b.toString()+","+f.toString()+")"},getAlpha:function(b){return b>>>24},getAlphaFloat:function(b){return(b>>>24)/255},getRed:function(b){return b>>16&255},getGreen:function(b){return b>>8&255},getBlue:function(b){return b&255}};Phaser.Physics={};Phaser.Physics.Arcade=function(b){this.game=b;this.gravity=new Phaser.Point;this.bounds=new Phaser.Rectangle(0,0,b.world.width,b.world.height);this.maxObjects=10;this.maxLevels=4;this.OVERLAP_BIAS=4;this.TILE_OVERLAP=false;this.quadTree=new Phaser.QuadTree(this,this.game.world.bounds.x,this.game.world.bounds.y,this.game.world.bounds.width,this.game.world.bounds.height,this.maxObjects,this.maxLevels);this.quadTreeID=0;this._bounds1=new Phaser.Rectangle;this._bounds2=new Phaser.Rectangle;this._overlap=0;this._maxOverlap=0;this._velocity1=0;this._velocity2=0;this._newVelocity1=0;this._newVelocity2=0;this._average=0;this._mapData=[];this._result=false;this._total=0};Phaser.Physics.Arcade.prototype={updateMotion:function(b){this._velocityDelta=(this.computeVelocity(0,false,b.angularVelocity,b.angularAcceleration,b.angularDrag,b.maxAngular)-b.angularVelocity)/2;b.angularVelocity+=this._velocityDelta;b.rotation+=b.angularVelocity*this.game.time.physicsElapsed;this._velocityDelta=(this.computeVelocity(1,b,b.velocity.x,b.acceleration.x,b.drag.x)-b.velocity.x)/2;b.velocity.x+=this._velocityDelta;this._delta=b.velocity.x*this.game.time.physicsElapsed;b.x+=this._delta;this._velocityDelta=(this.computeVelocity(2,b,b.velocity.y,b.acceleration.y,b.drag.y)-b.velocity.y)/2;b.velocity.y+=this._velocityDelta;this._delta=b.velocity.y*this.game.time.physicsElapsed;b.y+=this._delta},computeVelocity:function(e,c,g,f,d,b){b=b||10000;if(e==1&&c.allowGravity){g+=this.gravity.x+c.gravity.x}else{if(e==2&&c.allowGravity){g+=this.gravity.y+c.gravity.y}}if(f!==0){g+=f*this.game.time.physicsElapsed}else{if(d!==0){this._drag=d*this.game.time.physicsElapsed;if(g-this._drag>0){g=g-this._drag}else{if(g+this._drag<0){g+=this._drag}else{g=0}}}}if(g!=0){if(g>b){g=b}else{if(g<-b){g=-b}}}return g},preUpdate:function(){this.quadTree.clear();this.quadTreeID=0;this.quadTree=new Phaser.QuadTree(this,this.game.world.bounds.x,this.game.world.bounds.y,this.game.world.bounds.width,this.game.world.bounds.height,this.maxObjects,this.maxLevels)},postUpdate:function(){this.quadTree.clear()},collide:function(f,e,d,c,b){d=d||null;c=c||null;b=b||d;this._result=false;this._total=0;if(f&&e&&f.exists&&e.exists){if(f.type==Phaser.SPRITE&&e.type==Phaser.SPRITE){this.collideSpriteVsSprite(f,e,d,c,b)}else{if(f.type==Phaser.SPRITE&&e.type==Phaser.GROUP){this.collideSpriteVsGroup(f,e,d,c,b)}else{if(f.type==Phaser.GROUP&&e.type==Phaser.SPRITE){this.collideSpriteVsGroup(e,f,d,c,b)}else{if(f.type==Phaser.GROUP&&e.type==Phaser.GROUP){this.collideGroupVsGroup(f,e,d,c,b)}else{if(f.type==Phaser.SPRITE&&e.type==Phaser.TILEMAP){this.collideSpriteVsTilemap(f,e,d,c,b)}else{if(f.type==Phaser.TILEMAP&&e.type==Phaser.SPRITE){this.collideSpriteVsTilemap(e,f,d,c,b)}else{if(f.type==Phaser.GROUP&&e.type==Phaser.TILEMAP){this.collideGroupVsTilemap(f,e,d,c,b)}else{if(f.type==Phaser.TILEMAP&&e.type==Phaser.GROUP){this.collideGroupVsTilemap(e,f,d,c,b)}else{if(f.type==Phaser.EMITTER&&e.type==Phaser.TILEMAP){this.collideGroupVsTilemap(f,e,d,c,b)}else{if(f.type==Phaser.TILEMAP&&e.type==Phaser.EMITTER){this.collideGroupVsTilemap(e,f,d,c,b)}}}}}}}}}}}return(this._total>0)},collideSpriteVsSprite:function(f,e,d,c,b){this.separate(f.body,e.body);if(this._result){if(c){if(c.call(b,f,e)){this._total++;if(d){d.call(b,f,e)}}}else{this._total++;if(d){d.call(b,f,e)}}}},collideGroupVsTilemap:function(g,f,e,d,b){if(g._container.first._iNext){var c=g._container.first._iNext;do{if(c.exists){this.collideSpriteVsTilemap(c,f,e,d,b)}c=c._iNext}while(c!=g._container.last._iNext)}},collideSpriteVsTilemap:function(d,g,f,e,b){this._mapData=g.collisionLayer.getTileOverlaps(d);var c=this._mapData.length;while(c--){if(e){if(e.call(b,d,this._mapData[c].tile)){this._total++;if(f){f.call(b,d,this._mapData[c].tile)}}}else{this._total++;if(f){f.call(b,d,this._mapData[c].tile)}}}},collideSpriteVsGroup:function(e,h,g,f,c){this._potentials=this.quadTree.retrieve(e);for(var d=0,b=this._potentials.length;d0)?c.deltaX():0),c.lastY,c.width+((c.deltaX()>0)?c.deltaX():-c.deltaX()),c.height);this._bounds2.setTo(b.x-((b.deltaX()>0)?b.deltaX():0),b.lastY,b.width+((b.deltaX()>0)?b.deltaX():-b.deltaX()),b.height);if((this._bounds1.right>this._bounds2.x)&&(this._bounds1.xthis._bounds2.y)&&(this._bounds1.yb.deltaX()){this._overlap=c.x+c.width-b.x;if((this._overlap>this._maxOverlap)||c.allowCollision.right==false||b.allowCollision.left==false){this._overlap=0}else{c.touching.right=true;b.touching.left=true}}else{if(c.deltaX()this._maxOverlap)||c.allowCollision.left==false||b.allowCollision.right==false){this._overlap=0}else{c.touching.left=true;b.touching.right=true}}}}}if(this._overlap!=0){c.overlapX=this._overlap;b.overlapX=this._overlap;if(c.customSeparateX||b.customSeparateX){return true}this._velocity1=c.velocity.x;this._velocity2=b.velocity.x;if(!c.immovable&&!b.immovable){this._overlap*=0.5;c.x=c.x-this._overlap;b.x+=this._overlap;this._newVelocity1=Math.sqrt((this._velocity2*this._velocity2*b.mass)/c.mass)*((this._velocity2>0)?1:-1);this._newVelocity2=Math.sqrt((this._velocity1*this._velocity1*c.mass)/b.mass)*((this._velocity1>0)?1:-1);this._average=(this._newVelocity1+this._newVelocity2)*0.5;this._newVelocity1-=this._average;this._newVelocity2-=this._average;c.velocity.x=this._average+this._newVelocity1*c.bounce.x;b.velocity.x=this._average+this._newVelocity2*b.bounce.x}else{if(!c.immovable){c.x=c.x-this._overlap;c.velocity.x=this._velocity2-this._velocity1*c.bounce.x}else{if(!b.immovable){b.x+=this._overlap;b.velocity.x=this._velocity1-this._velocity2*b.bounce.x}}}return true}else{return false}},separateY:function(c,b){if(c.immovable&&b.immovable){return false}this._overlap=0;if(c.deltaY()!=b.deltaY()){this._bounds1.setTo(c.x,c.y-((c.deltaY()>0)?c.deltaY():0),c.width,c.height+c.deltaAbsY());this._bounds2.setTo(b.x,b.y-((b.deltaY()>0)?b.deltaY():0),b.width,b.height+b.deltaAbsY());if((this._bounds1.right>this._bounds2.x)&&(this._bounds1.xthis._bounds2.y)&&(this._bounds1.yb.deltaY()){this._overlap=c.y+c.height-b.y;if((this._overlap>this._maxOverlap)||c.allowCollision.down==false||b.allowCollision.up==false){this._overlap=0}else{c.touching.down=true;b.touching.up=true}}else{if(c.deltaY()this._maxOverlap)||c.allowCollision.up==false||b.allowCollision.down==false){this._overlap=0}else{c.touching.up=true;b.touching.down=true}}}}}if(this._overlap!=0){c.overlapY=this._overlap;b.overlapY=this._overlap;if(c.customSeparateY||b.customSeparateY){return true}this._velocity1=c.velocity.y;this._velocity2=b.velocity.y;if(!c.immovable&&!b.immovable){this._overlap*=0.5;c.y=c.y-this._overlap;b.y+=this._overlap;this._newVelocity1=Math.sqrt((this._velocity2*this._velocity2*b.mass)/c.mass)*((this._velocity2>0)?1:-1);this._newVelocity2=Math.sqrt((this._velocity1*this._velocity1*c.mass)/b.mass)*((this._velocity1>0)?1:-1);this._average=(this._newVelocity1+this._newVelocity2)*0.5;this._newVelocity1-=this._average;this._newVelocity2-=this._average;c.velocity.y=this._average+this._newVelocity1*c.bounce.y;b.velocity.y=this._average+this._newVelocity2*b.bounce.y}else{if(!c.immovable){c.y=c.y-this._overlap;c.velocity.y=this._velocity2-this._velocity1*c.bounce.y;if(b.active&&b.moves&&(c.deltaY()>b.deltaY())){c.x+=b.x-b.lastX}}else{if(!b.immovable){b.y+=this._overlap;b.velocity.y=this._velocity1-this._velocity2*b.bounce.y;if(c.sprite.active&&c.moves&&(c.deltaY()h)&&(this._bounds1.xg)&&(this._bounds1.yh)&&(this._bounds1.xg)&&(this._bounds1.y0){this._overlap=d.bottom-g;if(d.allowCollision.down&&b&&this._overlap0){var h=this.distanceBetween(g,e);f=h/(c/1000)}g.body.velocity.x=Math.cos(b)*f;g.body.velocity.y=Math.sin(b)*f},accelerateTowardsObject:function(f,d,e,b,g){b=b||1000;g=g||1000;var c=this.angleBetween(f,d);f.body.velocity.x=0;f.body.velocity.y=0;f.body.acceleration.x=Math.cos(c)*e;f.body.acceleration.y=Math.sin(c)*e;f.body.maxVelocity.x=b;f.body.maxVelocity.y=g},moveTowardsMouse:function(f,e,c){e=e||60;c=c||0;var b=this.angleBetweenMouse(f);if(c>0){var g=this.distanceToMouse(f);e=g/(c/1000)}f.body.velocity.x=Math.cos(b)*e;f.body.velocity.y=Math.sin(b)*e},accelerateTowardsMouse:function(e,d,b,f){b=b||1000;f=f||1000;var c=this.angleBetweenMouse(e);e.body.velocity.x=0;e.body.velocity.y=0;e.body.acceleration.x=Math.cos(c)*d;e.body.acceleration.y=Math.sin(c)*d;e.body.maxVelocity.x=b;e.body.maxVelocity.y=f},moveTowardsPoint:function(f,g,e,c){e=e||60;c=c||0;var b=this.angleBetweenPoint(f,g);if(c>0){var h=this.distanceToPoint(f,g);e=h/(c/1000)}f.body.velocity.x=Math.cos(b)*e;f.body.velocity.y=Math.sin(b)*e},accelerateTowardsPoint:function(e,f,d,b,g){b=b||1000;g=g||1000;var c=this.angleBetweenPoint(e,f);e.body.velocity.x=0;e.body.velocity.y=0;e.body.acceleration.x=Math.cos(c)*d;e.body.acceleration.y=Math.sin(c)*d;e.body.maxVelocity.x=b;e.body.maxVelocity.y=g},distanceBetween:function(e,c){var f=e.center.x-c.center.x;var d=e.center.y-c.center.y;return Math.sqrt(f*f+d*d)},distanceToPoint:function(c,e){var d=c.center.x-e.x;var b=c.center.y-e.y;return Math.sqrt(d*d+b*b)},distanceToMouse:function(c){var d=c.center.x-this.game.input.x;var b=c.center.y-this.game.input.y;return Math.sqrt(d*d+b*b)},angleBetweenPoint:function(c,f,e){e=e||false;var d=f.x-c.center.x;var b=f.y-c.center.y;if(e){return this.game.math.radToDeg(Math.atan2(b,d))}else{return Math.atan2(b,d)}},angleBetween:function(e,c,g){g=g||false;var f=c.center.x-e.center.x;var d=c.center.y-e.center.y;if(g){return this.game.math.radToDeg(Math.atan2(d,f))}else{return Math.atan2(d,f)}},velocityFromFacing:function(b,c){},angleBetweenMouse:function(c,e){e=e||false;var d=this.game.input.x-c.bounds.x;var b=this.game.input.y-c.bounds.y;if(e){return this.game.math.radToDeg(Math.atan2(b,d))}else{return Math.atan2(b,d)}}};Phaser.Physics.Arcade.Body=function(b){this.sprite=b;this.game=b.game;this.offset=new Phaser.Point;this.x=b.x;this.y=b.y;this.sourceWidth=b.currentFrame.sourceSizeW;this.sourceHeight=b.currentFrame.sourceSizeH;this.width=b.currentFrame.sourceSizeW;this.height=b.currentFrame.sourceSizeH;this.halfWidth=Math.floor(b.currentFrame.sourceSizeW/2);this.halfHeight=Math.floor(b.currentFrame.sourceSizeH/2);this._sx=b.scale.x;this._sy=b.scale.y;this.velocity=new Phaser.Point;this.acceleration=new Phaser.Point;this.drag=new Phaser.Point;this.gravity=new Phaser.Point;this.bounce=new Phaser.Point;this.maxVelocity=new Phaser.Point(10000,10000);this.angularVelocity=0;this.angularAcceleration=0;this.angularDrag=0;this.maxAngular=1000;this.mass=1;this.quadTreeIDs=[];this.quadTreeIndex=-1;this.allowCollision={none:false,any:true,up:true,down:true,left:true,right:true};this.touching={none:true,up:false,down:false,left:false,right:false};this.wasTouching={none:true,up:false,down:false,left:false,right:false};this.immovable=false;this.moves=true;this.rotation=0;this.allowRotation=true;this.allowGravity=true;this.customSeparateX=false;this.customSeparateY=false;this.overlapX=0;this.overlapY=0;this.collideWorldBounds=false;this.lastX=b.x;this.lastY=b.y};Phaser.Physics.Arcade.Body.prototype={updateBounds:function(e,d,c,b){if(c!=this._sx||b!=this._sy){this.width=this.sourceWidth*c;this.height=this.sourceHeight*b;this.halfWidth=Math.floor(this.width/2);this.halfHeight=Math.floor(this.height/2);this._sx=c;this._sy=b}},update:function(){this.wasTouching.none=this.touching.none;this.wasTouching.up=this.touching.up;this.wasTouching.down=this.touching.down;this.wasTouching.left=this.touching.left;this.wasTouching.right=this.touching.right;this.touching.none=true;this.touching.up=false;this.touching.down=false;this.touching.left=false;this.touching.right=false;this.lastX=this.x;this.lastY=this.y;this.rotation=this.sprite.angle;this.x=(this.sprite.x-(this.sprite.anchor.x*this.width))+this.offset.x;this.y=(this.sprite.y-(this.sprite.anchor.y*this.height))+this.offset.y;if(this.moves){this.game.physics.updateMotion(this)}if(this.collideWorldBounds){this.checkWorldBounds()}if(this.allowCollision.none==false&&this.sprite.visible&&this.sprite.alive){this.quadTreeIDs=[];this.quadTreeIndex=-1;this.game.physics.quadTree.insert(this)}this.sprite.x=this.x-this.offset.x+(this.sprite.anchor.x*this.width);this.sprite.y=this.y-this.offset.y+(this.sprite.anchor.y*this.height);if(this.allowRotation){this.sprite.angle=this.rotation}},postUpdate:function(){this.sprite.x=this.x-this.offset.x+(this.sprite.anchor.x*this.width);this.sprite.y=this.y-this.offset.y+(this.sprite.anchor.y*this.height);if(this.allowRotation){this.sprite.angle=this.rotation}},checkWorldBounds:function(){if(this.xthis.game.world.bounds.right){this.x=this.game.world.bounds.right-this.width;this.velocity.x*=-this.bounce.x}}if(this.ythis.game.world.bounds.bottom){this.y=this.game.world.bounds.bottom-this.height;this.velocity.y*=-this.bounce.y}}},setSize:function(d,c,b,e){b=b||this.offset.x;e=e||this.offset.y;this.sourceWidth=d;this.sourceHeight=c;this.width=this.sourceWidth*this._sx;this.height=this.sourceHeight*this._sy;this.halfWidth=Math.floor(this.width/2);this.halfHeight=Math.floor(this.height/2);this.offset.setTo(b,e)},reset:function(){this.velocity.setTo(0,0);this.acceleration.setTo(0,0);this.angularVelocity=0;this.angularAcceleration=0;this.x=(this.sprite.x-(this.sprite.anchor.x*this.width))+this.offset.x;this.y=(this.sprite.y-(this.sprite.anchor.y*this.height))+this.offset.y;this.lastX=this.x;this.lastY=this.y},deltaAbsX:function(){return(this.deltaX()>0?this.deltaX():-this.deltaX())},deltaAbsY:function(){return(this.deltaY()>0?this.deltaY():-this.deltaY())},deltaX:function(){return this.x-this.lastX},deltaY:function(){return this.y-this.lastY}};Object.defineProperty(Phaser.Physics.Arcade.Body.prototype,"bottom",{get:function(){return this.y+this.height},set:function(b){if(b<=this.y){this.height=0}else{this.height=(this.y-b)}}});Object.defineProperty(Phaser.Physics.Arcade.Body.prototype,"right",{get:function(){return this.x+this.width},set:function(b){if(b<=this.x){this.width=0}else{this.width=this.x+b}}});Phaser.Particles=function(b){this.emitters={};this.ID=0};Phaser.Particles.prototype={emitters:null,add:function(b){this.emitters[b.name]=b;return b},remove:function(b){delete this.emitters[b.name]},update:function(){for(var b in this.emitters){if(this.emitters[b].exists){this.emitters[b].update()}}}};Phaser.Particles.Arcade={};Phaser.Particles.Arcade.Emitter=function(c,b,e,d){d=d||50;Phaser.Group.call(this,c);this.name="emitter"+this.game.particles.ID++;this.type=Phaser.EMITTER;this.x=0;this.y=0;this.width=1;this.height=1;this.minParticleSpeed=new Phaser.Point(-100,-100);this.maxParticleSpeed=new Phaser.Point(100,100);this.minParticleScale=1;this.maxParticleScale=1;this.minRotation=-360;this.maxRotation=360;this.gravity=2;this.particleClass=null;this.particleDrag=new Phaser.Point();this.frequency=100;this.maxParticles=d;this.lifespan=2000;this.bounce=0;this._quantity=0;this._timer=0;this._counter=0;this._explode=true;this.on=false;this.exists=true;this.emitX=b;this.emitY=e};Phaser.Particles.Arcade.Emitter.prototype=Object.create(Phaser.Group.prototype);Phaser.Particles.Arcade.Emitter.prototype.constructor=Phaser.Particles.Arcade.Emitter;Phaser.Particles.Arcade.Emitter.prototype.update=function(){if(this.on){if(this._explode){this._counter=0;do{this.emitParticle();this._counter++}while(this._counter=this._timer){this.emitParticle();this._counter++;if(this._quantity>0){if(this._counter>=this._quantity){this.on=false}}this._timer=this.game.time.now+this.frequency}}}};Phaser.Particles.Arcade.Emitter.prototype.makeParticles=function(d,h,f,e){if(typeof h=="undefined"){h=0}f=f||this.maxParticles;e=e||0;var j;var b=0;var c=d;var g=0;while(b0){j.body.allowCollision.any=true;j.body.allowCollision.none=false}else{j.body.allowCollision.none=true}j.exists=false;j.visible=false;j.anchor.setTo(0.5,0.5);this.add(j);b++}return this};Phaser.Particles.Arcade.Emitter.prototype.kill=function(){this.on=false;this.alive=false;this.exists=false};Phaser.Particles.Arcade.Emitter.prototype.revive=function(){this.alive=true;this.exists=true};Phaser.Particles.Arcade.Emitter.prototype.start=function(b,e,d,c){if(typeof b!=="boolean"){b=true}e=e||0;d=d||250;c=c||0;this.revive();this.visible=true;this.on=true;this._explode=b;this.lifespan=e;this.frequency=d;this._quantity+=c;this._counter=0;this._timer=this.game.time.now+d};Phaser.Particles.Arcade.Emitter.prototype.emitParticle=function(){var c=this.getFirstExists(false);if(c==null){return}if(this.width>1||this.height>1){c.reset(this.emiteX-this.game.rnd.integerInRange(this.left,this.right),this.emiteY-this.game.rnd.integerInRange(this.top,this.bottom))}else{c.reset(this.emitX,this.emitY)}c.lifespan=this.lifespan;c.body.bounce.setTo(this.bounce,this.bounce);if(this.minParticleSpeed.x!=this.maxParticleSpeed.x){c.body.velocity.x=this.game.rnd.integerInRange(this.minParticleSpeed.x,this.maxParticleSpeed.x)}else{c.body.velocity.x=this.minParticleSpeed.x}if(this.minParticleSpeed.y!=this.maxParticleSpeed.y){c.body.velocity.y=this.game.rnd.integerInRange(this.minParticleSpeed.y,this.maxParticleSpeed.y)}else{c.body.velocity.y=this.minParticleSpeed.y}c.body.gravity.y=this.gravity;if(this.minRotation!=this.maxRotation){c.body.angularVelocity=this.game.rnd.integerInRange(this.minRotation,this.maxRotation)}else{c.body.angularVelocity=this.minRotation}if(this.minParticleScale!==1||this.maxParticleScale!==1){var b=this.game.rnd.realInRange(this.minParticleScale,this.maxParticleScale);c.scale.setTo(b,b)}c.body.drag.x=this.particleDrag.x;c.body.drag.y=this.particleDrag.y};Phaser.Particles.Arcade.Emitter.prototype.setSize=function(c,b){this.width=c;this.height=b};Phaser.Particles.Arcade.Emitter.prototype.setXSpeed=function(c,b){c=c||0;b=b||0;this.minParticleSpeed.x=c;this.maxParticleSpeed.x=b};Phaser.Particles.Arcade.Emitter.prototype.setYSpeed=function(c,b){c=c||0;b=b||0;this.minParticleSpeed.y=c;this.maxParticleSpeed.y=b};Phaser.Particles.Arcade.Emitter.prototype.setRotation=function(c,b){c=c||0;b=b||0;this.minRotation=c;this.maxRotation=b};Phaser.Particles.Arcade.Emitter.prototype.at=function(b){this.emitX=b.center.x;this.emitY=b.center.y};Object.defineProperty(Phaser.Particles.Arcade.Emitter.prototype,"alpha",{get:function(){return this._container.alpha},set:function(b){this._container.alpha=b}});Object.defineProperty(Phaser.Particles.Arcade.Emitter.prototype,"visible",{get:function(){return this._container.visible},set:function(b){this._container.visible=b}});Object.defineProperty(Phaser.Particles.Arcade.Emitter.prototype,"x",{get:function(){return this.emitX},set:function(b){this.emitX=b}});Object.defineProperty(Phaser.Particles.Arcade.Emitter.prototype,"y",{get:function(){return this.emitY},set:function(b){this.emitY=b}});Object.defineProperty(Phaser.Particles.Arcade.Emitter.prototype,"left",{get:function(){return Math.floor(this.x-(this.width/2))}});Object.defineProperty(Phaser.Particles.Arcade.Emitter.prototype,"right",{get:function(){return Math.floor(this.x+(this.width/2))}});Object.defineProperty(Phaser.Particles.Arcade.Emitter.prototype,"top",{get:function(){return Math.floor(this.y-(this.height/2))}});Object.defineProperty(Phaser.Particles.Arcade.Emitter.prototype,"bottom",{get:function(){return Math.floor(this.y+(this.height/2))}});Phaser.Tilemap=function(d,e,b,i,g,h,c){if(typeof g==="undefined"){g=true}if(typeof h==="undefined"){h=0}if(typeof c==="undefined"){c=0}this.game=d;this.group=null;this.name="";this.key=e;this.renderOrderID=0;this.collisionCallback=null;this.exists=true;this.visible=true;this.tiles=[];this.layers=[];var f=this.game.cache.getTilemap(e);PIXI.DisplayObjectContainer.call(this);this.position.x=b;this.position.y=i;this.type=Phaser.TILEMAP;this.renderer=new Phaser.TilemapRenderer(this.game);this.mapFormat=f.format;switch(this.mapFormat){case Phaser.Tilemap.CSV:this.parseCSV(f.mapData,e,h,c);break;case Phaser.Tilemap.JSON:this.parseTiledJSON(f.mapData,e);break}if(this.currentLayer&&g){this.game.world.setSize(this.currentLayer.widthInPixels,this.currentLayer.heightInPixels,true)}};Phaser.Tilemap.prototype=Object.create(PIXI.DisplayObjectContainer.prototype);Phaser.Tilemap.prototype.constructor=Phaser.Tilemap;Phaser.Tilemap.CSV=0;Phaser.Tilemap.JSON=1;Phaser.Tilemap.prototype.parseCSV=function(d,j,h,g){var f=new Phaser.TilemapLayer(this,0,j,Phaser.Tilemap.CSV,"TileLayerCSV"+this.layers.length.toString(),h,g);d=d.trim();var k=d.split("\n");for(var e=0;e0){f.addColumn(c)}}f.updateBounds();f.createCanvas();var b=f.parseTileOffsets();this.currentLayer=f;this.collisionLayer=f;this.layers.push(f);this.generateTiles(b)};Phaser.Tilemap.prototype.parseTiledJSON=function(g,f){for(var e=0;e0){this.collisionCallback.call(this.collisionCallbackContext,b,this._tempCollisionData)}return true}else{return false}};Phaser.Tilemap.prototype.putTile=function(b,e,c,d){if(typeof d==="undefined"){d=this.currentLayer.ID}this.layers[d].putTile(b,e,c)};Phaser.Tilemap.prototype.update=function(){this.renderer.render(this)};Phaser.Tilemap.prototype.destroy=function(){this.tiles.length=0;this.layers.length=0};Object.defineProperty(Phaser.Tilemap.prototype,"widthInPixels",{get:function(){return this.currentLayer.widthInPixels}});Object.defineProperty(Phaser.Tilemap.prototype,"heightInPixels",{get:function(){return this.currentLayer.heightInPixels}});Phaser.TilemapLayer=function(f,i,e,d,c,h,b){this.exists=true;this.visible=true;this.widthInTiles=0;this.heightInTiles=0;this.widthInPixels=0;this.heightInPixels=0;this.tileMargin=0;this.tileSpacing=0;this.parent=f;this.game=f.game;this.ID=i;this.name=c;this.key=e;this.type=Phaser.TILEMAPLAYER;this.mapFormat=d;this.tileWidth=h;this.tileHeight=b;this.boundsInTiles=new Phaser.Rectangle();var g=this.game.cache.getTilemap(e);this.tileset=g.data;this._alpha=1;this.canvas=null;this.context=null;this.baseTexture=null;this.texture=null;this.sprite=null;this.mapData=[];this._tempTileBlock=[];this._tempBlockResults=[]};Phaser.TilemapLayer.prototype={putTileWorldXY:function(b,d,c){b=this.game.math.snapToFloor(b,this.tileWidth)/this.tileWidth;d=this.game.math.snapToFloor(d,this.tileHeight)/this.tileHeight;if(d>=0&&d=0&&b=0&&d=0&&bthis.widthInPixels||b.body.y<0||b.body.bottom>this.heightInPixels){return this._tempBlockResults}this._tempTileX=this.game.math.snapToFloor(b.body.x,this.tileWidth)/this.tileWidth;this._tempTileY=this.game.math.snapToFloor(b.body.y,this.tileHeight)/this.tileHeight;this._tempTileW=(this.game.math.snapToCeil(b.body.width,this.tileWidth)+this.tileWidth)/this.tileWidth;this._tempTileH=(this.game.math.snapToCeil(b.body.height,this.tileHeight)+this.tileHeight)/this.tileHeight;this.getTempBlock(this._tempTileX,this._tempTileY,this._tempTileW,this._tempTileH,true);for(var c=0;cthis.widthInTiles){g=this.widthInTiles}if(c>this.heightInTiles){c=this.heightInTiles}this._tempTileBlock=[];for(var b=h;b=0&&c=0&&bb.widthInTiles){this._maxX=b.widthInTiles}if(this._maxY>b.heightInTiles){this._maxY=b.heightInTiles}if(this._startX+this._maxX>b.widthInTiles){this._startX=b.widthInTiles-this._maxX}if(this._startY+this._maxY>b.heightInTiles){this._startY=b.heightInTiles-this._maxY}this._dx=-(this.game.camera.x-(this._startX*b.tileWidth));this._dy=-(this.game.camera.y-(this._startY*b.tileHeight));this._tx=this._dx;this._ty=this._dy;if(b.alpha!==1){this._ga=b.context.globalAlpha;b.context.globalAlpha=b.alpha}b.context.clearRect(0,0,b.canvas.width,b.canvas.height);for(var f=this._startY;f-1){b.context.globalAlpha=this._ga}if(this.game.renderType==Phaser.WEBGL){PIXI.texturesToUpdate.push(b.baseTexture)}}return true}}; \ No newline at end of file diff --git a/docs2/jsdoc_work.txt b/docs2/jsdoc_work.txt deleted file mode 100644 index 03fb7337..00000000 --- a/docs2/jsdoc_work.txt +++ /dev/null @@ -1,74 +0,0 @@ -JSDOC3 Work: - -1) This should go at the top of every file (with the module name corrected) - -/** -* @author Richard Davey -* @copyright 2013 Photon Storm Ltd. -* @license https://github.com/photonstorm/phaser/blob/master/license.txt MIT License -* @module Phaser.Animation -*/ - -2) This is the format a constructor should be: - -/** -* The constructor description goes here. If there isn't one for you to paste in, just put TODO. -* -* @class Phaser.Animation -* @constructor -* @param {Phaser.Game} game - A reference to the currently running game. -* @param {Phaser.Sprite} parent - A reference to the owner of this Animation. -* @param {string} name - The unique name for this animation, used in playback commands. -* @param {Phaser.Animation.FrameData} frameData - The FrameData object that contains all frames used by this Animation. -* @param {(Array.|Array.)} frames - An array of numbers or strings indicating which frames to play in which order. -* @param {number} delay - The time between each frame of the animation, given in ms. -* @param {boolean} looped - Should this animation loop or play through once. -*/ - -You must ensure the class is correct and it has the @constructor tag. -It is important you include the data-type. I don't expect you to know what the data type is, so just include: {todo} -It is important you include the hypen after the parameter name. You will always know what the parameter name is, so it should always be included. -You often won't know what the parameter description is, so just put "todo", like this: - -* @param {todo} name - todo. - -3) Functions are nearly exactly the same as the constructor: - -/** -* The function description goes here. If there isn't one for you to paste in, just put TODO. -* -* @method play -* @param {Number} [frameRate=null] The framerate to play the animation at. -* @return {Phaser.Animation} A reference to this Animation instance. -*/ - -You must ensure the @method tag is correct and present. -It is important you include the data-type. I don't expect you to know what the data type is, so just include: {todo} -It is important you include the hypen after the parameter name. You will always know what the parameter name is, so it should always be included. -You often won't know what the parameter description is, so just put "todo", like this: - -* @param {todo} name - todo. - -4) All properties must be marked-up: - -/** -* @property {boolean} isFinished - The finished state of the Animation. Set to true once playback completes, false during playback. -* @default -*/ -this.isFinished = false; - -It is important you include the data-type. I don't expect you to know what the data type is, so just include: {todo} -It is important you include the hypen after the parameter name. You will always know what the parameter name is, so it should always be included. -You often won't know what the parameter description is, so just put "todo", like this: - -* @property {todo} isFinished - todo. - -If the property has a base value assigned to it (i.e. a number or a string) then put @default. -If the property starts with an underscore it must include @private. Here is an example combining the two: - -/** -* @property {number} _frameIndex - The index of the current frame. -* @private -* @default -*/ -this._frameIndex = 0; diff --git a/docs2/out/AnimationManager-Phaser.AnimationManager.html b/docs2/out/AnimationManager-Phaser.AnimationManager.html deleted file mode 100644 index 5a25abcb..00000000 --- a/docs2/out/AnimationManager-Phaser.AnimationManager.html +++ /dev/null @@ -1,707 +0,0 @@ - - - - - - Phaser Class: AnimationManager - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Class: AnimationManager

-
- -
-

- AnimationManager -

- -

Phaser.AnimationManager

- -
- -
-
- - - - -
-

new AnimationManager(sprite)

- - -
-
- - -
-

The Animation Manager is used to add, play and update Phaser Animations. -Any Game Object such as Phaser.Sprite that supports animation contains a single AnimationManager instance.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
sprite - - -Phaser.Sprite - - - -

A reference to the Game Object that owns this AnimationManager.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - -

Members

- -
- -
-

currentFrame

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
currentFrame - - -Phaser.Animation.Frame - - - -

The currently displayed Frame of animation, if any.

-
- - - - - - - - - - - - - - - - - - -
Default Value:
-
  • null
- - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

game

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
game - - -Phaser.Game - - - -

A reference to the currently running Game.

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

sprite

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
sprite - - -Phaser.Sprite - - - -

A reference to the parent Sprite that owns this AnimationManager.

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

updateIfVisible

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
updateIfVisible - - -boolean - - - -

Should the animation data continue to update even if the Sprite.visible is set to false.

-
- - - - - - - - - - - - - - - - - - -
Default Value:
-
  • true
- - - -
Source:
-
- - - - - - - -
- - - -
- -
- - - - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Tue Oct 01 2013 23:59:05 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/AnimationManager.html b/docs2/out/AnimationManager.html deleted file mode 100644 index 06c6b6a4..00000000 --- a/docs2/out/AnimationManager.html +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - Phaser Module: AnimationManager - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Module: AnimationManager

-
- -
-

- AnimationManager -

- -
- - - -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Tue Oct 01 2013 23:59:05 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/Back.html b/docs2/out/Back.html deleted file mode 100644 index b21a0a88..00000000 --- a/docs2/out/Back.html +++ /dev/null @@ -1,874 +0,0 @@ - - - - - - Phaser Namespace: Back - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Namespace: Back

-
- -
-

- Back -

- -
- -
-
- - - - -

Back easing.

- - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-

<static> In(k) → {number}

- - -
-
- - -
-

Back ease-in.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- - - -
-

<static> InOut(k) → {number}

- - -
-
- - -
-

Back ease-in/out.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- - - -
-

<static> Out(k) → {number}

- - -
-
- - -
-

Back ease-out.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 01:56:58 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/Bounce.html b/docs2/out/Bounce.html deleted file mode 100644 index 8767df5c..00000000 --- a/docs2/out/Bounce.html +++ /dev/null @@ -1,874 +0,0 @@ - - - - - - Phaser Namespace: Bounce - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Namespace: Bounce

-
- -
-

- Bounce -

- -
- -
-
- - - - -

Bounce easing.

- - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-

<static> In(k) → {number}

- - -
-
- - -
-

Bounce ease-in.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- - - -
-

<static> InOut(k) → {number}

- - -
-
- - -
-

Bounce ease-in/out.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- - - -
-

<static> Out(k) → {number}

- - -
-
- - -
-

Bounce ease-out.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 01:56:58 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/Circular.html b/docs2/out/Circular.html deleted file mode 100644 index bc4edeae..00000000 --- a/docs2/out/Circular.html +++ /dev/null @@ -1,874 +0,0 @@ - - - - - - Phaser Namespace: Circular - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Namespace: Circular

-
- -
-

- Circular -

- -
- -
-
- - - - -

Circular easing.

- - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-

<static> In(k) → {number}

- - -
-
- - -
-

Circular ease-in.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- - - -
-

<static> InOut(k) → {number}

- - -
-
- - -
-

Circular ease-in/out.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- - - -
-

<static> Out(k) → {number}

- - -
-
- - -
-

Circular ease-out.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 01:56:58 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/Cubic.html b/docs2/out/Cubic.html deleted file mode 100644 index d5580a6f..00000000 --- a/docs2/out/Cubic.html +++ /dev/null @@ -1,874 +0,0 @@ - - - - - - Phaser Namespace: Cubic - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Namespace: Cubic

-
- -
-

- Cubic -

- -
- -
-
- - - - -

Cubic easing.

- - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-

<static> In(k) → {number}

- - -
-
- - -
-

Cubic ease-in.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- - - -
-

<static> InOut(k) → {number}

- - -
-
- - -
-

Cubic ease-in/out.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- - - -
-

<static> Out(k) → {number}

- - -
-
- - -
-

Cubic ease-out.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 01:56:58 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/Elastic.html b/docs2/out/Elastic.html deleted file mode 100644 index c5338776..00000000 --- a/docs2/out/Elastic.html +++ /dev/null @@ -1,874 +0,0 @@ - - - - - - Phaser Namespace: Elastic - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Namespace: Elastic

-
- -
-

- Elastic -

- -
- -
-
- - - - -

Elastic easing.

- - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-

<static> In(k) → {number}

- - -
-
- - -
-

Elastic ease-in.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- - - -
-

<static> InOut(k) → {number}

- - -
-
- - -
-

Elastic ease-in/out.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- - - -
-

<static> Out(k) → {number}

- - -
-
- - -
-

Elastic ease-out.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 01:56:58 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/Exponential.html b/docs2/out/Exponential.html deleted file mode 100644 index 080e8300..00000000 --- a/docs2/out/Exponential.html +++ /dev/null @@ -1,874 +0,0 @@ - - - - - - Phaser Namespace: Exponential - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Namespace: Exponential

-
- -
-

- Exponential -

- -
- -
-
- - - - -

Exponential easing.

- - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-

<static> In(k) → {number}

- - -
-
- - -
-

Exponential ease-in.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- - - -
-

<static> InOut(k) → {number}

- - -
-
- - -
-

Exponential ease-in/out.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- - - -
-

<static> Out(k) → {number}

- - -
-
- - -
-

Exponential ease-out.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 01:56:58 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/Linear.html b/docs2/out/Linear.html deleted file mode 100644 index 53d2fdde..00000000 --- a/docs2/out/Linear.html +++ /dev/null @@ -1,592 +0,0 @@ - - - - - - Phaser Namespace: Linear - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Namespace: Linear

-
- -
-

- Linear -

- -
- -
-
- - - - -

Linear easing.

- - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-

<static> In(k) → {number}

- - -
-
- - -
-

Ease-in.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

k^2.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 01:56:58 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/Parser.js.html b/docs2/out/Parser.js.html deleted file mode 100644 index 4ee8747a..00000000 --- a/docs2/out/Parser.js.html +++ /dev/null @@ -1,617 +0,0 @@ - - - - - - Phaser Source: animation/Parser.js - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Source: animation/Parser.js

- -
-
- 
/**
-* @author       Richard Davey <rich@photonstorm.com>
-* @copyright    2013 Photon Storm Ltd.
-* @license      {@link https://github.com/photonstorm/phaser/blob/master/license.txt|MIT License}
-*/
-
-/**
-* Responsible for parsing sprite sheet and JSON data into the internal FrameData format that Phaser uses for animations.
-*
-* @class Phaser.Animation.Parser
-*/
-Phaser.Animation.Parser = {
-
-    /**
-    * Parse a Sprite Sheet and extract the animation frame data from it.
-    *
-    * @method Phaser.Animation.Parser.spriteSheet
-    * @param {Phaser.Game} game - A reference to the currently running game.
-    * @param {string} key - The Game.Cache asset key of the Sprite Sheet image.
-    * @param {number} frameWidth - The fixed width of each frame of the animation.
-    * @param {number} frameHeight - The fixed height of each frame of the animation.
-    * @param {number} [frameMax=-1] - The total number of animation frames to extact from the Sprite Sheet. The default value of -1 means "extract all frames".
-    * @return {Phaser.Animation.FrameData} A FrameData object containing the parsed frames.
-    */
-    spriteSheet: function (game, key, frameWidth, frameHeight, frameMax) {
-
-        //  How big is our image?
-        var img = game.cache.getImage(key);
-
-        if (img == null)
-        {
-            return null;
-        }
-
-        var width = img.width;
-        var height = img.height;
-
-        if (frameWidth <= 0)
-        {
-            frameWidth = Math.floor(-width / Math.min(-1, frameWidth));
-        }
-
-        if (frameHeight <= 0)
-        {
-            frameHeight = Math.floor(-height / Math.min(-1, frameHeight));
-        }
-
-        var row = Math.round(width / frameWidth);
-        var column = Math.round(height / frameHeight);
-        var total = row * column;
-        
-        if (frameMax !== -1)
-        {
-            total = frameMax;
-        }
-
-        //  Zero or smaller than frame sizes?
-        if (width == 0 || height == 0 || width < frameWidth || height < frameHeight || total === 0)
-        {
-            console.warn("Phaser.Animation.Parser.spriteSheet: width/height zero or width/height < given frameWidth/frameHeight");
-            return null;
-        }
-
-        //  Let's create some frames then
-        var data = new Phaser.Animation.FrameData();
-        var x = 0;
-        var y = 0;
-
-        for (var i = 0; i < total; i++)
-        {
-            var uuid = game.rnd.uuid();
-
-            data.addFrame(new Phaser.Animation.Frame(i, x, y, frameWidth, frameHeight, '', uuid));
-
-            PIXI.TextureCache[uuid] = new PIXI.Texture(PIXI.BaseTextureCache[key], {
-                x: x,
-                y: y,
-                width: frameWidth,
-                height: frameHeight
-            });
-
-            x += frameWidth;
-
-            if (x === width)
-            {
-                x = 0;
-                y += frameHeight;
-            }
-        }
-
-        return data;
-
-    },
-
-    /**
-    * Parse the JSON data and extract the animation frame data from it.
-    *
-    * @method Phaser.Animation.Parser.JSONData
-    * @param {Phaser.Game} game - A reference to the currently running game.
-    * @param {Object} json - The JSON data from the Texture Atlas. Must be in Array format.
-    * @param {string} cacheKey - The Game.Cache asset key of the texture image.
-    * @return {Phaser.Animation.FrameData} A FrameData object containing the parsed frames.
-    */
-    JSONData: function (game, json, cacheKey) {
-
-        //  Malformed?
-        if (!json['frames'])
-        {
-            console.warn("Phaser.Animation.Parser.JSONData: Invalid Texture Atlas JSON given, missing 'frames' array");
-            console.log(json);
-            return;
-        }
-
-        //  Let's create some frames then
-        var data = new Phaser.Animation.FrameData();
-        
-        //  By this stage frames is a fully parsed array
-        var frames = json['frames'];
-        var newFrame;
-        
-        for (var i = 0; i < frames.length; i++)
-        {
-            var uuid = game.rnd.uuid();
-
-            newFrame = data.addFrame(new Phaser.Animation.Frame(
-                i,
-            	frames[i].frame.x, 
-            	frames[i].frame.y, 
-            	frames[i].frame.w, 
-            	frames[i].frame.h, 
-            	frames[i].filename,
-                uuid
-			));
-
-            PIXI.TextureCache[uuid] = new PIXI.Texture(PIXI.BaseTextureCache[cacheKey], {
-                x: frames[i].frame.x,
-                y: frames[i].frame.y,
-                width: frames[i].frame.w,
-                height: frames[i].frame.h
-            });
-
-            if (frames[i].trimmed)
-            {
-                newFrame.setTrim(
-                    frames[i].trimmed, 
-                    frames[i].sourceSize.w, 
-                    frames[i].sourceSize.h, 
-                    frames[i].spriteSourceSize.x, 
-                    frames[i].spriteSourceSize.y, 
-                    frames[i].spriteSourceSize.w, 
-                    frames[i].spriteSourceSize.h
-                );
-
-                //  We had to hack Pixi to get this to work :(
-                PIXI.TextureCache[uuid].trimmed = true;
-                PIXI.TextureCache[uuid].trim.x = frames[i].spriteSourceSize.x;
-                PIXI.TextureCache[uuid].trim.y = frames[i].spriteSourceSize.y;
-
-            }
-        }
-
-        return data;
-
-    },
-
-    /**
-    * Parse the JSON data and extract the animation frame data from it.
-    *
-    * @method Phaser.Animation.Parser.JSONDataHash
-    * @param {Phaser.Game} game - A reference to the currently running game.
-    * @param {Object} json - The JSON data from the Texture Atlas. Must be in JSON Hash format.
-    * @param {string} cacheKey - The Game.Cache asset key of the texture image.
-    * @return {Phaser.Animation.FrameData} A FrameData object containing the parsed frames.
-    */
-    JSONDataHash: function (game, json, cacheKey) {
-
-        //  Malformed?
-        if (!json['frames'])
-        {
-            console.warn("Phaser.Animation.Parser.JSONDataHash: Invalid Texture Atlas JSON given, missing 'frames' object");
-            console.log(json);
-            return;
-        }
-            
-        //  Let's create some frames then
-        var data = new Phaser.Animation.FrameData();
-
-        //  By this stage frames is a fully parsed array
-        var frames = json['frames'];
-        var newFrame;
-        var i = 0;
-        
-        for (var key in frames)
-        {
-            var uuid = game.rnd.uuid();
-
-            newFrame = data.addFrame(new Phaser.Animation.Frame(
-                i,
-                frames[key].frame.x, 
-                frames[key].frame.y, 
-                frames[key].frame.w, 
-                frames[key].frame.h, 
-                key,
-                uuid
-            ));
-
-            PIXI.TextureCache[uuid] = new PIXI.Texture(PIXI.BaseTextureCache[cacheKey], {
-                x: frames[key].frame.x,
-                y: frames[key].frame.y,
-                width: frames[key].frame.w,
-                height: frames[key].frame.h
-            });
-
-            if (frames[key].trimmed)
-            {
-                newFrame.setTrim(
-                    frames[key].trimmed, 
-                    frames[key].sourceSize.w, 
-                    frames[key].sourceSize.h, 
-                    frames[key].spriteSourceSize.x, 
-                    frames[key].spriteSourceSize.y, 
-                    frames[key].spriteSourceSize.w, 
-                    frames[key].spriteSourceSize.h
-                );
-
-                //  We had to hack Pixi to get this to work :(
-                PIXI.TextureCache[uuid].trimmed = true;
-                PIXI.TextureCache[uuid].trim.x = frames[key].spriteSourceSize.x;
-                PIXI.TextureCache[uuid].trim.y = frames[key].spriteSourceSize.y;
-
-            }
-
-            i++;
-        }
-
-        return data;
-
-    },
-
-    /**
-    * Parse the XML data and extract the animation frame data from it.
-    *
-    * @method Phaser.Animation.Parser.XMLData
-    * @param {Phaser.Game} game - A reference to the currently running game.
-    * @param {Object} xml - The XML data from the Texture Atlas. Must be in Starling XML format.
-    * @param {string} cacheKey - The Game.Cache asset key of the texture image.
-    * @return {Phaser.Animation.FrameData} A FrameData object containing the parsed frames.
-    */
-    XMLData: function (game, xml, cacheKey) {
-
-        //  Malformed?
-        if (!xml.getElementsByTagName('TextureAtlas'))
-        {
-            console.warn("Phaser.Animation.Parser.XMLData: Invalid Texture Atlas XML given, missing <TextureAtlas> tag");
-            return;
-        }
-
-        //  Let's create some frames then
-        var data = new Phaser.Animation.FrameData();
-        var frames = xml.getElementsByTagName('SubTexture');
-        var newFrame;
-        
-        for (var i = 0; i < frames.length; i++)
-        {
-            var uuid = game.rnd.uuid();
-
-            var frame = frames[i].attributes;
-
-            newFrame = data.addFrame(new Phaser.Animation.Frame(
-                i,
-            	frame.x.nodeValue, 
-            	frame.y.nodeValue, 
-            	frame.width.nodeValue, 
-            	frame.height.nodeValue, 
-            	frame.name.nodeValue,
-                uuid
-            ));
-
-            PIXI.TextureCache[uuid] = new PIXI.Texture(PIXI.BaseTextureCache[cacheKey], {
-                x: frame.x.nodeValue,
-                y: frame.y.nodeValue,
-                width: frame.width.nodeValue,
-                height: frame.height.nodeValue
-            });
-
-            //  Trimmed?
-            if (frame.frameX.nodeValue != '-0' || frame.frameY.nodeValue != '-0')
-            {
-                newFrame.setTrim(
-                	true, 
-                	frame.width.nodeValue, 
-                	frame.height.nodeValue, 
-                	Math.abs(frame.frameX.nodeValue), 
-                	Math.abs(frame.frameY.nodeValue), 
-                	frame.frameWidth.nodeValue, 
-                	frame.frameHeight.nodeValue
-                );
-
-                PIXI.TextureCache[uuid].realSize = {
-                    x: Math.abs(frame.frameX.nodeValue),
-                    y: Math.abs(frame.frameY.nodeValue),
-                    w: frame.frameWidth.nodeValue,
-                    h: frame.frameHeight.nodeValue
-                };
-
-                //  We had to hack Pixi to get this to work :(
-                PIXI.TextureCache[uuid].trimmed = true;
-                PIXI.TextureCache[uuid].trim.x = Math.abs(frame.frameX.nodeValue);
-                PIXI.TextureCache[uuid].trim.y = Math.abs(frame.frameY.nodeValue);
-
-            }
-        }
-
-        return data;
-
-    }
-
-};
-
-
-
- - - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 01:18:41 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - diff --git a/docs2/out/Parser.js_.html b/docs2/out/Parser.js_.html deleted file mode 100644 index 3711692e..00000000 --- a/docs2/out/Parser.js_.html +++ /dev/null @@ -1,381 +0,0 @@ - - - - - - Phaser Source: loader/Parser.js - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Source: loader/Parser.js

- -
-
- 
/**
-* @author       Richard Davey <rich@photonstorm.com>
-* @copyright    2013 Photon Storm Ltd.
-* @license      {@link https://github.com/photonstorm/phaser/blob/master/license.txt|MIT License}
-*/
-
-/**
-* Phaser.Loader.Parser parses data objects from Phaser.Loader that need more preparation before they can be inserted into the Cache.
-*
-* @class Phaser.Loader.Parser
-*/
-Phaser.Loader.Parser = {
-	
-    /**
-    * Parse frame data from an XML file.
-    * @method Phaser.Loader.Parser.bitmapFont
-    * @param {object} xml - XML data you want to parse.
-    * @return {FrameData} Generated FrameData object.
-    */
-	bitmapFont: function (game, xml, cacheKey) {
-
-        //  Malformed?
-        if (!xml.getElementsByTagName('font'))
-        {
-            console.warn("Phaser.Loader.Parser.bitmapFont: Invalid XML given, missing <font> tag");
-            return;
-        }
-
-        var texture = PIXI.TextureCache[cacheKey];
-
-        var data = {};
-        var info = xml.getElementsByTagName("info")[0];
-        var common = xml.getElementsByTagName("common")[0];
-        data.font = info.attributes.getNamedItem("face").nodeValue;
-        data.size = parseInt(info.attributes.getNamedItem("size").nodeValue, 10);
-        data.lineHeight = parseInt(common.attributes.getNamedItem("lineHeight").nodeValue, 10);
-        data.chars = {};
-
-        //parse letters
-        var letters = xml.getElementsByTagName("char");
-
-        for (var i = 0; i < letters.length; i++)
-        {
-            var charCode = parseInt(letters[i].attributes.getNamedItem("id").nodeValue, 10);
-
-            var textureRect = {
-                x: parseInt(letters[i].attributes.getNamedItem("x").nodeValue, 10),
-                y: parseInt(letters[i].attributes.getNamedItem("y").nodeValue, 10),
-                width: parseInt(letters[i].attributes.getNamedItem("width").nodeValue, 10),
-                height: parseInt(letters[i].attributes.getNamedItem("height").nodeValue, 10)
-            };
-
-            //	Note: This means you can only have 1 BitmapFont loaded at once!
-            //	Need to replace this with our own handler soon.
-            PIXI.TextureCache[charCode] = new PIXI.Texture(texture, textureRect);
-
-            data.chars[charCode] = {
-                xOffset: parseInt(letters[i].attributes.getNamedItem("xoffset").nodeValue, 10),
-                yOffset: parseInt(letters[i].attributes.getNamedItem("yoffset").nodeValue, 10),
-                xAdvance: parseInt(letters[i].attributes.getNamedItem("xadvance").nodeValue, 10),
-                kerning: {},
-                texture:new PIXI.Texture(texture, textureRect)
-
-            };
-        }
-
-        //parse kernings
-        var kernings = xml.getElementsByTagName("kerning");
-
-        for (i = 0; i < kernings.length; i++)
-        {
-           var first = parseInt(kernings[i].attributes.getNamedItem("first").nodeValue, 10);
-           var second = parseInt(kernings[i].attributes.getNamedItem("second").nodeValue, 10);
-           var amount = parseInt(kernings[i].attributes.getNamedItem("amount").nodeValue, 10);
-
-            data.chars[second].kerning[first] = amount;
-        }
-
-        PIXI.BitmapText.fonts[data.font] = data;
-
-    }
-
-};
-
-
- - - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 01:18:41 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - diff --git a/docs2/out/Phaser.Animation.Frame.html b/docs2/out/Phaser.Animation.Frame.html deleted file mode 100644 index 45f24b81..00000000 --- a/docs2/out/Phaser.Animation.Frame.html +++ /dev/null @@ -1,2815 +0,0 @@ - - - - - - Phaser Class: Frame - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Class: Frame

-
- -
-

- .Animation. - - Frame -

- -

Phaser.Animation.Frame

- -
- -
-
- - - - -
-

new Frame(index, x, y, width, height, name, uuid)

- - -
-
- - -
-

A Frame is a single frame of an animation and is part of a FrameData collection.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
index - - -number - - - -

The index of this Frame within the FrameData set it is being added to.

x - - -number - - - -

X position of the frame within the texture image.

y - - -number - - - -

Y position of the frame within the texture image.

width - - -number - - - -

Width of the frame within the texture image.

height - - -number - - - -

Height of the frame within the texture image.

name - - -string - - - -

The name of the frame. In Texture Atlas data this is usually set to the filename.

uuid - - -string - - - -

Internal UUID key.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - -

Members

- -
- -
-

centerX

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
centerX - - -number - - - -

Center X position within the image to cut from.

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

centerY

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
centerY - - -number - - - -

Center Y position within the image to cut from.

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

distance

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
distance - - -number - - - -

The distance from the top left to the bottom-right of this Frame.

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

height

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
height - - -number - - - -

Height of the frame.

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

index

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
index - - -number - - - -

The index of this Frame within the FrameData set it is being added to.

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

name

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
name - - -string - - - -

Useful for Texture Atlas files (is set to the filename value).

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

rotated

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
rotated - - -boolean - - - -

Rotated? (not yet implemented)

-
- - - - - - - - - - - - - - - - - - -
Default Value:
-
  • false
- - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

rotationDirection

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
rotationDirection - - -string - - - -

Either 'cw' or 'ccw', rotation is always 90 degrees.

-
- - - - - - - - - - - - - - - - - - -
Default Value:
-
  • 'cw'
- - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

sourceSizeH

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
sourceSizeH - - -number - - - -

Height of the original sprite.

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

sourceSizeW

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
sourceSizeW - - -number - - - -

Width of the original sprite.

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

spriteSourceSizeH

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
spriteSourceSizeH - - -number - - - -

Height of the trimmed sprite.

-
- - - - - - - - - - - - - - - - - - -
Default Value:
-
  • 0
- - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

spriteSourceSizeW

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
spriteSourceSizeW - - -number - - - -

Width of the trimmed sprite.

-
- - - - - - - - - - - - - - - - - - -
Default Value:
-
  • 0
- - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

spriteSourceSizeX

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
spriteSourceSizeX - - -number - - - -

X position of the trimmed sprite inside original sprite.

-
- - - - - - - - - - - - - - - - - - -
Default Value:
-
  • 0
- - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

spriteSourceSizeY

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
spriteSourceSizeY - - -number - - - -

Y position of the trimmed sprite inside original sprite.

-
- - - - - - - - - - - - - - - - - - -
Default Value:
-
  • 0
- - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

trimmed

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
trimmed - - -boolean - - - -

Was it trimmed when packed?

-
- - - - - - - - - - - - - - - - - - -
Default Value:
-
  • false
- - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

uuid

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
uuid - - -string - - - -

A link to the PIXI.TextureCache entry.

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

width

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
width - - -number - - - -

Width of the frame.

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

x

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
x - - -number - - - -

X position within the image to cut from.

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

y

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
y - - -number - - - -

Y position within the image to cut from.

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - -
- -
- - - -

Methods

- -
- -
-

setTrim(trimmed, actualWidth, actualHeight, destX, destY, destWidth, destHeight)

- - -
-
- - -
-

If the frame was trimmed when added to the Texture Atlas this records the trim and source data.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
trimmed - - -boolean - - - -

If this frame was trimmed or not.

actualWidth - - -number - - - -

The width of the frame before being trimmed.

actualHeight - - -number - - - -

The height of the frame before being trimmed.

destX - - -number - - - -

The destination X position of the trimmed frame for display.

destY - - -number - - - -

The destination Y position of the trimmed frame for display.

destWidth - - -number - - - -

The destination width of the trimmed frame for display.

destHeight - - -number - - - -

The destination height of the trimmed frame for display.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - - - -
- -
- - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 01:18:41 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/Phaser.Animation.FrameData.html b/docs2/out/Phaser.Animation.FrameData.html deleted file mode 100644 index 6e9e4cf0..00000000 --- a/docs2/out/Phaser.Animation.FrameData.html +++ /dev/null @@ -1,1762 +0,0 @@ - - - - - - Phaser Class: FrameData - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Class: FrameData

-
- -
-

- .Animation. - - FrameData -

- -

Phaser.Animation.FrameData

- -
- -
-
- - - - -
-

new FrameData()

- - -
-
- - -
-

FrameData is a container for Frame objects, which are the internal representation of animation data in Phaser.

-
- - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - -

Members

- -
- -
-

<readonly> total

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
total - - -number - - - -

The total number of frames in this FrameData set.

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - -
- -
- - - -

Methods

- -
- -
-

addFrame(frame) → {Phaser.Animation.Frame}

- - -
-
- - -
-

Adds a new Frame to this FrameData collection. Typically called by the Animation.Parser and not directly.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
frame - - -Phaser.Animation.Frame - - - -

The frame to add to this FrameData set.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

The frame that was just added.

-
- - - -
-
- Type -
-
- -Phaser.Animation.Frame - - -
-
- - - - - -
- - - -
-

checkFrameName(name) → {boolean}

- - -
-
- - -
-

Check if there is a Frame with the given name.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
name - - -string - - - -

The name of the frame you want to check.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

True if the frame is found, otherwise false.

-
- - - -
-
- Type -
-
- -boolean - - -
-
- - - - - -
- - - -
-

getFrame(index) → {Phaser.Animation.Frame}

- - -
-
- - -
-

Get a Frame by its numerical index.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
index - - -number - - - -

The index of the frame you want to get.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

The frame, if found.

-
- - - -
-
- Type -
-
- -Phaser.Animation.Frame - - -
-
- - - - - -
- - - -
-

getFrameByName(name) → {Phaser.Animation.Frame}

- - -
-
- - -
-

Get a Frame by its frame name.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
name - - -string - - - -

The name of the frame you want to get.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

The frame, if found.

-
- - - -
-
- Type -
-
- -Phaser.Animation.Frame - - -
-
- - - - - -
- - - -
-

getFrameIndexes(frames, useNumericIndex, output) → {Array}

- - -
-
- - -
-

Returns all of the Frame indexes in this FrameData set. -The frames indexes are returned in the output array, or if none is provided in a new Array object.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeArgumentDefaultDescription
frames - - -Array - - - - - - - - - - - -

An Array containing the indexes of the frames to retrieve. If the array is empty then all frames in the FrameData are returned.

useNumericIndex - - -boolean - - - - - - <optional>
- - - - - - 		- - true - -

Are the given frames using numeric indexes (default) or strings? (false)

output - - -Array - - - - - - <optional>
- - - - - - 		- -

If given the results will be appended to the end of this array otherwise a new array will be created.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

An array of all Frame indexes matching the given names or IDs.

-
- - - -
-
- Type -
-
- -Array - - -
-
- - - - - -
- - - -
-

getFrameRange(start, end, output) → {Array}

- - -
-
- - -
-

Returns a range of frames based on the given start and end frame indexes and returns them in an Array.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeArgumentDescription
start - - -number - - - - - - - - - -

The starting frame index.

end - - -number - - - - - - - - - -

The ending frame index.

output - - -Array - - - - - - <optional>
- - - - - -

If given the results will be appended to the end of this array otherwise a new array will be created.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

An array of Frames between the start and end index values, or an empty array if none were found.

-
- - - -
-
- Type -
-
- -Array - - -
-
- - - - - -
- - - -
-

getFrames(frames, useNumericIndex, output) → {Array}

- - -
-
- - -
-

Returns all of the Frames in this FrameData set where the frame index is found in the input array. -The frames are returned in the output array, or if none is provided in a new Array object.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeArgumentDefaultDescription
frames - - -Array - - - - - - - - - - - -

An Array containing the indexes of the frames to retrieve. If the array is empty then all frames in the FrameData are returned.

useNumericIndex - - -boolean - - - - - - <optional>
- - - - - - 		- - true - -

Are the given frames using numeric indexes (default) or strings? (false)

output - - -Array - - - - - - <optional>
- - - - - - 		- -

If given the results will be appended to the end of this array otherwise a new array will be created.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

An array of all Frames in this FrameData set matching the given names or IDs.

-
- - - -
-
- Type -
-
- -Array - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 01:18:42 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/Phaser.Animation.Parser.html b/docs2/out/Phaser.Animation.Parser.html deleted file mode 100644 index 3bccd7c2..00000000 --- a/docs2/out/Phaser.Animation.Parser.html +++ /dev/null @@ -1,1269 +0,0 @@ - - - - - - Phaser Class: Parser - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Class: Parser

-
- -
-

- .Animation. - - Parser -

- -
- -
-
- - - - -
-

new Parser()

- - -
-
- - -
-

Responsible for parsing sprite sheet and JSON data into the internal FrameData format that Phaser uses for animations.

-
- - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-

<static> JSONData(game, json, cacheKey) → {Phaser.Animation.FrameData}

- - -
-
- - -
-

Parse the JSON data and extract the animation frame data from it.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
game - - -Phaser.Game - - - -

A reference to the currently running game.

json - - -Object - - - -

The JSON data from the Texture Atlas. Must be in Array format.

cacheKey - - -string - - - -

The Game.Cache asset key of the texture image.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

A FrameData object containing the parsed frames.

-
- - - -
-
- Type -
-
- -Phaser.Animation.FrameData - - -
-
- - - - - -
- - - -
-

<static> JSONDataHash(game, json, cacheKey) → {Phaser.Animation.FrameData}

- - -
-
- - -
-

Parse the JSON data and extract the animation frame data from it.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
game - - -Phaser.Game - - - -

A reference to the currently running game.

json - - -Object - - - -

The JSON data from the Texture Atlas. Must be in JSON Hash format.

cacheKey - - -string - - - -

The Game.Cache asset key of the texture image.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

A FrameData object containing the parsed frames.

-
- - - -
-
- Type -
-
- -Phaser.Animation.FrameData - - -
-
- - - - - -
- - - -
-

<static> spriteSheet(game, key, frameWidth, frameHeight, frameMax) → {Phaser.Animation.FrameData}

- - -
-
- - -
-

Parse a Sprite Sheet and extract the animation frame data from it.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeArgumentDefaultDescription
game - - -Phaser.Game - - - - - - - - - - - -

A reference to the currently running game.

key - - -string - - - - - - - - - - - -

The Game.Cache asset key of the Sprite Sheet image.

frameWidth - - -number - - - - - - - - - - - -

The fixed width of each frame of the animation.

frameHeight - - -number - - - - - - - - - - - -

The fixed height of each frame of the animation.

frameMax - - -number - - - - - - <optional>
- - - - - - 		- - -1 - -

The total number of animation frames to extact from the Sprite Sheet. The default value of -1 means "extract all frames".

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

A FrameData object containing the parsed frames.

-
- - - -
-
- Type -
-
- -Phaser.Animation.FrameData - - -
-
- - - - - -
- - - -
-

<static> XMLData(game, xml, cacheKey) → {Phaser.Animation.FrameData}

- - -
-
- - -
-

Parse the XML data and extract the animation frame data from it.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
game - - -Phaser.Game - - - -

A reference to the currently running game.

xml - - -Object - - - -

The XML data from the Texture Atlas. Must be in Starling XML format.

cacheKey - - -string - - - -

The Game.Cache asset key of the texture image.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

A FrameData object containing the parsed frames.

-
- - - -
-
- Type -
-
- -Phaser.Animation.FrameData - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 01:18:42 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/Phaser.Loader.Parser.html b/docs2/out/Phaser.Loader.Parser.html deleted file mode 100644 index a68e0d06..00000000 --- a/docs2/out/Phaser.Loader.Parser.html +++ /dev/null @@ -1,548 +0,0 @@ - - - - - - Phaser Class: Parser - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Class: Parser

-
- -
-

- .Loader. - - Parser -

- -
- -
-
- - - - -
-

new Parser()

- - -
-
- - -
-

Phaser.Loader.Parser parses data objects from Phaser.Loader that need more preparation before they can be inserted into the Cache.

-
- - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-

<static> bitmapFont(xml) → {FrameData}

- - -
-
- - -
-

Parse frame data from an XML file.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
xml - - -object - - - -

XML data you want to parse.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Generated FrameData object.

-
- - - -
-
- Type -
-
- -FrameData - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 01:18:43 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/PluginManager-Phaser.PluginManager.html b/docs2/out/PluginManager-Phaser.PluginManager.html deleted file mode 100644 index d899654c..00000000 --- a/docs2/out/PluginManager-Phaser.PluginManager.html +++ /dev/null @@ -1,599 +0,0 @@ - - - - - - Phaser Class: PluginManager - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Class: PluginManager

-
- -
-

- PluginManager -

- -

PPhaser - PluginManager

- -
- -
-
- - - - -
-

new PluginManager(game, parent)

- - -
-
- - -
-

Description.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
game - - -Phaser.Game - - - -

A reference to the currently running game.

parent - - -Description - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - -

Members

- -
- -
-

game

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
game - - -Phaser.Game - - - -

A reference to the currently running game.

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

plugins

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
plugins - - -array - - - -

Description.

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - -
- -
- - - - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Wed Oct 02 2013 13:35:30 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/PluginManager.html b/docs2/out/PluginManager.html deleted file mode 100644 index 62067e01..00000000 --- a/docs2/out/PluginManager.html +++ /dev/null @@ -1,300 +0,0 @@ - - - - - - Phaser Module: PluginManager - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Module: PluginManager

-
- -
-

- PluginManager -

- -
- -
-
- - - - - - -
- - - - - - - - - - - -
Author:
-
- -
- - - -
Copyright:
-
  • 2013 Photon Storm Ltd.
- - - -
License:
-
- - - - - -
Source:
-
- - - - - - - -
- - - - -
- - - - - - - - - - - - - - - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Wed Oct 02 2013 13:35:30 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/Quadratic.html b/docs2/out/Quadratic.html deleted file mode 100644 index 300ea209..00000000 --- a/docs2/out/Quadratic.html +++ /dev/null @@ -1,874 +0,0 @@ - - - - - - Phaser Namespace: Quadratic - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Namespace: Quadratic

-
- -
-

- Quadratic -

- -
- -
-
- - - - -

Quadratic easing.

- - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-

<static> In(k) → {number}

- - -
-
- - -
-

Ease-in.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

k^2.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- - - -
-

<static> InOut(k) → {number}

- - -
-
- - -
-

Ease-in/out.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- - - -
-

<static> Out(k) → {number}

- - -
-
- - -
-

Ease-out.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

k* (2-k).

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 01:57:03 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/Quartic.html b/docs2/out/Quartic.html deleted file mode 100644 index c9913fe0..00000000 --- a/docs2/out/Quartic.html +++ /dev/null @@ -1,874 +0,0 @@ - - - - - - Phaser Namespace: Quartic - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Namespace: Quartic

-
- -
-

- Quartic -

- -
- -
-
- - - - -

Quartic easing.

- - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-

<static> In(k) → {number}

- - -
-
- - -
-

Quartic ease-in.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- - - -
-

<static> InOut(k) → {number}

- - -
-
- - -
-

Quartic ease-in/out.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- - - -
-

<static> Out(k) → {number}

- - -
-
- - -
-

Quartic ease-out.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 01:57:03 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/Quintic.html b/docs2/out/Quintic.html deleted file mode 100644 index 9e505166..00000000 --- a/docs2/out/Quintic.html +++ /dev/null @@ -1,874 +0,0 @@ - - - - - - Phaser Namespace: Quintic - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Namespace: Quintic

-
- -
-

- Quintic -

- -
- -
-
- - - - -

Quintic easing.

- - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-

<static> In(k) → {number}

- - -
-
- - -
-

Quintic ease-in.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- - - -
-

<static> InOut(k) → {number}

- - -
-
- - -
-

Quintic ease-in/out.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- - - -
-

<static> Out(k) → {number}

- - -
-
- - -
-

Quintic ease-out.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 01:57:03 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/Sinusoidal.html b/docs2/out/Sinusoidal.html deleted file mode 100644 index e335ad15..00000000 --- a/docs2/out/Sinusoidal.html +++ /dev/null @@ -1,874 +0,0 @@ - - - - - - Phaser Namespace: Sinusoidal - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Namespace: Sinusoidal

-
- -
-

- Sinusoidal -

- -
- -
-
- - - - -

Sinusoidal easing.

- - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-

<static> In(k) → {number}

- - -
-
- - -
-

Sinusoidal ease-in.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- - - -
-

<static> InOut(k) → {number}

- - -
-
- - -
-

Sinusoidal ease-in/out.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- - - -
-

<static> Out(k) → {number}

- - -
-
- - -
-

Sinusoidal ease-out.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
k - - -number - - - -

Description.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - -
Returns:
- - -
-

Description.

-
- - - -
-
- Type -
-
- -number - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 01:57:03 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/Utils.html b/docs2/out/Utils.html deleted file mode 100644 index d664e73f..00000000 --- a/docs2/out/Utils.html +++ /dev/null @@ -1,502 +0,0 @@ - - - - - - Phaser Module: Utils - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Module: Utils

-
- -
-

- Phaser. - - Utils -

- -
- -
-
- - - - - - -
- - - - - - - - - - - -
Author:
-
- -
- - - -
Copyright:
-
  • 2013 Photon Storm Ltd.
- - - -
License:
-
- - - - - -
Source:
-
- - - - - - - -
- - - - -
- - - - - - - - - - - - - - - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:27:21 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/Utils_.html b/docs2/out/Utils_.html deleted file mode 100644 index fa393369..00000000 --- a/docs2/out/Utils_.html +++ /dev/null @@ -1,513 +0,0 @@ - - - - - - Phaser Class: Utils - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Class: Utils

-
- -
-

- Utils -

- -
- -
-
- - - - -
-

new Utils()

- - -
-
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:27:23 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/module-Phaser.html b/docs2/out/module-Phaser.html deleted file mode 100644 index 5017475c..00000000 --- a/docs2/out/module-Phaser.html +++ /dev/null @@ -1,441 +0,0 @@ - - - - - - Phaser Module: Phaser - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Module: Phaser

-
- -
-

- Phaser -

- -
- -
-
- - - - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - -
- - - - - - - - - - - - - - - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 01:47:48 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/module-Tween-Phaser.Tween.html b/docs2/out/module-Tween-Phaser.Tween.html deleted file mode 100644 index f5a017d4..00000000 --- a/docs2/out/module-Tween-Phaser.Tween.html +++ /dev/null @@ -1,1070 +0,0 @@ - - - - - - Phaser Class: Tween - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Class: Tween

-
- -
-

- Tween -

- -

Tween

- -
- -
-
- - - - -
-

new Tween(object, game)

- - -
-
- - -
-

Tween constructor -Create a new <code>Tween</code>.

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
object - - -object - - - -

Target object will be affected by this tween.

game - - -Phaser.Game - - - -

Current game instance.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - -

Members

- -
- -
-

game

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
game - - -Phaser.Game - - - -

A reference to the currently running Game.

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

isRunning

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
isRunning - - -boolean - - - -

Description.

-
- - - - - - - - - - - - - - - - - - -
Default Value:
-
  • false
- - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

onComplete

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
onComplete - - -Phaser.Signal - - - -

Description.

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

onStart

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
onStart - - -Phaser.Signal - - - -

Description.

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

pendingDelete

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
pendingDelete - - -boolean - - - -

If this tween is ready to be deleted by the TweenManager.

-
- - - - - - - - - - - - - - - - - - -
Default Value:
-
  • false
- - - -
Source:
-
- - - - - - - -
- - - -
- -
- - - - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 01:53:32 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/module-Tween-Phaser.TweenManager.html b/docs2/out/module-Tween-Phaser.TweenManager.html deleted file mode 100644 index 8d742af3..00000000 --- a/docs2/out/module-Tween-Phaser.TweenManager.html +++ /dev/null @@ -1,746 +0,0 @@ - - - - - - Phaser Class: TweenManager - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Class: TweenManager

-
- -
-

- TweenManager -

- -

Phaser.Game has a single instance of the TweenManager through which all Tween objects are created and updated. -Tweens are hooked into the game clock and pause system, adjusting based on the game state.

-

TweenManager is based heavily on tween.js by http://soledadpenades.com. -The difference being that tweens belong to a games instance of TweenManager, rather than to a global TWEEN object. -It also has callbacks swapped for Signals and a few issues patched with regard to properties and completion errors. -Please see https://github.com/sole/tween.js for a full list of contributors.

- -
- -
-
- - - - -
-

new TweenManager(game)

- - -
-
- - -
-

Phaser - TweenManager

-
- - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
game - - -Phaser.Game - - - -

A reference to the currently running game.

- - - - -
- - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - -

Members

- -
- -
-

game

- - -
-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
game - - -Phaser.Game - - - -

Local reference to game.

-
- - - - - - - - - - - - - - - - - - - - -
Source:
-
- - - - - - - -
- - - -
- - - -
-

REVISION

- - -
-
- -
-

Version number of this library.

-
- - - - - -
- - -
Properties:
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
REVISION - - -string - - - -
-
- - - - - - - - - - - - - - - - - - -
Default Value:
-
  • "11dev"
- - - -
Source:
-
- - - - - - - -
- - - -
- -
- - - - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 01:56:58 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/module-Tween.html b/docs2/out/module-Tween.html deleted file mode 100644 index 7c241474..00000000 --- a/docs2/out/module-Tween.html +++ /dev/null @@ -1,458 +0,0 @@ - - - - - - Phaser Module: Tween - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Module: Tween

-
- -
-

- Tween -

- -
- -
-
- - - - - - -
- - - - - - - - - - - -
Author:
-
- -
- - - -
Copyright:
-
  • 2013 Photon Storm Ltd.
- - - -
License:
-
- - - - - -
Source:
-
- - - - - - - -
- - - - -
- - - - - - - - - - - - - - - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 01:56:58 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/modules.list.html b/docs2/out/modules.list.html deleted file mode 100644 index 9a1416c1..00000000 --- a/docs2/out/modules.list.html +++ /dev/null @@ -1,676 +0,0 @@ - - - - - - Phaser Modules - - - - - - - - - - -
-
-
- Phaser - -
-
- -
- - -
- -
- - - -

Modules

-
- -
-

- -

- -
- -
-
- - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - - - -

Classes

- -
-
Animation
-
- -
AnimationManager
-
- -
AnimationParser
-
- -
Cache
-
- -
Camera
-
- -
Canvas
-
- -
Circle
-
- -
Color
-
- -
Device
-
- -
Easing
-
- -
Back
-
- -
Bounce
-
- -
Circular
-
- -
Cubic
-
- -
Elastic
-
- -
Exponential
-
- -
Linear
-
- -
Quadratic
-
- -
Quartic
-
- -
Quintic
-
- -
Sinusoidal
-
- -
Frame
-
- -
FrameData
-
- -
Game
-
- -
Group
-
- -
Input
-
- -
InputHandler
-
- -
Key
-
- -
Keyboard
-
- -
LinkedList
-
- -
Loader
-
- -
LoaderParser
-
- -
Math
-
- -
Mouse
-
- -
MSPointer
-
- -
Net
-
- -
Particles
-
- -
Emitter
-
- -
Plugin
-
- -
PluginManager
-
- -
Point
-
- -
Pointer
-
- -
QuadTree
-
- -
RandomDataGenerator
-
- -
Rectangle
-
- -
RequestAnimationFrame
-
- -
Signal
-
- -
Sound
-
- -
SoundManager
-
- -
Stage
-
- -
StageScaleMode
-
- -
State
-
- -
StateManager
-
- -
Time
-
- -
Touch
-
- -
Tween
-
- -
TweenManager
-
- -
Debug
-
- -
World
-
- -
SignalBinding
-
- -
Utils
-
-
- - - -

Namespaces

- -
-
Phaser
-
-
- - - - - - - - - -
- -
- - - - -
- -
-
- - - - Phaser Copyright © 2012-2013 Photon Storm Ltd. - -
- - - Documentation generated by JSDoc 3.2.0-dev - on Thu Oct 03 2013 02:27:17 GMT+0100 (BST) using the DocStrap template. - -
-
- - -
-
-
- -
-
- -
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs2/out/scripts/linenumber.js b/docs2/out/scripts/linenumber.js deleted file mode 100644 index a0c570d5..00000000 --- a/docs2/out/scripts/linenumber.js +++ /dev/null @@ -1,17 +0,0 @@ -(function() { - var counter = 0; - var numbered; - var source = document.getElementsByClassName('prettyprint source'); - - if (source && source[0]) { - source = source[0].getElementsByTagName('code')[0]; - - numbered = source.innerHTML.split('\n'); - numbered = numbered.map(function(item) { - counter++; - return '' + item; - }); - - source.innerHTML = numbered.join('\n'); - } -})(); diff --git a/docs2/out/styles/jsdoc-default.css b/docs2/out/styles/jsdoc-default.css deleted file mode 100644 index ea49f607..00000000 --- a/docs2/out/styles/jsdoc-default.css +++ /dev/null @@ -1,283 +0,0 @@ -html -{ - overflow: auto; - background-color: #fff; -} - -body -{ - font: 14px "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans serif; - line-height: 130%; - color: #000; - background-color: #fff; -} - -a { - color: #444; -} - -a:visited { - color: #444; -} - -a:active { - color: #444; -} - -header -{ - display: block; - padding: 6px 4px; -} - -.class-description { - font-style: italic; - font-family: Palatino, 'Palatino Linotype', serif; - font-size: 130%; - line-height: 140%; - margin-bottom: 1em; - margin-top: 1em; -} - -#main { - float: left; - width: 100%; -} - -section -{ - display: block; - - background-color: #fff; - padding: 12px 24px; - border-bottom: 1px solid #ccc; - margin-right: 240px; -} - -.variation { - display: none; -} - -.optional:after { - content: "opt"; - font-size: 60%; - color: #aaa; - font-style: italic; - font-weight: lighter; -} - -nav -{ - display: block; - float: left; - margin-left: -230px; - margin-top: 28px; - width: 220px; - border-left: 1px solid #ccc; - padding-left: 9px; -} - -nav ul { - font-family: 'Lucida Grande', 'Lucida Sans Unicode', arial, sans-serif; - font-size: 100%; - line-height: 17px; - padding:0; - margin:0; - list-style-type:none; -} - -nav h2 a, nav h2 a:visited { - color: #A35A00; - text-decoration: none; -} - -nav h3 { - margin-top: 12px; -} - -nav li { - margin-top: 6px; -} - -nav a { - color: #5C5954; -} - -nav a:visited { - color: #5C5954; -} - -nav a:active { - color: #5C5954; -} - -footer { - display: block; - padding: 6px; - margin-top: 12px; - font-style: italic; - font-size: 90%; -} - -h1 -{ - font-size: 200%; - font-weight: bold; - letter-spacing: -0.01em; - margin: 6px 0 9px 0; -} - -h2 -{ - font-size: 170%; - font-weight: bold; - letter-spacing: -0.01em; - margin: 6px 0 3px 0; -} - -h3 -{ - font-size: 150%; - font-weight: bold; - letter-spacing: -0.01em; - margin-top: 16px; - margin: 6px 0 3px 0; -} - -h4 -{ - font-size: 130%; - font-weight: bold; - letter-spacing: -0.01em; - margin-top: 16px; - margin: 18px 0 3px 0; - color: #A35A00; -} - -h5, .container-overview .subsection-title -{ - font-size: 120%; - font-weight: bold; - letter-spacing: -0.01em; - margin: 8px 0 3px -16px; -} - -h6 -{ - font-size: 100%; - letter-spacing: -0.01em; - margin: 6px 0 3px 0; - font-style: italic; -} - -.ancestors { color: #999; } -.ancestors a -{ - color: #999 !important; - text-decoration: none; -} - -.important -{ - font-weight: bold; - color: #950B02; -} - -.yes-def { - text-indent: -1000px; -} - -.type-signature { - color: #aaa; -} - -.name, .signature { - font-family: Consolas, "Lucida Console", Monaco, monospace; -} - -.details { margin-top: 14px; } -.details dt { width:100px; float:left; border-left: 2px solid #DDD; padding-left: 10px; padding-top: 6px; } -.details dd { margin-left: 50px; } -.details ul { margin: 0; } -.details ul { list-style-type: none; } -.details li { margin-left: 30px; padding-top: 6px; } - -.description { - margin-bottom: 1em; - margin-left: -16px; - margin-top: 1em; -} - -.code-caption -{ - font-style: italic; - font-family: Palatino, 'Palatino Linotype', serif; - font-size: 107%; - margin: 0; -} - -.prettyprint -{ - border: 1px solid #ddd; - width: 80%; - overflow: auto; -} - -.prettyprint.source { - width: inherit; -} - -.prettyprint code -{ - font-family: Consolas, 'Lucida Console', Monaco, monospace; - font-size: 100%; - line-height: 18px; - display: block; - padding: 4px 12px; - margin: 0; - background-color: #fff; - color: #000; - border-left: 3px #ddd solid; -} - -.params, .props -{ - border-spacing: 0; - border: 0; - border-collapse: collapse; -} - -.params .name, .props .name, .name code { - color: #A35A00; - font-family: Consolas, 'Lucida Console', Monaco, monospace; - font-size: 100%; -} - -.params td, .params th, .props td, .props th -{ - border: 1px solid #ddd; - margin: 0px; - text-align: left; - vertical-align: top; - padding: 4px 6px; - display: table-cell; -} - -.params thead tr, .props thead tr -{ - background-color: #ddd; - font-weight: bold; -} - -.params .params thead tr, .props .props thead tr -{ - background-color: #fff; - font-weight: bold; -} - -.params th, .props th { border-right: 1px solid #aaa; } -.params thead .last, .props thead .last { border-right: 1px solid #ddd; } - -.disabled { - color: #454545; -} diff --git a/docs2/out/styles/prettify-jsdoc.css b/docs2/out/styles/prettify-jsdoc.css deleted file mode 100644 index 5a2526e3..00000000 --- a/docs2/out/styles/prettify-jsdoc.css +++ /dev/null @@ -1,111 +0,0 @@ -/* JSDoc prettify.js theme */ - -/* plain text */ -.pln { - color: #000000; - font-weight: normal; - font-style: normal; -} - -/* string content */ -.str { - color: #006400; - font-weight: normal; - font-style: normal; -} - -/* a keyword */ -.kwd { - color: #000000; - font-weight: bold; - font-style: normal; -} - -/* a comment */ -.com { - font-weight: normal; - font-style: italic; -} - -/* a type name */ -.typ { - color: #000000; - font-weight: normal; - font-style: normal; -} - -/* a literal value */ -.lit { - color: #006400; - font-weight: normal; - font-style: normal; -} - -/* punctuation */ -.pun { - color: #000000; - font-weight: bold; - font-style: normal; -} - -/* lisp open bracket */ -.opn { - color: #000000; - font-weight: bold; - font-style: normal; -} - -/* lisp close bracket */ -.clo { - color: #000000; - font-weight: bold; - font-style: normal; -} - -/* a markup tag name */ -.tag { - color: #006400; - font-weight: normal; - font-style: normal; -} - -/* a markup attribute name */ -.atn { - color: #006400; - font-weight: normal; - font-style: normal; -} - -/* a markup attribute value */ -.atv { - color: #006400; - font-weight: normal; - font-style: normal; -} - -/* a declaration */ -.dec { - color: #000000; - font-weight: bold; - font-style: normal; -} - -/* a variable name */ -.var { - color: #000000; - font-weight: normal; - font-style: normal; -} - -/* a function name */ -.fun { - color: #000000; - font-weight: bold; - font-style: normal; -} - -/* Specify class=linenums on a pre to get line numbering */ -ol.linenums { - margin-top: 0; - margin-bottom: 0; -} diff --git a/docs2/tags.txt b/docs2/tags.txt deleted file mode 100644 index 3a300098..00000000 --- a/docs2/tags.txt +++ /dev/null @@ -1,47 +0,0 @@ -/** -* @author Richard Davey -* @copyright 2013 Photon Storm Ltd. -* @license https://github.com/photonstorm/phaser/blob/master/license.txt MIT License -* @module Phaser -*/ - -/** -* The class constructor -* -* @class Name -* @constructor -* @param {Phaser.Game} game A reference to the currently running game. -*/ - -/** -* A reference to the currently running Game. -* @property game -* @type {Phaser.Game} -*/ -public game: Phaser.Game; - -/** -* My method description. Like other pieces of your comment blocks, -* this can span multiple lines. -* -* @method methodName -* @param {String} foo Argument 1 -* @param {Object} config A config object -* @param {String} config.name The name on the config object -* @param {Function} config.callback A callback function on the config object -* @param {Boolean} [extra=false] Do extra, optional work -* @return {Boolean} Returns true on success -*/ - -/** -* Property description. -* -* @property propertyName -* @public @private -* @type {Object} -* @default "foo" -*/ - -@param {Type} Name Description -Object, Array, String, Boolean, Number, Mixed, MyType - diff --git a/plugins2/CSS3Filters.js b/plugins/CSS3Filters.js similarity index 100% rename from plugins2/CSS3Filters.js rename to plugins/CSS3Filters.js diff --git a/plugins2/ColorHarmony.js b/plugins/ColorHarmony.js similarity index 100% rename from plugins2/ColorHarmony.js rename to plugins/ColorHarmony.js diff --git a/plugins2/SamplePlugin.js b/plugins/SamplePlugin.js similarity index 100% rename from plugins2/SamplePlugin.js rename to plugins/SamplePlugin.js diff --git a/docs2/Phaser Logo/2D Text/Phaser Logo 2D Vector Outline.fla b/resources/Phaser Logo/2D Text/Phaser Logo 2D Vector Outline.fla similarity index 100% rename from docs2/Phaser Logo/2D Text/Phaser Logo 2D Vector Outline.fla rename to resources/Phaser Logo/2D Text/Phaser Logo 2D Vector Outline.fla diff --git a/docs2/Phaser Logo/PNG/Phaser Logo Print Quality.png b/resources/Phaser Logo/PNG/Phaser Logo Print Quality.png similarity index 100% rename from docs2/Phaser Logo/PNG/Phaser Logo Print Quality.png rename to resources/Phaser Logo/PNG/Phaser Logo Print Quality.png diff --git a/docs2/Phaser Logo/PNG/Phaser Logo Web Quality.png b/resources/Phaser Logo/PNG/Phaser Logo Web Quality.png similarity index 100% rename from docs2/Phaser Logo/PNG/Phaser Logo Web Quality.png rename to resources/Phaser Logo/PNG/Phaser Logo Web Quality.png diff --git a/docs2/Phaser Logo/PNG/Phaser Logo iPad Resolution.png b/resources/Phaser Logo/PNG/Phaser Logo iPad Resolution.png similarity index 100% rename from docs2/Phaser Logo/PNG/Phaser Logo iPad Resolution.png rename to resources/Phaser Logo/PNG/Phaser Logo iPad Resolution.png diff --git a/docs2/Phaser Logo/PNG/Phaser-Logo-Small.png b/resources/Phaser Logo/PNG/Phaser-Logo-Small.png similarity index 100% rename from docs2/Phaser Logo/PNG/Phaser-Logo-Small.png rename to resources/Phaser Logo/PNG/Phaser-Logo-Small.png diff --git a/docs2/Phaser Logo/Pixel Art/Phaser-Logo-Sizes.png b/resources/Phaser Logo/Pixel Art/Phaser-Logo-Sizes.png similarity index 100% rename from docs2/Phaser Logo/Pixel Art/Phaser-Logo-Sizes.png rename to resources/Phaser Logo/Pixel Art/Phaser-Logo-Sizes.png diff --git a/docs2/Phaser Logo/Pixel Art/phaser_pixel_large_shaded.png b/resources/Phaser Logo/Pixel Art/phaser_pixel_large_shaded.png similarity index 100% rename from docs2/Phaser Logo/Pixel Art/phaser_pixel_large_shaded.png rename to resources/Phaser Logo/Pixel Art/phaser_pixel_large_shaded.png diff --git a/docs2/Phaser Logo/Pixel Art/phaser_pixel_medium_flat.png b/resources/Phaser Logo/Pixel Art/phaser_pixel_medium_flat.png similarity index 100% rename from docs2/Phaser Logo/Pixel Art/phaser_pixel_medium_flat.png rename to resources/Phaser Logo/Pixel Art/phaser_pixel_medium_flat.png diff --git a/docs2/Phaser Logo/Pixel Art/phaser_pixel_medium_shaded.png b/resources/Phaser Logo/Pixel Art/phaser_pixel_medium_shaded.png similarity index 100% rename from docs2/Phaser Logo/Pixel Art/phaser_pixel_medium_shaded.png rename to resources/Phaser Logo/Pixel Art/phaser_pixel_medium_shaded.png diff --git a/docs2/Phaser Logo/Pixel Art/phaser_pixel_small_flat.png b/resources/Phaser Logo/Pixel Art/phaser_pixel_small_flat.png similarity index 100% rename from docs2/Phaser Logo/Pixel Art/phaser_pixel_small_flat.png rename to resources/Phaser Logo/Pixel Art/phaser_pixel_small_flat.png diff --git a/docs2/Phaser Logo/Vector/Phaser Logo.eps b/resources/Phaser Logo/Vector/Phaser Logo.eps similarity index 100% rename from docs2/Phaser Logo/Vector/Phaser Logo.eps rename to resources/Phaser Logo/Vector/Phaser Logo.eps diff --git a/docs2/Phaser Logo/Vector/Phaser Logo.fla b/resources/Phaser Logo/Vector/Phaser Logo.fla similarity index 100% rename from docs2/Phaser Logo/Vector/Phaser Logo.fla rename to resources/Phaser Logo/Vector/Phaser Logo.fla diff --git a/docs2/Screen Shots/phaser-cybernoid.png b/resources/Screen Shots/phaser-cybernoid.png similarity index 100% rename from docs2/Screen Shots/phaser-cybernoid.png rename to resources/Screen Shots/phaser-cybernoid.png diff --git a/docs2/Screen Shots/phaser_balls.png b/resources/Screen Shots/phaser_balls.png similarity index 100% rename from docs2/Screen Shots/phaser_balls.png rename to resources/Screen Shots/phaser_balls.png diff --git a/docs2/Screen Shots/phaser_blaster.png b/resources/Screen Shots/phaser_blaster.png similarity index 100% rename from docs2/Screen Shots/phaser_blaster.png rename to resources/Screen Shots/phaser_blaster.png diff --git a/docs2/Screen Shots/phaser_cams.png b/resources/Screen Shots/phaser_cams.png similarity index 100% rename from docs2/Screen Shots/phaser_cams.png rename to resources/Screen Shots/phaser_cams.png diff --git a/docs2/Screen Shots/phaser_desert.png b/resources/Screen Shots/phaser_desert.png similarity index 100% rename from docs2/Screen Shots/phaser_desert.png rename to resources/Screen Shots/phaser_desert.png diff --git a/docs2/Screen Shots/phaser_fixed_camera.png b/resources/Screen Shots/phaser_fixed_camera.png similarity index 100% rename from docs2/Screen Shots/phaser_fixed_camera.png rename to resources/Screen Shots/phaser_fixed_camera.png diff --git a/docs2/Screen Shots/phaser_fruit.png b/resources/Screen Shots/phaser_fruit.png similarity index 100% rename from docs2/Screen Shots/phaser_fruit.png rename to resources/Screen Shots/phaser_fruit.png diff --git a/docs2/Screen Shots/phaser_fruit_particles.png b/resources/Screen Shots/phaser_fruit_particles.png similarity index 100% rename from docs2/Screen Shots/phaser_fruit_particles.png rename to resources/Screen Shots/phaser_fruit_particles.png diff --git a/docs2/Screen Shots/phaser_mapdraw.png b/resources/Screen Shots/phaser_mapdraw.png similarity index 100% rename from docs2/Screen Shots/phaser_mapdraw.png rename to resources/Screen Shots/phaser_mapdraw.png diff --git a/docs2/Screen Shots/phaser_mario_combo.png b/resources/Screen Shots/phaser_mario_combo.png similarity index 100% rename from docs2/Screen Shots/phaser_mario_combo.png rename to resources/Screen Shots/phaser_mario_combo.png diff --git a/docs2/Screen Shots/phaser_particles.png b/resources/Screen Shots/phaser_particles.png similarity index 100% rename from docs2/Screen Shots/phaser_particles.png rename to resources/Screen Shots/phaser_particles.png diff --git a/docs2/Screen Shots/phaser_platformer.png b/resources/Screen Shots/phaser_platformer.png similarity index 100% rename from docs2/Screen Shots/phaser_platformer.png rename to resources/Screen Shots/phaser_platformer.png diff --git a/docs2/Screen Shots/phaser_quadtree.png b/resources/Screen Shots/phaser_quadtree.png similarity index 100% rename from docs2/Screen Shots/phaser_quadtree.png rename to resources/Screen Shots/phaser_quadtree.png diff --git a/docs2/Screen Shots/phaser_rotate4.png b/resources/Screen Shots/phaser_rotate4.png similarity index 100% rename from docs2/Screen Shots/phaser_rotate4.png rename to resources/Screen Shots/phaser_rotate4.png diff --git a/docs2/Screen Shots/phaser_scrollfactor.png b/resources/Screen Shots/phaser_scrollfactor.png similarity index 100% rename from docs2/Screen Shots/phaser_scrollfactor.png rename to resources/Screen Shots/phaser_scrollfactor.png diff --git a/docs2/Screen Shots/phaser_sprite_bounds.png b/resources/Screen Shots/phaser_sprite_bounds.png similarity index 100% rename from docs2/Screen Shots/phaser_sprite_bounds.png rename to resources/Screen Shots/phaser_sprite_bounds.png diff --git a/docs2/Screen Shots/phaser_tanks.png b/resources/Screen Shots/phaser_tanks.png similarity index 100% rename from docs2/Screen Shots/phaser_tanks.png rename to resources/Screen Shots/phaser_tanks.png diff --git a/docs2/Screen Shots/phaser_tilemap.png b/resources/Screen Shots/phaser_tilemap.png similarity index 100% rename from docs2/Screen Shots/phaser_tilemap.png rename to resources/Screen Shots/phaser_tilemap.png diff --git a/docs2/Screen Shots/phaser_tilemap_collision.png b/resources/Screen Shots/phaser_tilemap_collision.png similarity index 100% rename from docs2/Screen Shots/phaser_tilemap_collision.png rename to resources/Screen Shots/phaser_tilemap_collision.png diff --git a/docs2/Screen Shots/phaser_tilemap_debug.png b/resources/Screen Shots/phaser_tilemap_debug.png similarity index 100% rename from docs2/Screen Shots/phaser_tilemap_debug.png rename to resources/Screen Shots/phaser_tilemap_debug.png diff --git a/docs2/WIP/01_phaser-arcade.jpg b/resources/wip/01_phaser-arcade.jpg similarity index 100% rename from docs2/WIP/01_phaser-arcade.jpg rename to resources/wip/01_phaser-arcade.jpg diff --git a/docs2/WIP/02_phaser-newsletter.jpg b/resources/wip/02_phaser-newsletter.jpg similarity index 100% rename from docs2/WIP/02_phaser-newsletter.jpg rename to resources/wip/02_phaser-newsletter.jpg diff --git a/docs2/WIP/Physics Comparison.xlsx b/resources/wip/Physics Comparison.xlsx similarity index 100% rename from docs2/WIP/Physics Comparison.xlsx rename to resources/wip/Physics Comparison.xlsx diff --git a/docs2/WIP/phaser-manual_2013-08-27.pdf b/resources/wip/phaser-manual_2013-08-27.pdf similarity index 100% rename from docs2/WIP/phaser-manual_2013-08-27.pdf rename to resources/wip/phaser-manual_2013-08-27.pdf diff --git a/docs2/WIP/phaser_copy.doc b/resources/wip/phaser_copy.doc similarity index 100% rename from docs2/WIP/phaser_copy.doc rename to resources/wip/phaser_copy.doc diff --git a/docs2/WIP/phaser_onscreen-controls_1-arcade.png b/resources/wip/phaser_onscreen-controls_1-arcade.png similarity index 100% rename from docs2/WIP/phaser_onscreen-controls_1-arcade.png rename to resources/wip/phaser_onscreen-controls_1-arcade.png diff --git a/docs2/WIP/phaser_onscreen-controls_2-dpad.png b/resources/wip/phaser_onscreen-controls_2-dpad.png similarity index 100% rename from docs2/WIP/phaser_onscreen-controls_2-dpad.png rename to resources/wip/phaser_onscreen-controls_2-dpad.png diff --git a/docs2/WIP/phaser_onscreen-controls_3-generic.png b/resources/wip/phaser_onscreen-controls_3-generic.png similarity index 100% rename from docs2/WIP/phaser_onscreen-controls_3-generic.png rename to resources/wip/phaser_onscreen-controls_3-generic.png diff --git a/docs2/Resources/avoid-digits.png b/resources/wip/sprites/avoid-digits.png similarity index 100% rename from docs2/Resources/avoid-digits.png rename to resources/wip/sprites/avoid-digits.png diff --git a/docs2/Resources/avoid-panel.png b/resources/wip/sprites/avoid-panel.png similarity index 100% rename from docs2/Resources/avoid-panel.png rename to resources/wip/sprites/avoid-panel.png diff --git a/docs2/Resources/avoid-sheet.png b/resources/wip/sprites/avoid-sheet.png similarity index 100% rename from docs2/Resources/avoid-sheet.png rename to resources/wip/sprites/avoid-sheet.png diff --git a/docs2/Resources/avoidmock4x2.png b/resources/wip/sprites/avoidmock4x2.png similarity index 100% rename from docs2/Resources/avoidmock4x2.png rename to resources/wip/sprites/avoidmock4x2.png diff --git a/docs2/Resources/box-01.png b/resources/wip/sprites/box-01.png similarity index 100% rename from docs2/Resources/box-01.png rename to resources/wip/sprites/box-01.png diff --git a/docs2/Resources/box-02.png b/resources/wip/sprites/box-02.png similarity index 100% rename from docs2/Resources/box-02.png rename to resources/wip/sprites/box-02.png diff --git a/docs2/Resources/breakout2c.png b/resources/wip/sprites/breakout2c.png similarity index 100% rename from docs2/Resources/breakout2c.png rename to resources/wip/sprites/breakout2c.png diff --git a/docs2/Resources/phaser checkboxes.gif b/resources/wip/sprites/phaser checkboxes.gif similarity index 100% rename from docs2/Resources/phaser checkboxes.gif rename to resources/wip/sprites/phaser checkboxes.gif diff --git a/docs2/Resources/phaser power tools.gif b/resources/wip/sprites/phaser power tools.gif similarity index 100% rename from docs2/Resources/phaser power tools.gif rename to resources/wip/sprites/phaser power tools.gif diff --git a/docs2/Resources/phaser sprites10.gif b/resources/wip/sprites/phaser sprites10.gif similarity index 100% rename from docs2/Resources/phaser sprites10.gif rename to resources/wip/sprites/phaser sprites10.gif diff --git a/docs2/zwoptex-phaser.template b/resources/zwoptex-phaser.template similarity index 100% rename from docs2/zwoptex-phaser.template rename to resources/zwoptex-phaser.template diff --git a/wip/physics/AdvancedPhysics.js b/wip/physics/AdvancedPhysics.js deleted file mode 100644 index b65b373d..00000000 --- a/wip/physics/AdvancedPhysics.js +++ /dev/null @@ -1,269 +0,0 @@ -var Phaser; -(function (Phaser) { - /// - /// - /// - /// - /** - * Phaser - Physics Manager - * - * The Physics Manager is responsible for looking after, creating and colliding - * all of the physics bodies and joints in the world. - */ - (function (Physics) { - var AdvancedPhysics = (function () { - function AdvancedPhysics(game) { - this.lastTime = Date.now(); - this.frameRateHz = 60; - this.timeDelta = 0; - this.paused = false; - this.step = false; - // step through the simulation (i.e. per click) - //public paused: bool = true; - //public step: bool = false; // step through the simulation (i.e. per click) - this.velocityIterations = 8; - this.positionIterations = 4; - this.allowSleep = true; - this.warmStarting = true; - this.game = game; - this.gravity = new Phaser.Vec2(); - this.space = new Physics.Space(this); - this.collision = new Physics.Collision(); - } - AdvancedPhysics.clear = function clear() { - //Manager.debug.textContent = ""; - Physics.Manager.log = []; - }; - AdvancedPhysics.write = function write(s) { - //Manager.debug.textContent += s + "\n"; - }; - AdvancedPhysics.writeAll = function writeAll() { - for(var i = 0; i < Physics.Manager.log.length; i++) { - //Manager.debug.textContent += Manager.log[i]; - } - }; - AdvancedPhysics.log = []; - AdvancedPhysics.dump = function dump(phase, body) { - /* - var s = "\n\nPhase: " + phase + "\n"; - s += "Position: " + body.position.toString() + "\n"; - s += "Velocity: " + body.velocity.toString() + "\n"; - s += "Angle: " + body.angle + "\n"; - s += "Force: " + body.force.toString() + "\n"; - s += "Torque: " + body.torque + "\n"; - s += "Bounds: " + body.bounds.toString() + "\n"; - s += "Shape ***\n"; - s += "Vert 0: " + body.shapes[0].verts[0].toString() + "\n"; - s += "Vert 1: " + body.shapes[0].verts[1].toString() + "\n"; - s += "Vert 2: " + body.shapes[0].verts[2].toString() + "\n"; - s += "Vert 3: " + body.shapes[0].verts[3].toString() + "\n"; - s += "TVert 0: " + body.shapes[0].tverts[0].toString() + "\n"; - s += "TVert 1: " + body.shapes[0].tverts[1].toString() + "\n"; - s += "TVert 2: " + body.shapes[0].tverts[2].toString() + "\n"; - s += "TVert 3: " + body.shapes[0].tverts[3].toString() + "\n"; - s += "Plane 0: " + body.shapes[0].planes[0].normal.toString() + "\n"; - s += "Plane 1: " + body.shapes[0].planes[1].normal.toString() + "\n"; - s += "Plane 2: " + body.shapes[0].planes[2].normal.toString() + "\n"; - s += "Plane 3: " + body.shapes[0].planes[3].normal.toString() + "\n"; - s += "TPlane 0: " + body.shapes[0].tplanes[0].normal.toString() + "\n"; - s += "TPlane 1: " + body.shapes[0].tplanes[1].normal.toString() + "\n"; - s += "TPlane 2: " + body.shapes[0].tplanes[2].normal.toString() + "\n"; - s += "TPlane 3: " + body.shapes[0].tplanes[3].normal.toString() + "\n"; - - Manager.log.push(s); - */ - }; - AdvancedPhysics.SHAPE_TYPE_CIRCLE = 0; - AdvancedPhysics.SHAPE_TYPE_SEGMENT = 1; - AdvancedPhysics.SHAPE_TYPE_POLY = 2; - AdvancedPhysics.SHAPE_NUM_TYPES = 3; - AdvancedPhysics.JOINT_TYPE_ANGLE = 0; - AdvancedPhysics.JOINT_TYPE_REVOLUTE = 1; - AdvancedPhysics.JOINT_TYPE_WELD = 2; - AdvancedPhysics.JOINT_TYPE_WHEEL = 3; - AdvancedPhysics.JOINT_TYPE_PRISMATIC = 4; - AdvancedPhysics.JOINT_TYPE_DISTANCE = 5; - AdvancedPhysics.JOINT_TYPE_ROPE = 6; - AdvancedPhysics.JOINT_TYPE_MOUSE = 7; - AdvancedPhysics.JOINT_LINEAR_SLOP = 0.0008; - AdvancedPhysics.JOINT_ANGULAR_SLOP = 2 * 0.017453292519943294444444444444444; - AdvancedPhysics.JOINT_MAX_LINEAR_CORRECTION = 0.5; - AdvancedPhysics.JOINT_MAX_ANGULAR_CORRECTION = 8 * 0.017453292519943294444444444444444; - AdvancedPhysics.JOINT_LIMIT_STATE_INACTIVE = 0; - AdvancedPhysics.JOINT_LIMIT_STATE_AT_LOWER = 1; - AdvancedPhysics.JOINT_LIMIT_STATE_AT_UPPER = 2; - AdvancedPhysics.JOINT_LIMIT_STATE_EQUAL_LIMITS = 3; - AdvancedPhysics.CONTACT_SOLVER_COLLISION_SLOP = 0.0008; - AdvancedPhysics.CONTACT_SOLVER_BAUMGARTE = 0.28; - AdvancedPhysics.CONTACT_SOLVER_MAX_LINEAR_CORRECTION = 1; - AdvancedPhysics.bodyCounter = 0; - AdvancedPhysics.jointCounter = 0; - AdvancedPhysics.shapeCounter = 0; - AdvancedPhysics.prototype.update = function () { - // Get these from Phaser.Time instead - var time = Date.now(); - var frameTime = (time - this.lastTime) / 1000; - this.lastTime = time; - // if rAf - why? - frameTime = Math.floor(frameTime * 60 + 0.5) / 60; - //if (!mouseDown) - //{ - // var p = canvasToWorld(mousePosition); - // var body = space.findBodyByPoint(p); - // //domCanvas.style.cursor = body ? "pointer" : "default"; - //} - if(!this.paused || this.step) { - Physics.Manager.clear(); - var h = 1 / this.frameRateHz; - this.timeDelta += frameTime; - if(this.step) { - this.step = false; - this.timeDelta = h; - } - for(var maxSteps = 4; maxSteps > 0 && this.timeDelta >= h; maxSteps--) { - this.space.step(h, this.velocityIterations, this.positionIterations, this.warmStarting, this.allowSleep); - this.timeDelta -= h; - } - if(this.timeDelta > h) { - this.timeDelta = 0; - } - } - //frameCount++; - }; - AdvancedPhysics.prototype.addBody = function (body) { - this.space.addBody(body); - }; - AdvancedPhysics.prototype.removeBody = function (body) { - this.space.removeBody(body); - }; - AdvancedPhysics.prototype.addJoint = function (joint) { - this.space.addJoint(joint); - }; - AdvancedPhysics.prototype.removeJoint = function (joint) { - this.space.removeJoint(joint); - }; - AdvancedPhysics.prototype.pixelsToMeters = function (value) { - return value * 0.02; - }; - AdvancedPhysics.prototype.metersToPixels = function (value) { - return value * 50; - }; - AdvancedPhysics.pixelsToMeters = function pixelsToMeters(value) { - return value * 0.02; - }; - AdvancedPhysics.metersToPixels = function metersToPixels(value) { - return value * 50; - }; - AdvancedPhysics.p2m = function p2m(value) { - return value * 0.02; - }; - AdvancedPhysics.m2p = function m2p(value) { - return value * 50; - }; - AdvancedPhysics.areaForCircle = function areaForCircle(radius_outer, radius_inner) { - return Math.PI * (radius_outer * radius_outer - radius_inner * radius_inner); - }; - AdvancedPhysics.inertiaForCircle = function inertiaForCircle(mass, center, radius_outer, radius_inner) { - return mass * ((radius_outer * radius_outer + radius_inner * radius_inner) * 0.5 + center.lengthSq()); - }; - AdvancedPhysics.areaForSegment = function areaForSegment(a, b, radius) { - return radius * (Math.PI * radius + 2 * Phaser.Vec2Utils.distance(a, b)); - }; - AdvancedPhysics.centroidForSegment = function centroidForSegment(a, b) { - return Phaser.Vec2Utils.scale(Phaser.Vec2Utils.add(a, b), 0.5); - }; - AdvancedPhysics.inertiaForSegment = function inertiaForSegment(mass, a, b) { - var distsq = Phaser.Vec2Utils.distanceSq(b, a); - var offset = Phaser.Vec2Utils.scale(Phaser.Vec2Utils.add(a, b), 0.5); - return mass * (distsq / 12 + offset.lengthSq()); - }; - AdvancedPhysics.areaForPoly = function areaForPoly(verts) { - var area = 0; - for(var i = 0; i < verts.length; i++) { - area += Phaser.Vec2Utils.cross(verts[i], verts[(i + 1) % verts.length]); - } - return area / 2; - }; - AdvancedPhysics.centroidForPoly = function centroidForPoly(verts) { - var area = 0; - var vsum = new Phaser.Vec2(); - for(var i = 0; i < verts.length; i++) { - var v1 = verts[i]; - var v2 = verts[(i + 1) % verts.length]; - var cross = Phaser.Vec2Utils.cross(v1, v2); - area += cross; - // SO many vecs created here - unroll these bad boys - vsum.add(Phaser.Vec2Utils.scale(Phaser.Vec2Utils.add(v1, v2), cross)); - } - return Phaser.Vec2Utils.scale(vsum, 1 / (3 * area)); - }; - AdvancedPhysics.inertiaForPoly = function inertiaForPoly(mass, verts, offset) { - var sum1 = 0; - var sum2 = 0; - for(var i = 0; i < verts.length; i++) { - var v1 = Phaser.Vec2Utils.add(verts[i], offset); - var v2 = Phaser.Vec2Utils.add(verts[(i + 1) % verts.length], offset); - var a = Phaser.Vec2Utils.cross(v2, v1); - var b = Phaser.Vec2Utils.dot(v1, v1) + Phaser.Vec2Utils.dot(v1, v2) + Phaser.Vec2Utils.dot(v2, v2); - sum1 += a * b; - sum2 += a; - } - return (mass * sum1) / (6 * sum2); - }; - AdvancedPhysics.inertiaForBox = function inertiaForBox(mass, w, h) { - return mass * (w * w + h * h) / 12; - }; - AdvancedPhysics.createConvexHull = // Create the convex hull using the Gift wrapping algorithm (http://en.wikipedia.org/wiki/Gift_wrapping_algorithm) - function createConvexHull(points) { - // Find the right most point on the hull - var i0 = 0; - var x0 = points[0].x; - for(var i = 1; i < points.length; i++) { - var x = points[i].x; - if(x > x0 || (x == x0 && points[i].y < points[i0].y)) { - i0 = i; - x0 = x; - } - } - var n = points.length; - var hull = []; - var m = 0; - var ih = i0; - while(1) { - hull[m] = ih; - var ie = 0; - for(var j = 1; j < n; j++) { - if(ie == ih) { - ie = j; - continue; - } - var r = Phaser.Vec2Utils.subtract(points[ie], points[hull[m]]); - var v = Phaser.Vec2Utils.subtract(points[j], points[hull[m]]); - var c = Phaser.Vec2Utils.cross(r, v); - if(c < 0) { - ie = j; - } - // Collinearity check - if(c == 0 && v.lengthSq() > r.lengthSq()) { - ie = j; - } - } - m++; - ih = ie; - if(ie == i0) { - break; - } - } - // Copy vertices - var newPoints = []; - for(var i = 0; i < m; ++i) { - newPoints.push(points[hull[i]]); - } - return newPoints; - }; - return AdvancedPhysics; - })(); - Physics.AdvancedPhysics = AdvancedPhysics; - })(Phaser.Physics || (Phaser.Physics = {})); - var Physics = Phaser.Physics; -})(Phaser || (Phaser = {})); diff --git a/wip/physics/AdvancedPhysics.ts b/wip/physics/AdvancedPhysics.ts deleted file mode 100644 index c4010e83..00000000 --- a/wip/physics/AdvancedPhysics.ts +++ /dev/null @@ -1,386 +0,0 @@ -/// -/// -/// -/// - -/** -* Phaser - Physics Manager -* -* The Physics Manager is responsible for looking after, creating and colliding -* all of the physics bodies and joints in the world. -*/ - -module Phaser.Physics { - - export class AdvancedPhysics { - - constructor(game: Game) { - - this.game = game; - - this.gravity = new Phaser.Vec2; - - this.space = new Space(this); - - this.collision = new Collision(); - - } - - public collision; - - /** - * Local reference to Game. - */ - public game: Game; - - public static debug: HTMLTextAreaElement; - - public static clear() { - //Manager.debug.textContent = ""; - Manager.log = []; - } - - public static write(s: string) { - //Manager.debug.textContent += s + "\n"; - } - - public static writeAll() { - - for (var i = 0; i < Manager.log.length; i++) - { - //Manager.debug.textContent += Manager.log[i]; - } - - } - - public static log = []; - - public static dump(phase: string, body: Body) { - - /* - var s = "\n\nPhase: " + phase + "\n"; - s += "Position: " + body.position.toString() + "\n"; - s += "Velocity: " + body.velocity.toString() + "\n"; - s += "Angle: " + body.angle + "\n"; - s += "Force: " + body.force.toString() + "\n"; - s += "Torque: " + body.torque + "\n"; - s += "Bounds: " + body.bounds.toString() + "\n"; - s += "Shape ***\n"; - s += "Vert 0: " + body.shapes[0].verts[0].toString() + "\n"; - s += "Vert 1: " + body.shapes[0].verts[1].toString() + "\n"; - s += "Vert 2: " + body.shapes[0].verts[2].toString() + "\n"; - s += "Vert 3: " + body.shapes[0].verts[3].toString() + "\n"; - s += "TVert 0: " + body.shapes[0].tverts[0].toString() + "\n"; - s += "TVert 1: " + body.shapes[0].tverts[1].toString() + "\n"; - s += "TVert 2: " + body.shapes[0].tverts[2].toString() + "\n"; - s += "TVert 3: " + body.shapes[0].tverts[3].toString() + "\n"; - s += "Plane 0: " + body.shapes[0].planes[0].normal.toString() + "\n"; - s += "Plane 1: " + body.shapes[0].planes[1].normal.toString() + "\n"; - s += "Plane 2: " + body.shapes[0].planes[2].normal.toString() + "\n"; - s += "Plane 3: " + body.shapes[0].planes[3].normal.toString() + "\n"; - s += "TPlane 0: " + body.shapes[0].tplanes[0].normal.toString() + "\n"; - s += "TPlane 1: " + body.shapes[0].tplanes[1].normal.toString() + "\n"; - s += "TPlane 2: " + body.shapes[0].tplanes[2].normal.toString() + "\n"; - s += "TPlane 3: " + body.shapes[0].tplanes[3].normal.toString() + "\n"; - - Manager.log.push(s); - */ - - } - - public static collision: Collision; - - public static SHAPE_TYPE_CIRCLE: number = 0; - public static SHAPE_TYPE_SEGMENT: number = 1; - public static SHAPE_TYPE_POLY: number = 2; - public static SHAPE_NUM_TYPES: number = 3; - - public static JOINT_TYPE_ANGLE: number = 0; - public static JOINT_TYPE_REVOLUTE: number = 1; - public static JOINT_TYPE_WELD: number = 2; - public static JOINT_TYPE_WHEEL: number = 3; - public static JOINT_TYPE_PRISMATIC: number = 4; - public static JOINT_TYPE_DISTANCE: number = 5; - public static JOINT_TYPE_ROPE: number = 6; - public static JOINT_TYPE_MOUSE: number = 7; - - public static JOINT_LINEAR_SLOP: number = 0.0008; - public static JOINT_ANGULAR_SLOP: number = 2 * 0.017453292519943294444444444444444; - public static JOINT_MAX_LINEAR_CORRECTION: number = 0.5; - public static JOINT_MAX_ANGULAR_CORRECTION: number = 8 * 0.017453292519943294444444444444444; - - public static JOINT_LIMIT_STATE_INACTIVE: number = 0; - public static JOINT_LIMIT_STATE_AT_LOWER: number = 1; - public static JOINT_LIMIT_STATE_AT_UPPER: number = 2; - public static JOINT_LIMIT_STATE_EQUAL_LIMITS: number = 3; - - public static CONTACT_SOLVER_COLLISION_SLOP: number = 0.0008; - public static CONTACT_SOLVER_BAUMGARTE: number = 0.28; - public static CONTACT_SOLVER_MAX_LINEAR_CORRECTION: number = 1;//Infinity; - - public static bodyCounter: number = 0; - public static jointCounter: number = 0; - public static shapeCounter: number = 0; - - public space: Space; - public lastTime: number = Date.now(); - public frameRateHz: number = 60; - public timeDelta: number = 0; - public paused: bool = false; - public step: bool = false; // step through the simulation (i.e. per click) - //public paused: bool = true; - //public step: bool = false; // step through the simulation (i.e. per click) - public velocityIterations: number = 8; - public positionIterations: number = 4; - public allowSleep: bool = true; - public warmStarting: bool = true; - - public gravity: Phaser.Vec2; - - - public update() { - - // Get these from Phaser.Time instead - var time = Date.now(); - var frameTime = (time - this.lastTime) / 1000; - this.lastTime = time; - - // if rAf - why? - frameTime = Math.floor(frameTime * 60 + 0.5) / 60; - - //if (!mouseDown) - //{ - // var p = canvasToWorld(mousePosition); - // var body = space.findBodyByPoint(p); - // //domCanvas.style.cursor = body ? "pointer" : "default"; - //} - - if (!this.paused || this.step) - { - Manager.clear(); - - var h = 1 / this.frameRateHz; - - this.timeDelta += frameTime; - - if (this.step) - { - this.step = false; - this.timeDelta = h; - } - - for (var maxSteps = 4; maxSteps > 0 && this.timeDelta >= h; maxSteps--) - { - this.space.step(h, this.velocityIterations, this.positionIterations, this.warmStarting, this.allowSleep); - this.timeDelta -= h; - } - - if (this.timeDelta > h) - { - this.timeDelta = 0; - } - } - - //frameCount++; - - } - - public addBody(body: Body) { - this.space.addBody(body); - } - - public removeBody(body: Body) { - this.space.removeBody(body); - } - - public addJoint(joint: IJoint) { - this.space.addJoint(joint); - } - - public removeJoint(joint: IJoint) { - this.space.removeJoint(joint); - } - - public pixelsToMeters(value: number): number { - return value * 0.02; - } - - public metersToPixels(value: number): number { - return value * 50; - } - - public static pixelsToMeters(value: number): number { - return value * 0.02; - } - - public static metersToPixels(value: number): number { - return value * 50; - } - - public static p2m(value: number): number { - return value * 0.02; - } - - public static m2p(value: number): number { - return value * 50; - } - - public static areaForCircle(radius_outer: number, radius_inner: number): number { - return Math.PI * (radius_outer * radius_outer - radius_inner * radius_inner); - } - - public static inertiaForCircle(mass: number, center: Phaser.Vec2, radius_outer: number, radius_inner: number): number { - return mass * ((radius_outer * radius_outer + radius_inner * radius_inner) * 0.5 + center.lengthSq()); - } - - public static areaForSegment(a: Phaser.Vec2, b: Phaser.Vec2, radius: number): number { - return radius * (Math.PI * radius + 2 * Phaser.Vec2Utils.distance(a, b)); - } - - public static centroidForSegment(a: Phaser.Vec2, b: Phaser.Vec2): Phaser.Vec2 { - return Phaser.Vec2Utils.scale(Phaser.Vec2Utils.add(a, b), 0.5); - } - - public static inertiaForSegment(mass: number, a: Phaser.Vec2, b: Phaser.Vec2): number { - - var distsq = Phaser.Vec2Utils.distanceSq(b, a); - var offset: Phaser.Vec2 = Phaser.Vec2Utils.scale(Phaser.Vec2Utils.add(a, b), 0.5); - - return mass * (distsq / 12 + offset.lengthSq()); - - } - - public static areaForPoly(verts: Phaser.Vec2[]): number { - - var area = 0; - - for (var i = 0; i < verts.length; i++) - { - area += Phaser.Vec2Utils.cross(verts[i], verts[(i + 1) % verts.length]); - } - - return area / 2; - } - - public static centroidForPoly(verts: Phaser.Vec2[]): Phaser.Vec2 { - - var area = 0; - var vsum = new Phaser.Vec2; - - for (var i = 0; i < verts.length; i++) - { - var v1 = verts[i]; - var v2 = verts[(i + 1) % verts.length]; - var cross = Phaser.Vec2Utils.cross(v1, v2); - - area += cross; - - // SO many vecs created here - unroll these bad boys - vsum.add(Phaser.Vec2Utils.scale(Phaser.Vec2Utils.add(v1, v2), cross)); - } - - return Phaser.Vec2Utils.scale(vsum, 1 / (3 * area)); - - } - - public static inertiaForPoly(mass: number, verts: Phaser.Vec2[], offset: Phaser.Vec2): number { - - var sum1 = 0; - var sum2 = 0; - - for (var i = 0; i < verts.length; i++) - { - var v1 = Phaser.Vec2Utils.add(verts[i], offset); - var v2 = Phaser.Vec2Utils.add(verts[(i + 1) % verts.length], offset); - - var a = Phaser.Vec2Utils.cross(v2, v1); - var b = Phaser.Vec2Utils.dot(v1, v1) + Phaser.Vec2Utils.dot(v1, v2) + Phaser.Vec2Utils.dot(v2, v2); - - sum1 += a * b; - sum2 += a; - } - - return (mass * sum1) / (6 * sum2); - - } - - public static inertiaForBox(mass: number, w: number, h: number) { - return mass * (w * w + h * h) / 12; - } - - // Create the convex hull using the Gift wrapping algorithm (http://en.wikipedia.org/wiki/Gift_wrapping_algorithm) - public static createConvexHull(points) { - - // Find the right most point on the hull - var i0 = 0; - var x0 = points[0].x; - - for (var i = 1; i < points.length; i++) - { - var x = points[i].x; - - if (x > x0 || (x == x0 && points[i].y < points[i0].y)) - { - i0 = i; - x0 = x; - } - } - - var n = points.length; - var hull = []; - var m = 0; - var ih = i0; - - while (1) - { - hull[m] = ih; - - var ie = 0; - - for (var j = 1; j < n; j++) - { - if (ie == ih) - { - ie = j; - continue; - } - - var r = Phaser.Vec2Utils.subtract(points[ie], points[hull[m]]); - var v = Phaser.Vec2Utils.subtract(points[j], points[hull[m]]); - var c = Phaser.Vec2Utils.cross(r, v); - - if (c < 0) - { - ie = j; - } - - // Collinearity check - if (c == 0 && v.lengthSq() > r.lengthSq()) - { - ie = j; - } - } - - m++; - ih = ie; - - if (ie == i0) - { - break; - } - } - - // Copy vertices - var newPoints = []; - - for (var i = 0; i < m; ++i) - { - newPoints.push(points[hull[i]]); - } - - return newPoints; - } - - } - -} \ No newline at end of file diff --git a/wip/physics/ArcadePhysics.js b/wip/physics/ArcadePhysics.js deleted file mode 100644 index 2f9b5688..00000000 --- a/wip/physics/ArcadePhysics.js +++ /dev/null @@ -1,19 +0,0 @@ -var Shapes; -(function (Shapes) { - - var Point = Shapes.Point = (function () { - function Point(x, y) { - this.x = x; - this.y = y; - } - Point.prototype.getDist = function () { - return Math.sqrt((this.x * this.x) + (this.y * this.y)); - }; - Point.origin = new Point(0, 0); - return Point; - })(); - -})(Shapes || (Shapes = {})); - -var p = new Shapes.Point(3, 4); -var dist = p.getDist(); diff --git a/wip/physics/ArcadePhysics.ts b/wip/physics/ArcadePhysics.ts deleted file mode 100644 index 00ae9b18..00000000 --- a/wip/physics/ArcadePhysics.ts +++ /dev/null @@ -1,1121 +0,0 @@ -/// -/// -/// -/// -/// - -/** -* Phaser - PhysicsManager -* -* Your game only has one PhysicsManager instance and it's responsible for looking after, creating and colliding -* all of the physics objects in the world. -*/ - - -module Phaser.Physics { - - export class ArcadePhysics { - - constructor(game: Game, width: number, height: number) { - - this.game = game; - - this.gravity = new Vec2; - this.drag = new Vec2; - this.bounce = new Vec2; - this.angularDrag = 0; - - this.bounds = new Rectangle(0, 0, width, height); - - this._distance = new Vec2; - this._tangent = new Vec2; - - this.members = new Group(game); - - } - - /** - * Local private reference to Game. - */ - public game: Game; - - /** - * Physics object pool - */ - public members: Group; - - // Temp calculation vars - private _drag: number; - private _delta: number; - private _velocityDelta: number; - private _length: number = 0; - private _distance: Vec2; - private _tangent: Vec2; - private _separatedX: bool; - private _separatedY: bool; - private _overlap: number; - private _maxOverlap: number; - private _obj1Velocity: number; - private _obj2Velocity: number; - private _obj1NewVelocity: number; - private _obj2NewVelocity: number; - private _average: number; - private _quadTree: QuadTree; - private _quadTreeResult: bool; - - public bounds: Rectangle; - - public gravity: Vec2; - public drag: Vec2; - public bounce: Vec2; - public angularDrag: number; - - /** - * The overlap bias is used when calculating hull overlap before separation - change it if you have especially small or large GameObjects - * @type {number} - */ - static OVERLAP_BIAS: number = 4; - - /** - * The overlap bias is used when calculating hull overlap before separation - change it if you have especially small or large GameObjects - * @type {number} - */ - static TILE_OVERLAP: bool = false; - - /** - * @type {number} - */ - public worldDivisions: number = 6; - - - /* - public update() { - - this._length = this._objects.length; - - for (var i = 0; i < this._length; i++) - { - if (this._objects[i]) - { - this._objects[i].preUpdate(); - this.updateMotion(this._objects[i]); - this.collideWorld(this._objects[i]); - - for (var x = 0; x < this._length; x++) - { - if (this._objects[x] && this._objects[x] !== this._objects[i]) - { - //this.collideShapes(this._objects[i], this._objects[x]); - var r = this.NEWseparate(this._objects[i], this._objects[x]); - //console.log('sep', r); - } - } - - } - } - - } - - public render() { - - // iterate through the objects here, updating and colliding - for (var i = 0; i < this._length; i++) - { - if (this._objects[i]) - { - this._objects[i].render(this.game.stage.context); - } - } - - } -*/ - - public updateMotion(body: Phaser.Physics.Body) { - - if (body.type == Types.BODY_DISABLED) - { - return; - } - - this._velocityDelta = (this.computeVelocity(body.angularVelocity, body.gravity.x, body.angularAcceleration, body.angularDrag, body.maxAngular) - body.angularVelocity) / 2; - body.angularVelocity += this._velocityDelta; - body.sprite.transform.rotation += body.angularVelocity * this.game.time.elapsed; - body.angularVelocity += this._velocityDelta; - - this._velocityDelta = (this.computeVelocity(body.velocity.x, body.gravity.x, body.acceleration.x, body.drag.x) - body.velocity.x) / 2; - body.velocity.x += this._velocityDelta; - this._delta = body.velocity.x * this.game.time.elapsed; - body.velocity.x += this._velocityDelta; - //body.position.x += this._delta; - body.sprite.x += this._delta; - - this._velocityDelta = (this.computeVelocity(body.velocity.y, body.gravity.y, body.acceleration.y, body.drag.y) - body.velocity.y) / 2; - body.velocity.y += this._velocityDelta; - this._delta = body.velocity.y * this.game.time.elapsed; - body.velocity.y += this._velocityDelta; - //body.position.y += this._delta; - body.sprite.y += this._delta; - - } - - /** - * A tween-like function that takes a starting velocity and some other factors and returns an altered velocity. - * - * @param {number} Velocity Any component of velocity (e.g. 20). - * @param {number} Acceleration Rate at which the velocity is changing. - * @param {number} Drag Really kind of a deceleration, this is how much the velocity changes if Acceleration is not set. - * @param {number} Max An absolute value cap for the velocity. - * - * @return {number} The altered Velocity value. - */ - public computeVelocity(velocity: number, gravity: number = 0, acceleration: number = 0, drag: number = 0, max: number = 10000): number { - - if (acceleration !== 0) - { - velocity += (acceleration + gravity) * this.game.time.elapsed; - } - else if (drag !== 0) - { - this._drag = drag * this.game.time.elapsed; - - if (velocity - this._drag > 0) - { - velocity = velocity - this._drag; - } - else if (velocity + this._drag < 0) - { - velocity += this._drag; - } - else - { - velocity = 0; - } - - velocity += gravity; - } - - if ((velocity != 0) && (max != 10000)) - { - if (velocity > max) - { - velocity = max; - } - else if (velocity < -max) - { - velocity = -max; - } - } - - return velocity; - - } - - /** - * The core Collision separation method. - * @param body1 The first Physics.Body to separate - * @param body2 The second Physics.Body to separate - * @returns {boolean} Returns true if the bodies were separated, otherwise false. - */ - public separate(body1: Body, body2: Body): bool { - - this._separatedX = this.separateBodyX(body1, body2); - this._separatedY = this.separateBodyY(body1, body2); - - return this._separatedX || this._separatedY; - - } - - public checkHullIntersection(body1: Body, body2:Body): bool { - return ((body1.hullX + body1.hullWidth > body2.hullX) && (body1.hullX < body2.hullX + body2.hullWidth) && (body1.hullY + body1.hullHeight > body2.hullY) && (body1.hullY < body2.hullY + body2.hullHeight)); - } - - /** - * Separates the two objects on their x axis - * @param object1 The first GameObject to separate - * @param object2 The second GameObject to separate - * @returns {boolean} Whether the objects in fact touched and were separated along the X axis. - */ - public separateBodyX(body1: Body, body2: Body): bool { - - // Can't separate two disabled or static objects - if ((body1.type == Types.BODY_DISABLED || body1.type == Types.BODY_STATIC) && (body2.type == Types.BODY_DISABLED || body2.type == Types.BODY_STATIC)) - { - return false; - } - - // First, get the two object deltas - this._overlap = 0; - - if (body1.deltaX != body2.deltaX) - { - if (RectangleUtils.intersects(body1.bounds, body2.bounds)) - { - this._maxOverlap = body1.deltaXAbs + body2.deltaXAbs + PhysicsManager.OVERLAP_BIAS; - - // If they did overlap (and can), figure out by how much and flip the corresponding flags - if (body1.deltaX > body2.deltaX) - { - this._overlap = body1.bounds.right - body2.bounds.x; - - if ((this._overlap > this._maxOverlap) || !(body1.allowCollisions & Types.RIGHT) || !(body2.allowCollisions & Types.LEFT)) - { - this._overlap = 0; - } - else - { - body1.touching |= Types.RIGHT; - body2.touching |= Types.LEFT; - } - } - else if (body1.deltaX < body2.deltaX) - { - this._overlap = body1.bounds.x - body2.bounds.width - body2.bounds.x; - - if ((-this._overlap > this._maxOverlap) || !(body1.allowCollisions & Types.LEFT) || !(body2.allowCollisions & Types.RIGHT)) - { - this._overlap = 0; - } - else - { - body1.touching |= Types.LEFT; - body2.touching |= Types.RIGHT; - } - } - } - } - - // Then adjust their positions and velocities accordingly (if there was any overlap) - if (this._overlap != 0) - { - this._obj1Velocity = body1.velocity.x; - this._obj2Velocity = body2.velocity.x; - - /** - * Dynamic = gives and receives impacts - * Static = gives but doesn't receive impacts, cannot be moved by physics - * Kinematic = gives impacts, but never receives, can be moved by physics - */ - - // 2 dynamic bodies will exchange velocities - if (body1.type == Types.BODY_DYNAMIC && body2.type == Types.BODY_DYNAMIC) - { - this._overlap *= 0.5; - body1.position.x = body1.position.x - this._overlap; - body2.position.x += this._overlap; - - this._obj1NewVelocity = Math.sqrt((this._obj2Velocity * this._obj2Velocity * body2.mass) / body1.mass) * ((this._obj2Velocity > 0) ? 1 : -1); - this._obj2NewVelocity = Math.sqrt((this._obj1Velocity * this._obj1Velocity * body1.mass) / body2.mass) * ((this._obj1Velocity > 0) ? 1 : -1); - this._average = (this._obj1NewVelocity + this._obj2NewVelocity) * 0.5; - this._obj1NewVelocity -= this._average; - this._obj2NewVelocity -= this._average; - body1.velocity.x = this._average + this._obj1NewVelocity * body1.bounce.x; - body2.velocity.x = this._average + this._obj2NewVelocity * body2.bounce.x; - } - else if (body2.type != Types.BODY_DYNAMIC) - { - // Body 2 is Static or Kinematic - this._overlap *= 2; - body1.position.x -= this._overlap; - body1.velocity.x = this._obj2Velocity - this._obj1Velocity * body1.bounce.x; - } - else if (body1.type != Types.BODY_DYNAMIC) - { - // Body 1 is Static or Kinematic - this._overlap *= 2; - body2.position.x += this._overlap; - body2.velocity.x = this._obj1Velocity - this._obj2Velocity * body2.bounce.x; - } - - return true; - } - else - { - return false; - } - - } - - /** - * Separates the two objects on their y axis - * @param object1 The first GameObject to separate - * @param object2 The second GameObject to separate - * @returns {boolean} Whether the objects in fact touched and were separated along the Y axis. - */ - public separateBodyY(body1: Body, body2: Body): bool { - - // Can't separate two immovable objects - if ((body1.type == Types.BODY_DISABLED || body1.type == Types.BODY_STATIC) && (body2.type == Types.BODY_DISABLED || body2.type == Types.BODY_STATIC)) - { - return false; - } - - // First, get the two object deltas - this._overlap = 0; - - if (body1.deltaY != body2.deltaY) - { - if (RectangleUtils.intersects(body1.bounds, body2.bounds)) - { - // This is the only place to use the DeltaAbs values - this._maxOverlap = body1.deltaYAbs + body2.deltaYAbs + PhysicsManager.OVERLAP_BIAS; - - // If they did overlap (and can), figure out by how much and flip the corresponding flags - if (body1.deltaY > body2.deltaY) - { - this._overlap = body1.bounds.bottom - body2.bounds.y; - - if ((this._overlap > this._maxOverlap) || !(body1.allowCollisions & Types.DOWN) || !(body2.allowCollisions & Types.UP)) - { - this._overlap = 0; - } - else - { - body1.touching |= Types.DOWN; - body2.touching |= Types.UP; - } - } - else if (body1.deltaY < body2.deltaY) - { - this._overlap = body1.bounds.y - body2.bounds.height - body2.bounds.y; - - if ((-this._overlap > this._maxOverlap) || !(body1.allowCollisions & Types.UP) || !(body2.allowCollisions & Types.DOWN)) - { - this._overlap = 0; - } - else - { - body1.touching |= Types.UP; - body2.touching |= Types.DOWN; - } - } - } - } - - // Then adjust their positions and velocities accordingly (if there was any overlap) - if (this._overlap != 0) - { - this._obj1Velocity = body1.velocity.y; - this._obj2Velocity = body2.velocity.y; - - /** - * Dynamic = gives and receives impacts - * Static = gives but doesn't receive impacts, cannot be moved by physics - * Kinematic = gives impacts, but never receives, can be moved by physics - */ - - if (body1.type == Types.BODY_DYNAMIC && body2.type == Types.BODY_DYNAMIC) - { - this._overlap *= 0.5; - body1.position.y = body1.position.y - this._overlap; - body2.position.y += this._overlap; - - this._obj1NewVelocity = Math.sqrt((this._obj2Velocity * this._obj2Velocity * body2.mass) / body1.mass) * ((this._obj2Velocity > 0) ? 1 : -1); - this._obj2NewVelocity = Math.sqrt((this._obj1Velocity * this._obj1Velocity * body1.mass) / body2.mass) * ((this._obj1Velocity > 0) ? 1 : -1); - var average: number = (this._obj1NewVelocity + this._obj2NewVelocity) * 0.5; - this._obj1NewVelocity -= average; - this._obj2NewVelocity -= average; - body1.velocity.y = average + this._obj1NewVelocity * body1.bounce.y; - body2.velocity.y = average + this._obj2NewVelocity * body2.bounce.y; - } - else if (body2.type != Types.BODY_DYNAMIC) - { - this._overlap *= 2; - body1.position.y -= this._overlap; - body1.velocity.y = this._obj2Velocity - this._obj1Velocity * body1.bounce.y; - // This is special case code that handles things like horizontal moving platforms you can ride - //if (body2.parent.active && body2.moves && (body1.deltaY > body2.deltaY)) - if (body2.sprite.active && (body1.deltaY > body2.deltaY)) - { - body1.position.x += body2.position.x - body2.oldPosition.x; - } - } - else if (body1.type != Types.BODY_DYNAMIC) - { - this._overlap *= 2; - body2.position.y += this._overlap; - body2.velocity.y = this._obj1Velocity - this._obj2Velocity * body2.bounce.y; - // This is special case code that handles things like horizontal moving platforms you can ride - //if (object1.active && body1.moves && (body1.deltaY < body2.deltaY)) - if (body1.sprite.active && (body1.deltaY < body2.deltaY)) - { - body2.position.x += body1.position.x - body1.oldPosition.x; - } - } - - return true; - } - else - { - return false; - } - } - - - - - - - - /* - private TILEseparate(shapeA: IPhysicsShape, shapeB: IPhysicsShape, distance: Vec2, tangent: Vec2) { - - if (tangent.x == 1) - { - console.log('1 The left side of ShapeA hit the right side of ShapeB', Math.floor(distance.x)); - shapeA.physics.touching |= Phaser.Types.LEFT; - shapeB.physics.touching |= Phaser.Types.RIGHT; - } - else if (tangent.x == -1) - { - console.log('2 The right side of ShapeA hit the left side of ShapeB', Math.floor(distance.x)); - shapeA.physics.touching |= Phaser.Types.RIGHT; - shapeB.physics.touching |= Phaser.Types.LEFT; - } - - if (tangent.y == 1) - { - console.log('3 The top of ShapeA hit the bottom of ShapeB', Math.floor(distance.y)); - shapeA.physics.touching |= Phaser.Types.UP; - shapeB.physics.touching |= Phaser.Types.DOWN; - } - else if (tangent.y == -1) - { - console.log('4 The bottom of ShapeA hit the top of ShapeB', Math.floor(distance.y)); - shapeA.physics.touching |= Phaser.Types.DOWN; - shapeB.physics.touching |= Phaser.Types.UP; - } - - - // only apply collision response forces if the object is travelling into, and not out of, the collision - var dot = Vec2Utils.dot(shapeA.physics.velocity, tangent); - - if (dot < 0) - { - console.log('in to', dot); - - // Apply horizontal bounce - if (shapeA.physics.bounce.x > 0) - { - shapeA.physics.velocity.x *= -(shapeA.physics.bounce.x); - } - else - { - shapeA.physics.velocity.x = 0; - } - // Apply horizontal bounce - if (shapeA.physics.bounce.y > 0) - { - shapeA.physics.velocity.y *= -(shapeA.physics.bounce.y); - } - else - { - shapeA.physics.velocity.y = 0; - } - } - else - { - console.log('out of', dot); - } - - shapeA.position.x += Math.floor(distance.x); - //shapeA.bounds.x += Math.floor(distance.x); - - shapeA.position.y += Math.floor(distance.y); - //shapeA.bounds.y += distance.y; - - console.log('------------------------------------------------'); - - } - - private collideWorld(shape:IPhysicsShape) { - - // Collide on the x-axis - this._distance.x = shape.world.bounds.x - (shape.position.x - shape.bounds.halfWidth); - - if (0 < this._distance.x) - { - // Hit Left - this._tangent.setTo(1, 0); - this.separateXWall(shape, this._distance, this._tangent); - } - else - { - this._distance.x = (shape.position.x + shape.bounds.halfWidth) - shape.world.bounds.right; - - if (0 < this._distance.x) - { - // Hit Right - this._tangent.setTo(-1, 0); - this._distance.reverse(); - this.separateXWall(shape, this._distance, this._tangent); - } - } - - // Collide on the y-axis - this._distance.y = shape.world.bounds.y - (shape.position.y - shape.bounds.halfHeight); - - if (0 < this._distance.y) - { - // Hit Top - this._tangent.setTo(0, 1); - this.separateYWall(shape, this._distance, this._tangent); - } - else - { - this._distance.y = (shape.position.y + shape.bounds.halfHeight) - shape.world.bounds.bottom; - - if (0 < this._distance.y) - { - // Hit Bottom - this._tangent.setTo(0, -1); - this._distance.reverse(); - this.separateYWall(shape, this._distance, this._tangent); - } - } - - } - - private separateX(shapeA: IPhysicsShape, shapeB: IPhysicsShape, distance: Vec2, tangent: Vec2) { - - if (tangent.x == 1) - { - console.log('The left side of ShapeA hit the right side of ShapeB', distance.x); - shapeA.physics.touching |= Phaser.Types.LEFT; - shapeB.physics.touching |= Phaser.Types.RIGHT; - } - else - { - console.log('The right side of ShapeA hit the left side of ShapeB', distance.x); - shapeA.physics.touching |= Phaser.Types.RIGHT; - shapeB.physics.touching |= Phaser.Types.LEFT; - } - - // collision edges - //shapeA.oH = tangent.x; - - // only apply collision response forces if the object is travelling into, and not out of, the collision - if (Vec2Utils.dot(shapeA.physics.velocity, tangent) < 0) - { - // Apply horizontal bounce - if (shapeA.physics.bounce.x > 0) - { - shapeA.physics.velocity.x *= -(shapeA.physics.bounce.x); - } - else - { - shapeA.physics.velocity.x = 0; - } - } - - shapeA.position.x += distance.x; - shapeA.bounds.x += distance.x; - - } - - private separateY(shapeA: IPhysicsShape, shapeB: IPhysicsShape, distance: Vec2, tangent: Vec2) { - - if (tangent.y == 1) - { - console.log('The top of ShapeA hit the bottom of ShapeB', distance.y); - shapeA.physics.touching |= Phaser.Types.UP; - shapeB.physics.touching |= Phaser.Types.DOWN; - } - else - { - console.log('The bottom of ShapeA hit the top of ShapeB', distance.y); - shapeA.physics.touching |= Phaser.Types.DOWN; - shapeB.physics.touching |= Phaser.Types.UP; - } - - // collision edges - //shapeA.oV = tangent.y; - - // only apply collision response forces if the object is travelling into, and not out of, the collision - if (Vec2Utils.dot(shapeA.physics.velocity, tangent) < 0) - { - // Apply horizontal bounce - if (shapeA.physics.bounce.y > 0) - { - shapeA.physics.velocity.y *= -(shapeA.physics.bounce.y); - } - else - { - shapeA.physics.velocity.y = 0; - } - } - - shapeA.position.y += distance.y; - shapeA.bounds.y += distance.y; - - } - - private separateXWall(shapeA: IPhysicsShape, distance: Vec2, tangent: Vec2) { - - if (tangent.x == 1) - { - console.log('The left side of ShapeA hit the right side of ShapeB', distance.x); - shapeA.physics.touching |= Phaser.Types.LEFT; - } - else - { - console.log('The right side of ShapeA hit the left side of ShapeB', distance.x); - shapeA.physics.touching |= Phaser.Types.RIGHT; - } - - // collision edges - //shapeA.oH = tangent.x; - - // only apply collision response forces if the object is travelling into, and not out of, the collision - if (Vec2Utils.dot(shapeA.physics.velocity, tangent) < 0) - { - // Apply horizontal bounce - if (shapeA.physics.bounce.x > 0) - { - shapeA.physics.velocity.x *= -(shapeA.physics.bounce.x); - } - else - { - shapeA.physics.velocity.x = 0; - } - } - - shapeA.position.x += distance.x; - - } - - private separateYWall(shapeA: IPhysicsShape, distance: Vec2, tangent: Vec2) { - - if (tangent.y == 1) - { - console.log('The top of ShapeA hit the bottom of ShapeB', distance.y); - shapeA.physics.touching |= Phaser.Types.UP; - } - else - { - console.log('The bottom of ShapeA hit the top of ShapeB', distance.y); - shapeA.physics.touching |= Phaser.Types.DOWN; - } - - // collision edges - //shapeA.oV = tangent.y; - - // only apply collision response forces if the object is travelling into, and not out of, the collision - if (Vec2Utils.dot(shapeA.physics.velocity, tangent) < 0) - { - // Apply horizontal bounce - if (shapeA.physics.bounce.y > 0) - { - shapeA.physics.velocity.y *= -(shapeA.physics.bounce.y); - } - else - { - shapeA.physics.velocity.y = 0; - } - } - - shapeA.position.y += distance.y; - - } - */ - - /** - * Checks for overlaps between two objects using the world QuadTree. Can be Sprite vs. Sprite, Sprite vs. Group or Group vs. Group. - * Note: Does not take the objects scrollFactor into account. All overlaps are check in world space. - * @param object1 The first Sprite or Group to check. If null the world.group is used. - * @param object2 The second Sprite or Group to check. - * @param notifyCallback A callback function that is called if the objects overlap. The two objects will be passed to this function in the same order in which you passed them to Collision.overlap. - * @param processCallback A callback function that lets you perform additional checks against the two objects if they overlap. If this is set then notifyCallback will only be called if processCallback returns true. - * @param context The context in which the callbacks will be called - * @returns {boolean} true if the objects overlap, otherwise false. - */ - public overlap(object1 = null, object2 = null, notifyCallback = null, processCallback = null, context = null): bool { - - /* - if (object1 == null) - { - object1 = this.game.world.group; - } - - if (object2 == object1) - { - object2 = null; - } - - QuadTree.divisions = this.worldDivisions; - - this._quadTree = new Phaser.QuadTree(this, this.bounds.x, this.bounds.y, this.bounds.width, this.bounds.height); - - this._quadTree.load(object1, object2, notifyCallback, processCallback, context); - - this._quadTreeResult = this._quadTree.execute(); - - console.log('over', this._quadTreeResult); - - this._quadTree.destroy(); - - this._quadTree = null; - - return this._quadTreeResult; - */ - - return false; - - } - - - - - - - /** - * Collision resolution specifically for GameObjects vs. Tiles. - * @param object The GameObject to separate - * @param tile The Tile to separate - * @returns {boolean} Whether the objects in fact touched and were separated - */ - public separateTile(object:Sprite, x: number, y: number, width: number, height: number, mass: number, collideLeft: bool, collideRight: bool, collideUp: bool, collideDown: bool, separateX: bool, separateY: bool): bool { - - //var separatedX: bool = this.separateTileX(object, x, y, width, height, mass, collideLeft, collideRight, separateX); - //var separatedY: bool = this.separateTileY(object, x, y, width, height, mass, collideUp, collideDown, separateY); - - //return separatedX || separatedY; - - return false; - - } - - /** - * Separates the two objects on their x axis - * @param object The GameObject to separate - * @param tile The Tile to separate - * @returns {boolean} Whether the objects in fact touched and were separated along the X axis. - */ - /* - public separateTileX(object:Sprite, x: number, y: number, width: number, height: number, mass: number, collideLeft: bool, collideRight: bool, separate: bool): bool { - - // Can't separate two immovable objects (tiles are always immovable) - if (object.immovable) - { - return false; - } - - // First, get the object delta - var overlap: number = 0; - var objDelta: number = object.x - object.last.x; - //var objDelta: number = object.collisionMask.deltaX; - - if (objDelta != 0) - { - // Check if the X hulls actually overlap - var objDeltaAbs: number = (objDelta > 0) ? objDelta : -objDelta; - //var objDeltaAbs: number = object.collisionMask.deltaXAbs; - var objBounds: Rectangle = new Rectangle(object.x - ((objDelta > 0) ? objDelta : 0), object.last.y, object.width + ((objDelta > 0) ? objDelta : -objDelta), object.height); - - if ((objBounds.x + objBounds.width > x) && (objBounds.x < x + width) && (objBounds.y + objBounds.height > y) && (objBounds.y < y + height)) - { - var maxOverlap: number = objDeltaAbs + Collision.OVERLAP_BIAS; - - // If they did overlap (and can), figure out by how much and flip the corresponding flags - if (objDelta > 0) - { - overlap = object.x + object.width - x; - - if ((overlap > maxOverlap) || !(object.allowCollisions & Collision.RIGHT) || collideLeft == false) - { - overlap = 0; - } - else - { - object.touching |= Collision.RIGHT; - } - } - else if (objDelta < 0) - { - overlap = object.x - width - x; - - if ((-overlap > maxOverlap) || !(object.allowCollisions & Collision.LEFT) || collideRight == false) - { - overlap = 0; - } - else - { - object.touching |= Collision.LEFT; - } - - } - - } - } - - // Then adjust their positions and velocities accordingly (if there was any overlap) - if (overlap != 0) - { - if (separate == true) - { - //console.log(' - object.x = object.x - overlap; - object.velocity.x = -(object.velocity.x * object.elasticity); - } - - Collision.TILE_OVERLAP = true; - return true; - } - else - { - return false; - } - - } - */ - - /** - * Separates the two objects on their y axis - * @param object The first GameObject to separate - * @param tile The second GameObject to separate - * @returns {boolean} Whether the objects in fact touched and were separated along the Y axis. - */ - /* - public separateTileY(object: Sprite, x: number, y: number, width: number, height: number, mass: number, collideUp: bool, collideDown: bool, separate: bool): bool { - - // Can't separate two immovable objects (tiles are always immovable) - if (object.immovable) - { - return false; - } - - // First, get the two object deltas - var overlap: number = 0; - var objDelta: number = object.y - object.last.y; - - if (objDelta != 0) - { - // Check if the Y hulls actually overlap - var objDeltaAbs: number = (objDelta > 0) ? objDelta : -objDelta; - var objBounds: Rectangle = new Rectangle(object.x, object.y - ((objDelta > 0) ? objDelta : 0), object.width, object.height + objDeltaAbs); - - if ((objBounds.x + objBounds.width > x) && (objBounds.x < x + width) && (objBounds.y + objBounds.height > y) && (objBounds.y < y + height)) - { - var maxOverlap: number = objDeltaAbs + Collision.OVERLAP_BIAS; - - // If they did overlap (and can), figure out by how much and flip the corresponding flags - if (objDelta > 0) - { - overlap = object.y + object.height - y; - - if ((overlap > maxOverlap) || !(object.allowCollisions & Collision.DOWN) || collideUp == false) - { - overlap = 0; - } - else - { - object.touching |= Collision.DOWN; - } - } - else if (objDelta < 0) - { - overlap = object.y - height - y; - - if ((-overlap > maxOverlap) || !(object.allowCollisions & Collision.UP) || collideDown == false) - { - overlap = 0; - } - else - { - object.touching |= Collision.UP; - } - } - } - } - - // TODO - with super low velocities you get lots of stuttering, set some kind of base minimum here - - // Then adjust their positions and velocities accordingly (if there was any overlap) - if (overlap != 0) - { - if (separate == true) - { - object.y = object.y - overlap; - object.velocity.y = -(object.velocity.y * object.elasticity); - } - - Collision.TILE_OVERLAP = true; - return true; - } - else - { - return false; - } - } - */ - - - /** - * Separates the two objects on their x axis - * @param object The GameObject to separate - * @param tile The Tile to separate - * @returns {boolean} Whether the objects in fact touched and were separated along the X axis. - */ - /* - public static NEWseparateTileX(object:Sprite, x: number, y: number, width: number, height: number, mass: number, collideLeft: bool, collideRight: bool, separate: bool): bool { - - // Can't separate two immovable objects (tiles are always immovable) - if (object.immovable) - { - return false; - } - - // First, get the object delta - var overlap: number = 0; - - if (object.collisionMask.deltaX != 0) - { - // Check if the X hulls actually overlap - //var objDeltaAbs: number = (objDelta > 0) ? objDelta : -objDelta; - //var objBounds: Rectangle = new Rectangle(object.x - ((objDelta > 0) ? objDelta : 0), object.last.y, object.width + ((objDelta > 0) ? objDelta : -objDelta), object.height); - - //if ((objBounds.x + objBounds.width > x) && (objBounds.x < x + width) && (objBounds.y + objBounds.height > y) && (objBounds.y < y + height)) - if (object.collisionMask.intersectsRaw(x, x + width, y, y + height)) - { - var maxOverlap: number = object.collisionMask.deltaXAbs + Collision.OVERLAP_BIAS; - - // If they did overlap (and can), figure out by how much and flip the corresponding flags - if (object.collisionMask.deltaX > 0) - { - //overlap = object.x + object.width - x; - overlap = object.collisionMask.right - x; - - if ((overlap > maxOverlap) || !(object.allowCollisions & Collision.RIGHT) || collideLeft == false) - { - overlap = 0; - } - else - { - object.touching |= Collision.RIGHT; - } - } - else if (object.collisionMask.deltaX < 0) - { - //overlap = object.x - width - x; - overlap = object.collisionMask.x - width - x; - - if ((-overlap > maxOverlap) || !(object.allowCollisions & Collision.LEFT) || collideRight == false) - { - overlap = 0; - } - else - { - object.touching |= Collision.LEFT; - } - - } - - } - } - - // Then adjust their positions and velocities accordingly (if there was any overlap) - if (overlap != 0) - { - if (separate == true) - { - object.x = object.x - overlap; - object.velocity.x = -(object.velocity.x * object.elasticity); - } - - Collision.TILE_OVERLAP = true; - return true; - } - else - { - return false; - } - - } - */ - - /** - * Separates the two objects on their y axis - * @param object The first GameObject to separate - * @param tile The second GameObject to separate - * @returns {boolean} Whether the objects in fact touched and were separated along the Y axis. - */ - /* - public NEWseparateTileY(object: Sprite, x: number, y: number, width: number, height: number, mass: number, collideUp: bool, collideDown: bool, separate: bool): bool { - - // Can't separate two immovable objects (tiles are always immovable) - if (object.immovable) - { - return false; - } - - // First, get the two object deltas - var overlap: number = 0; - //var objDelta: number = object.y - object.last.y; - - if (object.collisionMask.deltaY != 0) - { - // Check if the Y hulls actually overlap - //var objDeltaAbs: number = (objDelta > 0) ? objDelta : -objDelta; - //var objBounds: Rectangle = new Rectangle(object.x, object.y - ((objDelta > 0) ? objDelta : 0), object.width, object.height + objDeltaAbs); - - //if ((objBounds.x + objBounds.width > x) && (objBounds.x < x + width) && (objBounds.y + objBounds.height > y) && (objBounds.y < y + height)) - if (object.collisionMask.intersectsRaw(x, x + width, y, y + height)) - { - //var maxOverlap: number = objDeltaAbs + Collision.OVERLAP_BIAS; - var maxOverlap: number = object.collisionMask.deltaYAbs + Collision.OVERLAP_BIAS; - - // If they did overlap (and can), figure out by how much and flip the corresponding flags - if (object.collisionMask.deltaY > 0) - { - //overlap = object.y + object.height - y; - overlap = object.collisionMask.bottom - y; - - if ((overlap > maxOverlap) || !(object.allowCollisions & Collision.DOWN) || collideUp == false) - { - overlap = 0; - } - else - { - object.touching |= Collision.DOWN; - } - } - else if (object.collisionMask.deltaY < 0) - { - //overlap = object.y - height - y; - overlap = object.collisionMask.y - height - y; - - if ((-overlap > maxOverlap) || !(object.allowCollisions & Collision.UP) || collideDown == false) - { - overlap = 0; - } - else - { - object.touching |= Collision.UP; - } - } - } - } - - // TODO - with super low velocities you get lots of stuttering, set some kind of base minimum here - - // Then adjust their positions and velocities accordingly (if there was any overlap) - if (overlap != 0) - { - if (separate == true) - { - object.y = object.y - overlap; - object.velocity.y = -(object.velocity.y * object.elasticity); - } - - Collision.TILE_OVERLAP = true; - return true; - } - else - { - return false; - } - } - */ - - } - -} \ No newline at end of file diff --git a/wip/physics/Body.js b/wip/physics/Body.js deleted file mode 100644 index 6f12a4b8..00000000 --- a/wip/physics/Body.js +++ /dev/null @@ -1,416 +0,0 @@ -var Phaser; -(function (Phaser) { - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /** - * Phaser - Advanced Physics - Body - * - * Based on the work Ju Hyung Lee started in JS PhyRus. - */ - (function (Physics) { - var Body = (function () { - function Body(sprite, type, x, y, shapeType) { - if (typeof x === "undefined") { x = 0; } - if (typeof y === "undefined") { y = 0; } - if (typeof shapeType === "undefined") { shapeType = 0; } - this._tempVec2 = new Phaser.Vec2(); - this._fixedRotation = false; - // Shapes - this.shapes = []; - // Joints - this.joints = []; - this.jointHash = { - }; - this.categoryBits = 0x0001; - this.maskBits = 0xFFFF; - this.stepCount = 0; - this._newPosition = new Phaser.Vec2(); - this.id = Phaser.Physics.AdvancedPhysics.bodyCounter++; - this.name = 'body' + this.id; - this.type = type; - if(sprite) { - this.sprite = sprite; - this.game = sprite.game; - this.position = new Phaser.Vec2(Phaser.Physics.AdvancedPhysics.pixelsToMeters(sprite.x), Phaser.Physics.AdvancedPhysics.pixelsToMeters(sprite.y)); - this.angle = this.game.math.degreesToRadians(sprite.rotation); - } else { - this.position = new Phaser.Vec2(Phaser.Physics.AdvancedPhysics.pixelsToMeters(x), Phaser.Physics.AdvancedPhysics.pixelsToMeters(y)); - this.angle = 0; - } - this.transform = new Phaser.Transform(this.position, this.angle); - this.centroid = new Phaser.Vec2(); - this.velocity = new Phaser.Vec2(); - this.force = new Phaser.Vec2(); - this.angularVelocity = 0; - this.torque = 0; - this.linearDamping = 0; - this.angularDamping = 0; - this.sleepTime = 0; - this.awaked = false; - this.shapes = []; - this.joints = []; - this.jointHash = { - }; - this.bounds = new Physics.Bounds(); - this.allowCollisions = Phaser.Types.ANY; - this.categoryBits = 0x0001; - this.maskBits = 0xFFFF; - this.stepCount = 0; - if(sprite) { - if(shapeType == 0) { - Phaser.BodyUtils.addBox(this, 0, 0, this.sprite.width, this.sprite.height, 1, 1, 1); - } else { - Phaser.BodyUtils.addCircle(this, Math.max(this.sprite.width, this.sprite.height) / 2, 0, 0, 1, 1, 1); - } - } - } - Object.defineProperty(Body.prototype, "rotation", { - get: /** - * The rotation of the body in degrees. Phaser uses a right-handed coordinate system, where 0 points to the right. - */ - function () { - return this.game.math.radiansToDegrees(this.angle); - }, - set: /** - * Set the rotation of the body in degrees. Phaser uses a right-handed coordinate system, where 0 points to the right. - * The value is automatically wrapped to be between 0 and 360. - */ - function (value) { - this.angle = this.game.math.degreesToRadians(this.game.math.wrap(value, 360, 0)); - }, - enumerable: true, - configurable: true - }); - Object.defineProperty(Body.prototype, "isDisabled", { - get: function () { - return this.type == Phaser.Types.BODY_DISABLED ? true : false; - }, - enumerable: true, - configurable: true - }); - Object.defineProperty(Body.prototype, "isStatic", { - get: function () { - return this.type == Phaser.Types.BODY_STATIC ? true : false; - }, - enumerable: true, - configurable: true - }); - Object.defineProperty(Body.prototype, "isKinetic", { - get: function () { - return this.type == Phaser.Types.BODY_KINETIC ? true : false; - }, - enumerable: true, - configurable: true - }); - Object.defineProperty(Body.prototype, "isDynamic", { - get: function () { - return this.type == Phaser.Types.BODY_DYNAMIC ? true : false; - }, - enumerable: true, - configurable: true - }); - Body.prototype.setType = function (type) { - if(type == this.type) { - return; - } - this.force.setTo(0, 0); - this.velocity.setTo(0, 0); - this.torque = 0; - this.angularVelocity = 0; - this.type = type; - this.awake(true); - }; - Body.prototype.addShape = function (shape) { - // Check not already part of this body - shape.body = this; - this.shapes.push(shape); - this.shapesLength = this.shapes.length; - return shape; - }; - Body.prototype.removeShape = function (shape) { - var index = this.shapes.indexOf(shape); - if(index != -1) { - this.shapes.splice(index, 1); - shape.body = undefined; - } - this.shapesLength = this.shapes.length; - }; - Body.prototype.setMass = function (mass) { - this.mass = mass; - this.massInverted = mass > 0 ? 1 / mass : 0; - }; - Body.prototype.setInertia = function (inertia) { - this.inertia = inertia; - this.inertiaInverted = inertia > 0 ? 1 / inertia : 0; - }; - Body.prototype.setPosition = function (x, y) { - this._newPosition.setTo(Phaser.Physics.AdvancedPhysics.pixelsToMeters(x), Phaser.Physics.AdvancedPhysics.pixelsToMeters(y)); - this.setTransform(this._newPosition, this.angle); - }; - Body.prototype.setTransform = function (pos, angle) { - // inject the transform into this.position - this.transform.setTo(pos, angle); - //Manager.write('setTransform: ' + this.position.toString()); - //Manager.write('centroid: ' + this.centroid.toString()); - Phaser.TransformUtils.transform(this.transform, this.centroid, this.position); - //Manager.write('post setTransform: ' + this.position.toString()); - //this.position.copyFrom(this.transform.transform(this.centroid)); - this.angle = angle; - }; - Body.prototype.syncTransform = function () { - //Manager.write('syncTransform:'); - //Manager.write('p: ' + this.position.toString()); - //Manager.write('centroid: ' + this.centroid.toString()); - //Manager.write('xf: ' + this.transform.toString()); - //Manager.write('a: ' + this.angle); - this.transform.setRotation(this.angle); - // OPTIMISE: Creating new vector - Phaser.Vec2Utils.subtract(this.position, Phaser.TransformUtils.rotate(this.transform, this.centroid), this.transform.t); - //Manager.write('--------------------'); - //Manager.write('xf: ' + this.transform.toString()); - //Manager.write('--------------------'); - }; - Body.prototype.getWorldPoint = function (p) { - // OPTIMISE: Creating new vector - return Phaser.TransformUtils.transform(this.transform, p); - }; - Body.prototype.getWorldVector = function (v) { - // OPTIMISE: Creating new vector - return Phaser.TransformUtils.rotate(this.transform, v); - }; - Body.prototype.getLocalPoint = function (p) { - // OPTIMISE: Creating new vector - return Phaser.TransformUtils.untransform(this.transform, p); - }; - Body.prototype.getLocalVector = function (v) { - // OPTIMISE: Creating new vector - return Phaser.TransformUtils.unrotate(this.transform, v); - }; - Object.defineProperty(Body.prototype, "fixedRotation", { - get: function () { - return this._fixedRotation; - }, - set: function (value) { - this._fixedRotation = value; - this.resetMassData(); - }, - enumerable: true, - configurable: true - }); - Body.prototype.resetMassData = function () { - this.centroid.setTo(0, 0); - this.mass = 0; - this.massInverted = 0; - this.inertia = 0; - this.inertiaInverted = 0; - if(this.isDynamic == false) { - Phaser.TransformUtils.transform(this.transform, this.centroid, this.position); - return; - } - var totalMassCentroid = new Phaser.Vec2(0, 0); - var totalMass = 0; - var totalInertia = 0; - for(var i = 0; i < this.shapes.length; i++) { - var shape = this.shapes[i]; - var centroid = shape.centroid(); - var mass = shape.area() * shape.density; - var inertia = shape.inertia(mass); - totalMassCentroid.multiplyAddByScalar(centroid, mass); - totalMass += mass; - totalInertia += inertia; - } - Phaser.Vec2Utils.scale(totalMassCentroid, 1 / totalMass, this.centroid); - this.setMass(totalMass); - if(!this.fixedRotation) { - this.setInertia(totalInertia - totalMass * Phaser.Vec2Utils.dot(this.centroid, this.centroid)); - } - // Move center of mass - var oldPosition = Phaser.Vec2Utils.clone(this.position); - Phaser.TransformUtils.transform(this.transform, this.centroid, this.position); - // Update center of mass velocity - oldPosition.subtract(this.position); - this.velocity.multiplyAddByScalar(Phaser.Vec2Utils.perp(oldPosition, oldPosition), this.angularVelocity); - }; - Body.prototype.resetJointAnchors = function () { - for(var i = 0; i < this.joints.length; i++) { - var joint = this.joints[i]; - if(!joint) { - continue; - } - var anchor1 = joint.getWorldAnchor1(); - var anchor2 = joint.getWorldAnchor2(); - joint.setWorldAnchor1(anchor1); - joint.setWorldAnchor2(anchor2); - } - }; - Body.prototype.cacheData = function (source) { - if (typeof source === "undefined") { source = ''; } - //Manager.write('cacheData -- start'); - //Manager.write('p: ' + this.position.toString()); - //Manager.write('xf: ' + this.transform.toString()); - this.bounds.clear(); - for(var i = 0; i < this.shapesLength; i++) { - var shape = this.shapes[i]; - shape.cacheData(this.transform); - this.bounds.addBounds(shape.bounds); - } - //Manager.write('bounds: ' + this.bounds.toString()); - //Manager.write('p: ' + this.position.toString()); - //Manager.write('xf: ' + this.transform.toString()); - //Manager.write('cacheData -- stop'); - }; - Body.prototype.updateVelocity = function (gravity, dt, damping) { - Phaser.Vec2Utils.multiplyAdd(gravity, this.force, this.massInverted, this._tempVec2); - Phaser.Vec2Utils.multiplyAdd(this.velocity, this._tempVec2, dt, this.velocity); - this.angularVelocity = this.angularVelocity + this.torque * this.inertiaInverted * dt; - // Apply damping. - // ODE: dv/dt + c * v = 0 - // Solution: v(t) = v0 * exp(-c * t) - // Time step: v(t + dt) = v0 * exp(-c * (t + dt)) = v0 * exp(-c * t) * exp(-c * dt) = v * exp(-c * dt) - // v2 = exp(-c * dt) * v1 - // Taylor expansion: - // v2 = (1.0f - c * dt) * v1 - this.velocity.scale(this.clamp(1 - dt * (damping + this.linearDamping), 0, 1)); - this.angularVelocity *= this.clamp(1 - dt * (damping + this.angularDamping), 0, 1); - this.force.setTo(0, 0); - this.torque = 0; - }; - Body.prototype.inContact = function (body2) { - if(!body2 || this.stepCount == body2.stepCount) { - return false; - } - if(!(this.isAwake && this.isStatic == false) && !(body2.isAwake && body2.isStatic == false)) { - return false; - } - if(this.isCollidable(body2) == false) { - return false; - } - if(!this.bounds.intersectsBounds(body2.bounds)) { - return false; - } - return true; - }; - Body.prototype.clamp = function (v, min, max) { - return v < min ? min : (v > max ? max : v); - }; - Body.prototype.updatePosition = function (dt) { - this.position.add(Phaser.Vec2Utils.scale(this.velocity, dt, this._tempVec2)); - this.angle += this.angularVelocity * dt; - if(this.sprite) { - this.sprite.x = this.position.x * 50; - this.sprite.y = this.position.y * 50; - this.sprite.transform.rotation = this.game.math.radiansToDegrees(this.angle); - } - }; - Body.prototype.resetForce = function () { - this.force.setTo(0, 0); - this.torque = 0; - }; - Body.prototype.applyForce = function (force, p) { - if(this.isDynamic == false) { - return; - } - if(this.isAwake == false) { - this.awake(true); - } - this.force.add(force); - Phaser.Vec2Utils.subtract(p, this.position, this._tempVec2); - this.torque += Phaser.Vec2Utils.cross(this._tempVec2, force); - }; - Body.prototype.applyForceToCenter = function (force) { - if(this.isDynamic == false) { - return; - } - if(this.isAwake == false) { - this.awake(true); - } - this.force.add(force); - }; - Body.prototype.applyTorque = function (torque) { - if(this.isDynamic == false) { - return; - } - if(this.isAwake == false) { - this.awake(true); - } - this.torque += torque; - }; - Body.prototype.applyLinearImpulse = function (impulse, p) { - if(this.isDynamic == false) { - return; - } - if(this.isAwake == false) { - this.awake(true); - } - this.velocity.multiplyAddByScalar(impulse, this.massInverted); - Phaser.Vec2Utils.subtract(p, this.position, this._tempVec2); - this.angularVelocity += Phaser.Vec2Utils.cross(this._tempVec2, impulse) * this.inertiaInverted; - }; - Body.prototype.applyAngularImpulse = function (impulse) { - if(this.isDynamic == false) { - return; - } - if(this.isAwake == false) { - this.awake(true); - } - this.angularVelocity += impulse * this.inertiaInverted; - }; - Body.prototype.kineticEnergy = function () { - return 0.5 * (this.mass * this.velocity.dot(this.velocity) + this.inertia * (this.angularVelocity * this.angularVelocity)); - }; - Object.defineProperty(Body.prototype, "isAwake", { - get: function () { - return this.awaked; - }, - enumerable: true, - configurable: true - }); - Body.prototype.awake = function (flag) { - this.awaked = flag; - if(flag) { - this.sleepTime = 0; - } else { - this.velocity.setTo(0, 0); - this.angularVelocity = 0; - this.force.setTo(0, 0); - this.torque = 0; - } - }; - Body.prototype.isCollidable = function (other) { - if((this.isDynamic == false && other.isDynamic == false) || this == other) { - return false; - } - if(!(this.maskBits & other.categoryBits) || !(other.maskBits & this.categoryBits)) { - return false; - } - for(var i = 0; i < this.joints.length; i++) { - var joint = this.joints[i]; - if(!this.joints[i] || (!this.joints[i].collideConnected && other.jointHash[this.joints[i].id] != undefined)) { - return false; - } - } - return true; - }; - Body.prototype.toString = function () { - return "[{Body (name=" + this.name + " velocity=" + this.velocity.toString() + " angularVelocity: " + this.angularVelocity + ")}]"; - }; - return Body; - })(); - Physics.Body = Body; - })(Phaser.Physics || (Phaser.Physics = {})); - var Physics = Phaser.Physics; -})(Phaser || (Phaser = {})); diff --git a/wip/physics/Body.ts b/wip/physics/Body.ts deleted file mode 100644 index 325965af..00000000 --- a/wip/physics/Body.ts +++ /dev/null @@ -1,657 +0,0 @@ -/// -/// -/// -/// -/// -/// -/// -/// -/// -/// -/// -/// -/// -/// -/// -/// - -/** -* Phaser - Advanced Physics - Body -* -* Based on the work Ju Hyung Lee started in JS PhyRus. -*/ - -module Phaser.Physics { - - export class Body { - - constructor(sprite: Phaser.Sprite, type: number, x?: number = 0, y?: number = 0, shapeType?: number = 0) { - - this.id = Phaser.Physics.AdvancedPhysics.bodyCounter++; - this.name = 'body' + this.id; - this.type = type; - - if (sprite) - { - this.sprite = sprite; - this.game = sprite.game; - this.position = new Phaser.Vec2(Phaser.Physics.AdvancedPhysics.pixelsToMeters(sprite.x), Phaser.Physics.AdvancedPhysics.pixelsToMeters(sprite.y)); - this.angle = this.game.math.degreesToRadians(sprite.rotation); - } - else - { - this.position = new Phaser.Vec2(Phaser.Physics.AdvancedPhysics.pixelsToMeters(x), Phaser.Physics.AdvancedPhysics.pixelsToMeters(y)); - this.angle = 0; - } - - this.transform = new Phaser.Transform(this.position, this.angle); - this.centroid = new Phaser.Vec2; - this.velocity = new Phaser.Vec2; - this.force = new Phaser.Vec2; - this.angularVelocity = 0; - this.torque = 0; - this.linearDamping = 0; - this.angularDamping = 0; - this.sleepTime = 0; - this.awaked = false; - - this.shapes = []; - this.joints = []; - this.jointHash = {}; - - this.bounds = new Bounds; - - this.allowCollisions = Phaser.Types.ANY; - - this.categoryBits = 0x0001; - this.maskBits = 0xFFFF; - - this.stepCount = 0; - - if (sprite) - { - if (shapeType == 0) - { - Phaser.BodyUtils.addBox(this, 0, 0, this.sprite.width, this.sprite.height, 1, 1, 1); - } - else - { - Phaser.BodyUtils.addCircle(this, Math.max(this.sprite.width, this.sprite.height) / 2, 0, 0, 1, 1, 1); - } - } - - } - - private _tempVec2: Phaser.Vec2 = new Phaser.Vec2; - private _fixedRotation: bool = false; - - /** - * Reference to Phaser.Game - */ - public game: Phaser.Game; - - /** - * Reference to the parent Sprite - */ - public sprite: Phaser.Sprite; - - /** - * The Body ID - */ - public id: number; - - /** - * The Body name - */ - public name: string; - - /** - * The type of Body (disabled, dynamic, static or kinematic) - * Disabled = skips all physics operations / tests (default) - * Dynamic = gives and receives impacts - * Static = gives but doesn't receive impacts, cannot be moved by physics - * Kinematic = gives impacts, but never receives, can be moved by physics - * @type {number} - */ - public type: number; - - /** - * The angle of the body in radians. Used by all of the internal physics methods. - */ - public angle: number; - - /** - * The rotation of the body in degrees. Phaser uses a right-handed coordinate system, where 0 points to the right. - */ - public get rotation(): number { - return this.game.math.radiansToDegrees(this.angle); - } - - /** - * Set the rotation of the body in degrees. Phaser uses a right-handed coordinate system, where 0 points to the right. - * The value is automatically wrapped to be between 0 and 360. - */ - public set rotation(value: number) { - this.angle = this.game.math.degreesToRadians(this.game.math.wrap(value, 360, 0)); - } - - // Local to world transform - public transform: Phaser.Transform; - - // Local center of mass - public centroid: Phaser.Vec2; - - // World position of centroid - public position: Phaser.Vec2; - - // Velocity - public velocity: Phaser.Vec2; - - // Force - public force: Phaser.Vec2; - - // Angular velocity - public angularVelocity: number; - - // Torque - public torque: number; - - // Linear damping - public linearDamping: number; - - // Angular damping - public angularDamping: number; - - // Sleep time - public sleepTime: number; - - // Awaked - public awaked: bool; - - // Allow Collisions - public allowCollisions: number; - - // Shapes - public shapes: IShape[] = []; - - // Length of the shapes array - public shapesLength: number; - - // Joints - public joints: IJoint[] = []; - public jointHash = {}; - - // Bounds of all shapes - public bounds: Bounds; - - public mass: number; - public massInverted: number; - public inertia: number; - public inertiaInverted: number; - - public categoryBits: number = 0x0001; - public maskBits: number = 0xFFFF; - public stepCount: number = 0; - public space: Space; - - - public get isDisabled(): bool { - return this.type == Phaser.Types.BODY_DISABLED ? true : false; - } - - public get isStatic(): bool { - return this.type == Phaser.Types.BODY_STATIC ? true : false; - } - - public get isKinetic(): bool { - return this.type == Phaser.Types.BODY_KINETIC ? true : false; - } - - public get isDynamic(): bool { - return this.type == Phaser.Types.BODY_DYNAMIC ? true : false; - } - - public setType(type: number) { - - if (type == this.type) - { - return; - } - - this.force.setTo(0, 0); - this.velocity.setTo(0, 0); - this.torque = 0; - this.angularVelocity = 0; - this.type = type; - - this.awake(true); - - } - - - public addShape(shape) { - - // Check not already part of this body - shape.body = this; - - this.shapes.push(shape); - - this.shapesLength = this.shapes.length; - - return shape; - - } - - public removeShape(shape) { - - var index = this.shapes.indexOf(shape); - - if (index != -1) - { - this.shapes.splice(index, 1); - shape.body = undefined; - } - - this.shapesLength = this.shapes.length; - - } - - private setMass(mass:number) { - - this.mass = mass; - this.massInverted = mass > 0 ? 1 / mass : 0; - - } - - private setInertia(inertia:number) { - - this.inertia = inertia; - this.inertiaInverted = inertia > 0 ? 1 / inertia : 0; - - } - - private _newPosition: Phaser.Vec2 = new Phaser.Vec2; - - public setPosition(x: number, y: number) { - - this._newPosition.setTo(Phaser.Physics.AdvancedPhysics.pixelsToMeters(x), Phaser.Physics.AdvancedPhysics.pixelsToMeters(y)); - - this.setTransform(this._newPosition, this.angle); - - } - - public setTransform(pos:Phaser.Vec2, angle:number) { - - // inject the transform into this.position - this.transform.setTo(pos, angle); - //Manager.write('setTransform: ' + this.position.toString()); - //Manager.write('centroid: ' + this.centroid.toString()); - Phaser.TransformUtils.transform(this.transform, this.centroid, this.position); - //Manager.write('post setTransform: ' + this.position.toString()); - //this.position.copyFrom(this.transform.transform(this.centroid)); - this.angle = angle; - - } - - public syncTransform() { - - //Manager.write('syncTransform:'); - //Manager.write('p: ' + this.position.toString()); - //Manager.write('centroid: ' + this.centroid.toString()); - //Manager.write('xf: ' + this.transform.toString()); - //Manager.write('a: ' + this.angle); - this.transform.setRotation(this.angle); - // OPTIMISE: Creating new vector - Phaser.Vec2Utils.subtract(this.position, Phaser.TransformUtils.rotate(this.transform, this.centroid), this.transform.t); - //Manager.write('--------------------'); - //Manager.write('xf: ' + this.transform.toString()); - //Manager.write('--------------------'); - - } - - public getWorldPoint(p:Phaser.Vec2) { - // OPTIMISE: Creating new vector - return Phaser.TransformUtils.transform(this.transform, p); - } - - public getWorldVector(v:Phaser.Vec2) { - // OPTIMISE: Creating new vector - return Phaser.TransformUtils.rotate(this.transform, v); - } - - public getLocalPoint(p:Phaser.Vec2) { - // OPTIMISE: Creating new vector - return Phaser.TransformUtils.untransform(this.transform, p); - } - - public getLocalVector(v:Phaser.Vec2) { - // OPTIMISE: Creating new vector - return Phaser.TransformUtils.unrotate(this.transform, v); - } - - public set fixedRotation(value:bool) { - - this._fixedRotation = value; - - this.resetMassData(); - - } - - public get fixedRotation(): bool { - return this._fixedRotation; - } - - public resetMassData() { - - this.centroid.setTo(0, 0); - this.mass = 0; - this.massInverted = 0; - this.inertia = 0; - this.inertiaInverted = 0; - - if (this.isDynamic == false) - { - Phaser.TransformUtils.transform(this.transform, this.centroid, this.position); - return; - } - - var totalMassCentroid = new Phaser.Vec2(0, 0); - var totalMass = 0; - var totalInertia = 0; - - for (var i = 0; i < this.shapes.length; i++) - { - var shape = this.shapes[i]; - var centroid = shape.centroid(); - var mass = shape.area() * shape.density; - var inertia = shape.inertia(mass); - - totalMassCentroid.multiplyAddByScalar(centroid, mass); - totalMass += mass; - totalInertia += inertia; - } - - Phaser.Vec2Utils.scale(totalMassCentroid, 1 / totalMass, this.centroid); - - this.setMass(totalMass); - - if (!this.fixedRotation) - { - this.setInertia(totalInertia - totalMass * Phaser.Vec2Utils.dot(this.centroid, this.centroid)); - } - - // Move center of mass - var oldPosition: Phaser.Vec2 = Phaser.Vec2Utils.clone(this.position); - Phaser.TransformUtils.transform(this.transform, this.centroid, this.position); - - // Update center of mass velocity - oldPosition.subtract(this.position); - this.velocity.multiplyAddByScalar(Phaser.Vec2Utils.perp(oldPosition, oldPosition), this.angularVelocity); - - } - - public resetJointAnchors() { - - for (var i = 0; i < this.joints.length; i++) - { - var joint = this.joints[i]; - - if (!joint) - { - continue; - } - - var anchor1 = joint.getWorldAnchor1(); - var anchor2 = joint.getWorldAnchor2(); - - joint.setWorldAnchor1(anchor1); - joint.setWorldAnchor2(anchor2); - } - } - - public cacheData(source:string = '') { - - //Manager.write('cacheData -- start'); - //Manager.write('p: ' + this.position.toString()); - //Manager.write('xf: ' + this.transform.toString()); - - this.bounds.clear(); - - for (var i = 0; i < this.shapesLength; i++) - { - var shape: IShape = this.shapes[i]; - shape.cacheData(this.transform); - this.bounds.addBounds(shape.bounds); - } - - //Manager.write('bounds: ' + this.bounds.toString()); - - //Manager.write('p: ' + this.position.toString()); - //Manager.write('xf: ' + this.transform.toString()); - //Manager.write('cacheData -- stop'); - - } - - public updateVelocity(gravity, dt, damping) { - - Phaser.Vec2Utils.multiplyAdd(gravity, this.force, this.massInverted, this._tempVec2); - Phaser.Vec2Utils.multiplyAdd(this.velocity, this._tempVec2, dt, this.velocity); - - this.angularVelocity = this.angularVelocity + this.torque * this.inertiaInverted * dt; - - // Apply damping. - // ODE: dv/dt + c * v = 0 - // Solution: v(t) = v0 * exp(-c * t) - // Time step: v(t + dt) = v0 * exp(-c * (t + dt)) = v0 * exp(-c * t) * exp(-c * dt) = v * exp(-c * dt) - // v2 = exp(-c * dt) * v1 - // Taylor expansion: - // v2 = (1.0f - c * dt) * v1 - this.velocity.scale(this.clamp(1 - dt * (damping + this.linearDamping), 0, 1)); - this.angularVelocity *= this.clamp(1 - dt * (damping + this.angularDamping), 0, 1); - - this.force.setTo(0, 0); - this.torque = 0; - - } - - public inContact(body2: Body): bool { - - if (!body2 || this.stepCount == body2.stepCount) - { - return false; - } - - if (!(this.isAwake && this.isStatic == false) && !(body2.isAwake && body2.isStatic == false)) - { - return false; - } - - if (this.isCollidable(body2) == false) - { - return false; - } - - if (!this.bounds.intersectsBounds(body2.bounds)) - { - return false; - } - - return true; - - } - - public clamp(v, min, max) { - return v < min ? min : (v > max ? max : v); - } - - public updatePosition(dt:number) { - - this.position.add(Phaser.Vec2Utils.scale(this.velocity, dt, this._tempVec2)); - - this.angle += this.angularVelocity * dt; - - if (this.sprite) - { - this.sprite.x = this.position.x * 50; - this.sprite.y = this.position.y * 50; - this.sprite.transform.rotation = this.game.math.radiansToDegrees(this.angle); - } - - } - - public resetForce() { - - this.force.setTo(0, 0); - this.torque = 0; - - } - - public applyForce(force:Phaser.Vec2, p:Phaser.Vec2) { - - if (this.isDynamic == false) - { - return; - } - - if (this.isAwake == false) - { - this.awake(true); - } - - this.force.add(force); - - Phaser.Vec2Utils.subtract(p, this.position, this._tempVec2); - - this.torque += Phaser.Vec2Utils.cross(this._tempVec2, force); - - } - - public applyForceToCenter(force:Phaser.Vec2) { - - if (this.isDynamic == false) - { - return; - } - - if (this.isAwake == false) - { - this.awake(true); - } - - this.force.add(force); - - } - - public applyTorque(torque:number) { - - if (this.isDynamic == false) - { - return; - } - - if (this.isAwake == false) - { - this.awake(true); - } - - this.torque += torque; - - } - - public applyLinearImpulse(impulse:Phaser.Vec2, p:Phaser.Vec2) { - - if (this.isDynamic == false) - { - return; - } - - if (this.isAwake == false) - { - this.awake(true); - } - - this.velocity.multiplyAddByScalar(impulse, this.massInverted); - - Phaser.Vec2Utils.subtract(p, this.position, this._tempVec2); - - this.angularVelocity += Phaser.Vec2Utils.cross(this._tempVec2, impulse) * this.inertiaInverted; - - } - - public applyAngularImpulse(impulse: number) { - - if (this.isDynamic == false) - { - return; - } - - if (this.isAwake == false) - { - this.awake(true); - } - - this.angularVelocity += impulse * this.inertiaInverted; - - } - - public kineticEnergy() { - - return 0.5 * (this.mass * this.velocity.dot(this.velocity) + this.inertia * (this.angularVelocity * this.angularVelocity)); - - } - - public get isAwake(): bool { - return this.awaked; - } - - public awake(flag) { - - this.awaked = flag; - - if (flag) - { - this.sleepTime = 0; - } - else - { - this.velocity.setTo(0, 0); - this.angularVelocity = 0; - this.force.setTo(0, 0); - this.torque = 0; - } - - } - - public isCollidable(other:Body) { - - if ((this.isDynamic == false && other.isDynamic == false) || this == other) - { - return false; - } - - if (!(this.maskBits & other.categoryBits) || !(other.maskBits & this.categoryBits)) - { - return false; - } - - for (var i = 0; i < this.joints.length; i++) - { - var joint = this.joints[i]; - - if (!this.joints[i] || (!this.joints[i].collideConnected && other.jointHash[this.joints[i].id] != undefined)) - { - return false; - } - } - - return true; - - } - - public toString(): string { - return "[{Body (name=" + this.name + " velocity=" + this.velocity.toString() + " angularVelocity: " + this.angularVelocity + ")}]"; - } - - } - -} \ No newline at end of file diff --git a/wip/physics/BodyUtils.ts b/wip/physics/BodyUtils.ts deleted file mode 100644 index e43a770d..00000000 --- a/wip/physics/BodyUtils.ts +++ /dev/null @@ -1,94 +0,0 @@ -/// -/// -/// -/// -/// - -/** -* Phaser - BodyUtils -* -* A collection of methods useful for manipulating AdvancedPhysics Body objects. -*/ - -module Phaser { - - export class BodyUtils { - - static duplicate(source: Phaser.Physics.Body, output?: Phaser.Physics.Body): Phaser.Physics.Body { - - /* - console.log('body duplicate called'); - - var newBody = new Phaser.Physics.Body(source.type, source.transform.t, source.rotation); - - for (var i = 0; i < source.shapes.length; i++) - { - output.addShape(source.shapes[i].duplicate()); - } - - output.resetMassData(); - */ - - return output; - - } - - static addPoly(body: Phaser.Physics.Body, verts, elasticity?: number = 1, friction?: number = 1, density?: number = 1): Phaser.Physics.Shapes.Poly { - - var poly: Phaser.Physics.Shapes.Poly = new Phaser.Physics.Shapes.Poly(verts); - poly.elasticity = elasticity; - poly.friction = friction; - poly.density = density; - - body.addShape(poly); - body.resetMassData(); - - return poly; - - } - - static addTriangle(body: Phaser.Physics.Body, x1: number, y1: number, x2: number, y2: number, x3: number, y3: number, elasticity?: number = 1, friction?: number = 1, density?: number = 1): Phaser.Physics.Shapes.Triangle { - - var tri: Phaser.Physics.Shapes.Triangle = new Phaser.Physics.Shapes.Triangle(x1, y1, x2, y2, x3, y3); - tri.elasticity = elasticity; - tri.friction = friction; - tri.density = density; - - body.addShape(tri); - body.resetMassData(); - - return tri; - - } - - static addBox(body: Phaser.Physics.Body, x: number, y: number, width: number, height: number, elasticity?: number = 1, friction?: number = 1, density?: number = 1): Phaser.Physics.Shapes.Box { - - var box: Phaser.Physics.Shapes.Box = new Phaser.Physics.Shapes.Box(x, y, width, height); - box.elasticity = elasticity; - box.friction = friction; - box.density = density; - - body.addShape(box); - body.resetMassData(); - - return box; - - } - - static addCircle(body: Phaser.Physics.Body, radius: number, x?: number = 0, y?: number = 0, elasticity?: number = 1, friction?: number = 1, density?: number = 1): Phaser.Physics.Shapes.Circle { - - var circle: Phaser.Physics.Shapes.Circle = new Phaser.Physics.Shapes.Circle(radius, x, y); - circle.elasticity = elasticity; - circle.friction = friction; - circle.density = density; - - body.addShape(circle); - body.resetMassData(); - - return circle; - - } - - } - -} \ No newline at end of file diff --git a/wip/physics/Bounds.js b/wip/physics/Bounds.js deleted file mode 100644 index 47b9ef6e..00000000 --- a/wip/physics/Bounds.js +++ /dev/null @@ -1,201 +0,0 @@ -var Phaser; -(function (Phaser) { - /// - /// - /// - /** - * Phaser - 2D AABB - * - * A 2D AABB object - */ - (function (Physics) { - var Bounds = (function () { - /** - * Creates a new 2D AABB object. - * @class Bounds - * @constructor - * @return {Bounds} This object - **/ - function Bounds(mins, maxs) { - if (typeof mins === "undefined") { mins = null; } - if (typeof maxs === "undefined") { maxs = null; } - if(mins) { - this.mins = Phaser.Vec2Utils.clone(mins); - } else { - this.mins = new Phaser.Vec2(999999, 999999); - } - if(maxs) { - this.maxs = Phaser.Vec2Utils.clone(maxs); - } else { - this.maxs = new Phaser.Vec2(999999, 999999); - } - } - Bounds.prototype.toString = function () { - return [ - "mins:", - this.mins.toString(), - "maxs:", - this.maxs.toString() - ].join(" "); - }; - Bounds.prototype.setTo = function (mins, maxs) { - this.mins.setTo(mins.x, mins.y); - this.maxs.setTo(maxs.x, maxs.y); - }; - Bounds.prototype.copy = function (b) { - this.mins.copyFrom(b.mins); - this.maxs.copyFrom(b.maxs); - return this; - }; - Bounds.prototype.clear = function () { - this.mins.setTo(999999, 999999); - this.maxs.setTo(-999999, -999999); - return this; - }; - Object.defineProperty(Bounds.prototype, "x", { - get: function () { - return Physics.AdvancedPhysics.metersToPixels(this.mins.x); - }, - enumerable: true, - configurable: true - }); - Object.defineProperty(Bounds.prototype, "y", { - get: function () { - return Physics.AdvancedPhysics.metersToPixels(this.mins.y); - }, - enumerable: true, - configurable: true - }); - Object.defineProperty(Bounds.prototype, "width", { - get: function () { - return Physics.AdvancedPhysics.metersToPixels(this.maxs.x - this.mins.x); - }, - enumerable: true, - configurable: true - }); - Object.defineProperty(Bounds.prototype, "height", { - get: function () { - return Physics.AdvancedPhysics.metersToPixels(this.maxs.y - this.mins.y); - }, - enumerable: true, - configurable: true - }); - Object.defineProperty(Bounds.prototype, "right", { - get: function () { - return this.x + this.width; - }, - enumerable: true, - configurable: true - }); - Object.defineProperty(Bounds.prototype, "bottom", { - get: function () { - return this.y + this.height; - }, - enumerable: true, - configurable: true - }); - Bounds.prototype.isEmpty = function () { - return (this.mins.x > this.maxs.x || this.mins.y > this.maxs.y); - }; - Bounds.prototype.getPerimeter = /* - public getCenter() { - return vec2.scale(vec2.add(this.mins, this.maxs), 0.5); - } - - public getExtent() { - return vec2.scale(vec2.sub(this.maxs, this.mins), 0.5); - } - */ - function () { - return (this.maxs.x - this.mins.x + this.maxs.y - this.mins.y) * 2; - }; - Bounds.prototype.addPoint = function (p) { - if(this.mins.x > p.x) { - this.mins.x = p.x; - } - if(this.maxs.x < p.x) { - this.maxs.x = p.x; - } - if(this.mins.y > p.y) { - this.mins.y = p.y; - } - if(this.maxs.y < p.y) { - this.maxs.y = p.y; - } - return this; - }; - Bounds.prototype.addBounds = function (b) { - if(this.mins.x > b.mins.x) { - this.mins.x = b.mins.x; - } - if(this.maxs.x < b.maxs.x) { - this.maxs.x = b.maxs.x; - } - if(this.mins.y > b.mins.y) { - this.mins.y = b.mins.y; - } - if(this.maxs.y < b.maxs.y) { - this.maxs.y = b.maxs.y; - } - return this; - }; - Bounds.prototype.addBounds2 = function (mins, maxs) { - if(this.mins.x > mins.x) { - this.mins.x = mins.x; - } - if(this.maxs.x < maxs.x) { - this.maxs.x = maxs.x; - } - if(this.mins.y > mins.y) { - this.mins.y = mins.y; - } - if(this.maxs.y < maxs.y) { - this.maxs.y = maxs.y; - } - return this; - }; - Bounds.prototype.addExtents = function (center, extent_x, extent_y) { - if(this.mins.x > center.x - extent_x) { - this.mins.x = center.x - extent_x; - } - if(this.maxs.x < center.x + extent_x) { - this.maxs.x = center.x + extent_x; - } - if(this.mins.y > center.y - extent_y) { - this.mins.y = center.y - extent_y; - } - if(this.maxs.y < center.y + extent_y) { - this.maxs.y = center.y + extent_y; - } - return this; - }; - Bounds.prototype.expand = function (ax, ay) { - this.mins.x -= ax; - this.mins.y -= ay; - this.maxs.x += ax; - this.maxs.y += ay; - return this; - }; - Bounds.prototype.containPoint = function (p) { - if(p.x < this.mins.x || p.x > this.maxs.x || p.y < this.mins.y || p.y > this.maxs.y) { - return false; - } - return true; - }; - Bounds.prototype.intersectsBounds = function (b) { - if(this.mins.x > b.maxs.x || this.maxs.x < b.mins.x || this.mins.y > b.maxs.y || this.maxs.y < b.mins.y) { - return false; - } - return true; - }; - Bounds.expand = function expand(b, ax, ay) { - var b = new Bounds(b.mins, b.maxs); - b.expand(ax, ay); - return b; - }; - return Bounds; - })(); - Physics.Bounds = Bounds; - })(Phaser.Physics || (Phaser.Physics = {})); - var Physics = Phaser.Physics; -})(Phaser || (Phaser = {})); diff --git a/wip/physics/Bounds.ts b/wip/physics/Bounds.ts deleted file mode 100644 index 8c3a72e5..00000000 --- a/wip/physics/Bounds.ts +++ /dev/null @@ -1,199 +0,0 @@ -/// -/// -/// - -/** -* Phaser - 2D AABB -* -* A 2D AABB object -*/ - -module Phaser.Physics { - - export class Bounds { - - /** - * Creates a new 2D AABB object. - * @class Bounds - * @constructor - * @return {Bounds} This object - **/ - constructor(mins?: Phaser.Vec2 = null, maxs?: Phaser.Vec2 = null) { - - if (mins) - { - this.mins = Phaser.Vec2Utils.clone(mins); - } - else - { - this.mins = new Phaser.Vec2(999999, 999999); - } - - if (maxs) - { - this.maxs = Phaser.Vec2Utils.clone(maxs); - } - else - { - this.maxs = new Phaser.Vec2(999999, 999999); - } - - } - - public mins: Phaser.Vec2; - public maxs: Phaser.Vec2; - - public toString() { - return ["mins:", this.mins.toString(), "maxs:", this.maxs.toString()].join(" "); - } - - public setTo(mins: Phaser.Vec2, maxs: Phaser.Vec2) { - - this.mins.setTo(mins.x, mins.y); - this.maxs.setTo(maxs.x, maxs.y); - - } - - public copy(b: Bounds): Bounds { - - this.mins.copyFrom(b.mins); - this.maxs.copyFrom(b.maxs); - - return this; - } - - public clear(): Bounds { - - this.mins.setTo(999999, 999999); - this.maxs.setTo(-999999, -999999); - - return this; - - } - - public get x(): number { - return AdvancedPhysics.metersToPixels(this.mins.x); - } - - public get y(): number { - return AdvancedPhysics.metersToPixels(this.mins.y); - } - - public get width(): number { - return AdvancedPhysics.metersToPixels(this.maxs.x - this.mins.x); - } - - public get height(): number { - return AdvancedPhysics.metersToPixels(this.maxs.y - this.mins.y); - } - - public get right(): number { - return this.x + this.width; - } - - public get bottom(): number { - return this.y + this.height; - } - - public isEmpty(): bool { - return (this.mins.x > this.maxs.x || this.mins.y > this.maxs.y); - } - - /* - public getCenter() { - return vec2.scale(vec2.add(this.mins, this.maxs), 0.5); - } - - public getExtent() { - return vec2.scale(vec2.sub(this.maxs, this.mins), 0.5); - } - */ - - public getPerimeter(): number { - return (this.maxs.x - this.mins.x + this.maxs.y - this.mins.y) * 2; - } - - public addPoint(p: Phaser.Vec2): Bounds { - - if (this.mins.x > p.x) this.mins.x = p.x; - if (this.maxs.x < p.x) this.maxs.x = p.x; - if (this.mins.y > p.y) this.mins.y = p.y; - if (this.maxs.y < p.y) this.maxs.y = p.y; - - return this; - } - - public addBounds(b: Bounds): Bounds { - - if (this.mins.x > b.mins.x) this.mins.x = b.mins.x; - if (this.maxs.x < b.maxs.x) this.maxs.x = b.maxs.x; - if (this.mins.y > b.mins.y) this.mins.y = b.mins.y; - if (this.maxs.y < b.maxs.y) this.maxs.y = b.maxs.y; - - return this; - } - - public addBounds2(mins, maxs): Bounds { - - if (this.mins.x > mins.x) this.mins.x = mins.x; - if (this.maxs.x < maxs.x) this.maxs.x = maxs.x; - if (this.mins.y > mins.y) this.mins.y = mins.y; - if (this.maxs.y < maxs.y) this.maxs.y = maxs.y; - - return this; - } - - public addExtents(center: Phaser.Vec2, extent_x: number, extent_y: number): Bounds { - - if (this.mins.x > center.x - extent_x) this.mins.x = center.x - extent_x; - if (this.maxs.x < center.x + extent_x) this.maxs.x = center.x + extent_x; - if (this.mins.y > center.y - extent_y) this.mins.y = center.y - extent_y; - if (this.maxs.y < center.y + extent_y) this.maxs.y = center.y + extent_y; - - return this; - - } - - public expand(ax: number, ay: number): Bounds { - - this.mins.x -= ax; - this.mins.y -= ay; - this.maxs.x += ax; - this.maxs.y += ay; - - return this; - - } - - public containPoint(p: Phaser.Vec2): bool { - - if (p.x < this.mins.x || p.x > this.maxs.x || p.y < this.mins.y || p.y > this.maxs.y) - { - return false; - } - - return true; - - } - - public intersectsBounds(b: Bounds): bool { - - if (this.mins.x > b.maxs.x || this.maxs.x < b.mins.x || this.mins.y > b.maxs.y || this.maxs.y < b.mins.y) - { - return false; - } - - return true; - } - - public static expand(b: Bounds, ax, ay) { - - var b = new Bounds(b.mins, b.maxs); - b.expand(ax, ay); - return b; - - } - - } - -} \ No newline at end of file diff --git a/wip/physics/Collision.js b/wip/physics/Collision.js deleted file mode 100644 index 4ea803a9..00000000 --- a/wip/physics/Collision.js +++ /dev/null @@ -1,373 +0,0 @@ -var Phaser; -(function (Phaser) { - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// - /** - * Phaser - Advanced Physics - Collision Handlers - * - * Based on the work Ju Hyung Lee started in JS PhyRus. - */ - (function (Physics) { - var Collision = (function () { - function Collision() { } - Collision.prototype.collide = function (a, b, contacts) { - // Circle (a is the circle) - if(a.type == Physics.AdvancedPhysics.SHAPE_TYPE_CIRCLE) { - if(b.type == Physics.AdvancedPhysics.SHAPE_TYPE_CIRCLE) { - return this.circle2Circle(a, b, contacts); - } else if(b.type == Physics.AdvancedPhysics.SHAPE_TYPE_SEGMENT) { - return this.circle2Segment(a, b, contacts); - } else if(b.type == Physics.AdvancedPhysics.SHAPE_TYPE_POLY) { - return this.circle2Poly(a, b, contacts); - } - } - // Segment (a is the segment) - if(a.type == Physics.AdvancedPhysics.SHAPE_TYPE_SEGMENT) { - if(b.type == Physics.AdvancedPhysics.SHAPE_TYPE_CIRCLE) { - return this.circle2Segment(b, a, contacts); - } else if(b.type == Physics.AdvancedPhysics.SHAPE_TYPE_SEGMENT) { - return this.segment2Segment(a, b, contacts); - } else if(b.type == Physics.AdvancedPhysics.SHAPE_TYPE_POLY) { - return this.segment2Poly(a, b, contacts); - } - } - // Poly (a is the poly) - if(a.type == Physics.AdvancedPhysics.SHAPE_TYPE_POLY) { - if(b.type == Physics.AdvancedPhysics.SHAPE_TYPE_CIRCLE) { - return this.circle2Poly(b, a, contacts); - } else if(b.type == Physics.AdvancedPhysics.SHAPE_TYPE_SEGMENT) { - return this.segment2Poly(b, a, contacts); - } else if(b.type == Physics.AdvancedPhysics.SHAPE_TYPE_POLY) { - return this.poly2Poly(a, b, contacts); - } - } - }; - Collision.prototype._circle2Circle = function (c1, r1, c2, r2, contactArr) { - var rmax = r1 + r2; - var t = new Phaser.Vec2(); - //var t = vec2.sub(c2, c1); - Phaser.Vec2Utils.subtract(c2, c1, t); - var distsq = t.lengthSq(); - if(distsq > rmax * rmax) { - return 0; - } - var dist = Math.sqrt(distsq); - var p = new Phaser.Vec2(); - Phaser.Vec2Utils.multiplyAdd(c1, t, 0.5 + (r1 - r2) * 0.5 / dist, p); - //var p = vec2.mad(c1, t, 0.5 + (r1 - r2) * 0.5 / dist); - var n = new Phaser.Vec2(); - //var n = (dist != 0) ? vec2.scale(t, 1 / dist) : vec2.zero; - if(dist != 0) { - Phaser.Vec2Utils.scale(t, 1 / dist, n); - } - var d = dist - rmax; - contactArr.push(new Physics.Contact(p, n, d, 0)); - return 1; - }; - Collision.prototype.circle2Circle = function (circ1, circ2, contactArr) { - return this._circle2Circle(circ1.tc, circ1.radius, circ2.tc, circ2.radius, contactArr); - }; - Collision.prototype.circle2Segment = function (circ, seg, contactArr) { - var rsum = circ.radius + seg.radius; - // Normal distance from segment - var dn = Phaser.Vec2Utils.dot(circ.tc, seg.tn) - Phaser.Vec2Utils.dot(seg.ta, seg.tn); - var dist = (dn < 0 ? dn * -1 : dn) - rsum; - if(dist > 0) { - return 0; - } - // Tangential distance along segment - var dt = Phaser.Vec2Utils.cross(circ.tc, seg.tn); - var dtMin = Phaser.Vec2Utils.cross(seg.ta, seg.tn); - var dtMax = Phaser.Vec2Utils.cross(seg.tb, seg.tn); - if(dt < dtMin) { - if(dt < dtMin - rsum) { - return 0; - } - return this._circle2Circle(circ.tc, circ.radius, seg.ta, seg.radius, contactArr); - } else if(dt > dtMax) { - if(dt > dtMax + rsum) { - return 0; - } - return this._circle2Circle(circ.tc, circ.radius, seg.tb, seg.radius, contactArr); - } - var n = new Phaser.Vec2(); - if(dn > 0) { - n.copyFrom(seg.tn); - } else { - Phaser.Vec2Utils.negative(seg.tn, n); - } - //var n = (dn > 0) ? seg.tn : vec2.neg(seg.tn); - var c1 = new Phaser.Vec2(); - Phaser.Vec2Utils.multiplyAdd(circ.tc, n, -(circ.radius + dist * 0.5), c1); - var c2 = new Phaser.Vec2(); - Phaser.Vec2Utils.negative(n, c2); - contactArr.push(new Physics.Contact(c1, c2, dist, 0)); - //contactArr.push(new Contact(vec2.mad(circ.tc, n, -(circ.r + dist * 0.5)), vec2.neg(n), dist, 0)); - return 1; - }; - Collision.prototype.circle2Poly = function (circ, poly, contactArr) { - var minDist = -999999; - var minIdx = -1; - for(var i = 0; i < poly.verts.length; i++) { - var plane = poly.tplanes[i]; - var dist = Phaser.Vec2Utils.dot(circ.tc, plane.normal) - plane.d - circ.radius; - if(dist > 0) { - return 0; - } else if(dist > minDist) { - minDist = dist; - minIdx = i; - } - } - var n = poly.tplanes[minIdx].normal; - var a = poly.tverts[minIdx]; - var b = poly.tverts[(minIdx + 1) % poly.verts.length]; - var dta = Phaser.Vec2Utils.cross(a, n); - var dtb = Phaser.Vec2Utils.cross(b, n); - var dt = Phaser.Vec2Utils.cross(circ.tc, n); - if(dt > dta) { - return this._circle2Circle(circ.tc, circ.radius, a, 0, contactArr); - } else if(dt < dtb) { - return this._circle2Circle(circ.tc, circ.radius, b, 0, contactArr); - } - var c1 = new Phaser.Vec2(); - Phaser.Vec2Utils.multiplyAdd(circ.tc, n, -(circ.radius + minDist * 0.5), c1); - var c2 = new Phaser.Vec2(); - Phaser.Vec2Utils.negative(n, c2); - contactArr.push(new Physics.Contact(c1, c2, minDist, 0)); - //contactArr.push(new Contact(vec2.mad(circ.tc, n, -(circ.r + minDist * 0.5)), vec2.neg(n), minDist, 0)); - return 1; - }; - Collision.prototype.segmentPointDistanceSq = function (seg, p) { - var w = new Phaser.Vec2(); - var d = new Phaser.Vec2(); - Phaser.Vec2Utils.subtract(p, seg.ta, w); - Phaser.Vec2Utils.subtract(seg.tb, seg.ta, d); - //var w = vec2.sub(p, seg.ta); - //var d = vec2.sub(seg.tb, seg.ta); - var proj = w.dot(d); - if(proj <= 0) { - return w.dot(w); - } - var vsq = d.dot(d); - if(proj >= vsq) { - return w.dot(w) - 2 * proj + vsq; - } - return w.dot(w) - proj * proj / vsq; - }; - Collision.prototype.segment2Segment = // FIXME and optimise me lots!!! - function (seg1, seg2, contactArr) { - var d = []; - d[0] = this.segmentPointDistanceSq(seg1, seg2.ta); - d[1] = this.segmentPointDistanceSq(seg1, seg2.tb); - d[2] = this.segmentPointDistanceSq(seg2, seg1.ta); - d[3] = this.segmentPointDistanceSq(seg2, seg1.tb); - var idx1 = d[0] < d[1] ? 0 : 1; - var idx2 = d[2] < d[3] ? 2 : 3; - var idxm = d[idx1] < d[idx2] ? idx1 : idx2; - var s, t; - var u = Phaser.Vec2Utils.subtract(seg1.tb, seg1.ta); - var v = Phaser.Vec2Utils.subtract(seg2.tb, seg2.ta); - switch(idxm) { - case 0: - s = Phaser.Vec2Utils.dot(Phaser.Vec2Utils.subtract(seg2.ta, seg1.ta), u) / Phaser.Vec2Utils.dot(u, u); - s = s < 0 ? 0 : (s > 1 ? 1 : s); - t = 0; - break; - case 1: - s = Phaser.Vec2Utils.dot(Phaser.Vec2Utils.subtract(seg2.tb, seg1.ta), u) / Phaser.Vec2Utils.dot(u, u); - s = s < 0 ? 0 : (s > 1 ? 1 : s); - t = 1; - break; - case 2: - s = 0; - t = Phaser.Vec2Utils.dot(Phaser.Vec2Utils.subtract(seg1.ta, seg2.ta), v) / Phaser.Vec2Utils.dot(v, v); - t = t < 0 ? 0 : (t > 1 ? 1 : t); - break; - case 3: - s = 1; - t = Phaser.Vec2Utils.dot(Phaser.Vec2Utils.subtract(seg1.tb, seg2.ta), v) / Phaser.Vec2Utils.dot(v, v); - t = t < 0 ? 0 : (t > 1 ? 1 : t); - break; - } - var minp1 = Phaser.Vec2Utils.multiplyAdd(seg1.ta, u, s); - var minp2 = Phaser.Vec2Utils.multiplyAdd(seg2.ta, v, t); - return this._circle2Circle(minp1, seg1.radius, minp2, seg2.radius, contactArr); - }; - Collision.prototype.findPointsBehindSeg = // Identify vertexes that have penetrated the segment. - function (contactArr, seg, poly, dist, coef) { - var dta = Phaser.Vec2Utils.cross(seg.tn, seg.ta); - var dtb = Phaser.Vec2Utils.cross(seg.tn, seg.tb); - var n = new Phaser.Vec2(); - Phaser.Vec2Utils.scale(seg.tn, coef, n); - //var n = vec2.scale(seg.tn, coef); - for(var i = 0; i < poly.verts.length; i++) { - var v = poly.tverts[i]; - if(Phaser.Vec2Utils.dot(v, n) < Phaser.Vec2Utils.dot(seg.tn, seg.ta) * coef + seg.radius) { - var dt = Phaser.Vec2Utils.cross(seg.tn, v); - if(dta >= dt && dt >= dtb) { - contactArr.push(new Physics.Contact(v, n, dist, (poly.id << 16) | i)); - } - } - } - }; - Collision.prototype.segment2Poly = function (seg, poly, contactArr) { - var seg_td = Phaser.Vec2Utils.dot(seg.tn, seg.ta); - var seg_d1 = poly.distanceOnPlane(seg.tn, seg_td) - seg.radius; - if(seg_d1 > 0) { - return 0; - } - var n = new Phaser.Vec2(); - Phaser.Vec2Utils.negative(seg.tn, n); - var seg_d2 = poly.distanceOnPlane(n, -seg_td) - seg.radius; - //var seg_d2 = poly.distanceOnPlane(vec2.neg(seg.tn), -seg_td) - seg.r; - if(seg_d2 > 0) { - return 0; - } - var poly_d = -999999; - var poly_i = -1; - for(var i = 0; i < poly.verts.length; i++) { - var plane = poly.tplanes[i]; - var dist = seg.distanceOnPlane(plane.normal, plane.d); - if(dist > 0) { - return 0; - } - if(dist > poly_d) { - poly_d = dist; - poly_i = i; - } - } - var poly_n = new Phaser.Vec2(); - Phaser.Vec2Utils.negative(poly.tplanes[poly_i].normal, poly_n); - //var poly_n = vec2.neg(poly.tplanes[poly_i].n); - var va = new Phaser.Vec2(); - Phaser.Vec2Utils.multiplyAdd(seg.ta, poly_n, seg.radius, va); - //var va = vec2.mad(seg.ta, poly_n, seg.r); - var vb = new Phaser.Vec2(); - Phaser.Vec2Utils.multiplyAdd(seg.tb, poly_n, seg.radius, vb); - //var vb = vec2.mad(seg.tb, poly_n, seg.r); - if(poly.containPoint(va)) { - contactArr.push(new Physics.Contact(va, poly_n, poly_d, (seg.id << 16) | 0)); - } - if(poly.containPoint(vb)) { - contactArr.push(new Physics.Contact(vb, poly_n, poly_d, (seg.id << 16) | 1)); - } - // Floating point precision problems here. - // This will have to do for now. - poly_d -= 0.1; - if(seg_d1 >= poly_d || seg_d2 >= poly_d) { - if(seg_d1 > seg_d2) { - this.findPointsBehindSeg(contactArr, seg, poly, seg_d1, 1); - } else { - this.findPointsBehindSeg(contactArr, seg, poly, seg_d2, -1); - } - } - // If no other collision points are found, try colliding endpoints. - if(contactArr.length == 0) { - var poly_a = poly.tverts[poly_i]; - var poly_b = poly.tverts[(poly_i + 1) % poly.verts.length]; - if(this._circle2Circle(seg.ta, seg.radius, poly_a, 0, contactArr)) { - return 1; - } - if(this._circle2Circle(seg.tb, seg.radius, poly_a, 0, contactArr)) { - return 1; - } - if(this._circle2Circle(seg.ta, seg.radius, poly_b, 0, contactArr)) { - return 1; - } - if(this._circle2Circle(seg.tb, seg.radius, poly_b, 0, contactArr)) { - return 1; - } - } - return contactArr.length; - }; - Collision.prototype.findMSA = // Find the minimum separating axis for the given poly and plane list. - function (poly, planes, num) { - var min_dist = -999999; - var min_index = -1; - for(var i = 0; i < num; i++) { - var dist = poly.distanceOnPlane(planes[i].normal, planes[i].d); - if(dist > 0) { - // no collision - return { - dist: 0, - index: -1 - }; - } else if(dist > min_dist) { - min_dist = dist; - min_index = i; - } - } - // new object - see what we can do here - return { - dist: min_dist, - index: min_index - }; - }; - Collision.prototype.findVertsFallback = function (contactArr, poly1, poly2, n, dist) { - var num = 0; - for(var i = 0; i < poly1.verts.length; i++) { - var v = poly1.tverts[i]; - if(poly2.containPointPartial(v, n)) { - contactArr.push(new Physics.Contact(v, n, dist, (poly1.id << 16) | i)); - num++; - } - } - for(var i = 0; i < poly2.verts.length; i++) { - var v = poly2.tverts[i]; - if(poly1.containPointPartial(v, n)) { - contactArr.push(new Physics.Contact(v, n, dist, (poly2.id << 16) | i)); - num++; - } - } - return num; - }; - Collision.prototype.findVerts = // Find the overlapped vertices. - function (contactArr, poly1, poly2, n, dist) { - var num = 0; - for(var i = 0; i < poly1.verts.length; i++) { - var v = poly1.tverts[i]; - if(poly2.containPoint(v)) { - contactArr.push(new Physics.Contact(v, n, dist, (poly1.id << 16) | i)); - num++; - } - } - for(var i = 0; i < poly2.verts.length; i++) { - var v = poly2.tverts[i]; - if(poly1.containPoint(v)) { - contactArr.push(new Physics.Contact(v, n, dist, (poly2.id << 16) | i)); - num++; - } - } - return num > 0 ? num : this.findVertsFallback(contactArr, poly1, poly2, n, dist); - }; - Collision.prototype.poly2Poly = function (poly1, poly2, contactArr) { - var msa1 = this.findMSA(poly2, poly1.tplanes, poly1.verts.length); - if(msa1.index == -1) { - console.log('poly2poly 0', msa1); - return 0; - } - var msa2 = this.findMSA(poly1, poly2.tplanes, poly2.verts.length); - if(msa2.index == -1) { - console.log('poly2poly 1', msa2); - return 0; - } - // Penetration normal direction should be from poly1 to poly2 - if(msa1.dist > msa2.dist) { - return this.findVerts(contactArr, poly1, poly2, poly1.tplanes[msa1.index].normal, msa1.dist); - } - return this.findVerts(contactArr, poly1, poly2, Phaser.Vec2Utils.negative(poly2.tplanes[msa2.index].normal), msa2.dist); - }; - return Collision; - })(); - Physics.Collision = Collision; - })(Phaser.Physics || (Phaser.Physics = {})); - var Physics = Phaser.Physics; -})(Phaser || (Phaser = {})); diff --git a/wip/physics/Collision.ts b/wip/physics/Collision.ts deleted file mode 100644 index 3cb00ebd..00000000 --- a/wip/physics/Collision.ts +++ /dev/null @@ -1,559 +0,0 @@ -/// -/// -/// -/// -/// -/// -/// -/// -/// -/// - -/** -* Phaser - Advanced Physics - Collision Handlers -* -* Based on the work Ju Hyung Lee started in JS PhyRus. -*/ - -module Phaser.Physics { - - export class Collision { - - public collide(a, b, contacts: Contact[]) { - - // Circle (a is the circle) - if (a.type == AdvancedPhysics.SHAPE_TYPE_CIRCLE) - { - if (b.type == AdvancedPhysics.SHAPE_TYPE_CIRCLE) - { - return this.circle2Circle(a, b, contacts); - } - else if (b.type == AdvancedPhysics.SHAPE_TYPE_SEGMENT) - { - return this.circle2Segment(a, b, contacts); - } - else if (b.type == AdvancedPhysics.SHAPE_TYPE_POLY) - { - return this.circle2Poly(a, b, contacts); - } - } - - // Segment (a is the segment) - if (a.type == AdvancedPhysics.SHAPE_TYPE_SEGMENT) - { - if (b.type == AdvancedPhysics.SHAPE_TYPE_CIRCLE) - { - return this.circle2Segment(b, a, contacts); - } - else if (b.type == AdvancedPhysics.SHAPE_TYPE_SEGMENT) - { - return this.segment2Segment(a, b, contacts); - } - else if (b.type == AdvancedPhysics.SHAPE_TYPE_POLY) - { - return this.segment2Poly(a, b, contacts); - } - } - - // Poly (a is the poly) - if (a.type == AdvancedPhysics.SHAPE_TYPE_POLY) - { - if (b.type == AdvancedPhysics.SHAPE_TYPE_CIRCLE) - { - return this.circle2Poly(b, a, contacts); - } - else if (b.type == AdvancedPhysics.SHAPE_TYPE_SEGMENT) - { - return this.segment2Poly(b, a, contacts); - } - else if (b.type == AdvancedPhysics.SHAPE_TYPE_POLY) - { - return this.poly2Poly(a, b, contacts); - } - } - - } - - private _circle2Circle(c1, r1, c2, r2, contactArr) { - - var rmax = r1 + r2; - - var t: Phaser.Vec2 = new Phaser.Vec2; - //var t = vec2.sub(c2, c1); - Phaser.Vec2Utils.subtract(c2, c1, t); - - var distsq = t.lengthSq(); - - if (distsq > rmax * rmax) - { - return 0; - } - - var dist = Math.sqrt(distsq); - - var p: Phaser.Vec2 = new Phaser.Vec2; - Phaser.Vec2Utils.multiplyAdd(c1, t, 0.5 + (r1 - r2) * 0.5 / dist, p); - //var p = vec2.mad(c1, t, 0.5 + (r1 - r2) * 0.5 / dist); - - var n: Phaser.Vec2 = new Phaser.Vec2; - //var n = (dist != 0) ? vec2.scale(t, 1 / dist) : vec2.zero; - - if (dist != 0) - { - Phaser.Vec2Utils.scale(t, 1 / dist, n); - } - - var d = dist - rmax; - - contactArr.push(new Contact(p, n, d, 0)); - - return 1; - - } - - public circle2Circle(circ1: Phaser.Physics.Shapes.Circle, circ2: Phaser.Physics.Shapes.Circle, contactArr: Contact[]) { - return this._circle2Circle(circ1.tc, circ1.radius, circ2.tc, circ2.radius, contactArr); - } - - public circle2Segment(circ: Phaser.Physics.Shapes.Circle, seg: Phaser.Physics.Shapes.Segment, contactArr: Contact[]) { - - var rsum = circ.radius + seg.radius; - - // Normal distance from segment - var dn = Phaser.Vec2Utils.dot(circ.tc, seg.tn) - Phaser.Vec2Utils.dot(seg.ta, seg.tn); - var dist = (dn < 0 ? dn * -1 : dn) - rsum; - if (dist > 0) - { - return 0; - } - - // Tangential distance along segment - var dt = Phaser.Vec2Utils.cross(circ.tc, seg.tn); - var dtMin = Phaser.Vec2Utils.cross(seg.ta, seg.tn); - var dtMax = Phaser.Vec2Utils.cross(seg.tb, seg.tn); - - if (dt < dtMin) - { - if (dt < dtMin - rsum) - { - return 0; - } - - return this._circle2Circle(circ.tc, circ.radius, seg.ta, seg.radius, contactArr); - } - else if (dt > dtMax) - { - if (dt > dtMax + rsum) - { - return 0; - } - - return this._circle2Circle(circ.tc, circ.radius, seg.tb, seg.radius, contactArr); - } - - var n: Phaser.Vec2 = new Phaser.Vec2; - - if (dn > 0) - { - n.copyFrom(seg.tn); - } - else - { - Phaser.Vec2Utils.negative(seg.tn, n); - } - //var n = (dn > 0) ? seg.tn : vec2.neg(seg.tn); - - var c1: Phaser.Vec2 = new Phaser.Vec2; - Phaser.Vec2Utils.multiplyAdd(circ.tc, n, -(circ.radius + dist * 0.5), c1); - - var c2: Phaser.Vec2 = new Phaser.Vec2; - Phaser.Vec2Utils.negative(n, c2); - - contactArr.push(new Contact(c1, c2, dist, 0)); - //contactArr.push(new Contact(vec2.mad(circ.tc, n, -(circ.r + dist * 0.5)), vec2.neg(n), dist, 0)); - - return 1; - - } - - public circle2Poly(circ: Phaser.Physics.Shapes.Circle, poly: Phaser.Physics.Shapes.Poly, contactArr: Contact[]) { - - var minDist = -999999; - var minIdx = -1; - - for (var i = 0; i < poly.verts.length; i++) - { - var plane = poly.tplanes[i]; - var dist = Phaser.Vec2Utils.dot(circ.tc, plane.normal) - plane.d - circ.radius; - - if (dist > 0) - { - return 0; - } - else if (dist > minDist) - { - minDist = dist; - minIdx = i; - } - } - - var n = poly.tplanes[minIdx].normal; - var a = poly.tverts[minIdx]; - var b = poly.tverts[(minIdx + 1) % poly.verts.length]; - var dta = Phaser.Vec2Utils.cross(a, n); - var dtb = Phaser.Vec2Utils.cross(b, n); - var dt = Phaser.Vec2Utils.cross(circ.tc, n); - - if (dt > dta) - { - return this._circle2Circle(circ.tc, circ.radius, a, 0, contactArr); - } - else if (dt < dtb) - { - return this._circle2Circle(circ.tc, circ.radius, b, 0, contactArr); - } - - var c1: Phaser.Vec2 = new Phaser.Vec2; - Phaser.Vec2Utils.multiplyAdd(circ.tc, n, -(circ.radius + minDist * 0.5), c1); - - var c2: Phaser.Vec2 = new Phaser.Vec2; - Phaser.Vec2Utils.negative(n, c2); - - contactArr.push(new Contact(c1, c2, minDist, 0)); - - //contactArr.push(new Contact(vec2.mad(circ.tc, n, -(circ.r + minDist * 0.5)), vec2.neg(n), minDist, 0)); - - return 1; - - } - - public segmentPointDistanceSq(seg: Phaser.Physics.Shapes.Segment, p) { - - var w: Phaser.Vec2 = new Phaser.Vec2; - var d: Phaser.Vec2 = new Phaser.Vec2; - Phaser.Vec2Utils.subtract(p, seg.ta, w); - Phaser.Vec2Utils.subtract(seg.tb, seg.ta, d); - - //var w = vec2.sub(p, seg.ta); - //var d = vec2.sub(seg.tb, seg.ta); - - var proj = w.dot(d); - - if (proj <= 0) - { - return w.dot(w); - } - - var vsq = d.dot(d); - - if (proj >= vsq) - { - return w.dot(w) - 2 * proj + vsq; - } - - return w.dot(w) - proj * proj / vsq; - - } - - // FIXME and optimise me lots!!! - public segment2Segment(seg1: Phaser.Physics.Shapes.Segment, seg2: Phaser.Physics.Shapes.Segment, contactArr: Contact[]) { - - var d = []; - d[0] = this.segmentPointDistanceSq(seg1, seg2.ta); - d[1] = this.segmentPointDistanceSq(seg1, seg2.tb); - d[2] = this.segmentPointDistanceSq(seg2, seg1.ta); - d[3] = this.segmentPointDistanceSq(seg2, seg1.tb); - - var idx1 = d[0] < d[1] ? 0 : 1; - var idx2 = d[2] < d[3] ? 2 : 3; - var idxm = d[idx1] < d[idx2] ? idx1 : idx2; - var s, t; - - var u = Phaser.Vec2Utils.subtract(seg1.tb, seg1.ta); - var v = Phaser.Vec2Utils.subtract(seg2.tb, seg2.ta); - - switch (idxm) - { - case 0: - s = Phaser.Vec2Utils.dot(Phaser.Vec2Utils.subtract(seg2.ta, seg1.ta), u) / Phaser.Vec2Utils.dot(u, u); - s = s < 0 ? 0 : (s > 1 ? 1 : s); - t = 0; - break; - case 1: - s = Phaser.Vec2Utils.dot(Phaser.Vec2Utils.subtract(seg2.tb, seg1.ta), u) / Phaser.Vec2Utils.dot(u, u); - s = s < 0 ? 0 : (s > 1 ? 1 : s); - t = 1; - break; - case 2: - s = 0; - t = Phaser.Vec2Utils.dot(Phaser.Vec2Utils.subtract(seg1.ta, seg2.ta), v) / Phaser.Vec2Utils.dot(v, v); - t = t < 0 ? 0 : (t > 1 ? 1 : t); - break; - case 3: - s = 1; - t = Phaser.Vec2Utils.dot(Phaser.Vec2Utils.subtract(seg1.tb, seg2.ta), v) / Phaser.Vec2Utils.dot(v, v); - t = t < 0 ? 0 : (t > 1 ? 1 : t); - break; - } - - var minp1 = Phaser.Vec2Utils.multiplyAdd(seg1.ta, u, s); - var minp2 = Phaser.Vec2Utils.multiplyAdd(seg2.ta, v, t); - - return this._circle2Circle(minp1, seg1.radius, minp2, seg2.radius, contactArr); - - } - - // Identify vertexes that have penetrated the segment. - public findPointsBehindSeg(contactArr: Contact[], seg: Phaser.Physics.Shapes.Segment, poly: Phaser.Physics.Shapes.Poly, dist: number, coef: number) { - - var dta = Phaser.Vec2Utils.cross(seg.tn, seg.ta); - var dtb = Phaser.Vec2Utils.cross(seg.tn, seg.tb); - - var n: Phaser.Vec2 = new Phaser.Vec2; - Phaser.Vec2Utils.scale(seg.tn, coef, n); - //var n = vec2.scale(seg.tn, coef); - - for (var i = 0; i < poly.verts.length; i++) - { - var v = poly.tverts[i]; - - if (Phaser.Vec2Utils.dot(v, n) < Phaser.Vec2Utils.dot(seg.tn, seg.ta) * coef + seg.radius) - { - var dt = Phaser.Vec2Utils.cross(seg.tn, v); - - if (dta >= dt && dt >= dtb) - { - contactArr.push(new Contact(v, n, dist, (poly.id << 16) | i)); - } - } - } - } - - public segment2Poly(seg: Phaser.Physics.Shapes.Segment, poly: Phaser.Physics.Shapes.Poly, contactArr: Contact[]) { - - var seg_td = Phaser.Vec2Utils.dot(seg.tn, seg.ta); - var seg_d1 = poly.distanceOnPlane(seg.tn, seg_td) - seg.radius; - - if (seg_d1 > 0) - { - return 0; - } - - var n: Phaser.Vec2 = new Phaser.Vec2; - Phaser.Vec2Utils.negative(seg.tn, n); - var seg_d2 = poly.distanceOnPlane(n, -seg_td) - seg.radius; - //var seg_d2 = poly.distanceOnPlane(vec2.neg(seg.tn), -seg_td) - seg.r; - - if (seg_d2 > 0) - { - return 0; - } - - var poly_d = -999999; - var poly_i = -1; - - for (var i = 0; i < poly.verts.length; i++) - { - var plane = poly.tplanes[i]; - var dist = seg.distanceOnPlane(plane.normal, plane.d); - - if (dist > 0) - { - return 0; - } - - if (dist > poly_d) - { - poly_d = dist; - poly_i = i; - } - } - - var poly_n: Phaser.Vec2 = new Phaser.Vec2; - Phaser.Vec2Utils.negative(poly.tplanes[poly_i].normal, poly_n); - //var poly_n = vec2.neg(poly.tplanes[poly_i].n); - - var va: Phaser.Vec2 = new Phaser.Vec2; - Phaser.Vec2Utils.multiplyAdd(seg.ta, poly_n, seg.radius, va); - //var va = vec2.mad(seg.ta, poly_n, seg.r); - - var vb: Phaser.Vec2 = new Phaser.Vec2; - Phaser.Vec2Utils.multiplyAdd(seg.tb, poly_n, seg.radius, vb); - //var vb = vec2.mad(seg.tb, poly_n, seg.r); - - if (poly.containPoint(va)) - { - contactArr.push(new Contact(va, poly_n, poly_d, (seg.id << 16) | 0)); - } - - if (poly.containPoint(vb)) - { - contactArr.push(new Contact(vb, poly_n, poly_d, (seg.id << 16) | 1)); - } - - // Floating point precision problems here. - // This will have to do for now. - poly_d -= 0.1 - - if (seg_d1 >= poly_d || seg_d2 >= poly_d) - { - if (seg_d1 > seg_d2) - { - this.findPointsBehindSeg(contactArr, seg, poly, seg_d1, 1); - } - else - { - this.findPointsBehindSeg(contactArr, seg, poly, seg_d2, -1); - } - } - - // If no other collision points are found, try colliding endpoints. - if (contactArr.length == 0) - { - var poly_a = poly.tverts[poly_i]; - var poly_b = poly.tverts[(poly_i + 1) % poly.verts.length]; - - if (this._circle2Circle(seg.ta, seg.radius, poly_a, 0, contactArr)) - { - return 1; - } - - if (this._circle2Circle(seg.tb, seg.radius, poly_a, 0, contactArr)) - { - return 1; - } - - if (this._circle2Circle(seg.ta, seg.radius, poly_b, 0, contactArr)) - { - return 1; - } - - if (this._circle2Circle(seg.tb, seg.radius, poly_b, 0, contactArr)) - { - return 1; - } - } - - return contactArr.length; - - } - - // Find the minimum separating axis for the given poly and plane list. - public findMSA(poly: Phaser.Physics.Shapes.Poly, planes: Phaser.Physics.Plane[], num: number) { - - var min_dist: number = -999999; - var min_index: number = -1; - - for (var i: number = 0; i < num; i++) - { - var dist: number = poly.distanceOnPlane(planes[i].normal, planes[i].d); - - if (dist > 0) - { - // no collision - return { dist: 0, index: -1 }; - } - else if (dist > min_dist) - { - min_dist = dist; - min_index = i; - } - } - - // new object - see what we can do here - return { dist: min_dist, index: min_index }; - - } - - public findVertsFallback(contactArr: Contact[], poly1: Phaser.Physics.Shapes.Poly, poly2: Phaser.Physics.Shapes.Poly, n, dist: number) { - - var num = 0; - - for (var i = 0; i < poly1.verts.length; i++) - { - var v = poly1.tverts[i]; - - if (poly2.containPointPartial(v, n)) - { - contactArr.push(new Contact(v, n, dist, (poly1.id << 16) | i)); - num++; - } - } - - for (var i = 0; i < poly2.verts.length; i++) - { - var v = poly2.tverts[i]; - - if (poly1.containPointPartial(v, n)) - { - contactArr.push(new Contact(v, n, dist, (poly2.id << 16) | i)); - num++; - } - } - - return num; - - } - - // Find the overlapped vertices. - public findVerts(contactArr: Contact[], poly1: Phaser.Physics.Shapes.Poly, poly2: Phaser.Physics.Shapes.Poly, n, dist: number) { - - var num = 0; - - for (var i = 0; i < poly1.verts.length; i++) - { - var v = poly1.tverts[i]; - - if (poly2.containPoint(v)) - { - contactArr.push(new Contact(v, n, dist, (poly1.id << 16) | i)); - num++; - } - } - - for (var i = 0; i < poly2.verts.length; i++) - { - var v = poly2.tverts[i]; - - if (poly1.containPoint(v)) - { - contactArr.push(new Contact(v, n, dist, (poly2.id << 16) | i)); - num++; - } - } - - return num > 0 ? num : this.findVertsFallback(contactArr, poly1, poly2, n, dist); - - } - - public poly2Poly(poly1: Phaser.Physics.Shapes.Poly, poly2: Phaser.Physics.Shapes.Poly, contactArr: Contact[]) { - - var msa1 = this.findMSA(poly2, poly1.tplanes, poly1.verts.length); - - if (msa1.index == -1) - { - console.log('poly2poly 0', msa1); - return 0; - } - - var msa2 = this.findMSA(poly1, poly2.tplanes, poly2.verts.length); - - if (msa2.index == -1) - { - console.log('poly2poly 1', msa2); - return 0; - } - - // Penetration normal direction should be from poly1 to poly2 - if (msa1.dist > msa2.dist) - { - return this.findVerts(contactArr, poly1, poly2, poly1.tplanes[msa1.index].normal, msa1.dist); - } - - return this.findVerts(contactArr, poly1, poly2, Phaser.Vec2Utils.negative(poly2.tplanes[msa2.index].normal), msa2.dist); - - } - - } - -} \ No newline at end of file diff --git a/wip/physics/Contact.js b/wip/physics/Contact.js deleted file mode 100644 index 61569c60..00000000 --- a/wip/physics/Contact.js +++ /dev/null @@ -1,32 +0,0 @@ -var Phaser; -(function (Phaser) { - /// - /// - /// - /// - /// - /** - * Phaser - Advanced Physics - Contact - * - * Based on the work Ju Hyung Lee started in JS PhyRus. - */ - (function (Physics) { - var Contact = (function () { - function Contact(p, n, d, hash) { - this.hash = hash; - this.point = p; - this.normal = n; - this.depth = d; - this.lambdaNormal = 0; - this.lambdaTangential = 0; - this.r1 = new Phaser.Vec2(); - this.r2 = new Phaser.Vec2(); - this.r1_local = new Phaser.Vec2(); - this.r2_local = new Phaser.Vec2(); - } - return Contact; - })(); - Physics.Contact = Contact; - })(Phaser.Physics || (Phaser.Physics = {})); - var Physics = Phaser.Physics; -})(Phaser || (Phaser = {})); diff --git a/wip/physics/Contact.ts b/wip/physics/Contact.ts deleted file mode 100644 index fe6f544f..00000000 --- a/wip/physics/Contact.ts +++ /dev/null @@ -1,62 +0,0 @@ -/// -/// -/// -/// -/// - -/** -* Phaser - Advanced Physics - Contact -* -* Based on the work Ju Hyung Lee started in JS PhyRus. -*/ - -module Phaser.Physics { - - export class Contact { - - constructor(p, n, d, hash) { - - this.hash = hash; - this.point = p; - this.normal = n; - this.depth = d; - this.lambdaNormal = 0; - this.lambdaTangential = 0; - - this.r1 = new Phaser.Vec2; - this.r2 = new Phaser.Vec2; - this.r1_local = new Phaser.Vec2; - this.r2_local = new Phaser.Vec2; - - } - - public hash; - - // Linear velocities at contact point - public r1: Phaser.Vec2; - public r2: Phaser.Vec2; - public r1_local: Phaser.Vec2; - public r2_local: Phaser.Vec2; - // Bounce velocity - public bounce: number; - public emn: number; - public emt: number; - - // Contact point - public point; - - // Contact normal (toward shape2) - public normal: Phaser.Vec2; - - // Penetration depth (d < 0) - public depth; - - // Accumulated normal constraint impulse - public lambdaNormal; - - // Accumulated tangential constraint impulse - public lambdaTangential; - - } - -} diff --git a/wip/physics/ContactSolver.js b/wip/physics/ContactSolver.js deleted file mode 100644 index 203a8740..00000000 --- a/wip/physics/ContactSolver.js +++ /dev/null @@ -1,269 +0,0 @@ -var Phaser; -(function (Phaser) { - /// - /// - /// - /// - /// - /// - /// - /** - * Phaser - Advanced Physics - ContactSolver - * - * Based on the work Ju Hyung Lee started in JS PhyRus. - */ - //------------------------------------------------------------------------------------------------- - // Contact Constraint - // - // Non-penetration constraint: - // C = dot(p2 - p1, n) - // Cdot = dot(v2 - v1, n) - // J = [ -n, -cross(r1, n), n, cross(r2, n) ] - // - // impulse = JT * lambda = [ -n * lambda, -cross(r1, n) * lambda, n * lambda, cross(r1, n) * lambda ] - // - // Friction constraint: - // C = dot(p2 - p1, t) - // Cdot = dot(v2 - v1, t) - // J = [ -t, -cross(r1, t), t, cross(r2, t) ] - // - // impulse = JT * lambda = [ -t * lambda, -cross(r1, t) * lambda, t * lambda, cross(r1, t) * lambda ] - // - // NOTE: lambda is an impulse in constraint space. - //------------------------------------------------------------------------------------------------- - (function (Physics) { - var ContactSolver = (function () { - function ContactSolver(shape1, shape2) { - this.shape1 = shape1; - this.shape2 = shape2; - this.contacts = []; - this.elasticity = 1; - this.friction = 1; - } - ContactSolver.prototype.update = function (newContactArr) { - for(var i = 0; i < newContactArr.length; i++) { - var newContact = newContactArr[i]; - var k = -1; - for(var j = 0; j < this.contacts.length; j++) { - if(newContact.hash == this.contacts[j].hash) { - k = j; - break; - } - } - if(k > -1) { - newContact.lambdaNormal = this.contacts[k].lambdaNormal; - newContact.lambdaTangential = this.contacts[k].lambdaTangential; - } - } - this.contacts = newContactArr; - }; - ContactSolver.prototype.initSolver = function (dt_inv) { - var body1 = this.shape1.body; - var body2 = this.shape2.body; - var sum_m_inv = body1.massInverted + body2.massInverted; - for(var i = 0; i < this.contacts.length; i++) { - var con = this.contacts[i]; - //console.log('initSolver con'); - //console.log(con); - // Transformed r1, r2 - Phaser.Vec2Utils.subtract(con.point, body1.position, con.r1); - Phaser.Vec2Utils.subtract(con.point, body2.position, con.r2); - //con.r1 = vec2.sub(con.point, body1.p); - //con.r2 = vec2.sub(con.point, body2.p); - // Local r1, r2 - Phaser.TransformUtils.unrotate(body1.transform, con.r1, con.r1_local); - Phaser.TransformUtils.unrotate(body2.transform, con.r2, con.r2_local); - //con.r1_local = body1.transform.unrotate(con.r1); - //con.r2_local = body2.transform.unrotate(con.r2); - var n = con.normal; - var t = Phaser.Vec2Utils.perp(con.normal); - // invEMn = J * invM * JT - // J = [ -n, -cross(r1, n), n, cross(r2, n) ] - var sn1 = Phaser.Vec2Utils.cross(con.r1, n); - var sn2 = Phaser.Vec2Utils.cross(con.r2, n); - var emn_inv = sum_m_inv + body1.inertiaInverted * sn1 * sn1 + body2.inertiaInverted * sn2 * sn2; - con.emn = emn_inv == 0 ? 0 : 1 / emn_inv; - // invEMt = J * invM * JT - // J = [ -t, -cross(r1, t), t, cross(r2, t) ] - var st1 = Phaser.Vec2Utils.cross(con.r1, t); - var st2 = Phaser.Vec2Utils.cross(con.r2, t); - var emt_inv = sum_m_inv + body1.inertiaInverted * st1 * st1 + body2.inertiaInverted * st2 * st2; - con.emt = emt_inv == 0 ? 0 : 1 / emt_inv; - // Linear velocities at contact point - // in 2D: cross(w, r) = perp(r) * w - var v1 = new Phaser.Vec2(); - var v2 = new Phaser.Vec2(); - Phaser.Vec2Utils.multiplyAdd(body1.velocity, Phaser.Vec2Utils.perp(con.r1), body1.angularVelocity, v1); - Phaser.Vec2Utils.multiplyAdd(body2.velocity, Phaser.Vec2Utils.perp(con.r2), body2.angularVelocity, v2); - //var v1 = vec2.mad(body1.v, vec2.perp(con.r1), body1.w); - //var v2 = vec2.mad(body2.v, vec2.perp(con.r2), body2.w); - // relative velocity at contact point - var rv = new Phaser.Vec2(); - Phaser.Vec2Utils.subtract(v2, v1, rv); - //var rv = vec2.sub(v2, v1); - // bounce velocity dot n - con.bounce = Phaser.Vec2Utils.dot(rv, con.normal) * this.elasticity; - } - }; - ContactSolver.prototype.warmStart = function () { - var body1 = this.shape1.body; - var body2 = this.shape2.body; - for(var i = 0; i < this.contacts.length; i++) { - var con = this.contacts[i]; - var n = con.normal; - var lambda_n = con.lambdaNormal; - var lambda_t = con.lambdaTangential; - // Apply accumulated impulses - //var impulse = vec2.rotate_vec(new vec2(lambda_n, lambda_t), n); - //var impulse = new vec2(lambda_n * n.x - lambda_t * n.y, lambda_t * n.x + lambda_n * n.y); - var impulse = new Phaser.Vec2(lambda_n * n.x - lambda_t * n.y, lambda_t * n.x + lambda_n * n.y); - //console.log('phaser warmStart impulse ' + i + ' = ' + impulse.toString()); - body1.velocity.multiplyAddByScalar(impulse, -body1.massInverted); - //body1.v.mad(impulse, -body1.m_inv); - body1.angularVelocity -= Phaser.Vec2Utils.cross(con.r1, impulse) * body1.inertiaInverted; - //body1.w -= vec2.cross(con.r1, impulse) * body1.i_inv; - body2.velocity.multiplyAddByScalar(impulse, body2.massInverted); - //body2.v.mad(impulse, body2.m_inv); - body2.angularVelocity += Phaser.Vec2Utils.cross(con.r2, impulse) * body2.inertiaInverted; - //body2.w += vec2.cross(con.r2, impulse) * body2.i_inv; - } - }; - ContactSolver.prototype.solveVelocityConstraints = function () { - var body1 = this.shape1.body; - var body2 = this.shape2.body; - Physics.AdvancedPhysics.write('solveVelocityConstraints. Body1: ' + body1.name + ' Body2: ' + body2.name); - Physics.AdvancedPhysics.write('Shape 1: ' + this.shape1.type + ' Shape 2: ' + this.shape2.type); - var m1_inv = body1.massInverted; - var i1_inv = body1.inertiaInverted; - var m2_inv = body2.massInverted; - var i2_inv = body2.inertiaInverted; - Physics.AdvancedPhysics.write('m1_inv: ' + m1_inv); - Physics.AdvancedPhysics.write('i1_inv: ' + i1_inv); - Physics.AdvancedPhysics.write('m2_inv: ' + m2_inv); - Physics.AdvancedPhysics.write('i2_inv: ' + i2_inv); - for(var i = 0; i < this.contacts.length; i++) { - Physics.AdvancedPhysics.write('------------ solve con ' + i); - var con = this.contacts[i]; - var n = con.normal; - var t = Phaser.Vec2Utils.perp(n); - var r1 = con.r1; - var r2 = con.r2; - // Linear velocities at contact point - // in 2D: cross(w, r) = perp(r) * w - var v1 = new Phaser.Vec2(); - var v2 = new Phaser.Vec2(); - Phaser.Vec2Utils.multiplyAdd(body1.velocity, Phaser.Vec2Utils.perp(r1), body1.angularVelocity, v1); - //var v1 = vec2.mad(body1.v, vec2.perp(r1), body1.w); - Physics.AdvancedPhysics.write('v1 ' + v1.toString()); - Phaser.Vec2Utils.multiplyAdd(body2.velocity, Phaser.Vec2Utils.perp(r2), body2.angularVelocity, v2); - //var v2 = vec2.mad(body2.v, vec2.perp(r2), body2.w); - Physics.AdvancedPhysics.write('v2 ' + v2.toString()); - // Relative velocity at contact point - var rv = new Phaser.Vec2(); - Phaser.Vec2Utils.subtract(v2, v1, rv); - //var rv = vec2.sub(v2, v1); - Physics.AdvancedPhysics.write('rv ' + rv.toString()); - // Compute normal constraint impulse + adding bounce as a velocity bias - // lambda_n = -EMn * J * V - var lambda_n = -con.emn * (Phaser.Vec2Utils.dot(n, rv) + con.bounce); - Physics.AdvancedPhysics.write('lambda_n: ' + lambda_n); - // Accumulate and clamp - var lambda_n_old = con.lambdaNormal; - con.lambdaNormal = Math.max(lambda_n_old + lambda_n, 0); - //con.lambdaNormal = this.clamp(lambda_n_old + lambda_n, 0); - lambda_n = con.lambdaNormal - lambda_n_old; - Physics.AdvancedPhysics.write('lambda_n clamped: ' + lambda_n); - // Compute frictional constraint impulse - // lambda_t = -EMt * J * V - var lambda_t = -con.emt * Phaser.Vec2Utils.dot(t, rv); - // Max friction constraint impulse (Coulomb's Law) - var lambda_t_max = con.lambdaNormal * this.friction; - // Accumulate and clamp - var lambda_t_old = con.lambdaTangential; - con.lambdaTangential = this.clamp(lambda_t_old + lambda_t, -lambda_t_max, lambda_t_max); - lambda_t = con.lambdaTangential - lambda_t_old; - // Apply the final impulses - //var impulse = vec2.rotate_vec(new vec2(lambda_n, lambda_t), n); - var impulse = new Phaser.Vec2(lambda_n * n.x - lambda_t * n.y, lambda_t * n.x + lambda_n * n.y); - Physics.AdvancedPhysics.write('impulse: ' + impulse.toString()); - body1.velocity.multiplyAddByScalar(impulse, -m1_inv); - //body1.v.mad(impulse, -m1_inv); - body1.angularVelocity -= Phaser.Vec2Utils.cross(r1, impulse) * i1_inv; - //body1.w -= vec2.cross(r1, impulse) * i1_inv; - body2.velocity.multiplyAddByScalar(impulse, m2_inv); - //body2.v.mad(impulse, m2_inv); - body2.angularVelocity += Phaser.Vec2Utils.cross(r2, impulse) * i2_inv; - //body2.w += vec2.cross(r2, impulse) * i2_inv; - Physics.AdvancedPhysics.write('body1: ' + body1.toString()); - Physics.AdvancedPhysics.write('body2: ' + body2.toString()); - } - }; - ContactSolver.prototype.solvePositionConstraints = function () { - var body1 = this.shape1.body; - var body2 = this.shape2.body; - Physics.AdvancedPhysics.write('solvePositionConstraints'); - var m1_inv = body1.massInverted; - var i1_inv = body1.inertiaInverted; - var m2_inv = body2.massInverted; - var i2_inv = body2.inertiaInverted; - var sum_m_inv = m1_inv + m2_inv; - var max_penetration = 0; - for(var i = 0; i < this.contacts.length; i++) { - Physics.AdvancedPhysics.write('------------- solvePositionConstraints ' + i); - var con = this.contacts[i]; - var n = con.normal; - var r1 = new Phaser.Vec2(); - var r2 = new Phaser.Vec2(); - // Transformed r1, r2 - Phaser.Vec2Utils.rotate(con.r1_local, body1.angle, r1); - Phaser.Vec2Utils.rotate(con.r2_local, body2.angle, r2); - Physics.AdvancedPhysics.write('r1_local.x = ' + con.r1_local.x + ' r1_local.y = ' + con.r1_local.y + ' angle: ' + body1.angle); - Physics.AdvancedPhysics.write('r1 rotated: r1.x = ' + r1.x + ' r1.y = ' + r1.y); - Physics.AdvancedPhysics.write('r2_local.x = ' + con.r2_local.x + ' r2_local.y = ' + con.r2_local.y + ' angle: ' + body2.angle); - Physics.AdvancedPhysics.write('r2 rotated: r2.x = ' + r2.x + ' r2.y = ' + r2.y); - // Contact points (corrected) - var p1 = new Phaser.Vec2(); - var p2 = new Phaser.Vec2(); - Phaser.Vec2Utils.add(body1.position, r1, p1); - Phaser.Vec2Utils.add(body2.position, r2, p2); - Physics.AdvancedPhysics.write('body1.pos.x=' + body1.position.x + ' y=' + body1.position.y); - Physics.AdvancedPhysics.write('body2.pos.x=' + body2.position.x + ' y=' + body2.position.y); - // Corrected delta vector - var dp = new Phaser.Vec2(); - Phaser.Vec2Utils.subtract(p2, p1, dp); - // Position constraint - var c = Phaser.Vec2Utils.dot(dp, n) + con.depth; - var correction = this.clamp(Physics.AdvancedPhysics.CONTACT_SOLVER_BAUMGARTE * (c + Physics.AdvancedPhysics.CONTACT_SOLVER_COLLISION_SLOP), -Physics.AdvancedPhysics.CONTACT_SOLVER_MAX_LINEAR_CORRECTION, 0); - if(correction == 0) { - continue; - } - // We don't need max_penetration less than or equal slop - max_penetration = Math.max(max_penetration, -c); - // Compute lambda for position constraint - // Solve (J * invM * JT) * lambda = -C / dt - var sn1 = Phaser.Vec2Utils.cross(r1, n); - var sn2 = Phaser.Vec2Utils.cross(r2, n); - var em_inv = sum_m_inv + body1.inertiaInverted * sn1 * sn1 + body2.inertiaInverted * sn2 * sn2; - var lambda_dt = em_inv == 0 ? 0 : -correction / em_inv; - // Apply correction impulses - var impulse_dt = new Phaser.Vec2(); - Phaser.Vec2Utils.scale(n, lambda_dt, impulse_dt); - body1.position.multiplyAddByScalar(impulse_dt, -m1_inv); - body1.angle -= sn1 * lambda_dt * i1_inv; - body2.position.multiplyAddByScalar(impulse_dt, m2_inv); - body2.angle += sn2 * lambda_dt * i2_inv; - Physics.AdvancedPhysics.write('body1.pos.x=' + body1.position.x + ' y=' + body1.position.y); - Physics.AdvancedPhysics.write('body2.pos.x=' + body2.position.x + ' y=' + body2.position.y); - } - Physics.AdvancedPhysics.write('max_penetration: ' + max_penetration); - return max_penetration <= Physics.AdvancedPhysics.CONTACT_SOLVER_COLLISION_SLOP * 3; - }; - ContactSolver.prototype.clamp = function (v, min, max) { - return v < min ? min : (v > max ? max : v); - }; - return ContactSolver; - })(); - Physics.ContactSolver = ContactSolver; - })(Phaser.Physics || (Phaser.Physics = {})); - var Physics = Phaser.Physics; -})(Phaser || (Phaser = {})); diff --git a/wip/physics/ContactSolver.ts b/wip/physics/ContactSolver.ts deleted file mode 100644 index 675e8b6b..00000000 --- a/wip/physics/ContactSolver.ts +++ /dev/null @@ -1,386 +0,0 @@ -/// -/// -/// -/// -/// -/// -/// - -/** -* Phaser - Advanced Physics - ContactSolver -* -* Based on the work Ju Hyung Lee started in JS PhyRus. -*/ - -//------------------------------------------------------------------------------------------------- -// Contact Constraint -// -// Non-penetration constraint: -// C = dot(p2 - p1, n) -// Cdot = dot(v2 - v1, n) -// J = [ -n, -cross(r1, n), n, cross(r2, n) ] -// -// impulse = JT * lambda = [ -n * lambda, -cross(r1, n) * lambda, n * lambda, cross(r1, n) * lambda ] -// -// Friction constraint: -// C = dot(p2 - p1, t) -// Cdot = dot(v2 - v1, t) -// J = [ -t, -cross(r1, t), t, cross(r2, t) ] -// -// impulse = JT * lambda = [ -t * lambda, -cross(r1, t) * lambda, t * lambda, cross(r1, t) * lambda ] -// -// NOTE: lambda is an impulse in constraint space. -//------------------------------------------------------------------------------------------------- - -module Phaser.Physics { - - export class ContactSolver { - - constructor(shape1, shape2) { - - this.shape1 = shape1; - this.shape2 = shape2; - - this.contacts = []; - this.elasticity = 1; - this.friction = 1; - - } - - public shape1; - public shape2; - - // Contact list - public contacts: Contact[]; - - // Coefficient of restitution (elasticity) - public elasticity: number; - - // Frictional coefficient - public friction: number; - - public update(newContactArr: Contact[]) { - - for (var i = 0; i < newContactArr.length; i++) - { - var newContact = newContactArr[i]; - var k = -1; - - for (var j = 0; j < this.contacts.length; j++) - { - if (newContact.hash == this.contacts[j].hash) - { - k = j; - break; - } - } - - if (k > -1) - { - newContact.lambdaNormal = this.contacts[k].lambdaNormal; - newContact.lambdaTangential = this.contacts[k].lambdaTangential; - } - } - - this.contacts = newContactArr; - - } - - public initSolver(dt_inv) { - - var body1: Body = this.shape1.body; - var body2: Body = this.shape2.body; - - var sum_m_inv = body1.massInverted + body2.massInverted; - - for (var i = 0; i < this.contacts.length; i++) - { - var con: Contact = this.contacts[i]; - - //console.log('initSolver con'); - //console.log(con); - - // Transformed r1, r2 - Phaser.Vec2Utils.subtract(con.point, body1.position, con.r1); - Phaser.Vec2Utils.subtract(con.point, body2.position, con.r2); - //con.r1 = vec2.sub(con.point, body1.p); - //con.r2 = vec2.sub(con.point, body2.p); - - // Local r1, r2 - Phaser.TransformUtils.unrotate(body1.transform, con.r1, con.r1_local); - Phaser.TransformUtils.unrotate(body2.transform, con.r2, con.r2_local); - //con.r1_local = body1.transform.unrotate(con.r1); - //con.r2_local = body2.transform.unrotate(con.r2); - - var n = con.normal; - var t = Phaser.Vec2Utils.perp(con.normal); - - // invEMn = J * invM * JT - // J = [ -n, -cross(r1, n), n, cross(r2, n) ] - var sn1 = Phaser.Vec2Utils.cross(con.r1, n); - var sn2 = Phaser.Vec2Utils.cross(con.r2, n); - var emn_inv = sum_m_inv + body1.inertiaInverted * sn1 * sn1 + body2.inertiaInverted * sn2 * sn2; - con.emn = emn_inv == 0 ? 0 : 1 / emn_inv; - - // invEMt = J * invM * JT - // J = [ -t, -cross(r1, t), t, cross(r2, t) ] - var st1 = Phaser.Vec2Utils.cross(con.r1, t); - var st2 = Phaser.Vec2Utils.cross(con.r2, t); - var emt_inv = sum_m_inv + body1.inertiaInverted * st1 * st1 + body2.inertiaInverted * st2 * st2; - con.emt = emt_inv == 0 ? 0 : 1 / emt_inv; - - // Linear velocities at contact point - // in 2D: cross(w, r) = perp(r) * w - - var v1 = new Phaser.Vec2; - var v2 = new Phaser.Vec2; - - Phaser.Vec2Utils.multiplyAdd(body1.velocity, Phaser.Vec2Utils.perp(con.r1), body1.angularVelocity, v1); - Phaser.Vec2Utils.multiplyAdd(body2.velocity, Phaser.Vec2Utils.perp(con.r2), body2.angularVelocity, v2); - //var v1 = vec2.mad(body1.v, vec2.perp(con.r1), body1.w); - //var v2 = vec2.mad(body2.v, vec2.perp(con.r2), body2.w); - - // relative velocity at contact point - var rv = new Phaser.Vec2; - Phaser.Vec2Utils.subtract(v2, v1, rv); - //var rv = vec2.sub(v2, v1); - - // bounce velocity dot n - con.bounce = Phaser.Vec2Utils.dot(rv, con.normal) * this.elasticity; - - } - } - - public warmStart() { - - var body1: Body = this.shape1.body; - var body2: Body = this.shape2.body; - - for (var i = 0; i < this.contacts.length; i++) - { - var con:Contact = this.contacts[i]; - var n = con.normal; - var lambda_n = con.lambdaNormal; - var lambda_t = con.lambdaTangential; - - // Apply accumulated impulses - //var impulse = vec2.rotate_vec(new vec2(lambda_n, lambda_t), n); - //var impulse = new vec2(lambda_n * n.x - lambda_t * n.y, lambda_t * n.x + lambda_n * n.y); - var impulse = new Phaser.Vec2(lambda_n * n.x - lambda_t * n.y, lambda_t * n.x + lambda_n * n.y); - - //console.log('phaser warmStart impulse ' + i + ' = ' + impulse.toString()); - - body1.velocity.multiplyAddByScalar(impulse, -body1.massInverted); - //body1.v.mad(impulse, -body1.m_inv); - - body1.angularVelocity -= Phaser.Vec2Utils.cross(con.r1, impulse) * body1.inertiaInverted; - //body1.w -= vec2.cross(con.r1, impulse) * body1.i_inv; - - body2.velocity.multiplyAddByScalar(impulse, body2.massInverted); - //body2.v.mad(impulse, body2.m_inv); - - body2.angularVelocity += Phaser.Vec2Utils.cross(con.r2, impulse) * body2.inertiaInverted; - //body2.w += vec2.cross(con.r2, impulse) * body2.i_inv; - } - - } - - public solveVelocityConstraints() { - - var body1: Body = this.shape1.body; - var body2: Body = this.shape2.body; - - AdvancedPhysics.write('solveVelocityConstraints. Body1: ' + body1.name + ' Body2: ' + body2.name); - AdvancedPhysics.write('Shape 1: ' + this.shape1.type + ' Shape 2: ' + this.shape2.type); - - var m1_inv = body1.massInverted; - var i1_inv = body1.inertiaInverted; - var m2_inv = body2.massInverted; - var i2_inv = body2.inertiaInverted; - - AdvancedPhysics.write('m1_inv: ' + m1_inv); - AdvancedPhysics.write('i1_inv: ' + i1_inv); - AdvancedPhysics.write('m2_inv: ' + m2_inv); - AdvancedPhysics.write('i2_inv: ' + i2_inv); - - for (var i = 0; i < this.contacts.length; i++) - { - AdvancedPhysics.write('------------ solve con ' + i); - - var con: Contact = this.contacts[i]; - var n: Phaser.Vec2 = con.normal; - var t = Phaser.Vec2Utils.perp(n); - var r1 = con.r1; - var r2 = con.r2; - - // Linear velocities at contact point - // in 2D: cross(w, r) = perp(r) * w - - var v1 = new Phaser.Vec2; - var v2 = new Phaser.Vec2; - - Phaser.Vec2Utils.multiplyAdd(body1.velocity, Phaser.Vec2Utils.perp(r1), body1.angularVelocity, v1); - //var v1 = vec2.mad(body1.v, vec2.perp(r1), body1.w); - - AdvancedPhysics.write('v1 ' + v1.toString()); - - Phaser.Vec2Utils.multiplyAdd(body2.velocity, Phaser.Vec2Utils.perp(r2), body2.angularVelocity, v2); - //var v2 = vec2.mad(body2.v, vec2.perp(r2), body2.w); - - AdvancedPhysics.write('v2 ' + v2.toString()); - - // Relative velocity at contact point - var rv = new Phaser.Vec2; - Phaser.Vec2Utils.subtract(v2, v1, rv); - //var rv = vec2.sub(v2, v1); - - AdvancedPhysics.write('rv ' + rv.toString()); - - // Compute normal constraint impulse + adding bounce as a velocity bias - // lambda_n = -EMn * J * V - var lambda_n = -con.emn * (Phaser.Vec2Utils.dot(n, rv) + con.bounce); - - AdvancedPhysics.write('lambda_n: ' + lambda_n); - - // Accumulate and clamp - var lambda_n_old = con.lambdaNormal; - con.lambdaNormal = Math.max(lambda_n_old + lambda_n, 0); - //con.lambdaNormal = this.clamp(lambda_n_old + lambda_n, 0); - lambda_n = con.lambdaNormal - lambda_n_old; - - AdvancedPhysics.write('lambda_n clamped: ' + lambda_n); - - // Compute frictional constraint impulse - // lambda_t = -EMt * J * V - var lambda_t = -con.emt * Phaser.Vec2Utils.dot(t, rv); - - // Max friction constraint impulse (Coulomb's Law) - var lambda_t_max = con.lambdaNormal * this.friction; - - // Accumulate and clamp - var lambda_t_old = con.lambdaTangential; - con.lambdaTangential = this.clamp(lambda_t_old + lambda_t, -lambda_t_max, lambda_t_max); - lambda_t = con.lambdaTangential - lambda_t_old; - - // Apply the final impulses - //var impulse = vec2.rotate_vec(new vec2(lambda_n, lambda_t), n); - var impulse = new Phaser.Vec2(lambda_n * n.x - lambda_t * n.y, lambda_t * n.x + lambda_n * n.y); - - AdvancedPhysics.write('impulse: ' + impulse.toString()); - - body1.velocity.multiplyAddByScalar(impulse, -m1_inv); - //body1.v.mad(impulse, -m1_inv); - - body1.angularVelocity -= Phaser.Vec2Utils.cross(r1, impulse) * i1_inv; - //body1.w -= vec2.cross(r1, impulse) * i1_inv; - - body2.velocity.multiplyAddByScalar(impulse, m2_inv); - //body2.v.mad(impulse, m2_inv); - - body2.angularVelocity += Phaser.Vec2Utils.cross(r2, impulse) * i2_inv; - //body2.w += vec2.cross(r2, impulse) * i2_inv; - - AdvancedPhysics.write('body1: ' + body1.toString()); - AdvancedPhysics.write('body2: ' + body2.toString()); - - } - - } - - public solvePositionConstraints() { - - var body1: Body = this.shape1.body; - var body2: Body = this.shape2.body; - - AdvancedPhysics.write('solvePositionConstraints'); - - var m1_inv = body1.massInverted; - var i1_inv = body1.inertiaInverted; - var m2_inv = body2.massInverted; - var i2_inv = body2.inertiaInverted; - var sum_m_inv = m1_inv + m2_inv; - - var max_penetration = 0; - - for (var i = 0; i < this.contacts.length; i++) - { - AdvancedPhysics.write('------------- solvePositionConstraints ' + i); - - var con:Contact = this.contacts[i]; - var n:Phaser.Vec2 = con.normal; - - var r1 = new Phaser.Vec2; - var r2 = new Phaser.Vec2; - - // Transformed r1, r2 - Phaser.Vec2Utils.rotate(con.r1_local, body1.angle, r1); - Phaser.Vec2Utils.rotate(con.r2_local, body2.angle, r2); - - AdvancedPhysics.write('r1_local.x = ' + con.r1_local.x + ' r1_local.y = ' + con.r1_local.y + ' angle: ' + body1.angle); - AdvancedPhysics.write('r1 rotated: r1.x = ' + r1.x + ' r1.y = ' + r1.y); - AdvancedPhysics.write('r2_local.x = ' + con.r2_local.x + ' r2_local.y = ' + con.r2_local.y + ' angle: ' + body2.angle); - AdvancedPhysics.write('r2 rotated: r2.x = ' + r2.x + ' r2.y = ' + r2.y); - - // Contact points (corrected) - var p1 = new Phaser.Vec2; - var p2 = new Phaser.Vec2; - - Phaser.Vec2Utils.add(body1.position, r1, p1); - Phaser.Vec2Utils.add(body2.position, r2, p2); - - AdvancedPhysics.write('body1.pos.x=' + body1.position.x + ' y=' + body1.position.y); - AdvancedPhysics.write('body2.pos.x=' + body2.position.x + ' y=' + body2.position.y); - - // Corrected delta vector - var dp = new Phaser.Vec2; - Phaser.Vec2Utils.subtract(p2, p1, dp); - - // Position constraint - var c = Phaser.Vec2Utils.dot(dp, n) + con.depth; - - var correction = this.clamp(AdvancedPhysics.CONTACT_SOLVER_BAUMGARTE * (c + AdvancedPhysics.CONTACT_SOLVER_COLLISION_SLOP), -AdvancedPhysics.CONTACT_SOLVER_MAX_LINEAR_CORRECTION, 0); - - if (correction == 0) - { - continue; - } - - // We don't need max_penetration less than or equal slop - max_penetration = Math.max(max_penetration, -c); - - // Compute lambda for position constraint - // Solve (J * invM * JT) * lambda = -C / dt - var sn1 = Phaser.Vec2Utils.cross(r1, n); - var sn2 = Phaser.Vec2Utils.cross(r2, n); - - var em_inv = sum_m_inv + body1.inertiaInverted * sn1 * sn1 + body2.inertiaInverted * sn2 * sn2; - - var lambda_dt = em_inv == 0 ? 0 : -correction / em_inv; - - // Apply correction impulses - var impulse_dt = new Phaser.Vec2; - Phaser.Vec2Utils.scale(n, lambda_dt, impulse_dt); - - body1.position.multiplyAddByScalar(impulse_dt, -m1_inv); - body1.angle -= sn1 * lambda_dt * i1_inv; - - body2.position.multiplyAddByScalar(impulse_dt, m2_inv); - body2.angle += sn2 * lambda_dt * i2_inv; - - AdvancedPhysics.write('body1.pos.x=' + body1.position.x + ' y=' + body1.position.y); - AdvancedPhysics.write('body2.pos.x=' + body2.position.x + ' y=' + body2.position.y); - } - - AdvancedPhysics.write('max_penetration: ' + max_penetration); - - return max_penetration <= AdvancedPhysics.CONTACT_SOLVER_COLLISION_SLOP * 3; - - } - - public clamp(v, min, max) { - return v < min ? min : (v > max ? max : v); - } - - } - -} diff --git a/wip/physics/Manager.js b/wip/physics/Manager.js deleted file mode 100644 index 517e40c6..00000000 --- a/wip/physics/Manager.js +++ /dev/null @@ -1,67 +0,0 @@ -var Phaser; -(function (Phaser) { - /// - /// - /// - /** - * Phaser - Physics Manager - * - * The Physics Manager is responsible for looking after, creating and colliding - * all of the physics bodies and joints in the world. - */ - (function (Physics) { - var Manager = (function () { - function Manager(game) { - this.game = game; - } - Manager.clear = function clear() { - //Manager.debug.textContent = ""; - Manager.log = []; - }; - Manager.write = function write(s) { - //Manager.debug.textContent += s + "\n"; - }; - Manager.writeAll = function writeAll() { - for(var i = 0; i < Manager.log.length; i++) { - //Manager.debug.textContent += Manager.log[i]; - } - }; - Manager.log = []; - Manager.dump = function dump(phase, body) { - /* - var s = "\n\nPhase: " + phase + "\n"; - s += "Position: " + body.position.toString() + "\n"; - s += "Velocity: " + body.velocity.toString() + "\n"; - s += "Angle: " + body.angle + "\n"; - s += "Force: " + body.force.toString() + "\n"; - s += "Torque: " + body.torque + "\n"; - s += "Bounds: " + body.bounds.toString() + "\n"; - s += "Shape ***\n"; - s += "Vert 0: " + body.shapes[0].verts[0].toString() + "\n"; - s += "Vert 1: " + body.shapes[0].verts[1].toString() + "\n"; - s += "Vert 2: " + body.shapes[0].verts[2].toString() + "\n"; - s += "Vert 3: " + body.shapes[0].verts[3].toString() + "\n"; - s += "TVert 0: " + body.shapes[0].tverts[0].toString() + "\n"; - s += "TVert 1: " + body.shapes[0].tverts[1].toString() + "\n"; - s += "TVert 2: " + body.shapes[0].tverts[2].toString() + "\n"; - s += "TVert 3: " + body.shapes[0].tverts[3].toString() + "\n"; - s += "Plane 0: " + body.shapes[0].planes[0].normal.toString() + "\n"; - s += "Plane 1: " + body.shapes[0].planes[1].normal.toString() + "\n"; - s += "Plane 2: " + body.shapes[0].planes[2].normal.toString() + "\n"; - s += "Plane 3: " + body.shapes[0].planes[3].normal.toString() + "\n"; - s += "TPlane 0: " + body.shapes[0].tplanes[0].normal.toString() + "\n"; - s += "TPlane 1: " + body.shapes[0].tplanes[1].normal.toString() + "\n"; - s += "TPlane 2: " + body.shapes[0].tplanes[2].normal.toString() + "\n"; - s += "TPlane 3: " + body.shapes[0].tplanes[3].normal.toString() + "\n"; - - Manager.log.push(s); - */ - }; - Manager.prototype.update = function () { - }; - return Manager; - })(); - Physics.Manager = Manager; - })(Phaser.Physics || (Phaser.Physics = {})); - var Physics = Phaser.Physics; -})(Phaser || (Phaser = {})); diff --git a/wip/physics/Manager.ts b/wip/physics/Manager.ts deleted file mode 100644 index 519e3cd8..00000000 --- a/wip/physics/Manager.ts +++ /dev/null @@ -1,86 +0,0 @@ -/// -/// -/// - -/** -* Phaser - Physics Manager -* -* The Physics Manager is responsible for looking after, creating and colliding -* all of the physics bodies and joints in the world. -*/ - -module Phaser.Physics { - - export class Manager { - - constructor(game: Game) { - this.game = game; - } - - /** - * Local reference to Game. - */ - public game: Game; - - public static debug: HTMLTextAreaElement; - - public static clear() { - //Manager.debug.textContent = ""; - Manager.log = []; - } - - public static write(s: string) { - //Manager.debug.textContent += s + "\n"; - } - - public static writeAll() { - - for (var i = 0; i < Manager.log.length; i++) - { - //Manager.debug.textContent += Manager.log[i]; - } - - } - - public static log = []; - - public static dump(phase: string, body: Body) { - - /* - var s = "\n\nPhase: " + phase + "\n"; - s += "Position: " + body.position.toString() + "\n"; - s += "Velocity: " + body.velocity.toString() + "\n"; - s += "Angle: " + body.angle + "\n"; - s += "Force: " + body.force.toString() + "\n"; - s += "Torque: " + body.torque + "\n"; - s += "Bounds: " + body.bounds.toString() + "\n"; - s += "Shape ***\n"; - s += "Vert 0: " + body.shapes[0].verts[0].toString() + "\n"; - s += "Vert 1: " + body.shapes[0].verts[1].toString() + "\n"; - s += "Vert 2: " + body.shapes[0].verts[2].toString() + "\n"; - s += "Vert 3: " + body.shapes[0].verts[3].toString() + "\n"; - s += "TVert 0: " + body.shapes[0].tverts[0].toString() + "\n"; - s += "TVert 1: " + body.shapes[0].tverts[1].toString() + "\n"; - s += "TVert 2: " + body.shapes[0].tverts[2].toString() + "\n"; - s += "TVert 3: " + body.shapes[0].tverts[3].toString() + "\n"; - s += "Plane 0: " + body.shapes[0].planes[0].normal.toString() + "\n"; - s += "Plane 1: " + body.shapes[0].planes[1].normal.toString() + "\n"; - s += "Plane 2: " + body.shapes[0].planes[2].normal.toString() + "\n"; - s += "Plane 3: " + body.shapes[0].planes[3].normal.toString() + "\n"; - s += "TPlane 0: " + body.shapes[0].tplanes[0].normal.toString() + "\n"; - s += "TPlane 1: " + body.shapes[0].tplanes[1].normal.toString() + "\n"; - s += "TPlane 2: " + body.shapes[0].tplanes[2].normal.toString() + "\n"; - s += "TPlane 3: " + body.shapes[0].tplanes[3].normal.toString() + "\n"; - - Manager.log.push(s); - */ - - } - - public update() { - - } - - } - -} \ No newline at end of file diff --git a/wip/physics/Plane.js b/wip/physics/Plane.js deleted file mode 100644 index 3e73d78b..00000000 --- a/wip/physics/Plane.js +++ /dev/null @@ -1,23 +0,0 @@ -var Phaser; -(function (Phaser) { - /// - /// - /// - /// - /** - * Phaser - Advanced Physics - Plane - * - * Based on the work Ju Hyung Lee started in JS PhyRus. - */ - (function (Physics) { - var Plane = (function () { - function Plane(normal, d) { - this.normal = normal; - this.d = d; - } - return Plane; - })(); - Physics.Plane = Plane; - })(Phaser.Physics || (Phaser.Physics = {})); - var Physics = Phaser.Physics; -})(Phaser || (Phaser = {})); diff --git a/wip/physics/Plane.ts b/wip/physics/Plane.ts deleted file mode 100644 index f8fd4836..00000000 --- a/wip/physics/Plane.ts +++ /dev/null @@ -1,28 +0,0 @@ -/// -/// -/// -/// - -/** -* Phaser - Advanced Physics - Plane -* -* Based on the work Ju Hyung Lee started in JS PhyRus. -*/ - -module Phaser.Physics { - - export class Plane { - - constructor(normal: Phaser.Vec2, d: number) { - - this.normal = normal; - this.d = d; - - } - - public normal: Phaser.Vec2; - public d: number; - - } - -} diff --git a/wip/physics/Space.js b/wip/physics/Space.js deleted file mode 100644 index 0021e9e8..00000000 --- a/wip/physics/Space.js +++ /dev/null @@ -1,500 +0,0 @@ -var Phaser; -(function (Phaser) { - /// - /// - /// - /// - /// - /// - /// - /// - /// - /** - * Phaser - Advanced Physics - Space - * - * Based on the work Ju Hyung Lee started in JS PhyRus. - */ - (function (Physics) { - var Space = (function () { - function Space(manager) { - this.postSolve = null; - this.stepCount = 0; - this._manager = manager; - this.bodies = []; - this.bodyHash = { - }; - this.joints = []; - this.jointHash = { - }; - this.numContacts = 0; - this.contactSolvers = []; - this.gravity = this._manager.gravity; - this.damping = 0; - this._linTolSqr = Space.SLEEP_LINEAR_TOLERANCE * Space.SLEEP_LINEAR_TOLERANCE; - this._angTolSqr = Space.SLEEP_ANGULAR_TOLERANCE * Space.SLEEP_ANGULAR_TOLERANCE; - } - Space.TIME_TO_SLEEP = 0.5; - Space.SLEEP_LINEAR_TOLERANCE = 0.5; - Space.SLEEP_ANGULAR_TOLERANCE = 2 * 0.017453292519943294444444444444444; - Space.prototype.clear = function () { - Physics.AdvancedPhysics.shapeCounter = 0; - Physics.AdvancedPhysics.bodyCounter = 0; - Physics.AdvancedPhysics.jointCounter = 0; - for(var i = 0; i < this.bodies.length; i++) { - if(this.bodies[i]) { - this.removeBody(this.bodies[i]); - } - } - this.bodies = []; - this.bodyHash = { - }; - this.joints = []; - this.jointHash = { - }; - this.contactSolvers = []; - this.stepCount = 0; - }; - Space.prototype.addBody = function (body) { - if(this.bodyHash[body.id] != undefined) { - return; - } - var index = this.bodies.push(body) - 1; - this.bodyHash[body.id] = index; - body.awake(true); - body.space = this; - body.cacheData('addBody'); - }; - Space.prototype.removeBody = function (body) { - if(this.bodyHash[body.id] == undefined) { - return; - } - // Remove linked joints - for(var i = 0; i < body.joints.length; i++) { - if(body.joints[i]) { - this.removeJoint(body.joints[i]); - } - } - body.space = null; - var index = this.bodyHash[body.id]; - delete this.bodyHash[body.id]; - delete this.bodies[index]; - }; - Space.prototype.addJoint = function (joint) { - if(this.jointHash[joint.id] != undefined) { - return; - } - joint.body1.awake(true); - joint.body2.awake(true); - var index = this.joints.push(joint) - 1; - this.jointHash[joint.id] = index; - var index = joint.body1.joints.push(joint) - 1; - joint.body1.jointHash[joint.id] = index; - var index = joint.body2.joints.push(joint) - 1; - joint.body2.jointHash[joint.id] = index; - }; - Space.prototype.removeJoint = function (joint) { - if(this.jointHash[joint.id] == undefined) { - return; - } - joint.body1.awake(true); - joint.body2.awake(true); - var index = joint.body1.jointHash[joint.id]; - delete joint.body1.jointHash[joint.id]; - delete joint.body1.joints[index]; - var index = joint.body2.jointHash[joint.id]; - delete joint.body2.jointHash[joint.id]; - delete joint.body2.joints[index]; - var index = this.jointHash[joint.id]; - delete this.jointHash[joint.id]; - delete this.joints[index]; - }; - Space.prototype.findShapeByPoint = function (p, refShape) { - var firstShape; - for(var i = 0; i < this.bodies.length; i++) { - var body = this.bodies[i]; - if(!body) { - continue; - } - for(var j = 0; j < body.shapes.length; j++) { - var shape = body.shapes[j]; - if(shape.pointQuery(p)) { - if(!refShape) { - return shape; - } - if(!firstShape) { - firstShape = shape; - } - if(shape == refShape) { - refShape = null; - } - } - } - } - return firstShape; - }; - Space.prototype.findBodyByPoint = function (p, refBody) { - var firstBody; - for(var i = 0; i < this.bodies.length; i++) { - var body = this.bodies[i]; - if(!body) { - continue; - } - for(var j = 0; j < body.shapes.length; j++) { - var shape = body.shapes[j]; - if(shape.pointQuery(p)) { - if(!refBody) { - return shape.body; - } - if(!firstBody) { - firstBody = shape.body; - } - if(shape.body == refBody) { - refBody = null; - } - break; - } - } - } - return firstBody; - }; - Space.prototype.shapeById = function (id) { - var shape; - for(var i = 0; i < this.bodies.length; i++) { - var body = this.bodies[i]; - if(!body) { - continue; - } - for(var j = 0; j < body.shapes.length; j++) { - if(body.shapes[j].id == id) { - return body.shapes[j]; - } - } - } - return null; - }; - Space.prototype.jointById = function (id) { - var index = this.jointHash[id]; - if(index != undefined) { - return this.joints[index]; - } - return null; - }; - Space.prototype.findVertexByPoint = function (p, minDist, refVertexId) { - var firstVertexId = -1; - refVertexId = refVertexId || -1; - for(var i = 0; i < this.bodies.length; i++) { - var body = this.bodies[i]; - if(!body) { - continue; - } - for(var j = 0; j < body.shapes.length; j++) { - var shape = body.shapes[j]; - var index = shape.findVertexByPoint(p, minDist); - if(index != -1) { - var vertex = (shape.id << 16) | index; - if(refVertexId == -1) { - return vertex; - } - if(firstVertexId == -1) { - firstVertexId = vertex; - } - if(vertex == refVertexId) { - refVertexId = -1; - } - } - } - } - return firstVertexId; - }; - Space.prototype.findEdgeByPoint = function (p, minDist, refEdgeId) { - var firstEdgeId = -1; - refEdgeId = refEdgeId || -1; - for(var i = 0; i < this.bodies.length; i++) { - var body = this.bodies[i]; - if(!body) { - continue; - } - for(var j = 0; j < body.shapes.length; j++) { - var shape = body.shapes[j]; - if(shape.type != Physics.AdvancedPhysics.SHAPE_TYPE_POLY) { - continue; - } - var index = shape.findEdgeByPoint(p, minDist); - if(index != -1) { - var edge = (shape.id << 16) | index; - if(refEdgeId == -1) { - return edge; - } - if(firstEdgeId == -1) { - firstEdgeId = edge; - } - if(edge == refEdgeId) { - refEdgeId = -1; - } - } - } - } - return firstEdgeId; - }; - Space.prototype.findJointByPoint = function (p, minDist, refJointId) { - var firstJointId = -1; - var dsq = minDist * minDist; - refJointId = refJointId || -1; - for(var i = 0; i < this.joints.length; i++) { - var joint = this.joints[i]; - if(!joint) { - continue; - } - var jointId = -1; - if(Phaser.Vec2Utils.distanceSq(p, joint.getWorldAnchor1()) < dsq) { - jointId = (joint.id << 16 | 0); - } else if(Phaser.Vec2Utils.distanceSq(p, joint.getWorldAnchor2()) < dsq) { - jointId = (joint.id << 16 | 1); - } - if(jointId != -1) { - if(refJointId == -1) { - return jointId; - } - if(firstJointId == -1) { - firstJointId = jointId; - } - if(jointId == refJointId) { - refJointId = -1; - } - } - } - return firstJointId; - }; - Space.prototype.findContactSolver = function (shape1, shape2) { - Physics.Manager.write('findContactSolver. Length: ' + this._cl); - for(var i = 0; i < this._cl; i++) { - var contactSolver = this.contactSolvers[i]; - if(shape1 == contactSolver.shape1 && shape2 == contactSolver.shape2) { - return contactSolver; - } - } - return null; - }; - Space.prototype.genTemporalContactSolvers = function () { - Physics.Manager.write('genTemporalContactSolvers'); - this._cl = 0; - this.contactSolvers.length = 0; - this.numContacts = 0; - for(var body1Index = 0; body1Index < this._bl; body1Index++) { - if(!this.bodies[body1Index]) { - continue; - } - this.bodies[body1Index].stepCount = this.stepCount; - for(var body2Index = 0; body2Index < this._bl; body2Index++) { - if(this.bodies[body1Index].inContact(this.bodies[body2Index]) == false) { - continue; - } - Physics.Manager.write('body1 and body2 intersect'); - for(var i = 0; i < this.bodies[body1Index].shapesLength; i++) { - for(var j = 0; j < this.bodies[body2Index].shapesLength; j++) { - this._shape1 = this.bodies[body1Index].shapes[i]; - this._shape2 = this.bodies[body2Index].shapes[j]; - var contactArr = []; - if(!Physics.AdvancedPhysics.collision.collide(this._shape1, this._shape2, contactArr)) { - continue; - } - if(this._shape1.type > this._shape2.type) { - var temp = this._shape1; - this._shape1 = this._shape2; - this._shape2 = temp; - } - this.numContacts += contactArr.length; - // Result stored in this._contactSolver (see what we can do about generating some re-usable solvers) - var contactSolver = this.findContactSolver(this._shape1, this._shape2); - Physics.Manager.write('findContactSolver result: ' + contactSolver); - if(contactSolver) { - contactSolver.update(contactArr); - this.contactSolvers.push(contactSolver); - } else { - Physics.Manager.write('awake both bodies'); - this.bodies[body1Index].awake(true); - this.bodies[body2Index].awake(true); - var newContactSolver = new Physics.ContactSolver(this._shape1, this._shape2); - newContactSolver.contacts = contactArr; - newContactSolver.elasticity = Math.max(this._shape1.elasticity, this._shape2.elasticity); - newContactSolver.friction = Math.sqrt(this._shape1.friction * this._shape2.friction); - this.contactSolvers.push(newContactSolver); - Physics.Manager.write('new contact solver'); - } - } - } - } - } - this._cl = this.contactSolvers.length; - }; - Space.prototype.initSolver = function (warmStarting) { - Physics.Manager.write('initSolver'); - Physics.Manager.write('contactSolvers.length: ' + this._cl); - // Initialize contact solvers - for(var c = 0; c < this._cl; c++) { - this.contactSolvers[c].initSolver(this._deltaInv); - // Warm starting (apply cached impulse) - if(warmStarting) { - this.contactSolvers[c].warmStart(); - } - } - // Initialize joint solver - for(var j = 0; j < this.joints.length; j++) { - if(this.joints[j]) { - this.joints[j].initSolver(this._delta, warmStarting); - } - } - // Warm starting (apply cached impulse) - /* - if (warmStarting) - { - for (var c = 0; c < this._cl; c++) - { - this.contactSolvers[c].warmStart(); - } - } - */ - }; - Space.prototype.velocitySolver = function (iterations) { - Physics.Manager.write('velocitySolver, iterations: ' + iterations + ' csa len: ' + this._cl); - for(var i = 0; i < iterations; i++) { - for(var j = 0; j < this._jl; j++) { - if(this.joints[j]) { - this.joints[j].solveVelocityConstraints(); - } - } - for(var c = 0; c < this._cl; c++) { - this.contactSolvers[c].solveVelocityConstraints(); - } - } - }; - Space.prototype.positionSolver = function (iterations) { - this._positionSolved = false; - for(var i = 0; i < iterations; i++) { - this._contactsOk = true; - this._jointsOk = true; - for(var c = 0; c < this._cl; c++) { - this._contactsOk = this.contactSolvers[c].solvePositionConstraints() && this._contactsOk; - } - for(var j = 0; j < this._jl; j++) { - if(this.joints[j]) { - this._jointsOk = this.joints[j].solvePositionConstraints() && this._jointsOk; - } - } - if(this._contactsOk && this._jointsOk) { - // exit early if the position errors are small - this._positionSolved = true; - break; - } - } - return this._positionSolved; - }; - Space.prototype.step = // Step through the physics simulation - function (dt, velocityIterations, positionIterations, warmStarting, allowSleep) { - Physics.Manager.clear(); - Physics.Manager.write('Space step ' + this.stepCount); - this._delta = dt; - this._deltaInv = 1 / dt; - this._bl = this.bodies.length; - this._jl = this.joints.length; - this.stepCount++; - // 1) Generate Contact Solvers (into the this.contactSolvers array) - this.genTemporalContactSolvers(); - Physics.Manager.dump("Contact Solvers", this.bodies[1]); - // 2) Initialize the Contact Solvers - this.initSolver(warmStarting); - Physics.Manager.dump("Init Solver", this.bodies[1]); - // 3) Intergrate velocity - for(var i = 0; i < this._bl; i++) { - if(this.bodies[i] && this.bodies[i].isDynamic && this.bodies[i].isAwake) { - this.bodies[i].updateVelocity(this.gravity, this._delta, this.damping); - } - } - Physics.Manager.dump("Update Velocity", this.bodies[1]); - // 4) Awaken bodies via joints - for(var j = 0; i < this._jl; j++) { - if(!this.joints[j]) { - continue; - } - // combine - var awake1 = this.joints[j].body1.isAwake && !this.joints[j].body1.isStatic; - var awake2 = this.joints[j].body2.isAwake && !this.joints[j].body2.isStatic; - if(awake1 ^ awake2) { - if(!awake1) { - this.joints[j].body1.awake(true); - } - if(!awake2) { - this.joints[j].body2.awake(true); - } - } - } - // 5) Iterative velocity constraints solver - this.velocitySolver(velocityIterations); - Physics.Manager.dump("Velocity Solvers", this.bodies[1]); - // 6) Integrate position - for(var i = 0; i < this._bl; i++) { - if(this.bodies[i] && this.bodies[i].isDynamic && this.bodies[i].isAwake) { - this.bodies[i].updatePosition(this._delta); - } - } - Physics.Manager.dump("Update Position", this.bodies[1]); - // 7) Process breakable joint - for(var i = 0; i < this._jl; i++) { - if(this.joints[i] && this.joints[i].breakable && (this.joints[i].getReactionForce(this._deltaInv).lengthSq() >= this.joints[i].maxForce * this.joints[i].maxForce)) { - this.removeJoint(this.joints[i]); - } - } - // 8) Iterative position constraints solver (result stored in this._positionSolved) - this.positionSolver(positionIterations); - Physics.Manager.dump("Position Solver", this.bodies[1]); - // 9) Sync the Transforms - for(var i = 0; i < this._bl; i++) { - if(this.bodies[i]) { - this.bodies[i].syncTransform(); - } - } - Physics.Manager.dump("Sync Transform", this.bodies[1]); - // 10) Post solve collision callback - if(this.postSolve) { - for(var i = 0; i < this._cl; i++) { - this.postSolve(this.contactSolvers[i]); - } - } - // 11) Cache Body Data - for(var i = 0; i < this._bl; i++) { - if(this.bodies[i] && this.bodies[i].isDynamic && this.bodies[i].isAwake) { - this.bodies[i].cacheData('post solve collision callback'); - } - } - Physics.Manager.dump("Cache Data", this.bodies[1]); - Physics.Manager.writeAll(); - // 12) Process sleeping - if(allowSleep) { - this._minSleepTime = 999999; - for(var i = 0; i < this._bl; i++) { - if(!this.bodies[i] || this.bodies[i].isDynamic == false) { - continue; - } - if(this.bodies[i].angularVelocity * this.bodies[i].angularVelocity > this._angTolSqr || this.bodies[i].velocity.dot(this.bodies[i].velocity) > this._linTolSqr) { - this.bodies[i].sleepTime = 0; - this._minSleepTime = 0; - } else { - this.bodies[i].sleepTime += this._delta; - this._minSleepTime = Math.min(this._minSleepTime, this.bodies[i].sleepTime); - } - } - if(this._positionSolved && this._minSleepTime >= Space.TIME_TO_SLEEP) { - for(var i = 0; i < this._bl; i++) { - if(this.bodies[i]) { - this.bodies[i].awake(false); - } - } - } - } - }; - return Space; - })(); - Physics.Space = Space; - })(Phaser.Physics || (Phaser.Physics = {})); - var Physics = Phaser.Physics; -})(Phaser || (Phaser = {})); diff --git a/wip/physics/Space.ts b/wip/physics/Space.ts deleted file mode 100644 index 030ceb32..00000000 --- a/wip/physics/Space.ts +++ /dev/null @@ -1,823 +0,0 @@ -/// -/// -/// -/// -/// -/// -/// -/// -/// - -/** -* Phaser - Advanced Physics - Space -* -* Based on the work Ju Hyung Lee started in JS PhyRus. -*/ - -module Phaser.Physics { - - export class Space { - - constructor(manager: Phaser.Physics.AdvancedPhysics) { - - this._manager = manager; - - this.bodies = []; - this.bodyHash = {}; - - this.joints = []; - this.jointHash = {}; - - this.numContacts = 0; - this.contactSolvers = []; - - this.gravity = this._manager.gravity; - this.damping = 0; - - this._linTolSqr = Space.SLEEP_LINEAR_TOLERANCE * Space.SLEEP_LINEAR_TOLERANCE; - this._angTolSqr = Space.SLEEP_ANGULAR_TOLERANCE * Space.SLEEP_ANGULAR_TOLERANCE; - - } - - private _manager: Phaser.Physics.AdvancedPhysics; - - // Delta Timer - private _delta: number; - private _deltaInv: number; - - // Body array length - private _bl: number; - - // Joints array length - private _jl: number; - - // Contact Solvers array length - private _cl: number; - - private _linTolSqr: number; - private _angTolSqr: number; - - // Minimum sleep time (used in the sleep process solver) - private _minSleepTime: number; - - private _positionSolved: bool; - - private _shape1: IShape; - private _shape2: IShape; - private _contactsOk: bool; - private _jointsOk: bool; - - private bodyHash; - private jointHash; - - public static TIME_TO_SLEEP = 0.5; - public static SLEEP_LINEAR_TOLERANCE = 0.5; - public static SLEEP_ANGULAR_TOLERANCE = 2 * 0.017453292519943294444444444444444; - - public bodies: Body[]; - public joints: IJoint[]; - public numContacts: number; - public contactSolvers: ContactSolver[]; - public postSolve = null; - public gravity: Phaser.Vec2; - public damping: number; - public stepCount: number = 0; - - public clear() { - - AdvancedPhysics.shapeCounter = 0; - AdvancedPhysics.bodyCounter = 0; - AdvancedPhysics.jointCounter = 0; - - for (var i = 0; i < this.bodies.length; i++) - { - if (this.bodies[i]) - { - this.removeBody(this.bodies[i]); - } - } - - this.bodies = []; - this.bodyHash = {}; - - this.joints = []; - this.jointHash = {}; - - this.contactSolvers = []; - - this.stepCount = 0; - - } - - public addBody(body: Body) { - - if (this.bodyHash[body.id] != undefined) - { - return; - } - - var index = this.bodies.push(body) - 1; - this.bodyHash[body.id] = index; - - body.awake(true); - body.space = this; - body.cacheData('addBody'); - - } - - public removeBody(body: Body) { - - if (this.bodyHash[body.id] == undefined) - { - return; - } - - // Remove linked joints - for (var i = 0; i < body.joints.length; i++) - { - if (body.joints[i]) - { - this.removeJoint(body.joints[i]); - } - } - - body.space = null; - - var index = this.bodyHash[body.id]; - delete this.bodyHash[body.id]; - delete this.bodies[index]; - - } - - public addJoint(joint: IJoint) { - - if (this.jointHash[joint.id] != undefined) - { - return; - } - - joint.body1.awake(true); - joint.body2.awake(true); - - var index = this.joints.push(joint) - 1; - this.jointHash[joint.id] = index; - - var index = joint.body1.joints.push(joint) - 1; - joint.body1.jointHash[joint.id] = index; - - var index = joint.body2.joints.push(joint) - 1; - joint.body2.jointHash[joint.id] = index; - - } - - public removeJoint(joint: IJoint) { - - if (this.jointHash[joint.id] == undefined) - { - return; - } - - joint.body1.awake(true); - joint.body2.awake(true); - - var index = joint.body1.jointHash[joint.id]; - delete joint.body1.jointHash[joint.id]; - delete joint.body1.joints[index]; - - var index = joint.body2.jointHash[joint.id]; - delete joint.body2.jointHash[joint.id]; - delete joint.body2.joints[index]; - - var index = this.jointHash[joint.id]; - delete this.jointHash[joint.id]; - delete this.joints[index]; - - } - - public findShapeByPoint(p, refShape) { - - var firstShape; - - for (var i = 0; i < this.bodies.length; i++) - { - var body = this.bodies[i]; - - if (!body) - { - continue; - } - - for (var j = 0; j < body.shapes.length; j++) - { - var shape = body.shapes[j]; - - if (shape.pointQuery(p)) - { - if (!refShape) - { - return shape; - } - - if (!firstShape) - { - firstShape = shape; - } - - if (shape == refShape) - { - refShape = null; - } - } - } - } - - return firstShape; - } - - public findBodyByPoint(p, refBody: Body) { - - var firstBody; - - for (var i = 0; i < this.bodies.length; i++) - { - var body = this.bodies[i]; - - if (!body) - { - continue; - } - - for (var j = 0; j < body.shapes.length; j++) - { - var shape = body.shapes[j]; - - if (shape.pointQuery(p)) - { - if (!refBody) - { - return shape.body; - } - - if (!firstBody) - { - firstBody = shape.body; - } - - if (shape.body == refBody) - { - refBody = null; - } - - break; - } - } - } - - return firstBody; - - } - - public shapeById(id) { - - var shape; - - for (var i = 0; i < this.bodies.length; i++) - { - var body: Body = this.bodies[i]; - - if (!body) - { - continue; - } - - for (var j = 0; j < body.shapes.length; j++) - { - if (body.shapes[j].id == id) - { - return body.shapes[j]; - } - } - } - - return null; - } - - public jointById(id) { - - var index = this.jointHash[id]; - - if (index != undefined) - { - return this.joints[index]; - } - - return null; - } - - public findVertexByPoint(p, minDist, refVertexId) { - - var firstVertexId = -1; - - refVertexId = refVertexId || -1; - - for (var i = 0; i < this.bodies.length; i++) - { - var body = this.bodies[i]; - - if (!body) - { - continue; - } - - for (var j = 0; j < body.shapes.length; j++) - { - var shape = body.shapes[j]; - var index = shape.findVertexByPoint(p, minDist); - - if (index != -1) - { - var vertex = (shape.id << 16) | index; - - if (refVertexId == -1) - { - return vertex; - } - - if (firstVertexId == -1) - { - firstVertexId = vertex; - } - - if (vertex == refVertexId) - { - refVertexId = -1; - } - } - } - } - - return firstVertexId; - - } - - public findEdgeByPoint(p, minDist, refEdgeId) { - - var firstEdgeId = -1; - - refEdgeId = refEdgeId || -1; - - for (var i = 0; i < this.bodies.length; i++) - { - var body = this.bodies[i]; - - if (!body) - { - continue; - } - - for (var j = 0; j < body.shapes.length; j++) - { - var shape = body.shapes[j]; - - if (shape.type != AdvancedPhysics.SHAPE_TYPE_POLY) - { - continue; - } - - var index = shape.findEdgeByPoint(p, minDist); - - if (index != -1) - { - var edge = (shape.id << 16) | index; - - if (refEdgeId == -1) - { - return edge; - } - - if (firstEdgeId == -1) - { - firstEdgeId = edge; - } - - if (edge == refEdgeId) - { - refEdgeId = -1; - } - } - } - } - - return firstEdgeId; - } - - public findJointByPoint(p, minDist, refJointId) { - - var firstJointId = -1; - - var dsq = minDist * minDist; - - refJointId = refJointId || -1; - - for (var i = 0; i < this.joints.length; i++) - { - var joint = this.joints[i]; - - if (!joint) - { - continue; - } - - var jointId = -1; - - if (Phaser.Vec2Utils.distanceSq(p, joint.getWorldAnchor1()) < dsq) - { - jointId = (joint.id << 16 | 0); - } - else if (Phaser.Vec2Utils.distanceSq(p, joint.getWorldAnchor2()) < dsq) - { - jointId = (joint.id << 16 | 1); - } - - if (jointId != -1) - { - if (refJointId == -1) - { - return jointId; - } - - if (firstJointId == -1) - { - firstJointId = jointId; - } - - if (jointId == refJointId) - { - refJointId = -1; - } - } - } - - return firstJointId; - } - - private findContactSolver(shape1:IShape, shape2:IShape):ContactSolver { - - Manager.write('findContactSolver. Length: ' + this._cl); - - for (var i = 0; i < this._cl; i++) - { - var contactSolver: ContactSolver = this.contactSolvers[i]; - - if (shape1 == contactSolver.shape1 && shape2 == contactSolver.shape2) - { - return contactSolver; - } - } - - return null; - - } - - private genTemporalContactSolvers() { - - Manager.write('genTemporalContactSolvers'); - - this._cl = 0; - this.contactSolvers.length = 0; - this.numContacts = 0; - - for (var body1Index = 0; body1Index < this._bl; body1Index++) - { - if (!this.bodies[body1Index]) - { - continue; - } - - this.bodies[body1Index].stepCount = this.stepCount; - - for (var body2Index = 0; body2Index < this._bl; body2Index++) - { - if (this.bodies[body1Index].inContact(this.bodies[body2Index]) == false) - { - continue; - } - - Manager.write('body1 and body2 intersect'); - - for (var i = 0; i < this.bodies[body1Index].shapesLength; i++) - { - for (var j = 0; j < this.bodies[body2Index].shapesLength; j++) - { - this._shape1 = this.bodies[body1Index].shapes[i]; - this._shape2 = this.bodies[body2Index].shapes[j]; - - var contactArr = []; - - if (!AdvancedPhysics.collision.collide(this._shape1, this._shape2, contactArr)) - { - continue; - } - - if (this._shape1.type > this._shape2.type) - { - var temp = this._shape1; - this._shape1 = this._shape2; - this._shape2 = temp; - } - - this.numContacts += contactArr.length; - - // Result stored in this._contactSolver (see what we can do about generating some re-usable solvers) - var contactSolver: ContactSolver = this.findContactSolver(this._shape1, this._shape2); - - Manager.write('findContactSolver result: ' + contactSolver); - - if (contactSolver) - { - contactSolver.update(contactArr); - this.contactSolvers.push(contactSolver); - } - else - { - Manager.write('awake both bodies'); - - this.bodies[body1Index].awake(true); - this.bodies[body2Index].awake(true); - - var newContactSolver = new ContactSolver(this._shape1, this._shape2); - newContactSolver.contacts = contactArr; - newContactSolver.elasticity = Math.max(this._shape1.elasticity, this._shape2.elasticity); - newContactSolver.friction = Math.sqrt(this._shape1.friction * this._shape2.friction); - - this.contactSolvers.push(newContactSolver); - Manager.write('new contact solver'); - } - } - } - } - } - - this._cl = this.contactSolvers.length; - - } - - private initSolver(warmStarting) { - - Manager.write('initSolver'); - Manager.write('contactSolvers.length: ' + this._cl); - - // Initialize contact solvers - for (var c = 0; c < this._cl; c++) - { - this.contactSolvers[c].initSolver(this._deltaInv); - - // Warm starting (apply cached impulse) - if (warmStarting) - { - this.contactSolvers[c].warmStart(); - } - - } - - // Initialize joint solver - for (var j = 0; j < this.joints.length; j++) - { - if (this.joints[j]) - { - this.joints[j].initSolver(this._delta, warmStarting); - } - } - - // Warm starting (apply cached impulse) - /* - if (warmStarting) - { - for (var c = 0; c < this._cl; c++) - { - this.contactSolvers[c].warmStart(); - } - } - */ - - } - - private velocitySolver(iterations:number) { - - Manager.write('velocitySolver, iterations: ' + iterations + ' csa len: ' + this._cl); - - for (var i = 0; i < iterations; i++) - { - for (var j = 0; j < this._jl; j++) - { - if (this.joints[j]) - { - this.joints[j].solveVelocityConstraints(); - } - } - - for (var c = 0; c < this._cl; c++) - { - this.contactSolvers[c].solveVelocityConstraints(); - } - } - - } - - private positionSolver(iterations:number):bool { - - this._positionSolved = false; - - for (var i = 0; i < iterations; i++) - { - this._contactsOk = true; - this._jointsOk = true; - - for (var c = 0; c < this._cl; c++) - { - this._contactsOk = this.contactSolvers[c].solvePositionConstraints() && this._contactsOk; - } - - for (var j = 0; j < this._jl; j++) - { - if (this.joints[j]) - { - this._jointsOk = this.joints[j].solvePositionConstraints() && this._jointsOk; - } - } - - if (this._contactsOk && this._jointsOk) - { - // exit early if the position errors are small - this._positionSolved = true; - break; - } - } - - return this._positionSolved; - - } - - // Step through the physics simulation - public step(dt: number, velocityIterations: number, positionIterations: number, warmStarting: bool, allowSleep: bool) { - - Manager.clear(); - Manager.write('Space step ' + this.stepCount); - - this._delta = dt; - this._deltaInv = 1 / dt; - this._bl = this.bodies.length; - this._jl = this.joints.length; - - this.stepCount++; - - // 1) Generate Contact Solvers (into the this.contactSolvers array) - this.genTemporalContactSolvers(); - - Manager.dump("Contact Solvers", this.bodies[1]); - - // 2) Initialize the Contact Solvers - this.initSolver(warmStarting); - - Manager.dump("Init Solver", this.bodies[1]); - - // 3) Intergrate velocity - for (var i = 0; i < this._bl; i++) - { - if (this.bodies[i] && this.bodies[i].isDynamic && this.bodies[i].isAwake) - { - this.bodies[i].updateVelocity(this.gravity, this._delta, this.damping); - } - } - - Manager.dump("Update Velocity", this.bodies[1]); - - // 4) Awaken bodies via joints - for (var j = 0; i < this._jl; j++) - { - if (!this.joints[j]) - { - continue; - } - - // combine - var awake1 = this.joints[j].body1.isAwake && !this.joints[j].body1.isStatic; - var awake2 = this.joints[j].body2.isAwake && !this.joints[j].body2.isStatic; - - if (awake1 ^ awake2) - { - if (!awake1) - { - this.joints[j].body1.awake(true); - } - - if (!awake2) - { - this.joints[j].body2.awake(true); - } - } - } - - // 5) Iterative velocity constraints solver - this.velocitySolver(velocityIterations); - - Manager.dump("Velocity Solvers", this.bodies[1]); - - // 6) Integrate position - for (var i = 0; i < this._bl; i++) - { - if (this.bodies[i] && this.bodies[i].isDynamic && this.bodies[i].isAwake) - { - this.bodies[i].updatePosition(this._delta); - } - } - - Manager.dump("Update Position", this.bodies[1]); - - // 7) Process breakable joint - for (var i = 0; i < this._jl; i++) - { - if (this.joints[i] && this.joints[i].breakable && (this.joints[i].getReactionForce(this._deltaInv).lengthSq() >= this.joints[i].maxForce * this.joints[i].maxForce)) - { - this.removeJoint(this.joints[i]); - } - } - - // 8) Iterative position constraints solver (result stored in this._positionSolved) - this.positionSolver(positionIterations); - - Manager.dump("Position Solver", this.bodies[1]); - - // 9) Sync the Transforms - for (var i = 0; i < this._bl; i++) - { - if (this.bodies[i]) - { - this.bodies[i].syncTransform(); - } - } - - Manager.dump("Sync Transform", this.bodies[1]); - - // 10) Post solve collision callback - if (this.postSolve) - { - for (var i = 0; i < this._cl; i++) - { - this.postSolve(this.contactSolvers[i]); - } - } - - // 11) Cache Body Data - for (var i = 0; i < this._bl; i++) - { - if (this.bodies[i] && this.bodies[i].isDynamic && this.bodies[i].isAwake) - { - this.bodies[i].cacheData('post solve collision callback'); - } - } - - Manager.dump("Cache Data", this.bodies[1]); - - Manager.writeAll(); - - // 12) Process sleeping - if (allowSleep) - { - this._minSleepTime = 999999; - - for (var i = 0; i < this._bl; i++) - { - if (!this.bodies[i] || this.bodies[i].isDynamic == false) - { - continue; - } - - if (this.bodies[i].angularVelocity * this.bodies[i].angularVelocity > this._angTolSqr || this.bodies[i].velocity.dot(this.bodies[i].velocity) > this._linTolSqr) - { - this.bodies[i].sleepTime = 0; - this._minSleepTime = 0; - } - else - { - this.bodies[i].sleepTime += this._delta; - this._minSleepTime = Math.min(this._minSleepTime, this.bodies[i].sleepTime); - } - } - - if (this._positionSolved && this._minSleepTime >= Space.TIME_TO_SLEEP) - { - for (var i = 0; i < this._bl; i++) - { - if (this.bodies[i]) - { - this.bodies[i].awake(false); - } - } - } - } - } - - } - -} \ No newline at end of file diff --git a/wip/physics/Transform.js b/wip/physics/Transform.js deleted file mode 100644 index 98c0c8c0..00000000 --- a/wip/physics/Transform.js +++ /dev/null @@ -1,53 +0,0 @@ -/// -/// -/** -* Phaser - 2D Transform -* -* A 2D Transform -*/ -var Phaser; -(function (Phaser) { - var Transform = (function () { - /** - * Creates a new 2D Transform object. - * @class Transform - * @constructor - * @return {Transform} This object - **/ - function Transform(pos, angle) { - this.t = Phaser.Vec2Utils.clone(pos); - this.c = Math.cos(angle); - this.s = Math.sin(angle); - this.angle = angle; - } - Transform.prototype.toString = function () { - return 't=' + this.t.toString() + ' c=' + this.c + ' s=' + this.s + ' a=' + this.angle; - }; - Transform.prototype.setTo = function (pos, angle) { - this.t.copyFrom(pos); - this.c = Math.cos(angle); - this.s = Math.sin(angle); - return this; - }; - Transform.prototype.setRotation = function (angle) { - if(angle !== this.angle) { - this.c = Math.cos(angle); - this.s = Math.sin(angle); - this.angle = angle; - } - return this; - }; - Transform.prototype.setPosition = function (p) { - this.t.copyFrom(p); - return this; - }; - Transform.prototype.identity = function () { - this.t.setTo(0, 0); - this.c = 1; - this.s = 0; - return this; - }; - return Transform; - })(); - Phaser.Transform = Transform; -})(Phaser || (Phaser = {})); diff --git a/wip/physics/Transform.ts b/wip/physics/Transform.ts deleted file mode 100644 index 6c451048..00000000 --- a/wip/physics/Transform.ts +++ /dev/null @@ -1,83 +0,0 @@ -/// -/// - -/** -* Phaser - 2D Transform -* -* A 2D Transform -*/ - -module Phaser { - - export class Transform { - - /** - * Creates a new 2D Transform object. - * @class Transform - * @constructor - * @return {Transform} This object - **/ - constructor(pos: Phaser.Vec2, angle: number) { - - this.t = Phaser.Vec2Utils.clone(pos); - this.c = Math.cos(angle); - this.s = Math.sin(angle); - this.angle = angle; - - } - - public t: Phaser.Vec2; - public c: number; - public s: number; - public angle: number; - - public toString() { - - return 't=' + this.t.toString() + ' c=' + this.c + ' s=' + this.s + ' a=' + this.angle; - - } - - public setTo(pos:Phaser.Vec2, angle:number) { - - this.t.copyFrom(pos); - this.c = Math.cos(angle); - this.s = Math.sin(angle); - - return this; - - } - - public setRotation(angle:number) { - - if (angle !== this.angle) - { - this.c = Math.cos(angle); - this.s = Math.sin(angle); - this.angle = angle; - } - - return this; - - } - - public setPosition(p:Phaser.Vec2) { - - this.t.copyFrom(p); - - return this; - - } - - public identity() { - - this.t.setTo(0, 0); - this.c = 1; - this.s = 0; - - return this; - - } - - } - -} \ No newline at end of file diff --git a/wip/physics/TransformUtils.js b/wip/physics/TransformUtils.js deleted file mode 100644 index 818a4d2d..00000000 --- a/wip/physics/TransformUtils.js +++ /dev/null @@ -1,39 +0,0 @@ -/// -/// -/// -/** -* Phaser - TransformUtils -* -* A collection of methods useful for manipulating and performing operations on 2D Transforms. -* -*/ -var Phaser; -(function (Phaser) { - var TransformUtils = (function () { - function TransformUtils() { } - TransformUtils.rotate = function rotate(t, v, out) { - if (typeof out === "undefined") { out = new Phaser.Vec2(); } - //return new vec2(v.x * this.c - v.y * this.s, v.x * this.s + v.y * this.c); - return out.setTo(v.x * t.c - v.y * t.s, v.x * t.s + v.y * t.c); - }; - TransformUtils.unrotate = function unrotate(t, v, out) { - if (typeof out === "undefined") { out = new Phaser.Vec2(); } - //return new vec2(v.x * this.c + v.y * this.s, -v.x * this.s + v.y * this.c); - return out.setTo(v.x * t.c + v.y * t.s, -v.x * t.s + v.y * t.c); - }; - TransformUtils.transform = function transform(t, v, out) { - if (typeof out === "undefined") { out = new Phaser.Vec2(); } - //return new vec2(v.x * this.c - v.y * this.s + this.t.x, v.x * this.s + v.y * this.c + this.t.y); - return out.setTo(v.x * t.c - v.y * t.s + t.t.x, v.x * t.s + v.y * t.c + t.t.y); - }; - TransformUtils.untransform = function untransform(t, v, out) { - if (typeof out === "undefined") { out = new Phaser.Vec2(); } - var px = v.x - t.t.x; - var py = v.y - t.t.y; - //return new vec2(px * this.c + py * this.s, -px * this.s + py * this.c); - return out.setTo(px * t.c + py * t.s, -px * t.s + py * t.c); - }; - return TransformUtils; - })(); - Phaser.TransformUtils = TransformUtils; -})(Phaser || (Phaser = {})); diff --git a/wip/physics/TransformUtils.ts b/wip/physics/TransformUtils.ts deleted file mode 100644 index 1f199209..00000000 --- a/wip/physics/TransformUtils.ts +++ /dev/null @@ -1,43 +0,0 @@ -/// -/// -/// - -/** -* Phaser - TransformUtils -* -* A collection of methods useful for manipulating and performing operations on 2D Transforms. -* -*/ - -module Phaser { - - export class TransformUtils { - - public static rotate(t: Transform, v:Phaser.Vec2, out?: Vec2 = new Vec2):Phaser.Vec2 { - //return new vec2(v.x * this.c - v.y * this.s, v.x * this.s + v.y * this.c); - return out.setTo(v.x * t.c - v.y * t.s, v.x * t.s + v.y * t.c); - } - - public static unrotate(t: Transform, v:Phaser.Vec2, out?: Vec2 = new Vec2):Phaser.Vec2 { - //return new vec2(v.x * this.c + v.y * this.s, -v.x * this.s + v.y * this.c); - return out.setTo(v.x * t.c + v.y * t.s, -v.x * t.s + v.y * t.c); - } - - public static transform(t: Transform, v:Phaser.Vec2, out?: Vec2 = new Vec2):Phaser.Vec2 { - //return new vec2(v.x * this.c - v.y * this.s + this.t.x, v.x * this.s + v.y * this.c + this.t.y); - return out.setTo(v.x * t.c - v.y * t.s + t.t.x, v.x * t.s + v.y * t.c + t.t.y); - } - - public static untransform(t: Transform, v:Phaser.Vec2, out?: Vec2 = new Vec2):Phaser.Vec2 { - - var px = v.x - t.t.x; - var py = v.y - t.t.y; - - //return new vec2(px * this.c + py * this.s, -px * this.s + py * this.c); - return out.setTo(px * t.c + py * t.s, -px * t.s + py * t.c); - - } - - } - -} \ No newline at end of file diff --git a/wip/physics/joints/IJoint.js b/wip/physics/joints/IJoint.js deleted file mode 100644 index 38c4f862..00000000 --- a/wip/physics/joints/IJoint.js +++ /dev/null @@ -1,3 +0,0 @@ -var Phaser; -(function (Phaser) { - })(Phaser || (Phaser = {})); diff --git a/wip/physics/joints/IJoint.js.map b/wip/physics/joints/IJoint.js.map deleted file mode 100644 index 715856b3..00000000 --- a/wip/physics/joints/IJoint.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"IJoint.js","sources":["IJoint.ts"],"names":["Phaser"],"mappings":"AAYA,IAAO,MAAM;AA6BZ,CA7BD,UAAO,MAAM;IA6BbA,CAACA,2BAAA"} \ No newline at end of file diff --git a/wip/physics/joints/IJoint.ts b/wip/physics/joints/IJoint.ts deleted file mode 100644 index cb940a12..00000000 --- a/wip/physics/joints/IJoint.ts +++ /dev/null @@ -1,43 +0,0 @@ -/// -/// -/// -/// -/// - -/** -* Phaser - Advanced Physics - Joint -* -* Based on the work Ju Hyung Lee started in JS PhyRus. -*/ - -module Phaser.Physics { - - export interface IJoint { - - id: number; - type: number; - - body1: Phaser.Physics.Body; - body2: Phaser.Physics.Body; - - collideConnected; // bool? - maxForce: number; - breakable: bool; - - anchor1: Phaser.Vec2; - anchor2: Phaser.Vec2; - - getWorldAnchor1(); - getWorldAnchor2(); - setWorldAnchor1(anchor1); - setWorldAnchor2(anchor2); - - initSolver(dt, warmStarting); - solveVelocityConstraints(); - solvePositionConstraints(); - getReactionForce(dt_inv); - - } - -} - diff --git a/wip/physics/joints/Joint.js b/wip/physics/joints/Joint.js deleted file mode 100644 index 8999f0e3..00000000 --- a/wip/physics/joints/Joint.js +++ /dev/null @@ -1,41 +0,0 @@ -var Phaser; -(function (Phaser) { - /// - /// - /// - /// - /// - /** - * Phaser - Advanced Physics - Joint - * - * Based on the work Ju Hyung Lee started in JS PhyRus. - */ - (function (Physics) { - var Joint = (function () { - function Joint(type, body1, body2, collideConnected) { - this.id = Physics.AdvancedPhysics.jointCounter++; - this.type = type; - this.body1 = body1; - this.body2 = body2; - this.collideConnected = collideConnected; - this.maxForce = 9999999999; - this.breakable = false; - } - Joint.prototype.getWorldAnchor1 = function () { - return this.body1.getWorldPoint(this.anchor1); - }; - Joint.prototype.getWorldAnchor2 = function () { - return this.body2.getWorldPoint(this.anchor2); - }; - Joint.prototype.setWorldAnchor1 = function (anchor1) { - this.anchor1 = this.body1.getLocalPoint(anchor1); - }; - Joint.prototype.setWorldAnchor2 = function (anchor2) { - this.anchor2 = this.body2.getLocalPoint(anchor2); - }; - return Joint; - })(); - Physics.Joint = Joint; - })(Phaser.Physics || (Phaser.Physics = {})); - var Physics = Phaser.Physics; -})(Phaser || (Phaser = {})); diff --git a/wip/physics/joints/Joint.js.map b/wip/physics/joints/Joint.js.map deleted file mode 100644 index 90974efb..00000000 --- a/wip/physics/joints/Joint.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Joint.js","sources":["Joint.ts"],"names":["Phaser","Phaser.Physics","Phaser.Physics.Joint","Phaser.Physics.Joint.constructor","Phaser.Physics.Joint.getWorldAnchor1","Phaser.Physics.Joint.getWorldAnchor2","Phaser.Physics.Joint.setWorldAnchor1","Phaser.Physics.Joint.setWorldAnchor2"],"mappings":"AAYA,IAAO,MAAM;AAmDZ,CAnDD,UAAO,MAAM;IAZbA,2CAA2CA;IAC3CA,4CAA4CA;IAC5CA,gDAAgDA;IAChDA,sCAAsCA;IACtCA,mCAAmCA;IAEnCA;;;;MAIEA;KAEKA,UAAOA,OAAOA;QAEjBC;YAEIC,SAFSA,KAAKA,CAEFA,IAAYA,EAAEA,KAAyBA,EAAEA,KAAyBA,EAAEA,gBAAgBA;gBAE5FC,IAAIA,CAACA,EAAEA,GAAGA,MAAMA,CAACA,OAAOA,CAACA,OAAOA,CAACA,YAAYA,EAAEA;gBAC/CA,IAAIA,CAACA,IAAIA,GAAGA,IAAIA;gBAEhBA,IAAIA,CAACA,KAAKA,GAAGA,KAAKA;gBAClBA,IAAIA,CAACA,KAAKA,GAAGA,KAAKA;gBAElBA,IAAIA,CAACA,gBAAgBA,GAAGA,gBAAgBA;gBAExCA,IAAIA,CAACA,QAAQA,GAAGA,UAAUA;gBAC1BA,IAAIA,CAACA,SAASA,GAAGA,KAAKA;YAE1BA,CAACA;YAeDD,kCAAAA;gBACIE,OAAOA,IAAIA,CAACA,KAAKA,CAACA,aAAaA,CAACA,IAAIA,CAACA,OAAOA,CAACA,CAACA;YAClDA,CAACA;YAEDF,kCAAAA;gBACIG,OAAOA,IAAIA,CAACA,KAAKA,CAACA,aAAaA,CAACA,IAAIA,CAACA,OAAOA,CAACA,CAACA;YAClDA,CAACA;YAEDH,kCAAAA,UAAuBA,OAAOA;gBAC1BI,IAAIA,CAACA,OAAOA,GAAGA,IAAIA,CAACA,KAAKA,CAACA,aAAaA,CAACA,OAAOA,CAACA;YACpDA,CAACA;YAEDJ,kCAAAA,UAAuBA,OAAOA;gBAC1BK,IAAIA,CAACA,OAAOA,GAAGA,IAAIA,CAACA,KAAKA,CAACA,aAAaA,CAACA,OAAOA,CAACA;YACpDA,CAACA;YAELL;AAACA,QAADA,CAACA,IAAAD;QA9CDA,sBA8CCA,QAAAA;IAGLA,CAACA,2CAAAD;IAnDMA;AAmDNA,CAAAA,2BAAA"} \ No newline at end of file diff --git a/wip/physics/joints/Joint.ts b/wip/physics/joints/Joint.ts deleted file mode 100644 index 48d8b277..00000000 --- a/wip/physics/joints/Joint.ts +++ /dev/null @@ -1,64 +0,0 @@ -/// -/// -/// -/// -/// - -/** -* Phaser - Advanced Physics - Joint -* -* Based on the work Ju Hyung Lee started in JS PhyRus. -*/ - -module Phaser.Physics { - - export class Joint { - - constructor(type: number, body1:Phaser.Physics.Body, body2:Phaser.Physics.Body, collideConnected) { - - this.id = AdvancedPhysics.jointCounter++; - this.type = type; - - this.body1 = body1; - this.body2 = body2; - - this.collideConnected = collideConnected; - - this.maxForce = 9999999999; - this.breakable = false; - - } - - public id: number; - public type: number; - - public body1: Phaser.Physics.Body; - public body2: Phaser.Physics.Body; - - public collideConnected; // bool? - public maxForce: number; - public breakable: bool; - - public anchor1: Phaser.Vec2; - public anchor2: Phaser.Vec2; - - public getWorldAnchor1() { - return this.body1.getWorldPoint(this.anchor1); - } - - public getWorldAnchor2() { - return this.body2.getWorldPoint(this.anchor2); - } - - public setWorldAnchor1(anchor1) { - this.anchor1 = this.body1.getLocalPoint(anchor1); - } - - public setWorldAnchor2(anchor2) { - this.anchor2 = this.body2.getLocalPoint(anchor2); - } - - } - - -} \ No newline at end of file diff --git a/wip/physics/shapes/Box.js b/wip/physics/shapes/Box.js deleted file mode 100644 index 892a27f2..00000000 --- a/wip/physics/shapes/Box.js +++ /dev/null @@ -1,59 +0,0 @@ -var __extends = this.__extends || function (d, b) { - function __() { this.constructor = d; } - __.prototype = b.prototype; - d.prototype = new __(); -}; -var Phaser; -(function (Phaser) { - (function (Physics) { - /// - /// - /// - /// - /// - /** - * Phaser - Advanced Physics - Shapes - Box - * - * Based on the work Ju Hyung Lee started in JS PhyRus. - */ - (function (Shapes) { - var Box = (function (_super) { - __extends(Box, _super); - // Give in pixels - function Box(x, y, width, height) { - console.log('Box px', x, y, width, height); - x = Phaser.Physics.AdvancedPhysics.pixelsToMeters(x); - y = Phaser.Physics.AdvancedPhysics.pixelsToMeters(y); - width = Phaser.Physics.AdvancedPhysics.pixelsToMeters(width); - height = Phaser.Physics.AdvancedPhysics.pixelsToMeters(height); - console.log('Box m', x, y, width, height); - var hw = width * 0.5; - var hh = height * 0.5; - console.log('Box hh', hw, hh); - _super.call(this, [ - { - x: -hw + x, - y: +hh + y - }, - { - x: -hw + x, - y: -hh + y - }, - { - x: +hw + x, - y: -hh + y - }, - { - x: +hw + x, - y: +hh + y - } - ]); - } - return Box; - })(Phaser.Physics.Shapes.Poly); - Shapes.Box = Box; - })(Physics.Shapes || (Physics.Shapes = {})); - var Shapes = Physics.Shapes; - })(Phaser.Physics || (Phaser.Physics = {})); - var Physics = Phaser.Physics; -})(Phaser || (Phaser = {})); diff --git a/wip/physics/shapes/Box.js.map b/wip/physics/shapes/Box.js.map deleted file mode 100644 index 1870ec11..00000000 --- a/wip/physics/shapes/Box.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Box.js","sources":["Box.ts"],"names":["Phaser","Phaser.Physics","Phaser.Physics.Shapes","Phaser.Physics.Shapes.Box","Phaser.Physics.Shapes.Box.constructor"],"mappings":";;;;;AAYA,IAAO,MAAM;AAgCZ,CAhCD,UAAO,MAAM;KAANA,UAAOA,OAAOA;QAZrBC,2CAA2CA;QAC3CA,sCAAsCA;QACtCA,mCAAmCA;QACnCA,iCAAiCA;QACjCA,gCAAgCA;QAEhCA;;;;UAIEA;SAEKA,UAAeA,MAAMA;YAExBC;;gBAGIC,kBADkBA;gBAClBA,SAHSA,GAAGA,CAGAA,CAACA,EAAEA,CAACA,EAAEA,KAAKA,EAAEA,MAAMA;oBAE3BC,OAAOA,CAACA,GAAGA,CAACA,QAAQA,EAAEA,CAACA,EAAEA,CAACA,EAAEA,KAAKA,EAAEA,MAAMA,CAACA;oBAE1CA,CAACA,GAAGA,eAAOA,CAACA,cAAcA,CAACA,CAACA,CAACA;oBAC7BA,CAACA,GAAGA,eAAOA,CAACA,cAAcA,CAACA,CAACA,CAACA;oBAC7BA,KAAKA,GAAGA,eAAOA,CAACA,cAAcA,CAACA,KAAKA,CAACA;oBACrCA,MAAMA,GAAGA,eAAOA,CAACA,cAAcA,CAACA,MAAMA,CAACA;oBAEvCA,OAAOA,CAACA,GAAGA,CAACA,OAAOA,EAAEA,CAACA,EAAEA,CAACA,EAAEA,KAAKA,EAAEA,MAAMA,CAACA;oBAE5CA,IAAIA,EAAEA,GAAGA,KAAKA,GAAGA,GAAGA,CAACA;oBACrBA,IAAIA,EAAEA,GAAGA,MAAMA,GAAGA,GAAGA,CAACA;oBAEnBA,OAAOA,CAACA,GAAGA,CAACA,QAAQA,EAAEA,EAAEA,EAAEA,EAAEA,CAACA;oBAEhCA,8BAAMA;gBACCA;oBAAEA,CAACA,EAAEA,CAACA,EAAEA,GAAGA,CAACA;oBAAEA,CAACA,EAAEA,CAACA,EAAEA,GAAGA,CAACA;iBAAEA;gBAC1BA;oBAAEA,CAACA,EAAEA,CAACA,EAAEA,GAAGA,CAACA;oBAAEA,CAACA,EAAEA,CAACA,EAAEA,GAAGA,CAACA;iBAAEA;gBAC1BA;oBAAEA,CAACA,EAAEA,CAACA,EAAEA,GAAGA,CAACA;oBAAEA,CAACA,EAAEA,CAACA,EAAEA,GAAGA,CAACA;iBAAEA;gBAC1BA;oBAAEA,CAACA,EAAEA,CAACA,EAAEA,GAAGA,CAACA;oBAAEA,CAACA,EAAEA,CAACA,EAAEA,GAAGA,CAACA;iBAAEA;aAChCA,CAILA;gBAFGA,CAACA;gBAELD;AAACA,YAADA,CAACA,EA5BwBD,MAAMA,CAACA,OAAOA,CAACA,MAAMA,CAACA,IAAIA,EA4BlDA;YA5BDA,iBA4BCA,YAAAA;QAELA,CAACA,2CAAAD;QAhCMA;AAgCNA,IAADA,CAACA,2CAAAD;IAhCMA;AAgCNA,CAAAA,2BAAA"} \ No newline at end of file diff --git a/wip/physics/shapes/Box.ts b/wip/physics/shapes/Box.ts deleted file mode 100644 index 90743c74..00000000 --- a/wip/physics/shapes/Box.ts +++ /dev/null @@ -1,45 +0,0 @@ -/// -/// -/// -/// -/// - -/** -* Phaser - Advanced Physics - Shapes - Box -* -* Based on the work Ju Hyung Lee started in JS PhyRus. -*/ - -module Phaser.Physics.Shapes { - - export class Box extends Phaser.Physics.Shapes.Poly { - - // Give in pixels - constructor(x, y, width, height) { - - console.log('Box px', x, y, width, height); - - x = Phaser.Physics.AdvancedPhysics.pixelsToMeters(x); - y = Phaser.Physics.AdvancedPhysics.pixelsToMeters(y); - width = Phaser.Physics.AdvancedPhysics.pixelsToMeters(width); - height = Phaser.Physics.AdvancedPhysics.pixelsToMeters(height); - - console.log('Box m', x, y, width, height); - - var hw = width * 0.5; - var hh = height * 0.5; - - console.log('Box hh', hw, hh); - - super([ - { x: -hw + x, y: +hh + y }, - { x: -hw + x, y: -hh + y }, - { x: +hw + x, y: -hh + y }, - { x: +hw + x, y: +hh + y } - ]); - - } - - } - -} diff --git a/wip/physics/shapes/Circle.js b/wip/physics/shapes/Circle.js deleted file mode 100644 index df298613..00000000 --- a/wip/physics/shapes/Circle.js +++ /dev/null @@ -1,87 +0,0 @@ -var __extends = this.__extends || function (d, b) { - function __() { this.constructor = d; } - __.prototype = b.prototype; - d.prototype = new __(); -}; -var Phaser; -(function (Phaser) { - (function (Physics) { - /// - /// - /// - /// - /// - /** - * Phaser - Advanced Physics - Shape - Circle - * - * Based on the work Ju Hyung Lee started in JS PhyRus. - */ - (function (Shapes) { - var Circle = (function (_super) { - __extends(Circle, _super); - function Circle(radius, x, y) { - if (typeof x === "undefined") { x = 0; } - if (typeof y === "undefined") { y = 0; } - _super.call(this, Physics.AdvancedPhysics.SHAPE_TYPE_CIRCLE); - x = Physics.AdvancedPhysics.pixelsToMeters(x); - y = Physics.AdvancedPhysics.pixelsToMeters(y); - radius = Physics.AdvancedPhysics.pixelsToMeters(radius); - this.center = new Phaser.Vec2(x, y); - this.radius = radius; - this.tc = new Phaser.Vec2(); - this.finishVerts(); - } - Circle.prototype.finishVerts = function () { - this.radius = Math.abs(this.radius); - }; - Circle.prototype.duplicate = function () { - return new Circle(this.center.x, this.center.y, this.radius); - }; - Circle.prototype.recenter = function (c) { - this.center.subtract(c); - }; - Circle.prototype.transform = function (xf) { - Phaser.TransformUtils.transform(xf, this.center, this.center); - //this.center = xf.transform(this.center); - }; - Circle.prototype.untransform = function (xf) { - Phaser.TransformUtils.untransform(xf, this.center, this.center); - //this.center = xf.untransform(this.center); - }; - Circle.prototype.area = function () { - return Physics.AdvancedPhysics.areaForCircle(this.radius, 0); - }; - Circle.prototype.centroid = function () { - return Phaser.Vec2Utils.clone(this.center); - }; - Circle.prototype.inertia = function (mass) { - return Physics.AdvancedPhysics.inertiaForCircle(mass, this.center, this.radius, 0); - }; - Circle.prototype.cacheData = function (xf) { - Phaser.TransformUtils.transform(xf, this.center, this.tc); - //this.tc = xf.transform(this.center); - this.bounds.mins.setTo(this.tc.x - this.radius, this.tc.y - this.radius); - this.bounds.maxs.setTo(this.tc.x + this.radius, this.tc.y + this.radius); - }; - Circle.prototype.pointQuery = function (p) { - //return vec2.distsq(this.tc, p) < (this.r * this.r); - return Phaser.Vec2Utils.distanceSq(this.tc, p) < (this.radius * this.radius); - }; - Circle.prototype.findVertexByPoint = function (p, minDist) { - var dsq = minDist * minDist; - if(Phaser.Vec2Utils.distanceSq(this.tc, p) < dsq) { - return 0; - } - return -1; - }; - Circle.prototype.distanceOnPlane = function (n, d) { - Phaser.Vec2Utils.dot(n, this.tc) - this.radius - d; - }; - return Circle; - })(Phaser.Physics.Shape); - Shapes.Circle = Circle; - })(Physics.Shapes || (Physics.Shapes = {})); - var Shapes = Physics.Shapes; - })(Phaser.Physics || (Phaser.Physics = {})); - var Physics = Phaser.Physics; -})(Phaser || (Phaser = {})); diff --git a/wip/physics/shapes/Circle.js.map b/wip/physics/shapes/Circle.js.map deleted file mode 100644 index 46921cb2..00000000 --- a/wip/physics/shapes/Circle.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Circle.js","sources":["Circle.ts"],"names":["Phaser","Phaser.Physics","Phaser.Physics.Shapes","Phaser.Physics.Shapes.Circle","Phaser.Physics.Shapes.Circle.constructor","Phaser.Physics.Shapes.Circle.finishVerts","Phaser.Physics.Shapes.Circle.duplicate","Phaser.Physics.Shapes.Circle.recenter","Phaser.Physics.Shapes.Circle.transform","Phaser.Physics.Shapes.Circle.untransform","Phaser.Physics.Shapes.Circle.area","Phaser.Physics.Shapes.Circle.centroid","Phaser.Physics.Shapes.Circle.inertia","Phaser.Physics.Shapes.Circle.cacheData","Phaser.Physics.Shapes.Circle.pointQuery","Phaser.Physics.Shapes.Circle.findVertexByPoint","Phaser.Physics.Shapes.Circle.distanceOnPlane"],"mappings":";;;;;AAYA,IAAO,MAAM;AA4FZ,CA5FD,UAAO,MAAM;KAANA,UAAOA,OAAOA;QAZrBC,2CAA2CA;QAC3CA,gDAAgDA;QAChDA,sCAAsCA;QACtCA,mCAAmCA;QACnCA,iCAAiCA;QAEjCA;;;;UAIEA;SAEKA,UAAeA,MAAMA;YAExBC;;gBAEIC,SAFSA,MAAMA,CAEHA,MAAcA,EAAEA,CAAcA,EAAEA,CAAcA;oBAA9BC,gCAAAA,CAACA,GAAYA,CAACA;AAAAA,oBAAEA,gCAAAA,CAACA,GAAYA,CAACA;AAAAA,oBAEtDA,8BAAMA,eAAOA,CAACA,iBAAiBA,CAoFtCA;oBAlFOA,CAACA,GAAGA,eAAOA,CAACA,cAAcA,CAACA,CAACA,CAACA;oBAC7BA,CAACA,GAAGA,eAAOA,CAACA,cAAcA,CAACA,CAACA,CAACA;oBAC7BA,MAAMA,GAAGA,eAAOA,CAACA,cAAcA,CAACA,MAAMA,CAACA;oBAEvCA,IAAIA,CAACA,MAAMA,GAAGA,IAAIA,MAAMA,CAACA,IAAIA,CAACA,CAACA,EAAEA,CAACA,CAACA;oBACnCA,IAAIA,CAACA,MAAMA,GAAGA,MAAMA;oBACpBA,IAAIA,CAACA,EAAEA,GAAGA,IAAIA,MAAMA,CAACA,IAAIA,EAAAA;oBAEzBA,IAAIA,CAACA,WAAWA,EAAEA;gBAEtBA,CAACA;gBAMDD,+BAAAA;oBACIE,IAAIA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,GAAGA,CAACA,IAAIA,CAACA,MAAMA,CAACA;gBACvCA,CAACA;gBAEDF,6BAAAA;oBACIG,OAAOA,IAAIA,MAAMA,CAACA,IAAIA,CAACA,MAAMA,CAACA,CAACA,EAAEA,IAAIA,CAACA,MAAMA,CAACA,CAACA,EAAEA,IAAIA,CAACA,MAAMA,CAACA,CAACA;gBACjEA,CAACA;gBAEDH,4BAAAA,UAAgBA,CAAaA;oBACzBI,IAAIA,CAACA,MAAMA,CAACA,QAAQA,CAACA,CAACA,CAACA;gBAC3BA,CAACA;gBAEDJ,6BAAAA,UAAiBA,EAAaA;oBAE1BK,MAAMA,CAACA,cAAcA,CAACA,SAASA,CAACA,EAAEA,EAAEA,IAAIA,CAACA,MAAMA,EAAEA,IAAIA,CAACA,MAAMA,CAACA;oBAC7DA,0CAA0CA;oCAC9CA,CAACA;gBAEDL,+BAAAA,UAAmBA,EAAaA;oBAC5BM,MAAMA,CAACA,cAAcA,CAACA,WAAWA,CAACA,EAAEA,EAAEA,IAAIA,CAACA,MAAMA,EAAEA,IAAIA,CAACA,MAAMA,CAACA;oBAC/DA,4CAA4CA;oCAChDA,CAACA;gBAEDN,wBAAAA;oBACIO,OAAOA,eAAOA,CAACA,aAAaA,CAACA,IAAIA,CAACA,MAAMA,EAAEA,CAACA,CAACA,CAACA;gBACjDA,CAACA;gBAEDP,4BAAAA;oBACIQ,OAAOA,MAAMA,CAACA,SAASA,CAACA,KAAKA,CAACA,IAAIA,CAACA,MAAMA,CAACA,CAACA;gBAC/CA,CAACA;gBAEDR,2BAAAA,UAAeA,IAAYA;oBACvBS,OAAOA,eAAOA,CAACA,gBAAgBA,CAACA,IAAIA,EAAEA,IAAIA,CAACA,MAAMA,EAAEA,IAAIA,CAACA,MAAMA,EAAEA,CAACA,CAACA,CAACA;gBACvEA,CAACA;gBAEDT,6BAAAA,UAAiBA,EAAaA;oBAE1BU,MAAMA,CAACA,cAAcA,CAACA,SAASA,CAACA,EAAEA,EAAEA,IAAIA,CAACA,MAAMA,EAAEA,IAAIA,CAACA,EAAEA,CAACA;oBACzDA,sCAAsCA;oBAEtCA,IAAIA,CAACA,MAAMA,CAACA,IAAIA,CAACA,KAAKA,CAACA,IAAIA,CAACA,EAAEA,CAACA,CAACA,GAAGA,IAAIA,CAACA,MAAMA,EAAEA,IAAIA,CAACA,EAAEA,CAACA,CAACA,GAAGA,IAAIA,CAACA,MAAMA,CAACA;oBACxEA,IAAIA,CAACA,MAAMA,CAACA,IAAIA,CAACA,KAAKA,CAACA,IAAIA,CAACA,EAAEA,CAACA,CAACA,GAAGA,IAAIA,CAACA,MAAMA,EAAEA,IAAIA,CAACA,EAAEA,CAACA,CAACA,GAAGA,IAAIA,CAACA,MAAMA,CAACA;gBAE5EA,CAACA;gBAEDV,8BAAAA,UAAkBA,CAAaA;oBAC3BW,qDAAqDA;oBACrDA,OAAOA,MAAMA,CAACA,SAASA,CAACA,UAAUA,CAACA,IAAIA,CAACA,EAAEA,EAAEA,CAACA,CAACA,IAAGA,IAAKA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,MAAMA,CAACA,CAACA;gBACjFA,CAACA;gBAEDX,qCAAAA,UAAyBA,CAAaA,EAAEA,OAAeA;oBAEnDY,IAAIA,GAAGA,GAAGA,OAAOA,GAAGA,OAAOA,CAACA;oBAE5BA,GAAIA,MAAMA,CAACA,SAASA,CAACA,UAAUA,CAACA,IAAIA,CAACA,EAAEA,EAAEA,CAACA,CAACA,GAAGA,GAAGA,CAACA;wBAE9CA,OAAOA,CAACA,CAACA;qBACZA;oBAEDA,OAAOA,CAACA,CAACA,CAACA;gBACdA,CAACA;gBAEDZ,mCAAAA,UAAuBA,CAACA,EAAEA,CAACA;oBACvBa,MAAMA,CAACA,SAASA,CAACA,GAAGA,CAACA,CAACA,EAAEA,IAAIA,CAACA,EAAEA,CAACA,GAAGA,IAAIA,CAACA,MAAMA,GAAGA,CAACA;gBACtDA,CAACA;gBAELb;AAACA,YAADA,CAACA,EAxF2BD,MAAMA,CAACA,OAAOA,CAACA,KAAKA,EAwF/CA;YAxFDA,uBAwFCA,YAAAA;QAELA,CAACA,2CAAAD;QA5FMA;AA4FNA,IAADA,CAACA,2CAAAD;IA5FMA;AA4FNA,CAAAA,2BAAA"} \ No newline at end of file diff --git a/wip/physics/shapes/Circle.ts b/wip/physics/shapes/Circle.ts deleted file mode 100644 index 52a60fde..00000000 --- a/wip/physics/shapes/Circle.ts +++ /dev/null @@ -1,105 +0,0 @@ -/// -/// -/// -/// -/// - -/** -* Phaser - Advanced Physics - Shape - Circle -* -* Based on the work Ju Hyung Lee started in JS PhyRus. -*/ - -module Phaser.Physics.Shapes { - - export class Circle extends Phaser.Physics.Shape implements IShape { - - constructor(radius: number, x?: number = 0, y?: number = 0) { - - super(AdvancedPhysics.SHAPE_TYPE_CIRCLE); - - x = AdvancedPhysics.pixelsToMeters(x); - y = AdvancedPhysics.pixelsToMeters(y); - radius = AdvancedPhysics.pixelsToMeters(radius); - - this.center = new Phaser.Vec2(x, y); - this.radius = radius; - this.tc = new Phaser.Vec2; - - this.finishVerts(); - - } - - public radius: number; - public center: Phaser.Vec2; - public tc: Phaser.Vec2; - - public finishVerts() { - this.radius = Math.abs(this.radius); - } - - public duplicate(): Circle { - return new Circle(this.center.x, this.center.y, this.radius); - } - - public recenter(c:Phaser.Vec2) { - this.center.subtract(c); - } - - public transform(xf: Transform) { - - Phaser.TransformUtils.transform(xf, this.center, this.center); - //this.center = xf.transform(this.center); - } - - public untransform(xf: Transform) { - Phaser.TransformUtils.untransform(xf, this.center, this.center); - //this.center = xf.untransform(this.center); - } - - public area(): number { - return AdvancedPhysics.areaForCircle(this.radius, 0); - } - - public centroid(): Phaser.Vec2 { - return Phaser.Vec2Utils.clone(this.center); - } - - public inertia(mass: number): number { - return AdvancedPhysics.inertiaForCircle(mass, this.center, this.radius, 0); - } - - public cacheData(xf: Transform) { - - Phaser.TransformUtils.transform(xf, this.center, this.tc); - //this.tc = xf.transform(this.center); - - this.bounds.mins.setTo(this.tc.x - this.radius, this.tc.y - this.radius); - this.bounds.maxs.setTo(this.tc.x + this.radius, this.tc.y + this.radius); - - } - - public pointQuery(p:Phaser.Vec2): bool { - //return vec2.distsq(this.tc, p) < (this.r * this.r); - return Phaser.Vec2Utils.distanceSq(this.tc, p) < (this.radius * this.radius); - } - - public findVertexByPoint(p:Phaser.Vec2, minDist: number): number { - - var dsq = minDist * minDist; - - if (Phaser.Vec2Utils.distanceSq(this.tc, p) < dsq) - { - return 0; - } - - return -1; - } - - public distanceOnPlane(n, d) { - Phaser.Vec2Utils.dot(n, this.tc) - this.radius - d; - } - - } - -} \ No newline at end of file diff --git a/wip/physics/shapes/IShape.js b/wip/physics/shapes/IShape.js deleted file mode 100644 index 38c4f862..00000000 --- a/wip/physics/shapes/IShape.js +++ /dev/null @@ -1,3 +0,0 @@ -var Phaser; -(function (Phaser) { - })(Phaser || (Phaser = {})); diff --git a/wip/physics/shapes/IShape.js.map b/wip/physics/shapes/IShape.js.map deleted file mode 100644 index b957e623..00000000 --- a/wip/physics/shapes/IShape.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"IShape.js","sources":["IShape.ts"],"names":["Phaser"],"mappings":"AAaA,IAAO,MAAM;AAgCZ,CAhCD,UAAO,MAAM;IAgCbA,CAACA,2BAAA"} \ No newline at end of file diff --git a/wip/physics/shapes/IShape.ts b/wip/physics/shapes/IShape.ts deleted file mode 100644 index 08085b74..00000000 --- a/wip/physics/shapes/IShape.ts +++ /dev/null @@ -1,47 +0,0 @@ -/// -/// -/// -/// -/// -/// - -/** -* Phaser - Advanced Physics - IShape -* -* Based on the work Ju Hyung Lee started in JS PhyRus. -*/ - -module Phaser.Physics { - - export interface IShape { - - id: number; - type: number; - - elasticity: number; - friction: number; - density: number; - - body: Body; - bounds: Bounds; - - area(): number; - centroid(): Phaser.Vec2; - inertia(mass: number): number; - cacheData(xf:Transform); - pointQuery(p: Phaser.Vec2): bool; - findEdgeByPoint(p: Phaser.Vec2, minDist: number): number; - findVertexByPoint(p: Phaser.Vec2, minDist: number): number; - - // The verts of the shape (in local coordinate space) - verts: Phaser.Vec2[]; - planes: Phaser.Physics.Plane[]; - // The translated verts (in world space) - tverts: Phaser.Vec2[]; - tplanes: Phaser.Physics.Plane[]; - convexity: bool; - - } - -} - diff --git a/wip/physics/shapes/Poly.js b/wip/physics/shapes/Poly.js deleted file mode 100644 index 95311d67..00000000 --- a/wip/physics/shapes/Poly.js +++ /dev/null @@ -1,206 +0,0 @@ -var __extends = this.__extends || function (d, b) { - function __() { this.constructor = d; } - __.prototype = b.prototype; - d.prototype = new __(); -}; -var Phaser; -(function (Phaser) { - (function (Physics) { - /// - /// - /// - /// - /// - /// - /** - * Phaser - Advanced Physics - Shapes - Convex Polygon - * - * Based on the work Ju Hyung Lee started in JS PhyRus. - */ - (function (Shapes) { - var Poly = (function (_super) { - __extends(Poly, _super); - // Verts is an optional array of objects, the objects must have public x and y properties which will be used - // to seed this polygon (i.e. Vec2 objects, or just straight JS objects) and must wind COUNTER clockwise - function Poly(verts) { - _super.call(this, Physics.AdvancedPhysics.SHAPE_TYPE_POLY); - this.verts = []; - this.planes = []; - this.tverts = []; - this.tplanes = []; - if(verts) { - for(var i = 0; i < verts.length; i++) { - this.verts[i] = new Phaser.Vec2(verts[i].x, verts[i].y); - this.tverts[i] = this.verts[i]; - //this.tverts[i] = new Phaser.Vec2(verts[i].x, verts[i].y); - this.tplanes[i] = new Phaser.Physics.Plane(new Phaser.Vec2(), 0); - } - } - this.finishVerts(); - } - Poly.prototype.finishVerts = function () { - if(this.verts.length < 2) { - this.convexity = false; - this.planes = []; - return; - } - this.convexity = true; - this.tverts = []; - this.tplanes = []; - // Must be counter-clockwise verts - for(var i = 0; i < this.verts.length; i++) { - var a = this.verts[i]; - var b = this.verts[(i + 1) % this.verts.length]; - var n = Phaser.Vec2Utils.normalize(Phaser.Vec2Utils.perp(Phaser.Vec2Utils.subtract(a, b))); - this.planes[i] = new Phaser.Physics.Plane(n, Phaser.Vec2Utils.dot(n, a)); - this.tverts[i] = Phaser.Vec2Utils.clone(this.verts[i])// reference??? - ; - //this.tverts[i] = this.verts[i]; // reference??? - this.tplanes[i] = new Phaser.Physics.Plane(new Phaser.Vec2(), 0); - } - for(var i = 0; i < this.verts.length; i++) { - //var b = this.verts[(i + 2) % this.verts.length]; - //var n = this.planes[i].normal; - //var d = this.planes[i].d; - if(Phaser.Vec2Utils.dot(this.planes[i].normal, this.verts[(i + 2) % this.verts.length]) - this.planes[i].d > 0) { - this.convexity = false; - } - } - }; - Poly.prototype.duplicate = function () { - return new Phaser.Physics.Shapes.Poly(this.verts); - }; - Poly.prototype.recenter = function (c) { - for(var i = 0; i < this.verts.length; i++) { - this.verts[i].subtract(c); - } - }; - Poly.prototype.transform = function (xf) { - for(var i = 0; i < this.verts.length; i++) { - this.verts[i] = Phaser.TransformUtils.transform(xf, this.verts[i]); - //this.verts[i] = xf.transform(this.verts[i]); - } - }; - Poly.prototype.untransform = function (xf) { - for(var i = 0; i < this.verts.length; i++) { - this.verts[i] = Phaser.TransformUtils.untransform(xf, this.verts[i]); - //this.verts[i] = xf.untransform(this.verts[i]); - } - }; - Poly.prototype.area = function () { - return Physics.AdvancedPhysics.areaForPoly(this.verts); - }; - Poly.prototype.centroid = function () { - return Physics.AdvancedPhysics.centroidForPoly(this.verts); - }; - Poly.prototype.inertia = function (mass) { - return Physics.AdvancedPhysics.inertiaForPoly(mass, this.verts, new Phaser.Vec2()); - }; - Poly.prototype.cacheData = function (xf) { - this.bounds.clear(); - var numVerts = this.verts.length; - Physics.AdvancedPhysics.write('----------- Poly cacheData = ' + numVerts); - if(numVerts == 0) { - return; - } - for(var i = 0; i < numVerts; i++) { - this.tverts[i] = Phaser.TransformUtils.transform(xf, this.verts[i]); - //this.tverts[i] = xf.transform(this.verts[i]); - Physics.AdvancedPhysics.write('tvert' + i + ' = ' + this.tverts[i].toString()); - } - if(numVerts < 2) { - this.bounds.addPoint(this.tverts[0]); - return; - } - for(var i = 0; i < numVerts; i++) { - var a = this.tverts[i]; - var b = this.tverts[(i + 1) % numVerts]; - var n = Phaser.Vec2Utils.normalize(Phaser.Vec2Utils.perp(Phaser.Vec2Utils.subtract(a, b))); - Physics.AdvancedPhysics.write('a = ' + a.toString()); - Physics.AdvancedPhysics.write('b = ' + b.toString()); - Physics.AdvancedPhysics.write('n = ' + n.toString()); - this.tplanes[i].normal = n; - this.tplanes[i].d = Phaser.Vec2Utils.dot(n, a); - Physics.AdvancedPhysics.write('tplanes' + i + ' n = ' + this.tplanes[i].normal.toString()); - Physics.AdvancedPhysics.write('tplanes' + i + ' d = ' + this.tplanes[i].d.toString()); - this.bounds.addPoint(a); - } - }; - Poly.prototype.pointQuery = function (p) { - if(!this.bounds.containPoint(p)) { - return false; - } - return this.containPoint(p); - }; - Poly.prototype.findVertexByPoint = function (p, minDist) { - var dsq = minDist * minDist; - for(var i = 0; i < this.tverts.length; i++) { - if(Phaser.Vec2Utils.distanceSq(this.tverts[i], p) < dsq) { - return i; - } - } - return -1; - }; - Poly.prototype.findEdgeByPoint = function (p, minDist) { - var dsq = minDist * minDist; - var numVerts = this.tverts.length; - for(var i = 0; i < this.tverts.length; i++) { - var v1 = this.tverts[i]; - var v2 = this.tverts[(i + 1) % numVerts]; - var n = this.tplanes[i].normal; - var dtv1 = Phaser.Vec2Utils.cross(v1, n); - var dtv2 = Phaser.Vec2Utils.cross(v2, n); - var dt = Phaser.Vec2Utils.cross(p, n); - if(dt > dtv1) { - if(Phaser.Vec2Utils.distanceSq(v1, p) < dsq) { - return i; - } - } else if(dt < dtv2) { - if(Phaser.Vec2Utils.distanceSq(v2, p) < dsq) { - return i; - } - } else { - var dist = Phaser.Vec2Utils.dot(n, p) - Phaser.Vec2Utils.dot(n, v1); - if(dist * dist < dsq) { - return i; - } - } - } - return -1; - }; - Poly.prototype.distanceOnPlane = function (n, d) { - var min = 999999; - for(var i = 0; i < this.verts.length; i++) { - min = Math.min(min, Phaser.Vec2Utils.dot(n, this.tverts[i])); - } - return min - d; - }; - Poly.prototype.containPoint = function (p) { - for(var i = 0; i < this.verts.length; i++) { - var plane = this.tplanes[i]; - if(Phaser.Vec2Utils.dot(plane.normal, p) - plane.d > 0) { - return false; - } - } - return true; - }; - Poly.prototype.containPointPartial = function (p, n) { - for(var i = 0; i < this.verts.length; i++) { - var plane = this.tplanes[i]; - if(Phaser.Vec2Utils.dot(plane.normal, n) < 0.0001) { - continue; - } - if(Phaser.Vec2Utils.dot(plane.normal, p) - plane.d > 0) { - return false; - } - } - return true; - }; - return Poly; - })(Phaser.Physics.Shape); - Shapes.Poly = Poly; - })(Physics.Shapes || (Physics.Shapes = {})); - var Shapes = Physics.Shapes; - })(Phaser.Physics || (Phaser.Physics = {})); - var Physics = Phaser.Physics; -})(Phaser || (Phaser = {})); diff --git a/wip/physics/shapes/Poly.js.map b/wip/physics/shapes/Poly.js.map deleted file mode 100644 index 14f926d9..00000000 --- a/wip/physics/shapes/Poly.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Poly.js","sources":["Poly.ts"],"names":["Phaser","Phaser.Physics","Phaser.Physics.Shapes","Phaser.Physics.Shapes.Poly","Phaser.Physics.Shapes.Poly.constructor","Phaser.Physics.Shapes.Poly.finishVerts","Phaser.Physics.Shapes.Poly.duplicate","Phaser.Physics.Shapes.Poly.recenter","Phaser.Physics.Shapes.Poly.transform","Phaser.Physics.Shapes.Poly.untransform","Phaser.Physics.Shapes.Poly.area","Phaser.Physics.Shapes.Poly.centroid","Phaser.Physics.Shapes.Poly.inertia","Phaser.Physics.Shapes.Poly.cacheData","Phaser.Physics.Shapes.Poly.pointQuery","Phaser.Physics.Shapes.Poly.findVertexByPoint","Phaser.Physics.Shapes.Poly.findEdgeByPoint","Phaser.Physics.Shapes.Poly.distanceOnPlane","Phaser.Physics.Shapes.Poly.containPoint","Phaser.Physics.Shapes.Poly.containPointPartial"],"mappings":";;;;;AAaA,IAAO,MAAM;AA6RZ,CA7RD,UAAO,MAAM;KAANA,UAAOA,OAAOA;QAbrBC,2CAA2CA;QAC3CA,gDAAgDA;QAChDA,sCAAsCA;QACtCA,mCAAmCA;QACnCA,oCAAoCA;QACpCA,iCAAiCA;QAEjCA;;;;UAIEA;SAEKA,UAAeA,MAAMA;YAExBC;;gBAIIC,6GAF6GA;gBAC7GA,yGAAyGA;gBACzGA,SAJSA,IAAIA,CAIDA,KAAMA;oBAEdC,8BAAMA,eAAOA,CAACA,eAAeA,CAmRpCA;oBAjROA,IAAIA,CAACA,KAAKA,GAAGA,EAAEA;oBACfA,IAAIA,CAACA,MAAMA,GAAGA,EAAEA;oBAChBA,IAAIA,CAACA,MAAMA,GAAGA,EAAEA;oBAChBA,IAAIA,CAACA,OAAOA,GAAGA,EAAEA;oBAEjBA,GAAIA,KAAKA,CAACA;wBAENA,IAAKA,IAAIA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,KAAKA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,CACrCA;4BACIA,IAAIA,CAACA,KAAKA,CAACA,CAACA,CAACA,GAAGA,IAAIA,MAAMA,CAACA,IAAIA,CAACA,KAAKA,CAACA,CAACA,CAACA,CAACA,CAACA,EAAEA,KAAKA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;4BACvDA,IAAIA,CAACA,MAAMA,CAACA,CAACA,CAACA,GAAGA,IAAIA,CAACA,KAAKA,CAACA,CAACA,CAACA;4BAC9BA,2DAA2DA;4BAC3DA,IAAIA,CAACA,OAAOA,CAACA,CAACA,CAACA,GAAGA,IAAIA,MAAMA,CAACA,OAAOA,CAACA,KAAKA,CAACA,IAAIA,MAAMA,CAACA,IAAIA,EAAAA,EAAEA,CAACA,CAACA;yBACjEA;qBACJA;oBAEDA,IAAIA,CAACA,WAAWA,EAAEA;gBAEtBA,CAACA;gBAGDD,6BAAAA;oBAEIE,GAAIA,IAAIA,CAACA,KAAKA,CAACA,MAAMA,GAAGA,CAACA,CAACA;wBAEtBA,IAAIA,CAACA,SAASA,GAAGA,KAAKA;wBACtBA,IAAIA,CAACA,MAAMA,GAAGA,EAAEA;wBAChBA,OAAOA;qBACVA;oBAEDA,IAAIA,CAACA,SAASA,GAAGA,IAAIA;oBACrBA,IAAIA,CAACA,MAAMA,GAAGA,EAAEA;oBAChBA,IAAIA,CAACA,OAAOA,GAAGA,EAAEA;oBAEjBA,kCAAkCA;oBAClCA,IAAKA,IAAIA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,IAAIA,CAACA,KAAKA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,CAC1CA;wBACIA,IAAIA,CAACA,GAAGA,IAAIA,CAACA,KAAKA,CAACA,CAACA,CAACA,CAACA;wBACtBA,IAAIA,CAACA,GAAGA,IAAIA,CAACA,KAAKA,CAACA,CAACA,CAACA,GAAGA,CAACA,IAAIA,IAAIA,CAACA,KAAKA,CAACA,MAAMA,CAACA,CAACA;wBAChDA,IAAIA,CAACA,GAAGA,MAAMA,CAACA,SAASA,CAACA,SAASA,CAACA,MAAMA,CAACA,SAASA,CAACA,IAAIA,CAACA,MAAMA,CAACA,SAASA,CAACA,QAAQA,CAACA,CAACA,EAAEA,CAACA,CAACA,CAACA,CAACA,CAACA;wBAE3FA,IAAIA,CAACA,MAAMA,CAACA,CAACA,CAACA,GAAGA,IAAIA,MAAMA,CAACA,OAAOA,CAACA,KAAKA,CAACA,CAACA,EAAEA,MAAMA,CAACA,SAASA,CAACA,GAAGA,CAACA,CAACA,EAAEA,CAACA,CAACA,CAACA;wBAExEA,IAAIA,CAACA,MAAMA,CAACA,CAACA,CAACA,GAAGA,MAAMA,CAACA,SAASA,CAACA,KAAKA,CAACA,IAAIA,CAACA,KAAKA,CAACA,CAACA,CAACA,CAACA,eAAiBA;;wBACvEA,iDAAiDA;wBAEjDA,IAAIA,CAACA,OAAOA,CAACA,CAACA,CAACA,GAAGA,IAAIA,MAAMA,CAACA,OAAOA,CAACA,KAAKA,CAACA,IAAIA,MAAMA,CAACA,IAAIA,EAAAA,EAAEA,CAACA,CAACA;qBACjEA;oBAEDA,IAAKA,IAAIA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,IAAIA,CAACA,KAAKA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,CAC1CA;wBACIA,kDAAkDA;wBAClDA,gCAAgCA;wBAChCA,2BAA2BA;wBAE3BA,GAAIA,MAAMA,CAACA,SAASA,CAACA,GAAGA,CAACA,IAAIA,CAACA,MAAMA,CAACA,CAACA,CAACA,CAACA,MAAMA,EAAEA,IAAIA,CAACA,KAAKA,CAACA,CAACA,CAACA,GAAGA,CAACA,IAAIA,IAAIA,CAACA,KAAKA,CAACA,MAAMA,CAACA,CAACA,GAAGA,IAAIA,CAACA,MAAMA,CAACA,CAACA,CAACA,CAACA,CAACA,GAAGA,CAACA,CAACA;4BAE5GA,IAAIA,CAACA,SAASA,GAAGA,KAAKA;yBACzBA;qBACJA;gBAELA,CAACA;gBAEDF,2BAAAA;oBACIG,OAAOA,IAAIA,MAAMA,CAACA,OAAOA,CAACA,MAAMA,CAACA,IAAIA,CAACA,IAAIA,CAACA,KAAKA,CAACA,CAACA;gBACtDA,CAACA;gBAEDH,0BAAAA,UAAgBA,CAACA;oBAEbI,IAAKA,IAAIA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,IAAIA,CAACA,KAAKA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,CAC1CA;wBACIA,IAAIA,CAACA,KAAKA,CAACA,CAACA,CAACA,CAACA,QAAQA,CAACA,CAACA,CAACA;qBAC5BA;gBAELA,CAACA;gBAEDJ,2BAAAA,UAAiBA,EAAmBA;oBAEhCK,IAAKA,IAAIA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,IAAIA,CAACA,KAAKA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,CAC1CA;wBACIA,IAAIA,CAACA,KAAKA,CAACA,CAACA,CAACA,GAAGA,MAAMA,CAACA,cAAcA,CAACA,SAASA,CAACA,EAAEA,EAAEA,IAAIA,CAACA,KAAKA,CAACA,CAACA,CAACA,CAACA;wBAClEA,8CAA8CA;6CACjDA;gBACLA,CAACA;gBAEDL,6BAAAA,UAAmBA,EAAmBA;oBAElCM,IAAKA,IAAIA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,IAAIA,CAACA,KAAKA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,CAC1CA;wBACIA,IAAIA,CAACA,KAAKA,CAACA,CAACA,CAACA,GAAGA,MAAMA,CAACA,cAAcA,CAACA,WAAWA,CAACA,EAAEA,EAAEA,IAAIA,CAACA,KAAKA,CAACA,CAACA,CAACA,CAACA;wBACpEA,gDAAgDA;6CACnDA;gBAELA,CAACA;gBAEDN,sBAAAA;oBACIO,OAAOA,eAAOA,CAACA,WAAWA,CAACA,IAAIA,CAACA,KAAKA,CAACA,CAACA;gBAC3CA,CAACA;gBAEDP,0BAAAA;oBACIQ,OAAOA,eAAOA,CAACA,eAAeA,CAACA,IAAIA,CAACA,KAAKA,CAACA,CAACA;gBAC/CA,CAACA;gBAEDR,yBAAAA,UAAeA,IAAYA;oBACvBS,OAAOA,eAAOA,CAACA,cAAcA,CAACA,IAAIA,EAAEA,IAAIA,CAACA,KAAKA,EAAEA,IAAIA,MAAMA,CAACA,IAAIA,EAAAA,CAACA,CAACA;gBACrEA,CAACA;gBAEDT,2BAAAA,UAAiBA,EAAYA;oBAEzBU,IAAIA,CAACA,MAAMA,CAACA,KAAKA,EAAEA;oBAEnBA,IAAIA,QAAQA,GAAGA,IAAIA,CAACA,KAAKA,CAACA,MAAMA,CAACA;oBAEjCA,eAAOA,CAACA,KAAKA,CAACA,+BAA+BA,GAAGA,QAAQA,CAACA;oBAEzDA,GAAIA,QAAQA,IAAIA,CAACA,CAACA;wBAEdA,OAAOA;qBACVA;oBAEDA,IAAKA,IAAIA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,QAAQA,EAAEA,CAACA,EAAEA,CACjCA;wBACIA,IAAIA,CAACA,MAAMA,CAACA,CAACA,CAACA,GAAGA,MAAMA,CAACA,cAAcA,CAACA,SAASA,CAACA,EAAEA,EAAEA,IAAIA,CAACA,KAAKA,CAACA,CAACA,CAACA,CAACA;wBACnEA,+CAA+CA;wBAC/CA,eAAOA,CAACA,KAAKA,CAACA,OAAOA,GAAGA,CAACA,GAAGA,KAAKA,GAAGA,IAAIA,CAACA,MAAMA,CAACA,CAACA,CAACA,CAACA,QAAQA,EAAEA,CAACA;qBACjEA;oBAEDA,GAAIA,QAAQA,GAAGA,CAACA,CAACA;wBAEbA,IAAIA,CAACA,MAAMA,CAACA,QAAQA,CAACA,IAAIA,CAACA,MAAMA,CAACA,CAACA,CAACA,CAACA;wBACpCA,OAAOA;qBACVA;oBAEDA,IAAKA,IAAIA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,QAAQA,EAAEA,CAACA,EAAEA,CACjCA;wBACIA,IAAIA,CAACA,GAAGA,IAAIA,CAACA,MAAMA,CAACA,CAACA,CAACA,CAACA;wBACvBA,IAAIA,CAACA,GAAGA,IAAIA,CAACA,MAAMA,CAACA,CAACA,CAACA,GAAGA,CAACA,IAAIA,QAAQA,CAACA,CAACA;wBACxCA,IAAIA,CAACA,GAAGA,MAAMA,CAACA,SAASA,CAACA,SAASA,CAACA,MAAMA,CAACA,SAASA,CAACA,IAAIA,CAACA,MAAMA,CAACA,SAASA,CAACA,QAAQA,CAACA,CAACA,EAAEA,CAACA,CAACA,CAACA,CAACA,CAACA;wBAEjGA,eAAOA,CAACA,KAAKA,CAACA,MAAMA,GAAGA,CAACA,CAACA,QAAQA,EAAEA,CAACA;wBACpCA,eAAOA,CAACA,KAAKA,CAACA,MAAMA,GAAGA,CAACA,CAACA,QAAQA,EAAEA,CAACA;wBACpCA,eAAOA,CAACA,KAAKA,CAACA,MAAMA,GAAGA,CAACA,CAACA,QAAQA,EAAEA,CAACA;wBAE9BA,IAAIA,CAACA,OAAOA,CAACA,CAACA,CAACA,CAACA,MAAMA,GAAGA,CAACA;wBAC1BA,IAAIA,CAACA,OAAOA,CAACA,CAACA,CAACA,CAACA,CAACA,GAAGA,MAAMA,CAACA,SAASA,CAACA,GAAGA,CAACA,CAACA,EAAEA,CAACA,CAACA;wBAEpDA,eAAOA,CAACA,KAAKA,CAACA,SAASA,GAAGA,CAACA,GAAGA,OAAOA,GAAGA,IAAIA,CAACA,OAAOA,CAACA,CAACA,CAACA,CAACA,MAAMA,CAACA,QAAQA,EAAEA,CAACA;wBAC1EA,eAAOA,CAACA,KAAKA,CAACA,SAASA,GAAGA,CAACA,GAAGA,OAAOA,GAAGA,IAAIA,CAACA,OAAOA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA,QAAQA,EAAEA,CAACA;wBAE/DA,IAAIA,CAACA,MAAMA,CAACA,QAAQA,CAACA,CAACA,CAACA;qBAE1BA;gBAELA,CAACA;gBAEDV,4BAAAA,UAAkBA,CAAcA;oBAE5BW,GAAIA,CAACA,IAAIA,CAACA,MAAMA,CAACA,YAAYA,CAACA,CAACA,CAACA,CAACA;wBAE7BA,OAAOA,KAAKA,CAACA;qBAChBA;oBAEDA,OAAOA,IAAIA,CAACA,YAAYA,CAACA,CAACA,CAACA,CAACA;gBAChCA,CAACA;gBAEDX,mCAAAA,UAAyBA,CAAaA,EAAEA,OAAeA;oBAEnDY,IAAIA,GAAGA,GAAGA,OAAOA,GAAGA,OAAOA,CAACA;oBAE5BA,IAAKA,IAAIA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,IAAIA,CAACA,MAAMA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,CAC3CA;wBACIA,GAAIA,MAAMA,CAACA,SAASA,CAACA,UAAUA,CAACA,IAAIA,CAACA,MAAMA,CAACA,CAACA,CAACA,EAAEA,CAACA,CAACA,GAAGA,GAAGA,CAACA;4BAErDA,OAAOA,CAACA,CAACA;yBACZA;qBACJA;oBAEDA,OAAOA,CAACA,CAACA,CAACA;gBACdA,CAACA;gBAEDZ,iCAAAA,UAAuBA,CAAcA,EAAEA,OAAeA;oBAElDa,IAAIA,GAAGA,GAAGA,OAAOA,GAAGA,OAAOA,CAACA;oBAC5BA,IAAIA,QAAQA,GAAGA,IAAIA,CAACA,MAAMA,CAACA,MAAMA,CAACA;oBAElCA,IAAKA,IAAIA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,IAAIA,CAACA,MAAMA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,CAC3CA;wBACIA,IAAIA,EAAEA,GAAGA,IAAIA,CAACA,MAAMA,CAACA,CAACA,CAACA,CAACA;wBACxBA,IAAIA,EAAEA,GAAGA,IAAIA,CAACA,MAAMA,CAACA,CAACA,CAACA,GAAGA,CAACA,IAAIA,QAAQA,CAACA,CAACA;wBACzCA,IAAIA,CAACA,GAAGA,IAAIA,CAACA,OAAOA,CAACA,CAACA,CAACA,CAACA,MAAMA,CAACA;wBAE/BA,IAAIA,IAAIA,GAAGA,MAAMA,CAACA,SAASA,CAACA,KAAKA,CAACA,EAAEA,EAAEA,CAACA,CAACA,CAACA;wBACzCA,IAAIA,IAAIA,GAAGA,MAAMA,CAACA,SAASA,CAACA,KAAKA,CAACA,EAAEA,EAAEA,CAACA,CAACA,CAACA;wBACzCA,IAAIA,EAAEA,GAAGA,MAAMA,CAACA,SAASA,CAACA,KAAKA,CAACA,CAACA,EAAEA,CAACA,CAACA,CAACA;wBAEtCA,GAAIA,EAAEA,GAAGA,IAAIA,CAACA;4BAEVA,GAAIA,MAAMA,CAACA,SAASA,CAACA,UAAUA,CAACA,EAAEA,EAAEA,CAACA,CAACA,GAAGA,GAAGA,CAACA;gCAEzCA,OAAOA,CAACA,CAACA;6BACZA;yBACJA,MACIA,GAAIA,EAAEA,GAAGA,IAAIA,CAACA;4BAEfA,GAAIA,MAAMA,CAACA,SAASA,CAACA,UAAUA,CAACA,EAAEA,EAAEA,CAACA,CAACA,GAAGA,GAAGA,CAACA;gCAEzCA,OAAOA,CAACA,CAACA;6BACZA;yBACJA,KAEDA;4BACIA,IAAIA,IAAIA,GAAGA,MAAMA,CAACA,SAASA,CAACA,GAAGA,CAACA,CAACA,EAAEA,CAACA,CAACA,GAAGA,MAAMA,CAACA,SAASA,CAACA,GAAGA,CAACA,CAACA,EAAEA,EAAEA,CAACA,CAACA;4BAEpEA,GAAIA,IAAIA,GAAGA,IAAIA,GAAGA,GAAGA,CAACA;gCAElBA,OAAOA,CAACA,CAACA;6BACZA;yBACJA;qBACJA;oBAEDA,OAAOA,CAACA,CAACA,CAACA;gBAEdA,CAACA;gBAEDb,iCAAAA,UAAuBA,CAAcA,EAAEA,CAAQA;oBAE3Cc,IAAIA,GAAGA,GAAWA,MAAMA,CAACA;oBAEzBA,IAAKA,IAAIA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,IAAIA,CAACA,KAAKA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,CAC1CA;wBACIA,GAAGA,GAAGA,IAAIA,CAACA,GAAGA,CAACA,GAAGA,EAAEA,MAAMA,CAACA,SAASA,CAACA,GAAGA,CAACA,CAACA,EAAEA,IAAIA,CAACA,MAAMA,CAACA,CAACA,CAACA,CAACA,CAACA;qBAC/DA;oBAEDA,OAAOA,GAAGA,GAAGA,CAACA,CAACA;gBAEnBA,CAACA;gBAEDd,8BAAAA,UAAoBA,CAAcA;oBAE9Be,IAAKA,IAAIA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,IAAIA,CAACA,KAAKA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,CAC1CA;wBACIA,IAAIA,KAAKA,GAAGA,IAAIA,CAACA,OAAOA,CAACA,CAACA,CAACA,CAACA;wBAE5BA,GAAIA,MAAMA,CAACA,SAASA,CAACA,GAAGA,CAACA,KAAKA,CAACA,MAAMA,EAAEA,CAACA,CAACA,GAAGA,KAAKA,CAACA,CAACA,GAAGA,CAACA,CAACA;4BAEpDA,OAAOA,KAAKA,CAACA;yBAChBA;qBACJA;oBAEDA,OAAOA,IAAIA,CAACA;gBAEhBA,CAACA;gBAEDf,qCAAAA,UAA2BA,CAACA,EAAEA,CAACA;oBAE3BgB,IAAKA,IAAIA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,IAAIA,CAACA,KAAKA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,CAC1CA;wBACIA,IAAIA,KAAKA,GAAGA,IAAIA,CAACA,OAAOA,CAACA,CAACA,CAACA,CAACA;wBAE5BA,GAAIA,MAAMA,CAACA,SAASA,CAACA,GAAGA,CAACA,KAAKA,CAACA,MAAMA,EAAEA,CAACA,CAACA,GAAGA,MAAMA,CAACA;4BAE/CA,QAASA;yBACZA;wBAEDA,GAAIA,MAAMA,CAACA,SAASA,CAACA,GAAGA,CAACA,KAAKA,CAACA,MAAMA,EAAEA,CAACA,CAACA,GAAGA,KAAKA,CAACA,CAACA,GAAGA,CAACA,CAACA;4BAEpDA,OAAOA,KAAKA,CAACA;yBAChBA;qBACJA;oBAEDA,OAAOA,IAAIA,CAACA;gBAChBA,CAACA;gBAELhB;AAACA,YAADA,CAACA,EAzRyBD,MAAMA,CAACA,OAAOA,CAACA,KAAKA,EAyR7CA;YAzRDA,mBAyRCA,YAAAA;QAELA,CAACA,2CAAAD;QA7RMA;AA6RNA,IAADA,CAACA,2CAAAD;IA7RMA;AA6RNA,CAAAA,2BAAA"} \ No newline at end of file diff --git a/wip/physics/shapes/Poly.ts b/wip/physics/shapes/Poly.ts deleted file mode 100644 index 0119dc47..00000000 --- a/wip/physics/shapes/Poly.ts +++ /dev/null @@ -1,299 +0,0 @@ -/// -/// -/// -/// -/// -/// - -/** -* Phaser - Advanced Physics - Shapes - Convex Polygon -* -* Based on the work Ju Hyung Lee started in JS PhyRus. -*/ - -module Phaser.Physics.Shapes { - - export class Poly extends Phaser.Physics.Shape implements IShape { - - // Verts is an optional array of objects, the objects must have public x and y properties which will be used - // to seed this polygon (i.e. Vec2 objects, or just straight JS objects) and must wind COUNTER clockwise - constructor(verts?) { - - super(AdvancedPhysics.SHAPE_TYPE_POLY); - - this.verts = []; - this.planes = []; - this.tverts = []; - this.tplanes = []; - - if (verts) - { - for (var i = 0; i < verts.length; i++) - { - this.verts[i] = new Phaser.Vec2(verts[i].x, verts[i].y); - this.tverts[i] = this.verts[i]; - //this.tverts[i] = new Phaser.Vec2(verts[i].x, verts[i].y); - this.tplanes[i] = new Phaser.Physics.Plane(new Phaser.Vec2, 0); - } - } - - this.finishVerts(); - - } - - - public finishVerts() { - - if (this.verts.length < 2) - { - this.convexity = false; - this.planes = []; - return; - } - - this.convexity = true; - this.tverts = []; - this.tplanes = []; - - // Must be counter-clockwise verts - for (var i = 0; i < this.verts.length; i++) - { - var a = this.verts[i]; - var b = this.verts[(i + 1) % this.verts.length]; - var n = Phaser.Vec2Utils.normalize(Phaser.Vec2Utils.perp(Phaser.Vec2Utils.subtract(a, b))); - - this.planes[i] = new Phaser.Physics.Plane(n, Phaser.Vec2Utils.dot(n, a)); - - this.tverts[i] = Phaser.Vec2Utils.clone(this.verts[i]); // reference??? - //this.tverts[i] = this.verts[i]; // reference??? - - this.tplanes[i] = new Phaser.Physics.Plane(new Phaser.Vec2, 0); - } - - for (var i = 0; i < this.verts.length; i++) - { - //var b = this.verts[(i + 2) % this.verts.length]; - //var n = this.planes[i].normal; - //var d = this.planes[i].d; - - if (Phaser.Vec2Utils.dot(this.planes[i].normal, this.verts[(i + 2) % this.verts.length]) - this.planes[i].d > 0) - { - this.convexity = false; - } - } - - } - - public duplicate() { - return new Phaser.Physics.Shapes.Poly(this.verts); - } - - public recenter(c) { - - for (var i = 0; i < this.verts.length; i++) - { - this.verts[i].subtract(c); - } - - } - - public transform(xf:Phaser.Transform) { - - for (var i = 0; i < this.verts.length; i++) - { - this.verts[i] = Phaser.TransformUtils.transform(xf, this.verts[i]); - //this.verts[i] = xf.transform(this.verts[i]); - } - } - - public untransform(xf:Phaser.Transform) { - - for (var i = 0; i < this.verts.length; i++) - { - this.verts[i] = Phaser.TransformUtils.untransform(xf, this.verts[i]); - //this.verts[i] = xf.untransform(this.verts[i]); - } - - } - - public area(): number { - return AdvancedPhysics.areaForPoly(this.verts); - } - - public centroid(): Phaser.Vec2 { - return AdvancedPhysics.centroidForPoly(this.verts); - } - - public inertia(mass: number): number { - return AdvancedPhysics.inertiaForPoly(mass, this.verts, new Phaser.Vec2); - } - - public cacheData(xf:Transform) { - - this.bounds.clear(); - - var numVerts = this.verts.length; - - AdvancedPhysics.write('----------- Poly cacheData = ' + numVerts); - - if (numVerts == 0) - { - return; - } - - for (var i = 0; i < numVerts; i++) - { - this.tverts[i] = Phaser.TransformUtils.transform(xf, this.verts[i]); - //this.tverts[i] = xf.transform(this.verts[i]); - AdvancedPhysics.write('tvert' + i + ' = ' + this.tverts[i].toString()); - } - - if (numVerts < 2) - { - this.bounds.addPoint(this.tverts[0]); - return; - } - - for (var i = 0; i < numVerts; i++) - { - var a = this.tverts[i]; - var b = this.tverts[(i + 1) % numVerts]; - var n = Phaser.Vec2Utils.normalize(Phaser.Vec2Utils.perp(Phaser.Vec2Utils.subtract(a, b))); - - AdvancedPhysics.write('a = ' + a.toString()); - AdvancedPhysics.write('b = ' + b.toString()); - AdvancedPhysics.write('n = ' + n.toString()); - - this.tplanes[i].normal = n; - this.tplanes[i].d = Phaser.Vec2Utils.dot(n, a); - - AdvancedPhysics.write('tplanes' + i + ' n = ' + this.tplanes[i].normal.toString()); - AdvancedPhysics.write('tplanes' + i + ' d = ' + this.tplanes[i].d.toString()); - - this.bounds.addPoint(a); - - } - - } - - public pointQuery(p: Phaser.Vec2): bool { - - if (!this.bounds.containPoint(p)) - { - return false; - } - - return this.containPoint(p); - } - - public findVertexByPoint(p:Phaser.Vec2, minDist: number): number { - - var dsq = minDist * minDist; - - for (var i = 0; i < this.tverts.length; i++) - { - if (Phaser.Vec2Utils.distanceSq(this.tverts[i], p) < dsq) - { - return i; - } - } - - return -1; - } - - public findEdgeByPoint(p: Phaser.Vec2, minDist: number): number { - - var dsq = minDist * minDist; - var numVerts = this.tverts.length; - - for (var i = 0; i < this.tverts.length; i++) - { - var v1 = this.tverts[i]; - var v2 = this.tverts[(i + 1) % numVerts]; - var n = this.tplanes[i].normal; - - var dtv1 = Phaser.Vec2Utils.cross(v1, n); - var dtv2 = Phaser.Vec2Utils.cross(v2, n); - var dt = Phaser.Vec2Utils.cross(p, n); - - if (dt > dtv1) - { - if (Phaser.Vec2Utils.distanceSq(v1, p) < dsq) - { - return i; - } - } - else if (dt < dtv2) - { - if (Phaser.Vec2Utils.distanceSq(v2, p) < dsq) - { - return i; - } - } - else - { - var dist = Phaser.Vec2Utils.dot(n, p) - Phaser.Vec2Utils.dot(n, v1); - - if (dist * dist < dsq) - { - return i; - } - } - } - - return -1; - - } - - public distanceOnPlane(n: Phaser.Vec2, d:number) { - - var min: number = 999999; - - for (var i = 0; i < this.verts.length; i++) - { - min = Math.min(min, Phaser.Vec2Utils.dot(n, this.tverts[i])); - } - - return min - d; - - } - - public containPoint(p: Phaser.Vec2) { - - for (var i = 0; i < this.verts.length; i++) - { - var plane = this.tplanes[i]; - - if (Phaser.Vec2Utils.dot(plane.normal, p) - plane.d > 0) - { - return false; - } - } - - return true; - - } - - public containPointPartial(p, n) { - - for (var i = 0; i < this.verts.length; i++) - { - var plane = this.tplanes[i]; - - if (Phaser.Vec2Utils.dot(plane.normal, n) < 0.0001) - { - continue; - } - - if (Phaser.Vec2Utils.dot(plane.normal, p) - plane.d > 0) - { - return false; - } - } - - return true; - } - - } - -} \ No newline at end of file diff --git a/wip/physics/shapes/Segment.js b/wip/physics/shapes/Segment.js deleted file mode 100644 index 678f8047..00000000 --- a/wip/physics/shapes/Segment.js +++ /dev/null @@ -1,141 +0,0 @@ -var __extends = this.__extends || function (d, b) { - function __() { this.constructor = d; } - __.prototype = b.prototype; - d.prototype = new __(); -}; -var Phaser; -(function (Phaser) { - (function (Physics) { - /// - /// - /// - /// - /// - /** - * Phaser - Advanced Physics - Shapes - Segment - * - * Based on the work Ju Hyung Lee started in JS PhyRus. - */ - (function (Shapes) { - var Segment = (function (_super) { - __extends(Segment, _super); - function Segment(a, b, radius) { - _super.call(this, Physics.AdvancedPhysics.SHAPE_TYPE_SEGMENT); - this.a = a.duplicate(); - this.b = b.duplicate(); - this.radius = radius; - this.normal = Phaser.Vec2Utils.perp(Phaser.Vec2Utils.subtract(b, a)); - this.normal.normalize(); - this.ta = new Phaser.Vec2(); - this.tb = new Phaser.Vec2(); - this.tn = new Phaser.Vec2(); - this.finishVerts(); - } - Segment.prototype.finishVerts = function () { - this.normal = Phaser.Vec2Utils.perp(Phaser.Vec2Utils.subtract(this.b, this.a)); - this.normal.normalize(); - this.radius = Math.abs(this.radius); - }; - Segment.prototype.duplicate = function () { - return new Phaser.Physics.Shapes.Segment(this.a, this.b, this.radius); - }; - Segment.prototype.recenter = function (c) { - this.a.subtract(c); - this.b.subtract(c); - }; - Segment.prototype.transform = function (xf) { - Phaser.TransformUtils.transform(xf, this.a, this.a); - Phaser.TransformUtils.transform(xf, this.b, this.b); - //this.a = xf.transform(this.a); - //this.b = xf.transform(this.b); - }; - Segment.prototype.untransform = function (xf) { - Phaser.TransformUtils.untransform(xf, this.a, this.a); - Phaser.TransformUtils.untransform(xf, this.b, this.b); - //this.a = xf.untransform(this.a); - //this.b = xf.untransform(this.b); - }; - Segment.prototype.area = function () { - return Physics.AdvancedPhysics.areaForSegment(this.a, this.b, this.radius); - }; - Segment.prototype.centroid = function () { - return Physics.AdvancedPhysics.centroidForSegment(this.a, this.b); - }; - Segment.prototype.inertia = function (mass) { - return Physics.AdvancedPhysics.inertiaForSegment(mass, this.a, this.b); - }; - Segment.prototype.cacheData = function (xf) { - Phaser.TransformUtils.transform(xf, this.a, this.ta); - Phaser.TransformUtils.transform(xf, this.b, this.tb); - //this.ta = xf.transform(this.a); - //this.tb = xf.transform(this.b); - this.tn = Phaser.Vec2Utils.perp(Phaser.Vec2Utils.subtract(this.tb, this.ta)).normalize(); - var l; - var r; - var t; - var b; - if(this.ta.x < this.tb.x) { - l = this.ta.x; - r = this.tb.x; - } else { - l = this.tb.x; - r = this.ta.x; - } - if(this.ta.y < this.tb.y) { - b = this.ta.y; - t = this.tb.y; - } else { - b = this.tb.y; - t = this.ta.y; - } - this.bounds.mins.setTo(l - this.radius, b - this.radius); - this.bounds.maxs.setTo(r + this.radius, t + this.radius); - }; - Segment.prototype.pointQuery = function (p) { - if(!this.bounds.containPoint(p)) { - return false; - } - var dn = Phaser.Vec2Utils.dot(this.tn, p) - Phaser.Vec2Utils.dot(this.ta, this.tn); - var dist = Math.abs(dn); - if(dist > this.radius) { - return false; - } - var dt = Phaser.Vec2Utils.cross(p, this.tn); - var dta = Phaser.Vec2Utils.cross(this.ta, this.tn); - var dtb = Phaser.Vec2Utils.cross(this.tb, this.tn); - if(dt <= dta) { - if(dt < dta - this.radius) { - return false; - } - return Phaser.Vec2Utils.distanceSq(this.ta, p) < (this.radius * this.radius); - } else if(dt > dtb) { - if(dt > dtb + this.radius) { - return false; - } - return Phaser.Vec2Utils.distanceSq(this.tb, p) < (this.radius * this.radius); - } - return true; - }; - Segment.prototype.findVertexByPoint = function (p, minDist) { - var dsq = minDist * minDist; - if(Phaser.Vec2Utils.distanceSq(this.ta, p) < dsq) { - return 0; - } - if(Phaser.Vec2Utils.distanceSq(this.tb, p) < dsq) { - return 1; - } - return -1; - }; - Segment.prototype.distanceOnPlane = function (n, d) { - var a = Phaser.Vec2Utils.dot(n, this.ta) - this.radius; - var b = Phaser.Vec2Utils.dot(n, this.tb) - this.radius; - return Math.min(a, b) - d; - }; - return Segment; - })(Phaser.Physics.Shape); - Shapes.Segment = Segment; - })(Physics.Shapes || (Physics.Shapes = {})); - var Shapes = Physics.Shapes; - })(Phaser.Physics || (Phaser.Physics = {})); - var Physics = Phaser.Physics; -})(Phaser || (Phaser = {})); diff --git a/wip/physics/shapes/Segment.js.map b/wip/physics/shapes/Segment.js.map deleted file mode 100644 index d7f8512a..00000000 --- a/wip/physics/shapes/Segment.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Segment.js","sources":["Segment.ts"],"names":["Phaser","Phaser.Physics","Phaser.Physics.Shapes","Phaser.Physics.Shapes.Segment","Phaser.Physics.Shapes.Segment.constructor","Phaser.Physics.Shapes.Segment.finishVerts","Phaser.Physics.Shapes.Segment.duplicate","Phaser.Physics.Shapes.Segment.recenter","Phaser.Physics.Shapes.Segment.transform","Phaser.Physics.Shapes.Segment.untransform","Phaser.Physics.Shapes.Segment.area","Phaser.Physics.Shapes.Segment.centroid","Phaser.Physics.Shapes.Segment.inertia","Phaser.Physics.Shapes.Segment.cacheData","Phaser.Physics.Shapes.Segment.pointQuery","Phaser.Physics.Shapes.Segment.findVertexByPoint","Phaser.Physics.Shapes.Segment.distanceOnPlane"],"mappings":";;;;;AAYA,IAAO,MAAM;AA+LZ,CA/LD,UAAO,MAAM;KAANA,UAAOA,OAAOA;QAZrBC,2CAA2CA;QAC3CA,gDAAgDA;QAChDA,sCAAsCA;QACtCA,mCAAmCA;QACnCA,iCAAiCA;QAEjCA;;;;UAIEA;SAEKA,UAAeA,MAAMA;YAExBC;;gBAEIC,SAFSA,OAAOA,CAEJA,CAACA,EAAEA,CAACA,EAAEA,MAAcA;oBAE5BC,8BAAMA,eAAOA,CAACA,kBAAkBA,CAuLvCA;oBArLOA,IAAIA,CAACA,CAACA,GAAGA,CAACA,CAACA,SAASA,EAAEA;oBACtBA,IAAIA,CAACA,CAACA,GAAGA,CAACA,CAACA,SAASA,EAAEA;oBACtBA,IAAIA,CAACA,MAAMA,GAAGA,MAAMA;oBAEpBA,IAAIA,CAACA,MAAMA,GAAGA,MAAMA,CAACA,SAASA,CAACA,IAAIA,CAACA,MAAMA,CAACA,SAASA,CAACA,QAAQA,CAACA,CAACA,EAAEA,CAACA,CAACA,CAACA;oBACpEA,IAAIA,CAACA,MAAMA,CAACA,SAASA,EAAEA;oBAEvBA,IAAIA,CAACA,EAAEA,GAAGA,IAAIA,MAAMA,CAACA,IAAIA,EAAAA;oBACzBA,IAAIA,CAACA,EAAEA,GAAGA,IAAIA,MAAMA,CAACA,IAAIA,EAAAA;oBACzBA,IAAIA,CAACA,EAAEA,GAAGA,IAAIA,MAAMA,CAACA,IAAIA,EAAAA;oBAEzBA,IAAIA,CAACA,WAAWA,EAAEA;gBAEtBA,CAACA;gBAWDD,gCAAAA;oBAEIE,IAAIA,CAACA,MAAMA,GAAGA,MAAMA,CAACA,SAASA,CAACA,IAAIA,CAACA,MAAMA,CAACA,SAASA,CAACA,QAAQA,CAACA,IAAIA,CAACA,CAACA,EAAEA,IAAIA,CAACA,CAACA,CAACA,CAACA;oBAC9EA,IAAIA,CAACA,MAAMA,CAACA,SAASA,EAAEA;oBAEvBA,IAAIA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,GAAGA,CAACA,IAAIA,CAACA,MAAMA,CAACA;gBAEvCA,CAACA;gBAEDF,8BAAAA;oBACIG,OAAOA,IAAIA,MAAMA,CAACA,OAAOA,CAACA,MAAMA,CAACA,OAAOA,CAACA,IAAIA,CAACA,CAACA,EAAEA,IAAIA,CAACA,CAACA,EAAEA,IAAIA,CAACA,MAAMA,CAACA,CAACA;gBAC1EA,CAACA;gBAEDH,6BAAAA,UAAgBA,CAACA;oBACbI,IAAIA,CAACA,CAACA,CAACA,QAAQA,CAACA,CAACA,CAACA;oBAClBA,IAAIA,CAACA,CAACA,CAACA,QAAQA,CAACA,CAACA,CAACA;gBACtBA,CAACA;gBAEDJ,8BAAAA,UAAiBA,EAAYA;oBAEzBK,MAAMA,CAACA,cAAcA,CAACA,SAASA,CAACA,EAAEA,EAAEA,IAAIA,CAACA,CAACA,EAAEA,IAAIA,CAACA,CAACA,CAACA;oBACnDA,MAAMA,CAACA,cAAcA,CAACA,SAASA,CAACA,EAAEA,EAAEA,IAAIA,CAACA,CAACA,EAAEA,IAAIA,CAACA,CAACA,CAACA;oBAEnDA,gCAAgCA;oBAChCA,gCAAgCA;oCAEpCA,CAACA;gBAEDL,gCAAAA,UAAmBA,EAAYA;oBAE3BM,MAAMA,CAACA,cAAcA,CAACA,WAAWA,CAACA,EAAEA,EAAEA,IAAIA,CAACA,CAACA,EAAEA,IAAIA,CAACA,CAACA,CAACA;oBACrDA,MAAMA,CAACA,cAAcA,CAACA,WAAWA,CAACA,EAAEA,EAAEA,IAAIA,CAACA,CAACA,EAAEA,IAAIA,CAACA,CAACA,CAACA;oBAErDA,kCAAkCA;oBAClCA,kCAAkCA;oCAEtCA,CAACA;gBAEDN,yBAAAA;oBACIO,OAAOA,eAAOA,CAACA,cAAcA,CAACA,IAAIA,CAACA,CAACA,EAAEA,IAAIA,CAACA,CAACA,EAAEA,IAAIA,CAACA,MAAMA,CAACA,CAACA;gBAC/DA,CAACA;gBAEDP,6BAAAA;oBACIQ,OAAOA,eAAOA,CAACA,kBAAkBA,CAACA,IAAIA,CAACA,CAACA,EAAEA,IAAIA,CAACA,CAACA,CAACA,CAACA;gBACtDA,CAACA;gBAEDR,4BAAAA,UAAeA,IAAYA;oBACvBS,OAAOA,eAAOA,CAACA,iBAAiBA,CAACA,IAAIA,EAAEA,IAAIA,CAACA,CAACA,EAAEA,IAAIA,CAACA,CAACA,CAACA,CAACA;gBAC3DA,CAACA;gBAEDT,8BAAAA,UAAiBA,EAAYA;oBAEzBU,MAAMA,CAACA,cAAcA,CAACA,SAASA,CAACA,EAAEA,EAAEA,IAAIA,CAACA,CAACA,EAAEA,IAAIA,CAACA,EAAEA,CAACA;oBACpDA,MAAMA,CAACA,cAAcA,CAACA,SAASA,CAACA,EAAEA,EAAEA,IAAIA,CAACA,CAACA,EAAEA,IAAIA,CAACA,EAAEA,CAACA;oBAEpDA,iCAAiCA;oBACjCA,iCAAiCA;oBAEjCA,IAAIA,CAACA,EAAEA,GAAGA,MAAMA,CAACA,SAASA,CAACA,IAAIA,CAACA,MAAMA,CAACA,SAASA,CAACA,QAAQA,CAACA,IAAIA,CAACA,EAAEA,EAAEA,IAAIA,CAACA,EAAEA,CAACA,CAACA,CAACA,SAASA,EAAEA;oBAExFA,IAAIA,CAACA,CAACA;oBACNA,IAAIA,CAACA,CAACA;oBACNA,IAAIA,CAACA,CAACA;oBACNA,IAAIA,CAACA,CAACA;oBAENA,GAAIA,IAAIA,CAACA,EAAEA,CAACA,CAACA,GAAGA,IAAIA,CAACA,EAAEA,CAACA,CAACA,CAACA;wBAEtBA,CAACA,GAAGA,IAAIA,CAACA,EAAEA,CAACA,CAACA;wBACbA,CAACA,GAAGA,IAAIA,CAACA,EAAEA,CAACA,CAACA;qBAChBA,KAEDA;wBACIA,CAACA,GAAGA,IAAIA,CAACA,EAAEA,CAACA,CAACA;wBACbA,CAACA,GAAGA,IAAIA,CAACA,EAAEA,CAACA,CAACA;qBAChBA;oBAEDA,GAAIA,IAAIA,CAACA,EAAEA,CAACA,CAACA,GAAGA,IAAIA,CAACA,EAAEA,CAACA,CAACA,CAACA;wBAEtBA,CAACA,GAAGA,IAAIA,CAACA,EAAEA,CAACA,CAACA;wBACbA,CAACA,GAAGA,IAAIA,CAACA,EAAEA,CAACA,CAACA;qBAChBA,KACDA;wBACIA,CAACA,GAAGA,IAAIA,CAACA,EAAEA,CAACA,CAACA;wBACbA,CAACA,GAAGA,IAAIA,CAACA,EAAEA,CAACA,CAACA;qBAChBA;oBAEDA,IAAIA,CAACA,MAAMA,CAACA,IAAIA,CAACA,KAAKA,CAACA,CAACA,GAAGA,IAAIA,CAACA,MAAMA,EAAEA,CAACA,GAAGA,IAAIA,CAACA,MAAMA,CAACA;oBACxDA,IAAIA,CAACA,MAAMA,CAACA,IAAIA,CAACA,KAAKA,CAACA,CAACA,GAAGA,IAAIA,CAACA,MAAMA,EAAEA,CAACA,GAAGA,IAAIA,CAACA,MAAMA,CAACA;gBAE5DA,CAACA;gBAEDV,+BAAAA,UAAkBA,CAAcA;oBAE5BW,GAAIA,CAACA,IAAIA,CAACA,MAAMA,CAACA,YAAYA,CAACA,CAACA,CAACA,CAACA;wBAE7BA,OAAOA,KAAKA,CAACA;qBAChBA;oBAEDA,IAAIA,EAAEA,GAAGA,MAAMA,CAACA,SAASA,CAACA,GAAGA,CAACA,IAAIA,CAACA,EAAEA,EAAEA,CAACA,CAACA,GAAGA,MAAMA,CAACA,SAASA,CAACA,GAAGA,CAACA,IAAIA,CAACA,EAAEA,EAAEA,IAAIA,CAACA,EAAEA,CAACA,CAACA;oBACnFA,IAAIA,IAAIA,GAAGA,IAAIA,CAACA,GAAGA,CAACA,EAAEA,CAACA,CAACA;oBAExBA,GAAIA,IAAIA,GAAGA,IAAIA,CAACA,MAAMA,CAACA;wBAEnBA,OAAOA,KAAKA,CAACA;qBAChBA;oBAEDA,IAAIA,EAAEA,GAAGA,MAAMA,CAACA,SAASA,CAACA,KAAKA,CAACA,CAACA,EAAEA,IAAIA,CAACA,EAAEA,CAACA,CAACA;oBAC5CA,IAAIA,GAAGA,GAAGA,MAAMA,CAACA,SAASA,CAACA,KAAKA,CAACA,IAAIA,CAACA,EAAEA,EAAEA,IAAIA,CAACA,EAAEA,CAACA,CAACA;oBACnDA,IAAIA,GAAGA,GAAGA,MAAMA,CAACA,SAASA,CAACA,KAAKA,CAACA,IAAIA,CAACA,EAAEA,EAAEA,IAAIA,CAACA,EAAEA,CAACA,CAACA;oBAEnDA,GAAIA,EAAEA,IAAIA,GAAGA,CAACA;wBAEVA,GAAIA,EAAEA,GAAGA,GAAGA,GAAGA,IAAIA,CAACA,MAAMA,CAACA;4BAEvBA,OAAOA,KAAKA,CAACA;yBAChBA;wBAEDA,OAAOA,MAAMA,CAACA,SAASA,CAACA,UAAUA,CAACA,IAAIA,CAACA,EAAEA,EAAEA,CAACA,CAACA,IAAGA,IAAKA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,MAAMA,CAACA,CAACA;qBAChFA,MACIA,GAAIA,EAAEA,GAAGA,GAAGA,CAACA;wBAEdA,GAAIA,EAAEA,GAAGA,GAAGA,GAAGA,IAAIA,CAACA,MAAMA,CAACA;4BAEvBA,OAAOA,KAAKA,CAACA;yBAChBA;wBAEDA,OAAOA,MAAMA,CAACA,SAASA,CAACA,UAAUA,CAACA,IAAIA,CAACA,EAAEA,EAAEA,CAACA,CAACA,IAAGA,IAAKA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,MAAMA,CAACA,CAACA;qBAChFA;oBAEDA,OAAOA,IAAIA,CAACA;gBAChBA,CAACA;gBAEDX,sCAAAA,UAAyBA,CAAaA,EAAEA,OAAeA;oBAEnDY,IAAIA,GAAGA,GAAGA,OAAOA,GAAGA,OAAOA,CAACA;oBAE5BA,GAAIA,MAAMA,CAACA,SAASA,CAACA,UAAUA,CAACA,IAAIA,CAACA,EAAEA,EAAEA,CAACA,CAACA,GAAGA,GAAGA,CAACA;wBAE9CA,OAAOA,CAACA,CAACA;qBACZA;oBAEDA,GAAIA,MAAMA,CAACA,SAASA,CAACA,UAAUA,CAACA,IAAIA,CAACA,EAAEA,EAAEA,CAACA,CAACA,GAAGA,GAAGA,CAACA;wBAE9CA,OAAOA,CAACA,CAACA;qBACZA;oBAEDA,OAAOA,CAACA,CAACA,CAACA;gBACdA,CAACA;gBAEDZ,oCAAAA,UAAuBA,CAACA,EAAEA,CAACA;oBAEvBa,IAAIA,CAACA,GAAGA,MAAMA,CAACA,SAASA,CAACA,GAAGA,CAACA,CAACA,EAAEA,IAAIA,CAACA,EAAEA,CAACA,GAAGA,IAAIA,CAACA,MAAMA,CAACA;oBACvDA,IAAIA,CAACA,GAAGA,MAAMA,CAACA,SAASA,CAACA,GAAGA,CAACA,CAACA,EAAEA,IAAIA,CAACA,EAAEA,CAACA,GAAGA,IAAIA,CAACA,MAAMA,CAACA;oBAEvDA,OAAOA,IAAIA,CAACA,GAAGA,CAACA,CAACA,EAAEA,CAACA,CAACA,GAAGA,CAACA,CAACA;gBAC9BA,CAACA;gBAELb;AAACA,YAADA,CAACA,EA3L4BD,MAAMA,CAACA,OAAOA,CAACA,KAAKA,EA2LhDA;YA3LDA,yBA2LCA,YAAAA;QAELA,CAACA,2CAAAD;QA/LMA;AA+LNA,IAADA,CAACA,2CAAAD;IA/LMA;AA+LNA,CAAAA,2BAAA"} \ No newline at end of file diff --git a/wip/physics/shapes/Segment.ts b/wip/physics/shapes/Segment.ts deleted file mode 100644 index 7416c03b..00000000 --- a/wip/physics/shapes/Segment.ts +++ /dev/null @@ -1,204 +0,0 @@ -/// -/// -/// -/// -/// - -/** -* Phaser - Advanced Physics - Shapes - Segment -* -* Based on the work Ju Hyung Lee started in JS PhyRus. -*/ - -module Phaser.Physics.Shapes { - - export class Segment extends Phaser.Physics.Shape implements IShape { - - constructor(a, b, radius: number) { - - super(AdvancedPhysics.SHAPE_TYPE_SEGMENT); - - this.a = a.duplicate(); - this.b = b.duplicate(); - this.radius = radius; - - this.normal = Phaser.Vec2Utils.perp(Phaser.Vec2Utils.subtract(b, a)); - this.normal.normalize(); - - this.ta = new Phaser.Vec2; - this.tb = new Phaser.Vec2; - this.tn = new Phaser.Vec2; - - this.finishVerts(); - - } - - public a: Phaser.Vec2; - public b: Phaser.Vec2; - public radius: number; - - public normal: Phaser.Vec2; - public ta: Phaser.Vec2; - public tb: Phaser.Vec2; - public tn: Phaser.Vec2; - - public finishVerts() { - - this.normal = Phaser.Vec2Utils.perp(Phaser.Vec2Utils.subtract(this.b, this.a)); - this.normal.normalize(); - - this.radius = Math.abs(this.radius); - - } - - public duplicate() { - return new Phaser.Physics.Shapes.Segment(this.a, this.b, this.radius); - } - - public recenter(c) { - this.a.subtract(c); - this.b.subtract(c); - } - - public transform(xf:Transform) { - - Phaser.TransformUtils.transform(xf, this.a, this.a); - Phaser.TransformUtils.transform(xf, this.b, this.b); - - //this.a = xf.transform(this.a); - //this.b = xf.transform(this.b); - - } - - public untransform(xf:Transform) { - - Phaser.TransformUtils.untransform(xf, this.a, this.a); - Phaser.TransformUtils.untransform(xf, this.b, this.b); - - //this.a = xf.untransform(this.a); - //this.b = xf.untransform(this.b); - - } - - public area(): number { - return AdvancedPhysics.areaForSegment(this.a, this.b, this.radius); - } - - public centroid(): Phaser.Vec2 { - return AdvancedPhysics.centroidForSegment(this.a, this.b); - } - - public inertia(mass: number): number { - return AdvancedPhysics.inertiaForSegment(mass, this.a, this.b); - } - - public cacheData(xf:Transform) { - - Phaser.TransformUtils.transform(xf, this.a, this.ta); - Phaser.TransformUtils.transform(xf, this.b, this.tb); - - //this.ta = xf.transform(this.a); - //this.tb = xf.transform(this.b); - - this.tn = Phaser.Vec2Utils.perp(Phaser.Vec2Utils.subtract(this.tb, this.ta)).normalize(); - - var l; - var r; - var t; - var b; - - if (this.ta.x < this.tb.x) - { - l = this.ta.x; - r = this.tb.x; - } - else - { - l = this.tb.x; - r = this.ta.x; - } - - if (this.ta.y < this.tb.y) - { - b = this.ta.y; - t = this.tb.y; - } else - { - b = this.tb.y; - t = this.ta.y; - } - - this.bounds.mins.setTo(l - this.radius, b - this.radius); - this.bounds.maxs.setTo(r + this.radius, t + this.radius); - - } - - public pointQuery(p: Phaser.Vec2): bool { - - if (!this.bounds.containPoint(p)) - { - return false; - } - - var dn = Phaser.Vec2Utils.dot(this.tn, p) - Phaser.Vec2Utils.dot(this.ta, this.tn); - var dist = Math.abs(dn); - - if (dist > this.radius) - { - return false; - } - - var dt = Phaser.Vec2Utils.cross(p, this.tn); - var dta = Phaser.Vec2Utils.cross(this.ta, this.tn); - var dtb = Phaser.Vec2Utils.cross(this.tb, this.tn); - - if (dt <= dta) - { - if (dt < dta - this.radius) - { - return false; - } - - return Phaser.Vec2Utils.distanceSq(this.ta, p) < (this.radius * this.radius); - } - else if (dt > dtb) - { - if (dt > dtb + this.radius) - { - return false; - } - - return Phaser.Vec2Utils.distanceSq(this.tb, p) < (this.radius * this.radius); - } - - return true; - } - - public findVertexByPoint(p:Phaser.Vec2, minDist: number): number { - - var dsq = minDist * minDist; - - if (Phaser.Vec2Utils.distanceSq(this.ta, p) < dsq) - { - return 0; - } - - if (Phaser.Vec2Utils.distanceSq(this.tb, p) < dsq) - { - return 1; - } - - return -1; - } - - public distanceOnPlane(n, d) { - - var a = Phaser.Vec2Utils.dot(n, this.ta) - this.radius; - var b = Phaser.Vec2Utils.dot(n, this.tb) - this.radius; - - return Math.min(a, b) - d; - } - - } - -} \ No newline at end of file diff --git a/wip/physics/shapes/Shape.js b/wip/physics/shapes/Shape.js deleted file mode 100644 index 12786dac..00000000 --- a/wip/physics/shapes/Shape.js +++ /dev/null @@ -1,33 +0,0 @@ -var Phaser; -(function (Phaser) { - /// - /// - /// - /// - /// - /// - /** - * Phaser - Advanced Physics - Shape - * - * Based on the work Ju Hyung Lee started in JS PhyRus. - */ - (function (Physics) { - var Shape = (function () { - function Shape(type) { - this.id = Physics.AdvancedPhysics.shapeCounter++; - this.type = type; - this.elasticity = 0.0; - this.friction = 1.0; - this.density = 1; - this.bounds = new Physics.Bounds(); - } - Shape.prototype.findEdgeByPoint = // Over-ridden by ShapePoly - function (p, minDist) { - return -1; - }; - return Shape; - })(); - Physics.Shape = Shape; - })(Phaser.Physics || (Phaser.Physics = {})); - var Physics = Phaser.Physics; -})(Phaser || (Phaser = {})); diff --git a/wip/physics/shapes/Shape.js.map b/wip/physics/shapes/Shape.js.map deleted file mode 100644 index eef9473d..00000000 --- a/wip/physics/shapes/Shape.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Shape.js","sources":["Shape.ts"],"names":["Phaser","Phaser.Physics","Phaser.Physics.Shape","Phaser.Physics.Shape.constructor","Phaser.Physics.Shape.findEdgeByPoint"],"mappings":"AAaA,IAAO,MAAM;AAgDZ,CAhDD,UAAO,MAAM;IAbbA,2CAA2CA;IAC3CA,gDAAgDA;IAChDA,sCAAsCA;IACtCA,mCAAmCA;IACnCA,qCAAqCA;IACrCA,kCAAkCA;IAElCA;;;;MAIEA;KAEKA,UAAOA,OAAOA;QAEjBC;YAEIC,SAFSA,KAAKA,CAEFA,IAAYA;gBAEpBC,IAAIA,CAACA,EAAEA,GAAGA,MAAMA,CAACA,OAAOA,CAACA,OAAOA,CAACA,YAAYA,EAAEA;gBAC/CA,IAAIA,CAACA,IAAIA,GAAGA,IAAIA;gBAEhBA,IAAIA,CAACA,UAAUA,GAAGA,GAAGA;gBACrBA,IAAIA,CAACA,QAAQA,GAAGA,GAAGA;gBACnBA,IAAIA,CAACA,OAAOA,GAAGA,CAACA;gBAEhBA,IAAIA,CAACA,MAAMA,GAAGA,IAAIA,MAAMA,EAAAA;YAE5BA,CAACA;YA2BDD,kCADAA,4BAA4BA;YAC5BA,UAAuBA,CAAcA,EAAEA,OAAeA;gBAClDE,OAAOA,CAACA,CAACA,CAACA;YACdA,CAACA;YAELF;AAACA,QAADA,CAACA,IAAAD;QA5CDA,sBA4CCA,QAAAA;IAELA,CAACA,2CAAAD;IAhDMA;AAgDNA,CAAAA,2BAAA"} \ No newline at end of file diff --git a/wip/physics/shapes/Shape.ts b/wip/physics/shapes/Shape.ts deleted file mode 100644 index edac5aa2..00000000 --- a/wip/physics/shapes/Shape.ts +++ /dev/null @@ -1,62 +0,0 @@ -/// -/// -/// -/// -/// -/// - -/** -* Phaser - Advanced Physics - Shape -* -* Based on the work Ju Hyung Lee started in JS PhyRus. -*/ - -module Phaser.Physics { - - export class Shape { - - constructor(type: number) { - - this.id = AdvancedPhysics.shapeCounter++; - this.type = type; - - this.elasticity = 0.0; - this.friction = 1.0; - this.density = 1; - - this.bounds = new Bounds; - - } - - public id: number; - public type: number; - public body: Body; - - public verts: Phaser.Vec2[]; - public planes: Phaser.Physics.Plane[]; - - public tverts: Phaser.Vec2[]; - public tplanes: Phaser.Physics.Plane[]; - - public convexity: bool; - - // Coefficient of restitution (elasticity) - public elasticity: number; - - // Frictional coefficient - public friction: number; - - // Mass density - public density: number; - - // Axis-aligned bounding box - public bounds: Bounds; - - // Over-ridden by ShapePoly - public findEdgeByPoint(p: Phaser.Vec2, minDist: number): number { - return -1; - } - - } - -} \ No newline at end of file diff --git a/wip/physics/shapes/Triangle.js b/wip/physics/shapes/Triangle.js deleted file mode 100644 index 2c8aea16..00000000 --- a/wip/physics/shapes/Triangle.js +++ /dev/null @@ -1,51 +0,0 @@ -var __extends = this.__extends || function (d, b) { - function __() { this.constructor = d; } - __.prototype = b.prototype; - d.prototype = new __(); -}; -var Phaser; -(function (Phaser) { - (function (Physics) { - /// - /// - /// - /// - /// - /** - * Phaser - Advanced Physics - Shapes - Triangle - * - * Based on the work Ju Hyung Lee started in JS PhyRus. - */ - (function (Shapes) { - var Triangle = (function (_super) { - __extends(Triangle, _super); - function Triangle(x1, y1, x2, y2, x3, y3) { - x1 = Phaser.Physics.AdvancedPhysics.pixelsToMeters(x1); - y1 = Phaser.Physics.AdvancedPhysics.pixelsToMeters(y1); - x2 = Phaser.Physics.AdvancedPhysics.pixelsToMeters(x2); - y2 = Phaser.Physics.AdvancedPhysics.pixelsToMeters(y2); - x3 = Phaser.Physics.AdvancedPhysics.pixelsToMeters(x3); - y3 = Phaser.Physics.AdvancedPhysics.pixelsToMeters(y3); - _super.call(this, [ - { - x: x1, - y: y1 - }, - { - x: x2, - y: y2 - }, - { - x: x3, - y: y3 - } - ]); - } - return Triangle; - })(Phaser.Physics.Shapes.Poly); - Shapes.Triangle = Triangle; - })(Physics.Shapes || (Physics.Shapes = {})); - var Shapes = Physics.Shapes; - })(Phaser.Physics || (Phaser.Physics = {})); - var Physics = Phaser.Physics; -})(Phaser || (Phaser = {})); diff --git a/wip/physics/shapes/Triangle.js.map b/wip/physics/shapes/Triangle.js.map deleted file mode 100644 index c1b54ffa..00000000 --- a/wip/physics/shapes/Triangle.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"Triangle.js","sources":["Triangle.ts"],"names":["Phaser","Phaser.Physics","Phaser.Physics.Shapes","Phaser.Physics.Shapes.Triangle","Phaser.Physics.Shapes.Triangle.constructor"],"mappings":";;;;;AAYA,IAAO,MAAM;AAmBZ,CAnBD,UAAO,MAAM;KAANA,UAAOA,OAAOA;QAZrBC,2CAA2CA;QAC3CA,sCAAsCA;QACtCA,mCAAmCA;QACnCA,iCAAiCA;QACjCA,gCAAgCA;QAEhCA;;;;UAIEA;SAEKA,UAAeA,MAAMA;YAExBC;;gBAEIC,SAFSA,QAAQA,CAELA,EAAUA,EAAEA,EAAUA,EAAEA,EAAUA,EAAEA,EAAUA,EAAEA,EAAUA,EAAEA,EAAUA;oBAE9EC,EAAEA,GAAGA,eAAOA,CAACA,cAAcA,CAACA,EAAEA,CAACA;oBAC/BA,EAAEA,GAAGA,eAAOA,CAACA,cAAcA,CAACA,EAAEA,CAACA;oBAC/BA,EAAEA,GAAGA,eAAOA,CAACA,cAAcA,CAACA,EAAEA,CAACA;oBAC/BA,EAAEA,GAAGA,eAAOA,CAACA,cAAcA,CAACA,EAAEA,CAACA;oBAC/BA,EAAEA,GAAGA,eAAOA,CAACA,cAAcA,CAACA,EAAEA,CAACA;oBAC/BA,EAAEA,GAAGA,eAAOA,CAACA,cAAcA,CAACA,EAAEA,CAACA;oBAE/BA,8BAAMA;gBAACA;oBAAEA,CAACA,EAAEA,EAAEA;oBAAEA,CAACA,EAAEA,EAAEA;iBAAEA;gBAAEA;oBAAEA,CAACA,EAAEA,EAAEA;oBAAEA,CAACA,EAAEA,EAAEA;iBAAEA;gBAAEA;oBAAEA,CAACA,EAAEA,EAAEA;oBAAEA,CAACA,EAAEA,EAAEA;iBAAEA;aAACA,CAInEA;gBAFGA,CAACA;gBAELD;AAACA,YAADA,CAACA,EAf6BD,MAAMA,CAACA,OAAOA,CAACA,MAAMA,CAACA,IAAIA,EAevDA;YAfDA,2BAeCA,YAAAA;QAELA,CAACA,2CAAAD;QAnBMA;AAmBNA,IAADA,CAACA,2CAAAD;IAnBMA;AAmBNA,CAAAA,2BAAA"} \ No newline at end of file diff --git a/wip/physics/shapes/Triangle.ts b/wip/physics/shapes/Triangle.ts deleted file mode 100644 index 03842876..00000000 --- a/wip/physics/shapes/Triangle.ts +++ /dev/null @@ -1,32 +0,0 @@ -/// -/// -/// -/// -/// - -/** -* Phaser - Advanced Physics - Shapes - Triangle -* -* Based on the work Ju Hyung Lee started in JS PhyRus. -*/ - -module Phaser.Physics.Shapes { - - export class Triangle extends Phaser.Physics.Shapes.Poly { - - constructor(x1: number, y1: number, x2: number, y2: number, x3: number, y3: number) { - - x1 = Phaser.Physics.AdvancedPhysics.pixelsToMeters(x1); - y1 = Phaser.Physics.AdvancedPhysics.pixelsToMeters(y1); - x2 = Phaser.Physics.AdvancedPhysics.pixelsToMeters(x2); - y2 = Phaser.Physics.AdvancedPhysics.pixelsToMeters(y2); - x3 = Phaser.Physics.AdvancedPhysics.pixelsToMeters(x3); - y3 = Phaser.Physics.AdvancedPhysics.pixelsToMeters(y3); - - super([{ x: x1, y: y1 }, { x: x2, y: y2 }, { x: x3, y: y3 }]); - - } - - } - -}