diff --git a/Docs/WIP/01_phaser-arcade.jpg b/Docs/WIP/01_phaser-arcade.jpg new file mode 100644 index 00000000..2fe7c150 Binary files /dev/null and b/Docs/WIP/01_phaser-arcade.jpg differ diff --git a/Docs/WIP/02_phaser-newsletter.jpg b/Docs/WIP/02_phaser-newsletter.jpg new file mode 100644 index 00000000..5fd49696 Binary files /dev/null and b/Docs/WIP/02_phaser-newsletter.jpg differ diff --git a/Docs/WIP/phaser-manual_2013-08-27.pdf b/Docs/WIP/phaser-manual_2013-08-27.pdf new file mode 100644 index 00000000..62d8287b Binary files /dev/null and b/Docs/WIP/phaser-manual_2013-08-27.pdf differ diff --git a/Docs/WIP/phaser_onscreen-controls_1-arcade.png b/Docs/WIP/phaser_onscreen-controls_1-arcade.png new file mode 100644 index 00000000..4da313ce Binary files /dev/null and b/Docs/WIP/phaser_onscreen-controls_1-arcade.png differ diff --git a/Docs/WIP/phaser_onscreen-controls_2-dpad.png b/Docs/WIP/phaser_onscreen-controls_2-dpad.png new file mode 100644 index 00000000..4d703593 Binary files /dev/null and b/Docs/WIP/phaser_onscreen-controls_2-dpad.png differ diff --git a/Docs/WIP/phaser_onscreen-controls_3-generic.png b/Docs/WIP/phaser_onscreen-controls_3-generic.png new file mode 100644 index 00000000..70135276 Binary files /dev/null and b/Docs/WIP/phaser_onscreen-controls_3-generic.png differ diff --git a/examples/stage 2.php b/examples/stage 2.php index 4c0555ca..f30ed092 100644 --- a/examples/stage 2.php +++ b/examples/stage 2.php @@ -22,33 +22,12 @@ function create() { - //var texture = PIXI.TextureCache['skully.png']; - - // PIXI.BaseTextureCache['monsters'] = new PIXI.BaseTexture(game.cache.getImage('monsters')); - - // every image loaded should go into the BaseTextureCache, unique by URL (or maybe key) - // var base = new PIXI.BaseTexture(game.cache.getImage('monsters')); - - // Every FRAME needs a PIXI.Texture, related to the base (the source image) and the frame data - // var texture = new PIXI.Texture(base, { x: 0, y: 0, width: 100, height: 100 }); - // var texture2 = new PIXI.Texture(base, { x: 0, y: 0, width: 100, height: 300 }); - - // PIXI.Sprite.fromFrame(key) pulls the texture from the TextureCache and returns a new Sprite made from it... - // var texture = PIXI.TextureCache[frameId]; - - - // console.log(PIXI.TextureCache); - - // console.log(game.cache.getFrameData('monsters')); - + // This is created by the very act of loading a texture atlas in frameData = game.cache.getFrameData('monsters'); - // bunny = new PIXI.Sprite(texture2); - + // Both of these work - they look fugly I know, but they'll be hidden behind a Phaser Sprite anyway bunny = PIXI.Sprite.fromFrame(frameData.getFrame(0).uuid); // bunny = PIXI.Sprite.fromFrame(frameData.getFrameByName('skully.png').uuid); - - // bunny = PIXI.Sprite.fromImage('monsters'); bunny.anchor.x = 0.5; bunny.anchor.y = 0.5; @@ -74,7 +53,7 @@ bunny.setTexture(PIXI.TextureCache[frameData.getFrame(f).uuid]); - n = game.time.now + 1000; + n = game.time.now + 500; } } diff --git a/examples/stage 3.php b/examples/stage 3.php new file mode 100644 index 00000000..859fae54 --- /dev/null +++ b/examples/stage 3.php @@ -0,0 +1,68 @@ + + + + phaser.js - a new beginning + + + + + + + + \ No newline at end of file diff --git a/src/animation/Parser.js b/src/animation/Parser.js index c644e67f..f5e00c52 100644 --- a/src/animation/Parser.js +++ b/src/animation/Parser.js @@ -48,13 +48,23 @@ Phaser.Animation.Parser = { var x = 0; var y = 0; - for (var i = 0; i < total; i++) { + for (var i = 0; i < total; i++) + { + var uuid = game.rnd.uuid(); - data.addFrame(new Phaser.Animation.Frame(x, y, frameWidth, frameHeight, '')); + data.addFrame(new Phaser.Animation.Frame(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) { + if (x === width) + { x = 0; y += frameHeight; } diff --git a/src/loader/Cache.js b/src/loader/Cache.js index 02dcaba2..684444f9 100644 --- a/src/loader/Cache.js +++ b/src/loader/Cache.js @@ -69,10 +69,11 @@ Phaser.Cache.prototype = { addSpriteSheet: function (key, url, data, frameWidth, frameHeight, frameMax) { this._images[key] = { url: url, data: data, spriteSheet: true, frameWidth: frameWidth, frameHeight: frameHeight }; - this._images[key].frameData = Phaser.Animation.Parser.spriteSheet(this.game, key, frameWidth, frameHeight, frameMax); PIXI.BaseTextureCache[key] = new PIXI.BaseTexture(data); + this._images[key].frameData = Phaser.Animation.Parser.spriteSheet(this.game, key, frameWidth, frameHeight, frameMax); + }, /** diff --git a/src/loader/Loader.js b/src/loader/Loader.js index f14093b2..1fd66419 100644 --- a/src/loader/Loader.js +++ b/src/loader/Loader.js @@ -177,7 +177,8 @@ Phaser.Loader.prototype = { if (typeof overwrite === "undefined") { overwrite = false; } - if (overwrite || this.checkKeyExists(key) == false) { + if (overwrite || this.checkKeyExists(key) == false) + { this.addToFileList('text', key, url); } @@ -195,7 +196,8 @@ Phaser.Loader.prototype = { if (typeof frameMax === "undefined") { frameMax = -1; } - if (this.checkKeyExists(key) === false) { + if (this.checkKeyExists(key) === false) + { this.addToFileList('spritesheet', key, url, { frameWidth: frameWidth, frameHeight: frameHeight, frameMax: frameMax }); } @@ -211,7 +213,8 @@ Phaser.Loader.prototype = { if (typeof autoDecode === "undefined") { autoDecode = true; } - if (this.checkKeyExists(key) === false) { + if (this.checkKeyExists(key) === false) + { this.addToFileList('audio', key, urls, { buffer: null, autoDecode: autoDecode }); }