Skip to content

Commit 548e022

Browse files
clark-stevensonclark-stevenson
committed
Updated typescript package for 2.4.0
1 parent d6b5972 commit 548e022

2 files changed

Lines changed: 66 additions & 27 deletions

File tree

‎typescript/phaser.d.ts‎

Lines changed: 52 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/// <reference path="pixi.d.ts" />
22
/// <reference path="p2.d.ts" />
33

4-
// Type definitions for Phaser 2.3.0 RC1 2015-03-24
4+
// Type definitions for Phaser 2.4.0 2015-04-23
55
// Project: https://github.com/photonstorm/phaser
66

77
declare class Phaser {
@@ -126,10 +126,10 @@ declare module Phaser {
126126

127127
class AnimationParser {
128128

129-
static JSONData(game: Phaser.Game, json: any, cacheKey: string): Phaser.FrameData;
130-
static JSONDataHash(game: Phaser.Game, json: any, cacheKey: string): Phaser.FrameData;
129+
static JSONData(game: Phaser.Game, json: any): Phaser.FrameData;
130+
static JSONDataHash(game: Phaser.Game, json: any): Phaser.FrameData;
131131
static spriteSheet(game: Phaser.Game, key: string, frameWidth: number, frameHeight: number, frameMax?: number, margin?: number, spacing?: number): Phaser.FrameData;
132-
static XMLData(game: Phaser.Game, xml: any, cacheKey: string): Phaser.FrameData;
132+
static XMLData(game: Phaser.Game, xml: any): Phaser.FrameData;
133133

134134
}
135135

@@ -415,6 +415,8 @@ declare module Phaser {
415415
getImage(key: string): Phaser.Image;
416416
getJSON(key: string): any;
417417
getKeys(array: string[]): string[];
418+
getPixiTexture(key: string): PIXI.Texture;
419+
getPixiBaseTexture(key: string): PIXI.BaseTexture;
418420
getPhysicsData(key: string, object?: string, fixtureKey?: string): any[];
419421
getRenderTexture(key: string): Phaser.RenderTexture;
420422
getSound(key: string): Phaser.Sound;
@@ -1049,7 +1051,7 @@ declare module Phaser {
10491051

10501052
class Frame {
10511053

1052-
constructor(index: number, x: number, y: number, width: number, height: number, name: string, uuid: string);
1054+
constructor(index: number, x: number, y: number, width: number, height: number, name: string);
10531055

10541056
bottom: number;
10551057
centerX: number;
@@ -1433,12 +1435,14 @@ declare module Phaser {
14331435
exists: boolean;
14341436
fixedToCamera: boolean;
14351437
game: Phaser.Game;
1438+
hash: PIXI.DisplayObject[];
14361439
ignoreDestroy: boolean;
14371440
length: number;
14381441
name: string;
14391442
onDestroy: Phaser.Signal;
14401443
physicsBodyType: number;
14411444
physicsType: number;
1445+
physicsSortDirection: number;
14421446
position: Phaser.Point;
14431447
rotation: number;
14441448
scale: Phaser.Point;
@@ -1451,6 +1455,7 @@ declare module Phaser {
14511455
addAll(property: string, amount: number, checkAlive: boolean, checkVisible: boolean): void;
14521456
addAt(child: any, index: number, silent?: boolean): any;
14531457
addMultiple(children: any[], silent?: boolean): any[];
1458+
addToHash(child: PIXI.DisplayObject): boolean;
14541459
bringToTop(child: any): any;
14551460
callAll(method: string, context: any, ...parameters: any[]): void;
14561461
callAllExists(callback: Function, existsValue: boolean, ...parameters: any[]): void;
@@ -1489,6 +1494,7 @@ declare module Phaser {
14891494
remove(child: any, destroy?: boolean, silent?: boolean): boolean;
14901495
removeAll(destroy?: boolean, silent?: boolean): void;
14911496
removeBetween(startIndex: number, endIndex?: number, destroy?: boolean, silent?: boolean): void;
1497+
removeFromHash(child: PIXI.DisplayObject): boolean;
14921498
replace(oldChild: any, newChild: any): any;
14931499
resetCursor(index?: number): any;
14941500
reverse(): void;
@@ -1985,15 +1991,15 @@ declare module Phaser {
19851991

19861992
asyncComplete(file: any, errorMessage?: string): void;
19871993
addSyncPoint(type: string, key: string): Phaser.Loader;
1988-
addToFileList(type: string, key: string, url: string, properties: any, overwrite: boolean): void;
1989-
atlas(key: string, textureURL: string, atlasURL?: string, atlasData?: any, format?: number): Phaser.Loader;
1990-
atlasJSONArray(key: string, textureURL: string, atlasURL?: string, atlasData?: any): Phaser.Loader;
1991-
atlasJSONHash(key: string, textureURL: string, atlasURL?: string, atlasData?: any): Phaser.Loader;
1992-
atlasXML(key: string, textureURL: string, atlasURL?: string, atlasData?: any): Phaser.Loader;
1994+
addToFileList(type: string, key: string, url?: string, properties?: any, overwrite?: boolean, extension?: string): Phaser.Loader;
1995+
atlas(key: string, textureURL?: string, atlasURL?: string, atlasData?: any, format?: number): Phaser.Loader;
1996+
atlasJSONArray(key: string, textureURL?: string, atlasURL?: string, atlasData?: any): Phaser.Loader;
1997+
atlasJSONHash(key: string, textureURL?: string, atlasURL?: string, atlasData?: any): Phaser.Loader;
1998+
atlasXML(key: string, textureURL?: string, atlasURL?: string, atlasData?: any): Phaser.Loader;
19931999
audio(key: string, urls: string|string[]|any, autoDecode?: boolean): Phaser.Loader;
19942000
audiosprite(key: string, urls: string[], jsonURL?: string, jsonData?: string|any, autoDecode?: boolean): Phaser.Loader;
1995-
binary(key: string, url: string, callback?: Function, callbackContext?: any): Phaser.Loader;
1996-
bitmapFont(key: string, textureURL: string, xmlURL?: string, xmlData?: any, xSpacing?: number, ySpacing?: number): Phaser.Loader;
2001+
binary(key: string, url?: string, callback?: Function, callbackContext?: any): Phaser.Loader;
2002+
bitmapFont(key: string, textureURL?: string, xmlURL?: string, xmlData?: any, xSpacing?: number, ySpacing?: number): Phaser.Loader;
19972003
checkKeyExists(type: string, key: string): boolean;
19982004
csvLoadComplete(file: any, xhr: XMLHttpRequest): void;
19992005
fileComplete(file: any, xhr: XMLHttpRequest): void;
@@ -2002,8 +2008,8 @@ declare module Phaser {
20022008
getAsset(type: string, key: string): any;
20032009
getAssetIndex(type: string, key: string): number;
20042010
getAudioURL(urls: any[]): void;
2005-
image(key: string, url: string, overwrite?: boolean): Phaser.Loader;
2006-
json(key: string, url: string, overwrite?: boolean): Phaser.Loader;
2011+
image(key: string, url?: string, overwrite?: boolean): Phaser.Loader;
2012+
json(key: string, url?: string, overwrite?: boolean): Phaser.Loader;
20072013
jsonLoadComplete(file: any, xhr: XMLHttpRequest): void;
20082014
loadAudioTag(file: any): void;
20092015
loadFile(file: any): void;
@@ -2018,11 +2024,11 @@ declare module Phaser {
20182024
replaceInFileList(type: string, key: string, url: string, properties: any): void;
20192025
reset(hard?: boolean, clearEvents?: boolean): void;
20202026
resize(): void;
2021-
script(key: string, url: String, callback?: Function, callbackContext?: any): Phaser.Loader;
2027+
script(key: string, url?: String, callback?: Function, callbackContext?: any): Phaser.Loader;
20222028
setPreloadSprite(sprite: Phaser.Sprite|Phaser.Image, direction?: number): void;
20232029
spritesheet(key: string, url: string, frameWidth: number, frameHeight: number, frameMax?: number, margin?: number, spacing?: number): Phaser.Loader;
20242030
start(): void;
2025-
text(key: string, url: string, overwrite?: boolean): Phaser.Loader;
2031+
text(key: string, url?: string, overwrite?: boolean): Phaser.Loader;
20262032
tilemap(key: string, url?: string, data?: any, format?: number): Phaser.Loader;
20272033
totalLoadedFiles(): number;
20282034
totalLoadedPacks(): number;
@@ -2031,7 +2037,7 @@ declare module Phaser {
20312037
transformUrl(url: string): string;
20322038
updateProgress(): void;
20332039
withSyncPoint(callback: Function, callbackContext?: any): Phaser.Loader;
2034-
xml(key: string, url: string, overwrite?: boolean): Phaser.Loader;
2040+
xml(key: string, url?: string, overwrite?: boolean): Phaser.Loader;
20352041
xhrLoad(file: any, url: string, type: string, onload: Function, onerror?: Function): void;
20362042
xhrLoadWithXDR(file: any, url: string, type: string, onload: Function, onerror?: Function): void;
20372043
xmlLoadComplete(file: any, xhr: XMLHttpRequest): void;
@@ -2054,10 +2060,17 @@ declare module Phaser {
20542060
ty: number;
20552061
type: number;
20562062

2063+
constructor(a?: number, b?: number, c?: number, d?: number, tx?: number, ty?: number);
2064+
2065+
20572066
apply(pos: Phaser.Point, newPos?: Phaser.Point): Phaser.Point;
20582067
applyInverse(pos: Phaser.Point, newPos?: Phaser.Point): Phaser.Point;
2059-
fromArray(array: number[]): void;
2060-
toArray(transpose: boolean): number[];
2068+
clone(output?: Phaser.Matrix): Phaser.Matrix;
2069+
copyFrom(matrix: Phaser.Matrix): Phaser.Matrix;
2070+
copyTo(matrix: Phaser.Matrix): Phaser.Matrix;
2071+
fromArray(array: number[]): Phaser.Matrix;
2072+
setTo(a: number, b: number, c: number, d: number, tx: number, ty: number): Phaser.Matrix;
2073+
toArray(transpose?: boolean, array?: number[]): number[];
20612074
translate(x: number, y: number): Phaser.Matrix;
20622075
scale(x: number, y: number): Phaser.Matrix;
20632076
rotate(angle: number): Phaser.Matrix;
@@ -2352,12 +2365,19 @@ declare module Phaser {
23522365
static NINJA: number;
23532366
static BOX2D: number;
23542367
static CHIPMUNK: number;
2368+
static MATTERJS: number;
23552369

23562370
arcade: Phaser.Physics.Arcade;
23572371
config: any;
23582372
game: Phaser.Game;
23592373
ninja: Phaser.Physics.Ninja;
23602374
p2: Phaser.Physics.P2;
2375+
//todo box2d
2376+
box2d: any;
2377+
//todo chipmunk
2378+
//chipmunk: any;
2379+
//todo matter
2380+
//matter: any;
23612381

23622382
clear(): void;
23632383
destroy(): void;
@@ -3562,11 +3582,11 @@ declare module Phaser {
35623582
crop: PIXI.Rectangle;
35633583
game: Phaser.Game;
35643584
key: string;
3565-
matrix: PIXI.Matrix;
35663585
type: number;
35673586

3568-
render(displayObject: PIXI.DisplayObject, position: Phaser.Point, clear?: boolean): void;
3587+
render(displayObject: PIXI.DisplayObject, matrix?: Phaser.Matrix, clear?: boolean): void;
35693588
renderXY(displayObject: PIXI.DisplayObject, x: number, y: number, clear?: boolean): void;
3589+
renderRawXY(displayObject: PIXI.DisplayObject, x: number, y: number, clear?: boolean): void;
35703590

35713591
}
35723592

@@ -4122,8 +4142,10 @@ declare module Phaser {
41224142
paused(): void;
41234143
pauseUpdate(): void;
41244144
preload(): void;
4145+
preRender(): void;
41254146
render(): void;
41264147
resize(): void;
4148+
resumed(): void;
41274149
shutdown(): void;
41284150
update(): void;
41294151

@@ -4142,6 +4164,7 @@ declare module Phaser {
41424164

41434165
constructor(game: Phaser.Game, pendingState?: Phaser.State);
41444166

4167+
created: boolean;
41454168
current: string;
41464169
game: Phaser.Game;
41474170
onCreateCallback: Function;
@@ -4345,7 +4368,7 @@ declare module Phaser {
43454368
getTileLeft(layer: number, x: number, y: number): Phaser.Tile;
43464369
getTileRight(layer: number, x: number, y: number): Phaser.Tile;
43474370
getTilesetIndex(name: string): number;
4348-
getTileWorldXY(x: number, y: number, tileWidth?: number, tileHeight?: number, layer?: any): Phaser.Tile;
4371+
getTileWorldXY(x: number, y: number, tileWidth?: number, tileHeight?: number, layer?: number|string|Phaser.TilemapLayer, nonNull?: boolean): Phaser.Tile;
43494372
hasTile(x: number, y: number, layer: Phaser.TilemapLayer): boolean;
43504373
paste(x: number, y: number, tileblock: Phaser.Tile[], layer?: any): void;
43514374
putTile(tile: any, x: number, y: number, layer?: any): Phaser.Tile;
@@ -4475,6 +4498,7 @@ declare module Phaser {
44754498
inputEnabled: boolean;
44764499
key: string|Phaser.RenderTexture|Phaser.BitmapData|PIXI.Texture;
44774500
name: string;
4501+
physicsType: number;
44784502
position: Phaser.Point;
44794503
previousPosition: Phaser.Point;
44804504
previousRoation: number;
@@ -4823,6 +4847,12 @@ declare module Phaser {
48234847
getObjectsUnderPointer(pointer: Phaser.Pointer, group: Phaser.Group, callback?: Function, callbackContext?: any): Phaser.Sprite;
48244848
resize(width: number, height: number): void;
48254849
setBounds(x: number, y: number, width: number, height: number): void;
4850+
sortLeftRight(a: Phaser.Sprite, b: Phaser.Sprite): number;
4851+
sortRightLeft(a: Phaser.Sprite, b: Phaser.Sprite): number;
4852+
sortTopBottom(a: Phaser.Sprite, b: Phaser.Sprite): number;
4853+
sortBottomTop(a: Phaser.Sprite, b: Phaser.Sprite): number;
4854+
sort(group: Phaser.Group, sortDirection?: number): void;
4855+
sort(key?: string, order?: number): void; //ugly? Group already has a sort method remove this line and you get error.
48264856
shutdown(): void;
48274857
wrap(sprite: any, padding?: number, useBounds?: boolean, horizontal?: boolean, vertical?: boolean): void;
48284858

‎typescript/pixi.d.ts‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ declare module PIXI {
511511
touchendoutside(e: InteractionData): void;
512512
touchstart(e: InteractionData): void;
513513
touchmove(e: InteractionData): void;
514-
updateTransform(): void;
514+
updateTransform(parent?: PIXI.DisplayObjectContainer): void;
515515

516516
}
517517

@@ -1161,10 +1161,13 @@ declare module PIXI {
11611161

11621162
constructor(texture: Texture, width: number, height: number);
11631163

1164+
canvasBuffer: PIXI.CanvasBuffer;
11641165
blendMode: number;
1166+
refreshTexture: boolean;
11651167
texture: Texture;
11661168
tint: number;
11671169
tilePosition: Point;
1170+
tilePattern: PIXI.Texture;
11681171
tileScale: Point;
11691172
tileScaleOffset: Point;
11701173

@@ -1221,11 +1224,17 @@ declare module PIXI {
12211224

12221225
autoUpdate: boolean;
12231226

1227+
onPlay: Phaser.Signal;
1228+
onComplete: Phaser.Signal;
1229+
1230+
play(): void;
1231+
stop(): void;
1232+
12241233
destroy(): void;
12251234
updateBound(): void;
1226-
onPlayStart(): void;
1227-
onPlayStop(): void;
1228-
onCanPlay(): void;
1235+
onPlayStart: () => void;
1236+
onPlayStop: () => void;
1237+
onCanPlay: () => void;
12291238

12301239
}
12311240

@@ -1453,7 +1462,7 @@ declare module PIXI {
14531462
getCanvas(): HTMLCanvasElement;
14541463
getImage(): HTMLImageElement;
14551464
resize(width: number, height: number, updateBase: boolean): void;
1456-
render(displayObject: DisplayObject, position?: Point, clear?: boolean): void;
1465+
render(displayObject: DisplayObject, matrix?: Matrix, clear?: boolean): void;
14571466

14581467
}
14591468

0 commit comments

Comments
 (0)