Skip to content

Commit 2aeafad

Browse files
photonstormphotonstorm
committed
Merge pull request phaserjs#1558 from vulvulune/ts
Update typescript definitions
2 parents 9a4af85 + c4f7834 commit 2aeafad

1 file changed

Lines changed: 82 additions & 28 deletions

File tree

‎typescript/phaser.d.ts‎

Lines changed: 82 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ declare module Phaser {
5050

5151
constructor(game: Phaser.Game, parent: Phaser.Sprite, name: string, frameData: Phaser.FrameData, frames: any[], frameRate?: number, loop?: boolean);
5252

53-
currentAnim: Phaser.Animation;
5453
currentFrame: Phaser.Frame;
5554
delay: number;
5655
enableUpdate: boolean;
@@ -261,6 +260,7 @@ declare module Phaser {
261260
setPixel32(x: number, y: number, red: number, green: number, blue: number, alpha: number, immediate?: boolean): Phaser.BitmapData;
262261
shadow(color: string, blur?: number, x?: number, y?: number): Phaser.BitmapData;
263262
shiftHSL(h?: number, s?: number, l?: number, region?: Phaser.Rectangle): Phaser.BitmapData;
263+
text(text: string, x?: number, y?: number, font?: string, color?: string, shadow?: boolean): Phaser.BitmapData;
264264
textureLine(line: Phaser.Line, key: string, repeat?: string): Phaser.BitmapData;
265265
update(x?: number, y?: number, width?: number, height?: number): Phaser.BitmapData;
266266

@@ -368,7 +368,7 @@ declare module Phaser {
368368
addDefaultImage(): void;
369369
addImage(key: string, url: string, data: any): void;
370370
addJSON(key: string, urL: string, data: any): void;
371-
addMisingImage(): void;
371+
addMissingImage(): void;
372372
addPhysicsData(key: string, url: string, JSONData: any, format: number): void;
373373
addRenderTexture(key: string, texture: RenderTexture): void;
374374
addSound(key: string, url: string, data: any, webAudio: boolean, audioTag: boolean): void;
@@ -477,6 +477,7 @@ declare module Phaser {
477477
setBoundsToWorld(): void;
478478
setPosition(x: number, y: number): void;
479479
setSize(width: number, height: number): void;
480+
unfollow(): void;
480481
update(): void;
481482

482483
}
@@ -678,18 +679,6 @@ declare module Phaser {
678679

679680
}
680681

681-
class DOMSprite {
682-
//constructor
683-
constructor(game: Phaser.Game, id: string, x: number, y: number, text: string, style: any);
684-
//members
685-
alive: boolean;
686-
exists: boolean;
687-
game: Phaser.Game;
688-
group: Phaser.Group;
689-
name: string;
690-
type: number;
691-
visible: boolean;
692-
}
693682

694683
module Easing {
695684

@@ -1032,6 +1021,7 @@ declare module Phaser {
10321021
createFullLayer(children: PIXI.DisplayObject[]): Phaser.FlexLayer;
10331022
createFixedLayer(children: PIXI.DisplayObject[]): Phaser.FlexLayer;
10341023
debug(): void;
1024+
fitSprite(sprite: Phaser.Sprite): void;
10351025
onResize(width: number, height: number): void;
10361026
refresh(): void;
10371027
reset(): void;
@@ -1050,6 +1040,7 @@ declare module Phaser {
10501040
bottomMiddle: Phaser.Point;
10511041
bottomRight: Phaser.Point;
10521042
bounds: Phaser.Rectangle;
1043+
persist: boolean;
10531044
position: Phaser.Point;
10541045
scale: Phaser.Point;
10551046
topLeft: Phaser.Point;
@@ -1225,7 +1216,7 @@ declare module Phaser {
12251216
sprite(x: number, y: number, key?: any, frame?: any): Phaser.Sprite;
12261217
spriteBatch(parent: any, name?: String, addToStage?: boolean): Phaser.SpriteBatch;
12271218
text(x: number, y: number, text?: string, style?: any): Phaser.Text;
1228-
tileMap(key: string, tileWidth?: number, tileHeight?: number, width?: number, height?: number): Phaser.Tilemap;
1219+
tilemap(key: string, tileWidth?: number, tileHeight?: number, width?: number, height?: number): Phaser.Tilemap;
12291220
tileSprite(x: number, y: number, width: number, height: number, key: any, frame: any): Phaser.TileSprite;
12301221
tween(obj: any): Phaser.Tween;
12311222

@@ -1431,6 +1422,7 @@ declare module Phaser {
14311422
static SORT_ASCENDING: number;
14321423
static SORT_DESCENDING: number;
14331424

1425+
alpha: number;
14341426
angle: number;
14351427
alive: boolean;
14361428
cameraOffset: Phaser.Point;
@@ -1447,9 +1439,11 @@ declare module Phaser {
14471439
onDestroy: Phaser.Signal;
14481440
physicsBodyType: number;
14491441
position: Phaser.Point;
1442+
rotation: number;
14501443
scale: Phaser.Point;
14511444
total: number;
14521445
type: number;
1446+
visible: boolean;
14531447
z: number;
14541448

14551449
add(child: any, silent?: boolean): any;
@@ -1499,7 +1493,8 @@ declare module Phaser {
14991493
reverse(): void;
15001494
sendToBack(child: any): any;
15011495
set(child: any, key: string[], value: any, operation?: number, force?: boolean): boolean;
1502-
setAll(key: string, value: any, checkAlive?: boolean, checkVisible?: boolean, operation?: number, force?: boolean): boolean;
1496+
setAll(key: string, value: any, checkAlive?: boolean, checkVisible?: boolean, operation?: number, force?: boolean): void;
1497+
setAllChildren(key: string, value: any, checkAlive?: boolean, checkVisible?: boolean, operation?: number, force?: boolean): void;
15031498
setProperty(child: any, key: string[], value: any, operation?: number, force?: boolean): boolean;
15041499
sort(key?: string, order?: number): void;
15051500
subAll(property: string, amount: number, checkAlive: boolean, checkVisible: boolean): void;
@@ -1517,9 +1512,11 @@ declare module Phaser {
15171512
alive: boolean;
15181513
angle: number;
15191514
anchor: Phaser.Point;
1515+
animations: Phaser.AnimationManager;
15201516
autoCull: boolean;
15211517
cameraOffset: Phaser.Point;
15221518
cropRect: Phaser.Rectangle;
1519+
debug: boolean;
15231520
deltaX: number;
15241521
deltaY: number;
15251522
deltaZ: number;
@@ -1541,6 +1538,7 @@ declare module Phaser {
15411538
scale: Phaser.Point;
15421539
smoothed: boolean;
15431540
type: number;
1541+
world: Phaser.Point;
15441542
z: number;
15451543

15461544
bringToTop(): Phaser.Image;
@@ -2072,6 +2070,7 @@ declare module Phaser {
20722070
static randomSign(): number;
20732071
static reverseAngle(angleRed: number): number;
20742072
static removeRandom<T>(objects: T[], startIndex?: number, length?: number): T;
2073+
static roundAwayFromZero(value: number): number;
20752074
static roundTo(value: number, place?: number, base?: number): number;
20762075
static shear(n: number): number;
20772076
static shift(stack: any[]): any;
@@ -2575,7 +2574,7 @@ declare module Phaser {
25752574
COL_OTHER: number;
25762575

25772576
body: Phaser.Physics.Ninja.Body;
2578-
circleTileProjections: any;
2577+
circleTileProjections: { [index: number]: ((x: number, y: number, oH: number, oV: number, obj: Phaser.Physics.Ninja.Circle, t: Phaser.Physics.Ninja.Tile) => number); } ;
25792578
oldPos: Phaser.Point;
25802579
height: number;
25812580
pos: Phaser.Point;
@@ -2598,6 +2597,19 @@ declare module Phaser {
25982597

25992598
}
26002599

2600+
enum TileType {
2601+
TYPE_EMPTY,
2602+
TYPE_FULL,
2603+
TYPE_45DEG,
2604+
TYPE_CONCAVE,
2605+
TYPE_CONVEX,
2606+
TYPE_22DEGs,
2607+
TYPE_22DEGb,
2608+
TYPE_67DEGs,
2609+
TYPE_67DEGb,
2610+
TYPE_HALF
2611+
}
2612+
26012613
class Tile {
26022614

26032615
constructor(body: Phaser.Physics.Ninja.Body, x: number, y: number, width: number, height: number, type?: number);
@@ -2610,7 +2622,7 @@ declare module Phaser {
26102622
pos: Phaser.Point;
26112623
right: number;
26122624
system: Phaser.Physics.Ninja;
2613-
type: number;
2625+
type: Phaser.Physics.Ninja.TileType;
26142626
velocity: Phaser.Point;
26152627
width: number;
26162628
xw: number;
@@ -2696,7 +2708,7 @@ declare module Phaser {
26962708
createParticle(x: number, y: number, mass: number, addToWorld?: boolean, options?: p2.BodyOptions, data?: number[][]): Phaser.Physics.P2.Body;
26972709
createParticle(x: number, y: number, mass: number, addToWorld?: boolean, options?: p2.BodyOptions, data?: number[]): Phaser.Physics.P2.Body;
26982710
createPrismaticConstraint(body: any, bodyB: any, lockRotation?: boolean, anchorA?: number[], anchorB?: number[], axis?: Float32Array, maxForce?: number): Phaser.Physics.P2.PrismaticConstraint;
2699-
createRevoluteConstraint(bodyA: any, pivotA: number[], bodyB: any, pivotB: number[], maxForce?: number, worldPivot?: number[]): Phaser.Physics.P2.RevoluteContraint;
2711+
createRevoluteConstraint(bodyA: any, pivotA: number[], bodyB: any, pivotB: number[], maxForce?: number, worldPivot?: number[]): Phaser.Physics.P2.RevoluteConstraint;
27002712
createRotationalSpring(bodyA: any, bodyB: any, restAngle?: number, stiffness?: number, damping?: number): p2.RotationalSpring;
27012713
createSpring(bodyA: any, bodyB: any, restLength?: number, stiffness?: number, damping?: number, worldA?: number[], worldB?: number[], localA?: number[], localB?: number[]): Phaser.Physics.P2.Spring;
27022714
destroy(): void;
@@ -2940,7 +2952,7 @@ declare module Phaser {
29402952

29412953
}
29422954

2943-
class RevoluteContraint extends p2.RevoluteConstraint {
2955+
class RevoluteConstraint extends p2.RevoluteConstraint {
29442956

29452957
constructor(world: Phaser.Physics.P2, bodyA: Phaser.Physics.P2.Body, pivotA: number[], bodyB: Phaser.Physics.P2.Body, pivotB: number[], maxForce?: number);
29462958

@@ -2961,7 +2973,7 @@ declare module Phaser {
29612973
}
29622974
}
29632975

2964-
class Plugin extends StateCycle {
2976+
class Plugin implements IStateCycle {
29652977

29662978
constructor(game: Phaser.Game, parent: any);
29672979

@@ -3152,11 +3164,48 @@ declare module Phaser {
31523164
update(): void;
31533165
}
31543166

3167+
class Juicy extends Phaser.Plugin {
3168+
3169+
constructor(game: Phaser.Game);
3170+
3171+
createScreenFlash(color?: string) : Phaser.Plugin.Juicy.ScreenFlash;
3172+
createTrail(length?: number, color?:number): Phaser.Plugin.Juicy.Trail;
3173+
overScale(object: Phaser.Sprite, scale?: number, initialScale?: Phaser.Point): void;
3174+
jelly(object: Phaser.Sprite, strength?: number, delay?: number, initialScale?: Phaser.Point): void;
3175+
mouseStretch(object: Phaser.Sprite, strength?: number, initialScale?: Phaser.Point): void;
3176+
update(): void;
3177+
shake(duration?: number, strength?: number): void;
3178+
}
3179+
3180+
module Juicy {
31553181

3182+
class Trail {
31563183

3184+
constructor(game: Phaser.Game, trailLength?: number, color?: number);
3185+
3186+
target: Phaser.Sprite;
3187+
trailLength: number;
3188+
trailWidth: number;
3189+
trailScaling: boolean;
3190+
trailColor: number;
3191+
3192+
update(): void;
3193+
addSegment(x: number, y: number): void;
3194+
redrawSegments(offsetX: number, offsetY: number): void;
3195+
3196+
}
3197+
3198+
class ScreenFlash {
3199+
3200+
constructor(game: Phaser.Game, color?: string);
3201+
3202+
flash(maxAlpha?: number, duration?: number);
3203+
3204+
}
3205+
}
31573206
}
31583207

3159-
class PluginManager extends StateCycle {
3208+
class PluginManager implements IStateCycle {
31603209

31613210
constructor(game: Phaser.Game);
31623211

@@ -3429,6 +3478,7 @@ declare module Phaser {
34293478
crop: PIXI.Rectangle;
34303479
game: Phaser.Game;
34313480
key: string;
3481+
matrix: PIXI.Matrix;
34323482
type: number;
34333483

34343484
render(displayObject: PIXI.DisplayObject, position: Phaser.Point, clear?: boolean): void;
@@ -3440,6 +3490,7 @@ declare module Phaser {
34403490

34413491
constructor(game: Phaser.Game, forceSetTimeOut?: boolean);
34423492

3493+
forceSetTimeOut: boolean;
34433494
game: Phaser.Game;
34443495
isRunning: boolean;
34453496

@@ -3525,6 +3576,7 @@ declare module Phaser {
35253576
position: Phaser.Point;
35263577
segments: Phaser.Rectangle[];
35273578
type: number;
3579+
updateAnimation: Function;
35283580
world: Phaser.Point;
35293581
x: number;
35303582
y: number;
@@ -3538,7 +3590,6 @@ declare module Phaser {
35383590
reset(x: number, y: number): void;
35393591
setFrame(frame: Phaser.Frame): void;
35403592
update(): void;
3541-
updateAnimation(): void;
35423593

35433594
}
35443595

@@ -3800,7 +3851,7 @@ declare module Phaser {
38003851
smoothed: boolean;
38013852

38023853
boot(): void;
3803-
checkVisiblity(): void;
3854+
checkVisibility(): void;
38043855
destroy(): void;
38053856
parseConfig(config: any): void;
38063857
postUpdate(): void;
@@ -3856,6 +3907,8 @@ declare module Phaser {
38563907
height: number;
38573908
incorrectOrientation: boolean;
38583909
isFullScreen: boolean;
3910+
isGameLandscape: boolean; //readonly
3911+
isGamePortrait: boolean; //readonly
38593912
isPortrait: boolean;
38603913
isLandscape: boolean;
38613914
leaveFullScreen: Signal;
@@ -3892,6 +3945,7 @@ declare module Phaser {
38923945

38933946
boot(): void;
38943947
checkOrientationState(): boolean;
3948+
38953949
createFullScreenTarget(): HTMLDivElement;
38963950
destroy(): void;
38973951
forceOrientation(forceLandscape: boolean, forcePortrait?: boolean): void;
@@ -3925,7 +3979,6 @@ declare module Phaser {
39253979
static getBounds(element: any, cushion?: number): any;
39263980
static getOffset(element: any, point?: Point): Point;
39273981
static inLayoutViewport(element: any, cushion?: number): boolean;
3928-
39293982
}
39303983

39313984
class State {
@@ -3949,9 +4002,11 @@ declare module Phaser {
39494002
world: Phaser.World;
39504003

39514004
create(): void;
4005+
init(): void;
39524006
loadRender(): void;
39534007
loadUpdate(): void;
39544008
paused(): void;
4009+
pauseUpdate(): void;
39554010
preload(): void;
39564011
render(): void;
39574012
resize(): void;
@@ -3960,14 +4015,13 @@ declare module Phaser {
39604015

39614016
}
39624017

3963-
class StateCycle {
4018+
interface IStateCycle {
39644019

39654020
preUpdate(): void;
39664021
update(): void;
39674022
render(): void;
39684023
postRender(): void;
39694024
destroy(): void;
3970-
39714025
}
39724026

39734027
class StateManager {
@@ -3998,7 +4052,6 @@ declare module Phaser {
39984052
getCurrentState(): Phaser.State;
39994053
link(key: string): void;
40004054
loadComplete(): void;
4001-
pause(): void;
40024055
preRender(elapsedTime: number): void;
40034056
preUpdate(): void;
40044057
render(): void;
@@ -4546,6 +4599,7 @@ declare module Phaser {
45464599
static mixin(from: any, to: any): any;
45474600
static pad(str: string, len: number, pad: number, dir?: number): string;
45484601
static parseDimension(size: any, dimension: number): number;
4602+
static randomChoice(choice1: any, choice2: any): any;
45494603
static rotateArray<T>(array: T[], direction: any): T;
45504604
static setProperty(obj: any, prop: string, value: any): any;
45514605
static shuffle<T>(array: T[]): T[];

0 commit comments

Comments
 (0)