Skip to content

Commit c5396eb

Browse files
clark-stevensonclark-stevenson
committed
2.4.0 Definition Updates.
1 parent 4a4d7d5 commit c5396eb

3 files changed

Lines changed: 132 additions & 22 deletions

File tree

‎typescript/phaser.d.ts‎

Lines changed: 118 additions & 7 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-04-23
4+
// Type definitions for Phaser 2.4.0 2015-May-09
55
// Project: https://github.com/photonstorm/phaser
66

77
declare class Phaser {
@@ -42,6 +42,8 @@ declare class Phaser {
4242
static TILESPRITE: number;
4343
static WEBGL_FILTER: number;
4444
static ROPE: number;
45+
static CREATURE: number;
46+
static VIDEO: number;
4547

4648
static NONE: number;
4749
static LEFT: number;
@@ -264,6 +266,7 @@ declare module Phaser {
264266
render(): Phaser.BitmapData;
265267
replaceRGB(r1: number, g1: number, b1: number, a1: number, r2: number, g2: number, b2: number, a2: number, region: Phaser.Rectangle): Phaser.BitmapData;
266268
resize(width: number, height: number): Phaser.BitmapData;
269+
resizeFrame(parent: any, width: number, height: number): void;
267270
setHSL(h?: number, s?: number, l?: number, region?: Phaser.Rectangle): Phaser.BitmapData;
268271
setPixel(x: number, y: number, red: number, green: number, blue: number, immediate?: boolean): Phaser.BitmapData;
269272
setPixel32(x: number, y: number, red: number, green: number, blue: number, alpha: number, immediate?: boolean): Phaser.BitmapData;
@@ -359,6 +362,7 @@ declare module Phaser {
359362
static IMAGE: number;
360363
static JSON: number;
361364
static PHYSICS: number;
365+
static VIDEO: number;
362366
static SOUND: number;
363367
static TEXT: number;
364368
static TEXTURE: number;
@@ -430,6 +434,7 @@ declare module Phaser {
430434
getURL(url: string): any;
431435
getUrl(url: string): any;
432436
getXML(key: string): any;
437+
getVideo(key: string): Phaser.Video;
433438
isSoundDecoded(key: string): boolean;
434439
isSoundReady(key: string): boolean;
435440
isSpriteSheet(key: string): boolean;
@@ -446,6 +451,7 @@ declare module Phaser {
446451
removeText(key: string): void;
447452
removeTilemap(key: string): void;
448453
removeXML(key: string): void;
454+
removeVideo(key: string): void;
449455
updateFrameData(key: string, frameData: any): void;
450456
updateSound(key: string, property: string, value: Phaser.Sound): void;
451457

@@ -582,6 +588,31 @@ declare module Phaser {
582588
static updateColor(out: any): number;
583589
static valueToColor(value: string, out?: any): { r: number; g: number; b: number; a: number; };
584590
static webToColor(web: string, out?: any): { r: number; g: number; b: number; a: number; };
591+
static blendNormal(a: number): number;
592+
static blendLighten(a: number, b: number): number;
593+
static blendDarken(a: number, b: number): number;
594+
static blendMultiply(a: number, b: number): number;
595+
static blendAverage(a: number, b: number): number;
596+
static blendAdd(a: number, b: number): number;
597+
static blendSubtract(a: number, b: number): number;
598+
static blendDifference(a: number, b: number): number;
599+
static blendNegation(a: number, b: number): number;
600+
static blendScreen(a: number, b: number): number;
601+
static blendExclusion(a: number, b: number): number;
602+
static blendOverlay(a: number, b: number): number;
603+
static blendSoftLight(a: number, b: number): number;
604+
static blendHardLight(a: number, b: number): number;
605+
static blendColorDodge(a: number, b: number): number;
606+
static blendColorBurn(a: number, b: number): number;
607+
static blendLinearDodge(a: number, b: number): number;
608+
static blendLinearBurn(a: number, b: number): number;
609+
static blendLinearLight(a: number, b: number): number;
610+
static blendVividLight(a: number, b: number): number;
611+
static blendPinLight(a: number, b: number): number;
612+
static blendHardMix(a: number, b: number): number;
613+
static blendReflect(a: number, b: number): number;
614+
static blendGlow(a: number, b: number): number;
615+
static blendPhoenix(a: number, b: number): number;
585616

586617
}
587618

@@ -601,6 +632,7 @@ declare module Phaser {
601632

602633
static checkFullScreenSupport(): void;
603634
static canPlayAudio(type: string): boolean;
635+
static canPlayVideo(type: string): boolean;
604636
static isConsoleOpen(): boolean;
605637
static isAndroidStockBrowser(): string;
606638
static whenReady: (callback: Function, context?: any) => void;
@@ -628,6 +660,8 @@ declare module Phaser {
628660
fullScreenKeyboard: boolean;
629661
getUserMedia: boolean;
630662
game: Phaser.Game;
663+
h264Video: boolean;
664+
hlsVideo: boolean;
631665
ie: boolean;
632666
ieVersion: number;
633667
iOS: boolean;
@@ -644,10 +678,12 @@ declare module Phaser {
644678
midori: boolean;
645679
mobileSafari: boolean;
646680
mp3: boolean;
681+
mp4Video: boolean;
647682
mspointer: boolean;
648683
node: boolean;
649684
nodeWebkit: boolean;
650685
ogg: boolean;
686+
oggVideo: number;
651687
opera: boolean;
652688
opus: boolean;
653689
pixelRatio: number;
@@ -668,10 +704,12 @@ declare module Phaser {
668704
webAudio: boolean;
669705
webGL: boolean;
670706
webm: boolean;
707+
webmVideo: boolean;
671708
windows: boolean;
672709
windowsPhone: boolean;
673710
wheelEvent: string;
674711
worker: boolean;
712+
wp9Video: boolean;
675713

676714
}
677715

@@ -1078,6 +1116,7 @@ declare module Phaser {
10781116
clone(): Phaser.Frame;
10791117
getRect(out?: Phaser.Rectangle): Phaser.Rectangle;
10801118
setTrim(trimmed: boolean, actualWidth: number, actualHeight: number, destX: number, destY: number, destWidth: number, destHeight: number): void;
1119+
resize(width: number, height: number): void;
10811120

10821121
}
10831122

@@ -1250,6 +1289,8 @@ declare module Phaser {
12501289
tilemap(key?: string, tileWidth?: number, tileHeight?: number, width?: number, height?: number): Phaser.Tilemap;
12511290
tileSprite(x: number, y: number, width: number, height: number, key?: any, frame?: any, group?: Phaser.Group): Phaser.TileSprite;
12521291
tween(obj: any): Phaser.Tween;
1292+
video(key: string, captureAudio?: boolean, width?: number, height?: number): Phaser.Video;
1293+
videoSprite(): void; //todo not sure?
12531294

12541295
}
12551296

@@ -1562,6 +1603,7 @@ declare module Phaser {
15621603
destroy(destroyChildren?: boolean): void;
15631604
kill(): Phaser.Image;
15641605
loadTexture(key: string|Phaser.RenderTexture|Phaser.BitmapData|PIXI.Texture, frame: string|number): void;
1606+
resizeFrame(parent: any, width: number, height: number): void;
15651607
postUpdate(): void;
15661608
preUpdate(): void;
15671609
reset(x: number, y: number): Phaser.Image;
@@ -1602,9 +1644,7 @@ declare module Phaser {
16021644
minPriorityID: number;
16031645
mouse: Phaser.Mouse;
16041646
mousePointer: Phaser.Pointer;
1605-
moveCallback: (pointer: Phaser.Pointer, x: number, y: number) => void;
16061647
moveCallbacks: (pointer: Phaser.Pointer, x: number, y: number) => void[];
1607-
moveCallbackContext: any;
16081648
mspointer: Phaser.MSPointer;
16091649
multiInputOverride: number;
16101650
onDown: Phaser.Signal;
@@ -1644,7 +1684,7 @@ declare module Phaser {
16441684
addMoveCallback(callback: Function, context: any): number;
16451685
boot(): void;
16461686
countActivePointers(limit?: number): number;
1647-
deleteMoveCallback(index: number): void;
1687+
deleteMoveCallback(callback: Function, context?: any): void;
16481688
destroy(): void;
16491689
getLocalPosition(displayObject: any, pointer: Phaser.Pointer): Phaser.Point;
16501690
getPointer(isActive?: boolean): Phaser.Pointer;
@@ -2036,6 +2076,7 @@ declare module Phaser {
20362076
totalQueuedPacks(): number;
20372077
transformUrl(url: string): string;
20382078
updateProgress(): void;
2079+
video(key: string, urls: string | string[]| any, asBlob?: boolean): Phaser.Loader;
20392080
withSyncPoint(callback: Function, callbackContext?: any): Phaser.Loader;
20402081
xml(key: string, url?: string, overwrite?: boolean): Phaser.Loader;
20412082
xhrLoad(file: any, url: string, type: string, onload: Function, onerror?: Function): void;
@@ -2391,6 +2432,60 @@ declare module Phaser {
23912432

23922433
}
23932434

2435+
export class Video {
2436+
2437+
game: Phaser.Game;
2438+
key: string;
2439+
video: HTMLVideoElement;
2440+
baseTexture: PIXI.BaseTexture;
2441+
texture: PIXI.Texture;
2442+
textureFrame: Phaser.Frame;
2443+
type: number;
2444+
disableTextureUpload: boolean;
2445+
dirty: boolean;
2446+
2447+
currentTime: number;
2448+
duration: number;
2449+
progress: number;
2450+
mute: boolean;
2451+
paused: boolean;
2452+
volume: boolean;
2453+
playbackRate: boolean;
2454+
playing: boolean;
2455+
loop: boolean;
2456+
width: number;
2457+
height: number;
2458+
videoStream: any;
2459+
snapshot: Phaser.BitmapData;
2460+
2461+
onAccess: Phaser.Signal;
2462+
onError: Phaser.Signal;
2463+
onPlay: Phaser.Signal;
2464+
onComplete: Phaser.Signal;
2465+
onUpdate: Phaser.Signal;
2466+
2467+
touchLocked: boolean;
2468+
complete: () => void;
2469+
2470+
constructor(game: Phaser.Game, key?: string, captureAudio?: boolean, width?: number, height?: number);
2471+
2472+
add(object: Phaser.Sprite | Phaser.Sprite[]| Phaser.Image | Phaser.Image[]): Phaser.Video;
2473+
addToWorld(x?: number, y?: number, anchorX?: number, anchorY?: Number, scaleX?: number, scaleY?: number): Phaser.Image;
2474+
createVideoFromBlob(blob: Blob): Phaser.Video;
2475+
createVideoStream(captureAudio?: boolean, width?: number, height?: number): Phaser.Video;
2476+
changeSource(src: string, autoplay?: boolean): Phaser.Video;
2477+
destroy(): void;
2478+
play(loop?: boolean, playbackRate?: number): Phaser.Video;
2479+
render(): void;
2480+
resizeFrame(parent: any, width: number, height: number): void;
2481+
setTouchLock(): void;
2482+
grab(clear?: boolean, alpha?: number, blendMode?: string): Phaser.BitmapData;
2483+
stop(): void;
2484+
unlock(): boolean;
2485+
updateTexture(event?: any, width?: number, height?: number): void;
2486+
2487+
}
2488+
23942489
module Physics {
23952490

23962491
class Arcade {
@@ -2505,6 +2600,7 @@ declare module Phaser {
25052600
sourceHeight: number;
25062601
speed: number;
25072602
sprite: Phaser.Sprite;
2603+
syncBounds: boolean;
25082604
tilePadding: Phaser.Point;
25092605
touching: FaceChoices;
25102606
type: number;
@@ -3243,6 +3339,8 @@ declare module Phaser {
32433339

32443340
}
32453341

3342+
3343+
32463344
class Webcam extends Phaser.Plugin {
32473345

32483346
constructor(game: Phaser.Game, parent: PIXI.DisplayObject);
@@ -3552,6 +3650,8 @@ declare module Phaser {
35523650
static size(a: Phaser.Rectangle, output?: Phaser.Point): Phaser.Point;
35533651
static union(a: Phaser.Rectangle, b: Phaser.Rectangle, out?: Phaser.Rectangle): Phaser.Rectangle;
35543652

3653+
ceil(): void;
3654+
ceilAll(): void;
35553655
centerOn(x: number, y: number): Phaser.Rectangle;
35563656
clone(output: Phaser.Rectangle): Phaser.Rectangle;
35573657
contains(x: number, y: number): boolean;
@@ -3867,6 +3967,9 @@ declare module Phaser {
38673967
mute: boolean;
38683968
noAudio: boolean;
38693969
onSoundDecode: Phaser.Signal;
3970+
onVolumeChange: Phaser.Signal;
3971+
onMute: Phaser.Signal;
3972+
onUnMute: Phaser.Signal;
38703973
touchLocked: boolean;
38713974
usingAudioTag: boolean;
38723975
usingWebAudio: boolean;
@@ -3883,8 +3986,9 @@ declare module Phaser {
38833986
removeByKey(key: string): number;
38843987
resumeAll(): void;
38853988
setDecodedCallback(files: string[]|Phaser.Sound[], callback: Function, callbackContext: any): void;
3989+
setTouchLock(): void;
38863990
stopAll(): void;
3887-
unlock(): void;
3991+
unlock(): boolean;
38883992
update(): void;
38893993

38903994
}
@@ -3940,6 +4044,7 @@ declare module Phaser {
39404044
smoothed: boolean;
39414045
top: number;
39424046
type: number;
4047+
tintedTexture: HTMLCanvasElement;
39434048
world: Phaser.Point;
39444049
x: number;
39454050
y: number;
@@ -4234,8 +4339,10 @@ declare module Phaser {
42344339
renderOrderID: number;
42354340
shadowBlur: number;
42364341
shadowColor: string;
4342+
shadowFill: boolean;
42374343
shadowOffsetX: number;
42384344
shadowOffsetY: number;
4345+
shadowStroke: boolean;
42394346
stroke: string;
42404347
strokeThickness: number;
42414348
scale: Phaser.Point;
@@ -4253,12 +4360,13 @@ declare module Phaser {
42534360
fontToComponents(font: string): any;
42544361
postUpdate(): void;
42554362
preUpdate(): void;
4256-
setShadow(x?: number, y?: number, color?: any, blur?: number): void;
4363+
setShadow(x?: number, y?: number, color?: any, blur?: number, shadowStroke?: boolean, shadowFill?: boolean): void;
42574364
setStyle(style?: { font?: string; fill?: any; align?: string; stroke?: string; strokeThickness?: number; wordWrap?: boolean; wordWrapWidth?: number; shadowOffsetX?: number; shadowOffsetY?: number; shadowColor?: string; shadowBlur?: number; }): void;
42584365
update(): void;
42594366
updateFont(components: any): void;
4260-
updateTexture(): void;
42614367
updateLine(text: string, x?: number, y?: number): void;
4368+
updateShadow(state?: boolean): void;
4369+
updateTexture(): void;
42624370

42634371
}
42644372

@@ -4633,7 +4741,10 @@ declare module Phaser {
46334741
touchLeaveCallback: Function;
46344742
touchMoveCallback: Function;
46354743
touchStartCallback: Function;
4744+
touchLockCallbacks: Function[];
46364745

4746+
addTouchLockCallback(callback: Function, context?: any): void;
4747+
removeTouchLockCallback(callback: Function, context?: any): boolean;
46374748
consumeTouchMove(): void;
46384749
onTouchCancel(event: any): void;
46394750
onTouchEnd(event: any): void;

‎typescript/pixi.d.ts‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// Type definitions for PIXI 2.2.8 2015-03-24
2-
// Project: https://github.com/GoodBoyDigital/pixi.js/
1+
// Type definitions for PIXI 2.2.8 Deviation. Commit History Reviewed: 2015-May-09
32

43
declare module PIXI {
54

@@ -275,7 +274,7 @@ declare module PIXI {
275274
once(eventName: string, fn: Function): Function;
276275
off(eventName: string, fn: Function): Function;
277276
removeAllEventListeners(eventName: string): void;
278-
277+
forceLoaded(width: number, height: number): void;
279278
destroy(): void;
280279
dirty(): void;
281280
updateSourceImage(newSrc: string): void;
@@ -396,10 +395,7 @@ declare module PIXI {
396395
static tintWithMultiply(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
397396
static tintWithOverlay(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
398397
static tintWithPerPixel(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
399-
static roundColor(color: number): void;
400398

401-
static cacheStepsPerColorChannel: number;
402-
static convertTintToImage: boolean;
403399
static canUseMultiply: boolean;
404400
static tintMethod: any;
405401

@@ -484,6 +480,9 @@ declare module PIXI {
484480
stage: Stage;
485481
visible: boolean;
486482
worldAlpha: number;
483+
worldPosition: PIXI.Point;
484+
worldScale: PIXI.Point;
485+
worldRotation: number;
487486
worldVisible: boolean;
488487
x: number;
489488
y: number;
@@ -1220,21 +1219,21 @@ declare module PIXI {
12201219

12211220
static baseTextureFromVideo(video: HTMLVideoElement, scaleMode: number): BaseTexture;
12221221
static textureFromVideo(video: HTMLVideoElement, scaleMode: number): Texture;
1223-
static fromUrl(videoSrc: string, scaleMode: number): Texture;
1222+
static fromUrl(videoSrc: string, scaleMode?: number, autoPlay?: boolean, type?: string, loop?: boolean): Texture;
12241223

1224+
controls: boolean;
12251225
autoUpdate: boolean;
1226+
type: string;
12261227

1227-
onPlay: Phaser.Signal;
1228-
onComplete: Phaser.Signal;
1229-
1228+
changeSource(src: string, type: string, loop: boolean): void;
12301229
play(): void;
12311230
stop(): void;
12321231

12331232
destroy(): void;
12341233
updateBound(): void;
12351234
onPlayStart: () => void;
12361235
onPlayStop: () => void;
1237-
onCanPlay: () => void;
1236+
onCanPlay: (event: any) => void;
12381237

12391238
}
12401239

0 commit comments

Comments
 (0)