Skip to content

Commit 35cb63f

Browse files
photonstormphotonstorm
committed
Merge pull request phaserjs#964 from clark-stevenson/patch-4
Various updates to Phaser, and 1.5.4 PIXI
2 parents c71ca3b + 3c90ccc commit 35cb63f

1 file changed

Lines changed: 65 additions & 7 deletions

File tree

‎build/phaser.d.ts‎

Lines changed: 65 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Type definitions for PIXI 1.5.2
1+
// Type definitions for PIXI 1.5.4
22
// Project: https://github.com/GoodBoyDigital/pixi.js/
33
// Original 1.3 by: xperiments <http://github.com/xperiments>
44
// Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -52,6 +52,7 @@ declare module PIXI {
5252
export function getNextPowerOfTwo(): number;
5353
export function rgb2hex(rgb: any): number;
5454
export function hex2rgb(hex: number): any;
55+
export function sayHello(): void;
5556

5657
/*INTERFACES*/
5758
export interface IBasicCallback {
@@ -198,11 +199,12 @@ declare module PIXI {
198199
export class BaseTexture extends EventTarget {
199200

200201
id: number;
202+
hasLoaded: boolean;
201203
height: number;
202-
width: number;
204+
premultipliedAlpha: boolean;
203205
source: HTMLImageElement;
204206
scaleMode: scaleModes;
205-
hasLoaded: boolean;
207+
width: number;
206208

207209
constructor(source: HTMLImageElement, scaleMode: scaleModes);
208210
constructor(source: HTMLCanvasElement, scaleMode: scaleModes);
@@ -465,17 +467,23 @@ declare module PIXI {
465467
blendMode: blendModes;
466468
bounds: Rectangle;
467469
boundsPadding: number;
470+
dirty: boolean;
468471
fillAlpha: number;
469472
isMask: boolean;
470473
lineColor: string;
471474
lineWidth: number;
472475
renderable: boolean;
473476
tint: number;
474477

478+
arc(cx: number, cy: number, radius: number, startAngule: number, endAngle: number, anticlockwise: boolean): PIXI.Graphics;
479+
arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): PIXI.Graphics;
475480
beginFill(color: number, alpha: number): void;
481+
bezierCurveTo(cpX: number, cpY: number, cpX2: number, cpY2: number, toX: number, toY: number): PIXI.Graphics;
476482
clear(): void;
477483
drawCircle(x: number, y: number, radius: number): void;
478484
drawEllipse(x: number, y: number, width: number, height: number): void;
485+
drawPath(x: number, y: number): PIXI.Graphics;
486+
drawRoundedRect(x: number, y: number, width: number, height: number, radius: number): PIXI.Graphics;
479487
drawRect(x: number, y: number, width: number, height: number): void;
480488
endFill(): void;
481489
generateTexture(): Texture;
@@ -484,6 +492,7 @@ declare module PIXI {
484492
lineStyle(lineWidth: number, color: number, alpha: number): void;
485493
lineTo(x: number, y: number): void;
486494
moveTo(x: number, y: number): void;
495+
quadraticCurveTo(cpX: number, cpY: number, toX: number, toY: number): PIXI.Graphics;
487496
updateBounds(): void;
488497

489498
}
@@ -550,6 +559,9 @@ declare module PIXI {
550559

551560
export class MovieClip extends Sprite {
552561

562+
static fromFrames(frames: any[]): MovieClip;
563+
static fromImages(images: any[]): MovieClip;
564+
553565
animationSpeed: number;
554566
currentFrame: number;
555567
loop: boolean;
@@ -718,6 +730,7 @@ declare module PIXI {
718730

719731
export class Spine {
720732

733+
animationSpeed: number;
721734
url: string;
722735
crossorigin: any;
723736
loaded: boolean;
@@ -797,17 +810,21 @@ declare module PIXI {
797810

798811
export class Strip extends DisplayObjectContainer {
799812

800-
constructor(texture: Texture, width: number, height: number);
813+
constructor(texture: Texture);
801814

802815
}
803816

804817
export class StripShader {
805818

819+
//where is WebGLContext in TypeScript? "any" is used
820+
constructor(gl:any)
821+
806822
program: any;
807-
fragmentSrc: string[];
808-
vertexSrc: string[];
823+
fragmentSrc: any[];
824+
vertexSrc: any[];
809825

810826
init(): void;
827+
destroy(): void;
811828

812829
}
813830

@@ -818,7 +835,7 @@ declare module PIXI {
818835

819836
constructor(text: string, style: ITextStyle);
820837

821-
destroy(destroyTexture: boolean): void;
838+
destroy(destroyBaseTexture: boolean): void;
822839
setText(text: string): void;
823840
setStyle(style: ITextStyle): void;
824841

@@ -831,6 +848,7 @@ declare module PIXI {
831848
trim: Point;
832849
width: number;
833850
height: number;
851+
valid: boolean;
834852

835853
constructor(baseTexture: BaseTexture, frame?: Rectangle);
836854

@@ -872,6 +890,10 @@ declare module PIXI {
872890

873891
}
874892

893+
export class WebGLComplexGraphics {
894+
895+
}
896+
875897
export class WebGLFastSpriteBatch {
876898

877899
vertSize: number;
@@ -936,6 +958,10 @@ declare module PIXI {
936958

937959
}
938960

961+
export class WebGLPrimitiveBatch {
962+
963+
}
964+
939965
export class WebGLRenderer implements IPixiRenderer {
940966

941967
contextLost: boolean;
@@ -967,6 +993,10 @@ declare module PIXI {
967993

968994
}
969995

996+
export class WebGLStencilManager {
997+
998+
}
999+
9701000
export class WebGLShaderUtils {
9711001

9721002

@@ -1478,6 +1508,21 @@ declare module Phaser {
14781508
static updateColor(out: any): number;
14791509
}
14801510

1511+
class ComplexPrimitiveShader {
1512+
1513+
//where is WebGLContext in TypeScript? "any" is used
1514+
constructor(gl: any);
1515+
1516+
gl: any;
1517+
program: any;
1518+
fragmentSrc: any[];
1519+
vertexSrc: any[];
1520+
1521+
destroy(): void;
1522+
init(): void;
1523+
1524+
}
1525+
14811526
interface CursorKeys {
14821527

14831528
up: Phaser.Key;
@@ -1796,6 +1841,12 @@ declare module Phaser {
17961841

17971842
}
17981843

1844+
class Pixelate extends Phaser.Filter {
1845+
1846+
size: number;
1847+
1848+
}
1849+
17991850
class Plasma extends Phaser.Filter {
18001851

18011852
constructor(game: Phaser.Game, width: number, height: number, alpha?: number, size?: number);
@@ -2758,6 +2809,7 @@ declare module Phaser {
27582809
static distance(x1: number, y1: number, x2: number, y2: number): number;
27592810
static distancePow(xy: number, y1: number, x2: number, y2: number, pow?: number): number;
27602811
static distanceRounded(x1: number, y1: number, x2: number, y2: number): number;
2812+
static factorial(value: number): number;
27612813
static floor(value: number): number;
27622814
static floorTo(value: number, place: number, base: number): number;
27632815
static fuzzyCeil(val: number, epsilon?: number): boolean;
@@ -2821,6 +2873,8 @@ declare module Phaser {
28212873
static MIDDLE_BUTTON: number;
28222874
static NO_BUTTON: number;
28232875
static RIGHT_BUTTON: number;
2876+
static WHEEL_DOWN: number;
2877+
static WHEEL_UP: number;
28242878

28252879
button: number;
28262880
callbackContext: Object;
@@ -2834,14 +2888,17 @@ declare module Phaser {
28342888
mouseOutCallback: Function;
28352889
mouseOverCallback: Function;
28362890
mouseUpCallback: Function;
2891+
mouseWheelCallback: Function;
28372892
pointerLock: Phaser.Signal;
28382893
stopOnGameOut: boolean;
2894+
wheelDelta: number;
28392895

28402896
onMouseDown(event: MouseEvent): void;
28412897
onMouseMove(event: MouseEvent): void;
28422898
onMouseOut(event: MouseEvent): void;
28432899
onMouseOver(event: MouseEvent): void;
28442900
onMouseUp(event: MouseEvent): void;
2901+
onMouseWheel(event: MouseEvent): void;
28452902
pointerLockChange(event: MouseEvent): void;
28462903
releasePointerLock(): void;
28472904
requestPointerLock(): void;
@@ -4717,6 +4774,7 @@ declare module Phaser {
47174774
setCollisionByExclusion(indexes: any[], collides?: boolean, layer?: any, recalculate?: boolean): void;
47184775
setCollisionByIndex(index: number, collides?: boolean, layer?: number, recalculate?: boolean): void;
47194776
setLayer(layer: any): void;
4777+
setPreventRecalculate(value: boolean): void;
47204778
setTileIndexCallback(indexes: any, callback: Function, callbackContext: Object, layer?: any): void;
47214779
setTileLocationCallback(x: number, y: number, width: number, height: number, callback: Function, callbackContext: Object, layer?: any): void;
47224780
setTileSize(tileWidth: number, tileHeight: number): void;

0 commit comments

Comments
 (0)