Skip to content

Commit 5c6b5f3

Browse files
photonstormphotonstorm
committed
New build files.
1 parent 3888653 commit 5c6b5f3

7 files changed

Lines changed: 177 additions & 129 deletions

File tree

‎build/custom/phaser-arcade-physics.js‎

Lines changed: 57 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Phaser - http://phaser.io
99
*
10-
* v2.0.6 "Jornhill" - Built: Wed Jun 11 2014 12:46:18
10+
* v2.0.6 "Jornhill" - Built: Wed Jun 11 2014 14:38:21
1111
*
1212
* By Richard Davey http://www.photonstorm.com @photonstorm
1313
*
@@ -9790,7 +9790,7 @@ PIXI.RenderTexture.tempMatrix = new PIXI.Matrix();
97909790
*
97919791
* Phaser - http://phaser.io
97929792
*
9793-
* v2.0.6 "Jornhill" - Built: Wed Jun 11 2014 12:46:18
9793+
* v2.0.6 "Jornhill" - Built: Wed Jun 11 2014 14:38:21
97949794
*
97959795
* By Richard Davey http://www.photonstorm.com @photonstorm
97969796
*
@@ -24459,14 +24459,14 @@ Phaser.Gamepad.PS3XC_SELECT = 8;
2445924459
Phaser.Gamepad.PS3XC_START = 9;
2446024460
Phaser.Gamepad.PS3XC_STICK_LEFT_BUTTON = 10;
2446124461
Phaser.Gamepad.PS3XC_STICK_RIGHT_BUTTON = 11;
24462-
Phaser.Gamepad.PS3CX_DPAD_UP = 12;
24463-
Phaser.Gamepad.PS3CX_DPAD_DOWN = 13;
24464-
Phaser.Gamepad.PS3CX_DPAD_LEFT = 14;
24465-
Phaser.Gamepad.PS3CX_DPAD_RIGHT = 15;
24466-
Phaser.Gamepad.PS3CX_STICK_LEFT_X = 0; // analog stick, range -1..1
24467-
Phaser.Gamepad.PS3CX_STICK_LEFT_Y = 1; // analog stick, range -1..1
24468-
Phaser.Gamepad.PS3CX_STICK_RIGHT_X = 2; // analog stick, range -1..1
24469-
Phaser.Gamepad.PS3CX_STICK_RIGHT_Y = 3; // analog stick, range -1..1
24462+
Phaser.Gamepad.PS3XC_DPAD_UP = 12;
24463+
Phaser.Gamepad.PS3XC_DPAD_DOWN = 13;
24464+
Phaser.Gamepad.PS3XC_DPAD_LEFT = 14;
24465+
Phaser.Gamepad.PS3XC_DPAD_RIGHT = 15;
24466+
Phaser.Gamepad.PS3XC_STICK_LEFT_X = 0; // analog stick, range -1..1
24467+
Phaser.Gamepad.PS3XC_STICK_LEFT_Y = 1; // analog stick, range -1..1
24468+
Phaser.Gamepad.PS3XC_STICK_RIGHT_X = 2; // analog stick, range -1..1
24469+
Phaser.Gamepad.PS3XC_STICK_RIGHT_Y = 3; // analog stick, range -1..1
2447024470

2447124471
/**
2447224472
* @author @karlmacklin <tacklemcclean@gmail.com>
@@ -30773,8 +30773,6 @@ Phaser.TileSprite = function (game, x, y, width, height, key, frame) {
3077330773

3077430774
PIXI.TilingSprite.call(this, PIXI.TextureCache['__default'], width, height);
3077530775

30776-
this.loadTexture(key, frame);
30777-
3077830776
this.position.set(x, y);
3077930777

3078030778
/**
@@ -30840,6 +30838,8 @@ Phaser.TileSprite = function (game, x, y, width, height, key, frame) {
3084030838
*/
3084130839
this._cache = [ 0, 0, 0, 0, 1, 0, 1, 0, 0 ];
3084230840

30841+
this.loadTexture(key, frame);
30842+
3084330843
};
3084430844

3084530845
Phaser.TileSprite.prototype = Object.create(PIXI.TilingSprite.prototype);
@@ -31016,72 +31016,88 @@ Phaser.TileSprite.prototype.stopScroll = function() {
3101631016
*
3101731017
* @method Phaser.TileSprite#loadTexture
3101831018
* @memberof Phaser.TileSprite
31019-
* @param {string|Phaser.RenderTexture|Phaser.BitmapData|PIXI.Texture} key - This is the image or texture used by the Sprite during rendering. It can be a string which is a reference to the Cache entry, or an instance of a RenderTexture, BitmapData or PIXI.Texture.
31020-
* @param {string|number} frame - If this Sprite is using part of a sprite sheet or texture atlas you can specify the exact frame to use by giving a string or numeric index.
31019+
* @param {string|Phaser.RenderTexture|Phaser.BitmapData|PIXI.Texture} key - This is the image or texture used by the TileSprite during rendering. It can be a string which is a reference to the Cache entry, or an instance of a RenderTexture, BitmapData or PIXI.Texture.
31020+
* @param {string|number} frame - If this TileSprite is using part of a sprite sheet or texture atlas you can specify the exact frame to use by giving a string or numeric index.
3102131021
*/
3102231022
Phaser.TileSprite.prototype.loadTexture = function (key, frame) {
3102331023

3102431024
frame = frame || 0;
31025+
31026+
this.key = key;
3102531027

3102631028
if (key instanceof Phaser.RenderTexture)
3102731029
{
3102831030
this.key = key.key;
3102931031
this.setTexture(key);
31030-
return;
3103131032
}
3103231033
else if (key instanceof Phaser.BitmapData)
3103331034
{
31034-
this.key = key;
3103531035
this.setTexture(key.texture);
31036-
return;
3103731036
}
3103831037
else if (key instanceof PIXI.Texture)
3103931038
{
31040-
this.key = key;
3104131039
this.setTexture(key);
31042-
return;
3104331040
}
3104431041
else
3104531042
{
3104631043
if (key === null || typeof key === 'undefined')
3104731044
{
3104831045
this.key = '__default';
3104931046
this.setTexture(PIXI.TextureCache[this.key]);
31050-
return;
3105131047
}
3105231048
else if (typeof key === 'string' && !this.game.cache.checkImageKey(key))
3105331049
{
3105431050
this.key = '__missing';
3105531051
this.setTexture(PIXI.TextureCache[this.key]);
31056-
return;
31057-
}
31058-
31059-
if (this.game.cache.isSpriteSheet(key))
31060-
{
31061-
this.key = key;
31062-
31063-
// var frameData = this.game.cache.getFrameData(key);
31064-
this.animations.loadFrameData(this.game.cache.getFrameData(key));
31065-
31066-
if (typeof frame === 'string')
31067-
{
31068-
this.frameName = frame;
31069-
}
31070-
else
31071-
{
31072-
this.frame = frame;
31073-
}
3107431052
}
3107531053
else
3107631054
{
31077-
this.key = key;
31078-
this.setTexture(PIXI.TextureCache[key]);
31079-
return;
31055+
this.setTexture(new PIXI.Texture(PIXI.BaseTextureCache[key]));
31056+
this.animations.loadFrameData(this.game.cache.getFrameData(key), frame);
3108031057
}
3108131058
}
3108231059

3108331060
};
3108431061

31062+
/**
31063+
* Sets the Texture frame the TileSprite uses for rendering.
31064+
* This is primarily an internal method used by TileSprite.loadTexture, although you may call it directly.
31065+
*
31066+
* @method Phaser.TileSprite#setFrame
31067+
* @memberof Phaser.TileSprite
31068+
* @param {Phaser.Frame} frame - The Frame to be used by the TileSprite texture.
31069+
*/
31070+
Phaser.TileSprite.prototype.setFrame = function(frame) {
31071+
31072+
// this._cache[9] = frame.x;
31073+
// this._cache[10] = frame.y;
31074+
// this._cache[11] = frame.width;
31075+
// this._cache[12] = frame.height;
31076+
// this._cache[13] = frame.spriteSourceSizeX;
31077+
// this._cache[14] = frame.spriteSourceSizeY;
31078+
31079+
this.texture.frame.x = frame.x;
31080+
this.texture.frame.y = frame.y;
31081+
this.texture.frame.width = frame.width;
31082+
this.texture.frame.height = frame.height;
31083+
31084+
if (frame.trimmed)
31085+
{
31086+
this.texture.trim = { x: frame.spriteSourceSizeX, y: frame.spriteSourceSizeY, width: frame.width, height: frame.height };
31087+
}
31088+
31089+
if (this.game.renderType === Phaser.WEBGL)
31090+
{
31091+
PIXI.WebGLRenderer.updateTextureFrame(this.texture);
31092+
}
31093+
31094+
// if (this.cropRect)
31095+
// {
31096+
// this.updateCrop();
31097+
// }
31098+
31099+
};
31100+
3108531101
/**
3108631102
* Destroys the TileSprite. This removes it from its parent group, destroys the event and animation handlers if present
3108731103
* and nulls its reference to game, freeing it up for garbage collection.

‎build/custom/phaser-arcade-physics.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/custom/phaser-no-libs.js‎

Lines changed: 56 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Phaser - http://phaser.io
99
*
10-
* v2.0.6 "Jornhill" - Built: Wed Jun 11 2014 12:46:18
10+
* v2.0.6 "Jornhill" - Built: Wed Jun 11 2014 14:38:21
1111
*
1212
* By Richard Davey http://www.photonstorm.com @photonstorm
1313
*
@@ -14676,14 +14676,14 @@ Phaser.Gamepad.PS3XC_SELECT = 8;
1467614676
Phaser.Gamepad.PS3XC_START = 9;
1467714677
Phaser.Gamepad.PS3XC_STICK_LEFT_BUTTON = 10;
1467814678
Phaser.Gamepad.PS3XC_STICK_RIGHT_BUTTON = 11;
14679-
Phaser.Gamepad.PS3CX_DPAD_UP = 12;
14680-
Phaser.Gamepad.PS3CX_DPAD_DOWN = 13;
14681-
Phaser.Gamepad.PS3CX_DPAD_LEFT = 14;
14682-
Phaser.Gamepad.PS3CX_DPAD_RIGHT = 15;
14683-
Phaser.Gamepad.PS3CX_STICK_LEFT_X = 0; // analog stick, range -1..1
14684-
Phaser.Gamepad.PS3CX_STICK_LEFT_Y = 1; // analog stick, range -1..1
14685-
Phaser.Gamepad.PS3CX_STICK_RIGHT_X = 2; // analog stick, range -1..1
14686-
Phaser.Gamepad.PS3CX_STICK_RIGHT_Y = 3; // analog stick, range -1..1
14679+
Phaser.Gamepad.PS3XC_DPAD_UP = 12;
14680+
Phaser.Gamepad.PS3XC_DPAD_DOWN = 13;
14681+
Phaser.Gamepad.PS3XC_DPAD_LEFT = 14;
14682+
Phaser.Gamepad.PS3XC_DPAD_RIGHT = 15;
14683+
Phaser.Gamepad.PS3XC_STICK_LEFT_X = 0; // analog stick, range -1..1
14684+
Phaser.Gamepad.PS3XC_STICK_LEFT_Y = 1; // analog stick, range -1..1
14685+
Phaser.Gamepad.PS3XC_STICK_RIGHT_X = 2; // analog stick, range -1..1
14686+
Phaser.Gamepad.PS3XC_STICK_RIGHT_Y = 3; // analog stick, range -1..1
1468714687

1468814688
/**
1468914689
* @author @karlmacklin <tacklemcclean@gmail.com>
@@ -20990,8 +20990,6 @@ Phaser.TileSprite = function (game, x, y, width, height, key, frame) {
2099020990

2099120991
PIXI.TilingSprite.call(this, PIXI.TextureCache['__default'], width, height);
2099220992

20993-
this.loadTexture(key, frame);
20994-
2099520993
this.position.set(x, y);
2099620994

2099720995
/**
@@ -21057,6 +21055,8 @@ Phaser.TileSprite = function (game, x, y, width, height, key, frame) {
2105721055
*/
2105821056
this._cache = [ 0, 0, 0, 0, 1, 0, 1, 0, 0 ];
2105921057

21058+
this.loadTexture(key, frame);
21059+
2106021060
};
2106121061

2106221062
Phaser.TileSprite.prototype = Object.create(PIXI.TilingSprite.prototype);
@@ -21233,72 +21233,88 @@ Phaser.TileSprite.prototype.stopScroll = function() {
2123321233
*
2123421234
* @method Phaser.TileSprite#loadTexture
2123521235
* @memberof Phaser.TileSprite
21236-
* @param {string|Phaser.RenderTexture|Phaser.BitmapData|PIXI.Texture} key - This is the image or texture used by the Sprite during rendering. It can be a string which is a reference to the Cache entry, or an instance of a RenderTexture, BitmapData or PIXI.Texture.
21237-
* @param {string|number} frame - If this Sprite is using part of a sprite sheet or texture atlas you can specify the exact frame to use by giving a string or numeric index.
21236+
* @param {string|Phaser.RenderTexture|Phaser.BitmapData|PIXI.Texture} key - This is the image or texture used by the TileSprite during rendering. It can be a string which is a reference to the Cache entry, or an instance of a RenderTexture, BitmapData or PIXI.Texture.
21237+
* @param {string|number} frame - If this TileSprite is using part of a sprite sheet or texture atlas you can specify the exact frame to use by giving a string or numeric index.
2123821238
*/
2123921239
Phaser.TileSprite.prototype.loadTexture = function (key, frame) {
2124021240

2124121241
frame = frame || 0;
21242+
21243+
this.key = key;
2124221244

2124321245
if (key instanceof Phaser.RenderTexture)
2124421246
{
2124521247
this.key = key.key;
2124621248
this.setTexture(key);
21247-
return;
2124821249
}
2124921250
else if (key instanceof Phaser.BitmapData)
2125021251
{
21251-
this.key = key;
2125221252
this.setTexture(key.texture);
21253-
return;
2125421253
}
2125521254
else if (key instanceof PIXI.Texture)
2125621255
{
21257-
this.key = key;
2125821256
this.setTexture(key);
21259-
return;
2126021257
}
2126121258
else
2126221259
{
2126321260
if (key === null || typeof key === 'undefined')
2126421261
{
2126521262
this.key = '__default';
2126621263
this.setTexture(PIXI.TextureCache[this.key]);
21267-
return;
2126821264
}
2126921265
else if (typeof key === 'string' && !this.game.cache.checkImageKey(key))
2127021266
{
2127121267
this.key = '__missing';
2127221268
this.setTexture(PIXI.TextureCache[this.key]);
21273-
return;
21274-
}
21275-
21276-
if (this.game.cache.isSpriteSheet(key))
21277-
{
21278-
this.key = key;
21279-
21280-
// var frameData = this.game.cache.getFrameData(key);
21281-
this.animations.loadFrameData(this.game.cache.getFrameData(key));
21282-
21283-
if (typeof frame === 'string')
21284-
{
21285-
this.frameName = frame;
21286-
}
21287-
else
21288-
{
21289-
this.frame = frame;
21290-
}
2129121269
}
2129221270
else
2129321271
{
21294-
this.key = key;
21295-
this.setTexture(PIXI.TextureCache[key]);
21296-
return;
21272+
this.setTexture(new PIXI.Texture(PIXI.BaseTextureCache[key]));
21273+
this.animations.loadFrameData(this.game.cache.getFrameData(key), frame);
2129721274
}
2129821275
}
2129921276

2130021277
};
2130121278

21279+
/**
21280+
* Sets the Texture frame the TileSprite uses for rendering.
21281+
* This is primarily an internal method used by TileSprite.loadTexture, although you may call it directly.
21282+
*
21283+
* @method Phaser.TileSprite#setFrame
21284+
* @memberof Phaser.TileSprite
21285+
* @param {Phaser.Frame} frame - The Frame to be used by the TileSprite texture.
21286+
*/
21287+
Phaser.TileSprite.prototype.setFrame = function(frame) {
21288+
21289+
// this._cache[9] = frame.x;
21290+
// this._cache[10] = frame.y;
21291+
// this._cache[11] = frame.width;
21292+
// this._cache[12] = frame.height;
21293+
// this._cache[13] = frame.spriteSourceSizeX;
21294+
// this._cache[14] = frame.spriteSourceSizeY;
21295+
21296+
this.texture.frame.x = frame.x;
21297+
this.texture.frame.y = frame.y;
21298+
this.texture.frame.width = frame.width;
21299+
this.texture.frame.height = frame.height;
21300+
21301+
if (frame.trimmed)
21302+
{
21303+
this.texture.trim = { x: frame.spriteSourceSizeX, y: frame.spriteSourceSizeY, width: frame.width, height: frame.height };
21304+
}
21305+
21306+
if (this.game.renderType === Phaser.WEBGL)
21307+
{
21308+
PIXI.WebGLRenderer.updateTextureFrame(this.texture);
21309+
}
21310+
21311+
// if (this.cropRect)
21312+
// {
21313+
// this.updateCrop();
21314+
// }
21315+
21316+
};
21317+
2130221318
/**
2130321319
* Destroys the TileSprite. This removes it from its parent group, destroys the event and animation handlers if present
2130421320
* and nulls its reference to game, freeing it up for garbage collection.

‎build/custom/phaser-no-libs.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)