Skip to content

Commit 7ac7501

Browse files
clark-stevensonclark-stevenson
committed
Updated TypeScript Definitions
1 parent 5f2b2df commit 7ac7501

2 files changed

Lines changed: 44 additions & 76 deletions

File tree

‎typescript/phaser.d.ts‎

Lines changed: 43 additions & 59 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.4.0 2015-Jun-12
4+
// Type definitions for Phaser 2.4.0 2015-Jun-22
55
// Project: https://github.com/photonstorm/phaser
66

77
declare class Phaser {
@@ -385,7 +385,7 @@ declare module Phaser {
385385
addBinary(key: string, binaryData: any): void;
386386
addBitmapData(key: string, bitmapData: Phaser.BitmapData, frameData?: Phaser.FrameData): Phaser.BitmapData;
387387
addBitmapFont(key: string, texture: Phaser.RetroFont): void;
388-
addBitmapFont(key: string, url: string, data: any, xmlData: any, xSpacing?: number, ySpacing?: number): void;
388+
addBitmapFont(key: string, url: string, data: any, atlasData: any, atlasType: string, xSpacing?: number, ySpacing?: number): void;
389389
addCanvas(key: string, canvas: HTMLCanvasElement, context: CanvasRenderingContext2D): void;
390390
addDefaultImage(): void;
391391
addImage(key: string, url: string, data: any): void;
@@ -441,7 +441,6 @@ declare module Phaser {
441441
getTilemap(key: string): any;
442442
getTilemapData(key: string): any;
443443
getURL(url: string): any;
444-
getUrl(url: string): any;
445444
getXML(key: string): any;
446445
getVideo(key: string): Phaser.Video;
447446
isSoundDecoded(key: string): boolean;
@@ -485,7 +484,6 @@ declare module Phaser {
485484
position: Phaser.Point;
486485
roundPx: boolean;
487486
scale: Phaser.Point;
488-
screenView: Phaser.Rectangle;
489487
target: Phaser.Sprite;
490488
totalInView: number;
491489
view: Phaser.Rectangle;
@@ -512,8 +510,6 @@ declare module Phaser {
512510

513511
static addToDOM(canvas: HTMLCanvasElement, parent: HTMLElement, overflowHidden?: boolean): HTMLCanvasElement;
514512
static create(width?: number, height?: number, id?: string): HTMLCanvasElement;
515-
static getAspectRatio(canvas: HTMLCanvasElement): number;
516-
static getOffset(element: HTMLElement, point?: Phaser.Point): Phaser.Point;
517513
static getSmoothngEnabled(context: CanvasRenderingContext2D): boolean;
518514
static removeFromDOM(canvas: HTMLCanvasElement): void;
519515
static setBackgroundColor(canvas: HTMLCanvasElement, color: string): HTMLCanvasElement;
@@ -662,6 +658,7 @@ declare module Phaser {
662658
css3D: boolean;
663659
desktop: boolean;
664660
deviceReadyAt: number;
661+
electron: boolean;
665662
ejecta: boolean;
666663
epiphany: boolean;
667664
file: boolean;
@@ -1386,7 +1383,6 @@ declare module Phaser {
13861383

13871384
active: boolean;
13881385
callbackContext: any;
1389-
disabled: boolean;
13901386
enabled: boolean;
13911387
game: Phaser.Game;
13921388
onAxisCallBack: Function;
@@ -1643,8 +1639,6 @@ declare module Phaser {
16431639

16441640
activePointer: Phaser.Pointer;
16451641
circle: Phaser.Circle;
1646-
currentPointers: number;
1647-
disabled: boolean;
16481642
enabled: boolean;
16491643
doubleTapRate: number;
16501644
game: Phaser.Game;
@@ -1932,7 +1926,6 @@ declare module Phaser {
19321926
static MINUS: number;
19331927

19341928
callbackContext: any;
1935-
disabled: boolean;
19361929
enabled: boolean;
19371930
event: any;
19381931
game: Phaser.Game;
@@ -2058,7 +2051,7 @@ declare module Phaser {
20582051
audio(key: string, urls: string|string[]|any, autoDecode?: boolean): Phaser.Loader;
20592052
audiosprite(key: string, urls: string[], jsonURL?: string, jsonData?: string|any, autoDecode?: boolean): Phaser.Loader;
20602053
binary(key: string, url?: string, callback?: Function, callbackContext?: any): Phaser.Loader;
2061-
bitmapFont(key: string, textureURL?: string, xmlURL?: string, xmlData?: any, xSpacing?: number, ySpacing?: number): Phaser.Loader;
2054+
bitmapFont(key: string, textureURL?: string, atlasURL?: string, atlasData?: any, xSpacing?: number, ySpacing?: number): Phaser.Loader;
20622055
checkKeyExists(type: string, key: string): boolean;
20632056
csvLoadComplete(file: any, xhr: XMLHttpRequest): void;
20642057
fileComplete(file: any, xhr: XMLHttpRequest): void;
@@ -2106,8 +2099,8 @@ declare module Phaser {
21062099

21072100
class LoaderParser {
21082101

2109-
static bitmapFont(game: Phaser.Game, xml: any, cacheKey: string, xSpacing: number, ySpacing: number): Phaser.FrameData;
2110-
2102+
static bitmapFont(game: Phaser.Game, xml: any, cacheKey: string, xSpacing: number, ySpacing: number): void;
2103+
static jsonBitmapFont(game: Phaser.Game, json: any, cacheKey: string, xSpacing?: number, ySpacing?: number): void;
21112104
}
21122105

21132106
class Matrix extends PIXI.Matrix {
@@ -2144,39 +2137,31 @@ declare module Phaser {
21442137
static angleBetweenPoints(point1: Phaser.Point, point2: Phaser.Point): number;
21452138
static angleBetweenY(x1: number, y1: number, x2: number, y2: number): number;
21462139
static angleBetweenPointsY(point1: Phaser.Point, point2: Phaser.Point): number;
2147-
static angleLimit(angle: number, min: number, max: number): number;
21482140
static average(...numbers: number[]): number;
21492141
static bernstein(n: number, i: number): number;
21502142
static bezierInterpolation(v: number[], k: number): number;
21512143
static catmullRom(p0: number, p1: number, p2: number, p3: number, t: number): number;
21522144
static catmullRomInterpolation(v: number[], k: number): number;
2153-
static ceil(value: number): number;
21542145
static ceilTo(value: number, place?: number, base?: number): number;
2155-
static chanceRoll(chance: number): boolean;
21562146
static clamp(x: number, a: number, b: number): number;
21572147
static clampBottom(x: number, a: number): number;
21582148
static degToRad(degrees: number): number;
21592149
static difference(a: number, b: number): number;
21602150
static distance(x1: number, y1: number, x2: number, y2: number): number;
21612151
static distanceSq(x1: number, y1: number, x2: number, y2: number): number;
21622152
static distancePow(xy: number, y1: number, x2: number, y2: number, pow?: number): number;
2163-
static distanceRounded(x1: number, y1: number, x2: number, y2: number): number;
21642153
static factorial(value: number): number;
2165-
static floor(value: number): number;
21662154
static floorTo(value: number, place: number, base: number): number;
21672155
static fuzzyCeil(val: number, epsilon?: number): boolean;
21682156
static fuzzyEqual(a: number, b: number, epsilon?: number): boolean;
21692157
static fuzzyLessThan(a: Number, b: number, epsilon?: number): boolean;
21702158
static fuzzyFloor(val: number, epsilon?: number): boolean;
21712159
static fuzzyGreaterThan(a: number, b: number, epsilon?: number): boolean;
21722160
static fuzzyLessThan(a: number, b: number, epsilon?: number): boolean;
2173-
static getRandom<T>(objects: T[], startIndex?: number, length?: number): T;
2174-
static interpolateFloat(a: number, b: number, weight: number): number;
21752161
static isEven(n: number): boolean;
21762162
static isOdd(n: number): boolean;
21772163
static linear(p0: number, p1: number, t: number): number;
21782164
static linearInterpolation(v: number[], k: number): number;
2179-
static limitValue(value: number, min: number, max: number): number;
21802165
static mapLinear(x: number, a1: number, a2: number, b1: number, b2: number): number;
21812166
static max(...numbers: number[]): number;
21822167
static maxAdd(value: number, amount: number, max: number): number;
@@ -2185,31 +2170,21 @@ declare module Phaser {
21852170
static minProperty(...numbers: number[]): number;
21862171
static minSub(value: number, amount: number, min: number): number;
21872172
static normalizeAngle(angle: number, radians?: boolean): number;
2188-
static normalizeLatitude(lat: number): number;
2189-
static normalizeLongitude(lng: number): number;
2190-
static numberArray(start: number, end: number): number[];
2191-
static numberArrayStep(start: number, end: number, step?: number): number[];
21922173
static percent(a: number, b: number, base?: number): number;
21932174
static p2px(v: number): number;
21942175
static PI2: number;
21952176
static radToDeg(radians: number): number;
2196-
static randomSign(): number;
21972177
static reverseAngle(angleRed: number): number;
2198-
static removeRandom<T>(objects: T[], startIndex?: number, length?: number): T;
21992178
static roundAwayFromZero(value: number): number;
22002179
static roundTo(value: number, place?: number, base?: number): number;
22012180
static shear(n: number): number;
2202-
static shift(stack: any[]): any;
2203-
static shuffleArray<T>(array: T[]): T[];
22042181
static sign(x: number): number;
22052182
static sinCosGenerator(length: number, sinAmplitude?: number, cosAmplitude?: number, frequency?: number): { sin: number[]; cos: number[]; };
22062183
static smootherstep(x: number, min: number, max: number): number;
22072184
static smoothstep(x: number, min: number, max: number): number;
22082185
static snapTo(input: number, gap: number, start?: number): number;
22092186
static snapToCeil(input: number, gap: number, start?: number): number;
22102187
static snapToFloor(input: number, gap: number, start?: number): number;
2211-
static snapToInArray(input: number, arr: number[], sort?: boolean): number;
2212-
static truncate(n: number): number;
22132188
static within(a: number, b: number, tolerance: number): boolean;
22142189
static wrap(value: number, min: number, max: number): number;
22152190
static wrapAngle(angle: number, radians?: boolean): number;
@@ -2243,13 +2218,11 @@ declare module Phaser {
22432218
button: number;
22442219
callbackContext: any;
22452220
capture: boolean;
2246-
disabled: boolean;
22472221
enabled: boolean;
22482222
event: MouseEvent;
22492223
game: Phaser.Game;
22502224
locked: boolean;
22512225
mouseDownCallback: (event: MouseEvent) => void;
2252-
mouseMoveCallback: (event: MouseEvent) => void;
22532226
mouseOutCallback: (event: MouseEvent) => void;
22542227
mouseOverCallback: (event: MouseEvent) => void;
22552228
mouseUpCallback: (event: MouseEvent) => void;
@@ -2288,7 +2261,6 @@ declare module Phaser {
22882261
capture: boolean;
22892262
callbackContext: any;
22902263
event: MSPointerEvent;
2291-
disabled: boolean;
22922264
game: Phaser.Game;
22932265

22942266
onPointerDown: (event: MSPointerEvent) => void;
@@ -4166,14 +4138,10 @@ declare module Phaser {
41664138
currentScaleMode: number;
41674139
dom: Phaser.DOM;
41684140
enterIncorrectOrientation: Signal;
4169-
enterFullScreen: Signal;
4170-
enterLandscape: Signal;
4171-
enterPortrait: Signal;
41724141
event: any;
41734142
forceLandscape: boolean;
41744143
forcePortrait: boolean;
41754144
fullScreenScaleMode: number;
4176-
fullScreenFailed: Signal;
41774145
fullScreenTarget: HTMLElement;
41784146
game: Phaser.Game;
41794147
grid: Phaser.FlexGrid;
@@ -4184,10 +4152,8 @@ declare module Phaser {
41844152
isGamePortrait: boolean; //readonly
41854153
isPortrait: boolean;
41864154
isLandscape: boolean;
4187-
leaveFullScreen: Signal;
41884155
leaveIncorrectOrientation: Signal;
41894156
margin: { left: number; top: number; right: number; bottom: number; x: number; y: number; };
4190-
maxIterations: number;
41914157
maxHeight: number;
41924158
maxWidth: number;
41934159
minHeight: number;
@@ -4198,7 +4164,6 @@ declare module Phaser {
41984164
onFullScreenError: Phaser.Signal;
41994165
onOrientationChange: Phaser.Signal;
42004166
onSizeChange: Signal;
4201-
orientation: number;
42024167
pageAlignHorizontally: boolean;
42034168
pageAlignVertically: boolean;
42044169
parentNode: HTMLElement;
@@ -4217,8 +4182,6 @@ declare module Phaser {
42174182
};
42184183

42194184
boot(): void;
4220-
checkOrientationState(): boolean;
4221-
42224185
createFullScreenTarget(): HTMLDivElement;
42234186
destroy(): void;
42244187
forceOrientation(forceLandscape: boolean, forcePortrait?: boolean): void;
@@ -4342,9 +4305,33 @@ declare module Phaser {
43424305

43434306
}
43444307

4308+
interface PhaserTextStyle {
4309+
4310+
font?: string;
4311+
fill?: any;
4312+
align?: string;
4313+
stroke?: string;
4314+
strokeThickness?: number;
4315+
wordWrap?: boolean;
4316+
wordWrapWidth?: number;
4317+
shadowOffsetX?: number;
4318+
shadowOffsetY?: number;
4319+
shadowColor?: string;
4320+
shadowBlur?: number;
4321+
valign?: string;
4322+
4323+
fontStyle?: string;
4324+
fontVariant?: string;
4325+
fontWeight?: string;
4326+
backgroundColor?: string;
4327+
boundsAlignH?: string;
4328+
boundsAlignV?: string;
4329+
4330+
}
4331+
43454332
class Text extends Phaser.Sprite {
43464333

4347-
constructor(game: Phaser.Game, x: number, y: number, text: string, style: any);
4334+
constructor(game: Phaser.Game, x: number, y: number, text: string, style?: PhaserTextStyle);
43484335

43494336
static fontPropertiesCanvas: any;
43504337
static fontPropertiesContext: any;
@@ -4406,7 +4393,7 @@ declare module Phaser {
44064393
postUpdate(): void;
44074394
preUpdate(): void;
44084395
setShadow(x?: number, y?: number, color?: any, blur?: number, shadowStroke?: boolean, shadowFill?: boolean): Phaser.Text;
4409-
setStyle(style?: { font?: string; fill?: any; align?: string; stroke?: string; strokeThickness?: number; wordWrap?: boolean; wordWrapWidth?: number; shadowOffsetX?: number; shadowOffsetY?: number; shadowColor?: string; shadowBlur?: number; valign?: string; }): Phaser.Text;
4396+
setStyle(style?: PhaserTextStyle): Phaser.Text;
44104397
setText(text: string): Phaser.Text;
44114398
setTextBounds(x?: number, y?: number, width?: number, height?: number): Phaser.Text;
44124399
update(): void;
@@ -4500,7 +4487,7 @@ declare module Phaser {
45004487
width: number;
45014488
widthInPixels: number;
45024489

4503-
addTilesetImage(tileset: string, key?: string, tileWidth?: number, tileHeight?: number, tileMargin?: number, tileSpacing?: number, gid?: number): Phaser.Tileset;
4490+
addTilesetImage(tileset: string, key?: string | Phaser.BitmapData, tileWidth?: number, tileHeight?: number, tileMargin?: number, tileSpacing?: number, gid?: number): Phaser.Tileset;
45044491
calculateFaces(layer: number): void;
45054492
copy(x: number, y: number, width: number, height: number, layer?: any): Phaser.Tile[];
45064493
create(name: string, width: number, height: number, tileWidth: number, tileHeight: number, group?: Phaser.Group): Phaser.TilemapLayer;
@@ -4548,7 +4535,7 @@ declare module Phaser {
45484535

45494536
}
45504537

4551-
class TilemapLayer extends Phaser.Image {
4538+
class TilemapLayer extends Phaser.Sprite {
45524539

45534540
constructor(game: Phaser.Game, tilemap: Phaser.Tilemap, index: number, width?: number, height?: number);
45544541

@@ -4580,7 +4567,6 @@ declare module Phaser {
45804567
scrollY: number;
45814568
texture: PIXI.Texture;
45824569
textureFrame: Phaser.Frame;
4583-
tileColor: string;
45844570
type: number;
45854571
wrap: boolean;
45864572

@@ -4777,7 +4763,6 @@ declare module Phaser {
47774763
constructor(game: Phaser.Game);
47784764

47794765
callbackContext: any;
4780-
disabled: boolean;
47814766
enabled: boolean;
47824767
event: any;
47834768
game: Phaser.Game;
@@ -4838,7 +4823,7 @@ declare module Phaser {
48384823
generateData(frameRate?: number, data?: any): any[];
48394824
interpolation(interpolation: Function, context?: any, index?: number): Phaser.Tween;
48404825
loop(value?: boolean): Phaser.Tween;
4841-
onUpdateCallback(callback: Function, callbackContext: any): Phaser.Tween;
4826+
onUpdateCallback(callback: Function, callbackContext?: any): Phaser.Tween;
48424827
pause(): void;
48434828
repeat(total: number, repeatDelay?: number, index?: number): Phaser.Tween;
48444829
repeatDelay(duration: number, index?: number): Phaser.Tween;
@@ -4914,17 +4899,16 @@ declare module Phaser {
49144899

49154900
class Utils {
49164901

4917-
static extend(deep: boolean, target: any): any;
49184902
static getProperty(obj: any, prop: string): any;
4919-
static isPlainObject(object: any): boolean;
4920-
static mixin(from: any, to: any): any;
4921-
static pad(str: string, len?: number, pad?: string, dir?: number): string;
4922-
static parseDimension(size: any, dimension: number): number;
4923-
static randomChoice(choice1: any, choice2: any): any;
4924-
static rotateArray<T>(array: T[], direction: any): T;
49254903
static setProperty(obj: any, prop: string, value: any): any;
4926-
static shuffle<T>(array: T[]): T[];
4927-
static transposeArray<T>(array: T[]): T[];
4904+
static chanceRoll(chance: number): boolean;
4905+
static randomChoice(choice1: string | number, choice2: any): any;
4906+
static parseDimension(size: any, dimension: number): number;
4907+
static pad(str: string, len?: number, pad?: string, dir?: number): string;
4908+
static isPlainObject(object: any): boolean;
4909+
static extend(deep: boolean, target: any): any;
4910+
static mixinPrototype(target: any, mixin: any, replace?: boolean): void;
4911+
static mixin<T>(from: T, to: any): T;
49284912

49294913
}
49304914

‎typescript/pixi.d.ts‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,23 +1084,6 @@ declare module PIXI {
10841084

10851085
}
10861086

1087-
export class Text extends Sprite {
1088-
1089-
constructor(text: string, style?: TextStyle);
1090-
1091-
static fontPropertiesCanvas: any;
1092-
static fontPropertiesContext: any;
1093-
static fontPropertiesCache: any;
1094-
1095-
context: CanvasRenderingContext2D;
1096-
resolution: number;
1097-
1098-
destroy(destroyTexture: boolean): void;
1099-
setStyle(style: TextStyle): void;
1100-
setText(text: string): void;
1101-
1102-
}
1103-
11041087
export class Texture implements Mixin {
11051088

11061089
static emptyTexture: Texture;
@@ -1146,6 +1129,7 @@ declare module PIXI {
11461129
blendMode: number;
11471130
refreshTexture: boolean;
11481131
texture: Texture;
1132+
textureDebug: boolean;
11491133
tint: number;
11501134
tilePosition: Point;
11511135
tilePattern: PIXI.Texture;

0 commit comments

Comments
 (0)