Skip to content

Commit 63abd17

Browse files
committed
Merge pull request phaserjs#800 from clark-stevenson/patch-2
Update phaser.d.ts
2 parents 6070bc6 + 266417e commit 63abd17

1 file changed

Lines changed: 41 additions & 11 deletions

File tree

build/phaser.d.ts

Lines changed: 41 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ declare module PIXI {
3232

3333
}
3434

35-
export enum scaleModes {
35+
export class scaleModes {
3636

37-
DEFAULT,
38-
LINEAR,
39-
NEAREST
37+
public static DEFAULT: number;
38+
public static LINEAR: number;
39+
public static NEAREST: number;
4040

4141
}
4242

@@ -1045,6 +1045,7 @@ declare module Phaser {
10451045

10461046
constructor(game: Phaser.Game, parent: Phaser.Sprite, name: string, frameData: Phaser.FrameData, frames: any[], delay: number, loop: boolean);
10471047

1048+
currentAnim: Phaser.Animation;
10481049
currentFrame: Phaser.Frame;
10491050
delay: number;
10501051
frame: number;
@@ -1152,11 +1153,13 @@ declare module Phaser {
11521153

11531154
add(object: any): void;
11541155
alphaMask(source: any, mask: any): void;
1156+
circle(x: number, y: number, radius: number, fillStyle?: string): void;
11551157
clear(): void;
11561158
cls(): void;
11571159
copyPixels(source: any, area: Phaser.Rectangle, destX: number, destY: number): void;
11581160
draw(source: any, x: number, y: number): void;
11591161
drawSprite(sprite: any, x?: number, y?: number): void;
1162+
extract(destination: Phaser.BitmapData, r: number, g: number, b: number, a?:number): Phaser.BitmapData;
11601163
fill(r: number, g: number, b: number, a?: number): void;
11611164
getPixel(x: number, y: number, out?: Object): number;
11621165
getPixelRGB(x: number, y: number, out?: Object, hsl?: boolean, hsv?: boolean): Object;
@@ -1426,7 +1429,9 @@ declare module Phaser {
14261429
static hexToRGB(h: string): number;
14271430
static hexToColor(hex: string, out?: Object): Object;
14281431
static HSLtoRGB(h: number, s: number, l: number, out?: Object): Object;
1432+
static HSLColorWheel(s?: number, l?: number): any[];
14291433
static HSVtoRGB(h: number, s: number, v: number, out?: Object): Object;
1434+
static HSVColorWheel(s?: number, v?: number): any[];
14301435
static hueToColor(p: number, q: number, t: number): number;
14311436
static interpolateColor(color1: number, color2: number, steps: number, currentStep: number, alpha: number): number;
14321437
static interpolateColorWithRGB(color: number, r: number, g: number, b: number, steps: number, currentStep: number): number;
@@ -1439,7 +1444,7 @@ declare module Phaser {
14391444
static RGBtoWebstring(color: number): string;
14401445
static toRGBA(r: number, g: number, b: number, a: number): number;
14411446
static unpackPixel(rgba: number, out?: Object, hsl?: boolean, hsv?: boolean): Object;
1442-
1447+
static updateColor(out: any): number;
14431448
}
14441449

14451450
interface CursorKeys {
@@ -2024,6 +2029,7 @@ declare module Phaser {
20242029
getIndex(child: any): number;
20252030
getRandom(startIndex: number, length: number): any;
20262031
getTop(): any;
2032+
hasProperty(child: any, key: string[]): boolean;
20272033
iterate(key: string, value: any, returnType: number, callback?: Function, callbackContext?: Object, ...args: any[]): any;
20282034
moveDown(child: any): any;
20292035
moveUp(child: any): any;
@@ -2038,9 +2044,9 @@ declare module Phaser {
20382044
replace(oldChild: any, newChild: any): any;
20392045
reverse(): void;
20402046
sendToBack(child: any): any;
2041-
set(child: Phaser.Sprite, key: string, value: any, checkAlive?: boolean, checkVisible?: boolean, operation?: number): void;
2042-
setAll(key: string, value: any, checkAlive?: boolean, checkVisible?: boolean, operation?: number): void;
2043-
setProperty(child: any, key: string[], value: any, operation?: number): void;
2047+
set(child: any, key: string[], value: any, operation?: number, force?: boolean): boolean;
2048+
setAll(key: string, value: any, checkAlive?: boolean, checkVisible?: boolean, operation?: number, force?:boolean): boolean;
2049+
setProperty(child: any, key: string[], value: any, operation?: number, force?: boolean): boolean;
20442050
sort(index?: string, order?: number): void;
20452051
subAll(property: string, amount: number, checkAlive: boolean, checkVisible: boolean): void;
20462052
swap(child1: any, child2: any): boolean;
@@ -2160,6 +2166,7 @@ declare module Phaser {
21602166
destroy(): void;
21612167
getLocalPosition(displayObject: any, pointer: Phaser.Pointer): Phaser.Point;
21622168
getPointer(state: boolean): Phaser.Pointer;
2169+
getPointerFromId(pointerID: number): Phaser.Pointer;
21632170
getPointerFromIdentifier(identifier: number): Phaser.Pointer;
21642171
hitTest(displayObject: any, pointer: Phaser.Pointer, localPoint: Phaser.Point): void;
21652172
reset(hard?: boolean): void;
@@ -3473,23 +3480,36 @@ declare module Phaser {
34733480
static subtract(a: Phaser.Point, b: Phaser.Point, out?: Phaser.Point): Phaser.Point;
34743481

34753482
add(x: number, y: number): Phaser.Point;
3483+
angle(a: Phaser.Point, b: Phaser.Point): number;
3484+
angleSq(a: Phaser.Point, b: Phaser.Point): number;
34763485
clamp(min: number, max: number): Phaser.Point;
34773486
clampX(min: number, max: number): Phaser.Point;
34783487
clampY(min: number, max: number): Phaser.Point;
34793488
clone(output?: Phaser.Point): Phaser.Point;
34803489
copyFrom(source: any): Phaser.Point;
34813490
copyTo(dest: any): Object;
3491+
cross(a: Phaser.Point): number;
34823492
distance(dest: Object, round?: boolean): number;
34833493
divide(x: number, y: number): Phaser.Point;
3494+
dot(a: Phaser.Point): number;
34843495
equals(a: Phaser.Point): boolean;
34853496
getMagnitude(): number;
3486-
setMagnitude(magnitude: number): Phaser.Point;
3497+
getMagnitudeSq(): number;
3498+
interpolate(a: Phaser.Point, b: Phaser.Point, f: number, out?: Phaser.Point): Phaser.Point;
34873499
invert(): Phaser.Point;
34883500
isZero(): boolean;
34893501
multiply(x: number, y: number): Phaser.Point;
3490-
normalise(): Phaser.Point;
3491-
rotate(x: number, y: number, angle: number, asDegrees: boolean, distance?: number): Phaser.Point;
3502+
multiplyAdd(a: Phaser.Point, b: Phaser.Point, s: number, out?: Phaser.Point): Phaser.Point;
3503+
negative(a: Phaser.Point, out?: Phaser.Point): Phaser.Point;
3504+
normalise(a: Phaser.Point, out?: Phaser.Point): Phaser.Point;
3505+
normalRightHand(a: Phaser.Point, out?: Phaser.Point): Phaser.Point;
3506+
perp(a: Phaser.Point, out?: Phaser.Point): Phaser.Point;
3507+
project(a: Phaser.Point, b: Phaser.Point, out?: Phaser.Point): Phaser.Point;
3508+
projectUnit(a: Phaser.Point, b: Phaser.Point, out?: Phaser.Point): Phaser.Point;
3509+
rotate(x: number, y: number, angle: number, asDegrees?: boolean, distance?: number): Phaser.Point;
3510+
rperp(a: Phaser.Point, out?: Phaser.Point): Phaser.Point;
34923511
set(x: number, y?: number): Phaser.Point;
3512+
setMagnitude(magnitude: number): Phaser.Point;
34933513
setTo(x: number, y?: number): Phaser.Point;
34943514
subtract(x: number, y: number): Phaser.Point;
34953515
toString(): string;
@@ -3501,24 +3521,28 @@ declare module Phaser {
35013521
constructor(game: Phaser.Game, id: number);
35023522

35033523
active: boolean;
3524+
button: any;
35043525
circle: Phaser.Circle;
35053526
clientX: number;
35063527
clientY: number;
35073528
duation: number;
35083529
game: Phaser.Game;
35093530
id: number;
3531+
identifier: number;
35103532
isDown: boolean;
35113533
isMouse: boolean;
35123534
isUp: boolean;
35133535
msSinceLastClick: number;
35143536
pageX: number;
35153537
pageY: number;
3538+
pointerId: number;
35163539
position: Phaser.Point;
35173540
positionDown: Phaser.Point;
35183541
positionUp: Phaser.Point;
35193542
previousTapTime: number;
35203543
screenX: number;
35213544
screenY: number;
3545+
target: any;
35223546
targetObject: any;
35233547
timeDown: number;
35243548
timeUp: number;
@@ -3814,14 +3838,17 @@ declare module Phaser {
38143838
currentTime: number;
38153839
destroy(remove?: boolean): void;
38163840
duration: number;
3841+
durationMS: number;
38173842
externalNode: Object;
38183843
game: Phaser.Game;
3844+
gainNode: Object;
38193845
isDecoded: boolean;
38203846
isDecoding: boolean;
38213847
isPlaying: boolean;
38223848
key: string;
38233849
loop: boolean;
38243850
markers: Object;
3851+
masterGainNode: Object;
38253852
mute: boolean;
38263853
name: string;
38273854
onDecoded: Phaser.Signal;
@@ -3837,6 +3864,7 @@ declare module Phaser {
38373864
pausedPosition: number;
38383865
pausedTime: number;
38393866
pendingPlayback: boolean;
3867+
position: number;
38403868
startTime: number;
38413869
stopTime: number;
38423870
totalDuration: number;
@@ -4089,6 +4117,7 @@ declare module Phaser {
40894117
onLoadRenderCallback: Function;
40904118
onLoadUpdateCallback: Function;
40914119
onPausedCallback: Function;
4120+
onPauseUpdateCallback: Function;
40924121
onPreloadCallback: Function;
40934122
onPreRenderCallback: Function;
40944123
onRenderCallback: Function;
@@ -4525,6 +4554,7 @@ declare module Phaser {
45254554
chain(): Phaser.Tween;
45264555
delay(amount: number): Phaser.Tween;
45274556
easing(easing: Function): Phaser.Tween;
4557+
from(properties: Object, duration?: number, ease?: Function, autoStart?: boolean, delay?: number, repeat?: number, yoyo?: boolean): Phaser.Tween;
45284558
generateData(frameRate: number, data: Object): any[];
45294559
interpolation(interpolation: Function): Phaser.Tween;
45304560
loop(): Phaser.Tween;

0 commit comments

Comments
 (0)