Skip to content

Commit 0689395

Browse files
committed
Merge pull request phaserjs#2033 from clark-stevenson/dev
Minor TypeScript definition edits.
2 parents a1bd35f + 77329e7 commit 0689395

2 files changed

Lines changed: 18 additions & 3 deletions

File tree

typescript/phaser.d.ts

Lines changed: 5 additions & 2 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.3 2015-Aug-24
4+
// Type definitions for Phaser 2.4.4+ 2015-Aug-25
55
// Project: https://github.com/photonstorm/phaser
66

77
declare class Phaser {
@@ -250,6 +250,7 @@ declare module Phaser {
250250
copy(source?: any, x?: number, y?: number, width?: number, height?: number, tx?: number, ty?: number, newWidth?: number, newHeight?: number, rotate?: number, anchorX?: number, anchorY?: number, scaleX?: number, scaleY?: number, alpha?: number, blendMode?: number, roundPx?: boolean): Phaser.BitmapData;
251251
copyPixels(source: any, area: Phaser.Rectangle, x: number, y: number, alpha?: number): void;
252252
copyRect(source: any, area: Phaser.Rectangle, x?: number, y?: number, alpha?: number, blendMode?: number, roundPx?: boolean): Phaser.BitmapData;
253+
destroy(): void;
253254
draw(source: any, x?: number, y?: number, width?: number, height?: number, blendMode?: number, roundPx?: boolean): Phaser.BitmapData;
254255
drawFull(parent: any, blendMode?: number, roundPx?: boolean): Phaser.BitmapData;
255256
drawGroup(group: Phaser.Group, blendMode?: number, roundPx?: boolean): Phaser.BitmapData;
@@ -582,7 +583,7 @@ declare module Phaser {
582583
class Canvas {
583584

584585
static addToDOM(canvas: HTMLCanvasElement, parent: HTMLElement, overflowHidden?: boolean): HTMLCanvasElement;
585-
static create(width?: number, height?: number, id?: string): HTMLCanvasElement;
586+
static create(parent: HTMLDivElement, width?: number, height?: number, id?: string, skipPool?: boolean): HTMLCanvasElement;
586587
static getSmoothngEnabled(context: CanvasRenderingContext2D): boolean;
587588
static removeFromDOM(canvas: HTMLCanvasElement): void;
588589
static setBackgroundColor(canvas: HTMLCanvasElement, color: string): HTMLCanvasElement;
@@ -4817,6 +4818,7 @@ declare module Phaser {
48174818
type: number;
48184819
wrap: boolean;
48194820

4821+
destroy(): void;
48204822
getRayCastTiles(line: Phaser.Line, stepRate?: number, collides?: boolean, interestingFace?: boolean): Phaser.Tile[];
48214823
getTiles(x: number, y: number, width: number, height: number, collides?: boolean, interestingFace?: boolean): Phaser.Tile[];
48224824
getTileX(x: number): number;
@@ -5208,6 +5210,7 @@ declare module Phaser {
52085210
box2dBody(body: Phaser.Sprite, color?: string): void;
52095211
box2dWorld(): void;
52105212
cameraInfo(camera: Phaser.Camera, x: number, y: number, color?: string): void;
5213+
destroy(): void;
52115214
geom(object: any, color?: string, fiiled?: boolean, forceType?: number): void;
52125215
inputInfo(x: number, y: number, color?: string): void;
52135216
lineInfo(line: Phaser.Line, x: number, y: number, color?: string): void;

typescript/pixi.d.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,11 +335,23 @@ declare module PIXI {
335335
height: number;
336336
width: number;
337337

338+
destroy(): void;
338339
clear(): void;
339340
resize(width: number, height: number): void;
340341

341342
}
342343

344+
export class CanvasPool {
345+
346+
static create(parent: HTMLElement, width?: number, height?: number): HTMLCanvasElement;
347+
static getFirst(): HTMLCanvasElement;
348+
static remove(parent: HTMLElement): void;
349+
static removeByCanvas(canvas: HTMLCanvasElement): HTMLCanvasElement;
350+
static getTotal(): number;
351+
static getFree(): number;
352+
353+
}
354+
343355
export class CanvasMaskManager {
344356

345357
pushMask(maskData: MaskData, renderSession: RenderSession): void;
@@ -1010,7 +1022,7 @@ declare module PIXI {
10101022
texture: Texture;
10111023
tint: number;
10121024

1013-
setTexture(texture: Texture): void;
1025+
setTexture(texture: Texture, destroyBase?: boolean): void;
10141026

10151027
}
10161028

0 commit comments

Comments
 (0)