Skip to content

Commit 3a69ed9

Browse files
committed
Fixed TypeScript defs for BitmapData.
1 parent 9aaa8d8 commit 3a69ed9

2 files changed

Lines changed: 61 additions & 24 deletions

File tree

build/phaser.d.ts

Lines changed: 51 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,37 +1151,68 @@ declare module Phaser {
11511151
imageData: ImageData;
11521152
key: string;
11531153
pixels: Uint32Array;
1154+
smoothed: boolean;
11541155
texture: PIXI.Texture;
11551156
textureFrame: Phaser.Frame;
11561157
type: number;
11571158
width: number;
11581159

1159-
add(object: any): void;
1160-
alphaMask(source: any, mask: any, sourceRect?: Phaser.Rectangle, maskRect?: Phaser.Rectangle): void;
1161-
circle(x: number, y: number, radius: number, fillStyle?: string): void;
1162-
clear(): void;
1163-
cls(): void;
1164-
copyPixels(source: any, area: Phaser.Rectangle, destX: number, destY: number): void;
1165-
draw(source: any, x?: number, y?: number, width?: number, height?: number): void;
1166-
drawSprite(sprite: any, x?: number, y?: number): void;
1160+
static getTransform(translateX: number, translateY: number, scaleX: number, scaleY: number, skewX: number, skewY: number): any;
1161+
1162+
add(object: any): Phaser.BitmapData;
1163+
addToWorld(x?: number, y?: number, anchorX?: number, anchorY?: number, scaleX?: number, scaleY?: number): Phaser.Image;
1164+
alphaMask(source: any, mask: any, sourceRect?: Phaser.Rectangle, maskRect?: Phaser.Rectangle): Phaser.BitmapData;
1165+
blendAdd(): Phaser.BitmapData;
1166+
blendColor(): Phaser.BitmapData;
1167+
blendColorBurn(): Phaser.BitmapData;
1168+
blendColorDodge(): Phaser.BitmapData;
1169+
blendDarken(): Phaser.BitmapData;
1170+
blendDestinationAtop(): Phaser.BitmapData;
1171+
blendDestinationIn(): Phaser.BitmapData;
1172+
blendDestinationOut(): Phaser.BitmapData;
1173+
blendDestinationOver(): Phaser.BitmapData;
1174+
blendDifference(): Phaser.BitmapData;
1175+
blendExclusion(): Phaser.BitmapData;
1176+
blendHardLight(): Phaser.BitmapData;
1177+
blendHue(): Phaser.BitmapData;
1178+
blendLighten(): Phaser.BitmapData;
1179+
blendLuminosity(): Phaser.BitmapData;
1180+
blendMultiply(): Phaser.BitmapData;
1181+
blendOverlay(): Phaser.BitmapData;
1182+
blendReset(): Phaser.BitmapData;
1183+
blendSaturation(): Phaser.BitmapData;
1184+
blendScreen(): Phaser.BitmapData;
1185+
blendSoftLight(): Phaser.BitmapData;
1186+
blendSourceAtop(): Phaser.BitmapData;
1187+
blendSourceIn(): Phaser.BitmapData;
1188+
blendSourceOut(): Phaser.BitmapData;
1189+
blendSourceOver(): Phaser.BitmapData;
1190+
blendXor(): Phaser.BitmapData;
1191+
circle(x: number, y: number, radius: number, fillStyle?: string): Phaser.BitmapData;
1192+
clear(): Phaser.BitmapData;
1193+
cls(): Phaser.BitmapData;
1194+
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?: string, roundPx?: boolean): Phaser.BitmapData;
1195+
copyRect(source: any, area: Phaser.Rectangle, x?: number, y?: number, alpha?: number, blendMode?: string, roundPx?: boolean): Phaser.BitmapData;
1196+
draw(source: any, x?: number, y?: number, width?: number, height?: number, blendMode?: string, roundPx?: boolean): Phaser.BitmapData;
11671197
extract(destination: Phaser.BitmapData, r: number, g: number, b: number, a?: number, resize?: boolean, r2?: number, g2?: number, b2?: number): Phaser.BitmapData;
1168-
fill(r: number, g: number, b: number, a?: number): void;
1198+
fill(r: number, g: number, b: number, a?: number): Phaser.BitmapData;
11691199
getPixel(x: number, y: number, out?: any): number;
11701200
getPixelRGB(x: number, y: number, out?: any, hsl?: boolean, hsv?: boolean): any;
11711201
getPixel32(x: number, y: number): number;
11721202
getPixels(rect: Phaser.Rectangle): ImageData;
1173-
load(source: any): void;
1174-
processPixel(callback: Function, callbackContext: any, x?: number, y?: Number, width?: number, height?: number): void;
1175-
processPixelRGB(callback: Function, callbackContext: any, x?: number, y?: Number, width?: number, height?: number): void;
1176-
rect(x: number, y: number, width: number, height: number, fillStyle?: string): void;
1203+
load(source: any): Phaser.BitmapData;
1204+
processPixel(callback: Function, callbackContext: any, x?: number, y?: Number, width?: number, height?: number): Phaser.BitmapData;
1205+
processPixelRGB(callback: Function, callbackContext: any, x?: number, y?: Number, width?: number, height?: number): Phaser.BitmapData;
1206+
rect(x: number, y: number, width: number, height: number, fillStyle?: string): Phaser.BitmapData;
11771207
refreshBuffer(x?: number, y?: number, width?: number, height?: number): void;
1178-
render(): void;
1179-
replaceRGB(r1: number, g1: number, b1: number, a1: number, r2: number, g2: number, b2: number, a2: number, region: Phaser.Rectangle): void;
1180-
resize(width: number, height: number): void;
1181-
shiftHSL(h?: number, s?: number, l?: number, region?: Phaser.Rectangle): void;
1182-
setHSL(h?: number, s?: number, l?: number, region?: Phaser.Rectangle): void;
1183-
setPixel(x: number, y: number, red: number, green: number, blue: number, immediate?: boolean): void;
1184-
setPixel32(x: number, y: number, red: number, green: number, blue: number, alpha: number, immediate?: boolean): void;
1208+
render(): Phaser.BitmapData;
1209+
replaceRGB(r1: number, g1: number, b1: number, a1: number, r2: number, g2: number, b2: number, a2: number, region: Phaser.Rectangle): Phaser.BitmapData;
1210+
resize(width: number, height: number): Phaser.BitmapData;
1211+
shiftHSL(h?: number, s?: number, l?: number, region?: Phaser.Rectangle): Phaser.BitmapData;
1212+
setHSL(h?: number, s?: number, l?: number, region?: Phaser.Rectangle): Phaser.BitmapData;
1213+
setPixel(x: number, y: number, red: number, green: number, blue: number, immediate?: boolean): Phaser.BitmapData;
1214+
setPixel32(x: number, y: number, red: number, green: number, blue: number, alpha: number, immediate?: boolean): Phaser.BitmapData;
1215+
update(x: number, y: number, width: number, height: number): Phaser.BitmapData;
11851216

11861217
}
11871218

src/gameobjects/BitmapData.js

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,6 @@ Phaser.BitmapData = function (game, key, width, height) {
132132
*/
133133
this.dirty = false;
134134

135-
this.copyCallback = null;
136-
this.copyCallbackContext = null;
137-
138135
// Aliases
139136
this.cls = this.clear;
140137

@@ -406,6 +403,7 @@ Phaser.BitmapData.prototype = {
406403
* @param {number} [y=0] - The y coordinate of the top-left of the region to process from.
407404
* @param {number} [width] - The width of the region to process.
408405
* @param {number} [height] - The height of the region to process.
406+
* @return {Phaser.BitmapData} This BitmapData object for method chaining.
409407
*/
410408
processPixelRGB: function (callback, callbackContext, x, y, width, height) {
411409

@@ -442,6 +440,8 @@ Phaser.BitmapData.prototype = {
442440
this.dirty = true;
443441
}
444442

443+
return this;
444+
445445
},
446446

447447
/**
@@ -458,6 +458,7 @@ Phaser.BitmapData.prototype = {
458458
* @param {number} [y=0] - The y coordinate of the top-left of the region to process from.
459459
* @param {number} [width] - The width of the region to process.
460460
* @param {number} [height] - The height of the region to process.
461+
* @return {Phaser.BitmapData} This BitmapData object for method chaining.
461462
*/
462463
processPixel: function (callback, callbackContext, x, y, width, height) {
463464

@@ -493,6 +494,8 @@ Phaser.BitmapData.prototype = {
493494
this.dirty = true;
494495
}
495496

497+
return this;
498+
496499
},
497500

498501
/**
@@ -1084,7 +1087,7 @@ Phaser.BitmapData.prototype = {
10841087
* the color during extraction.
10851088
*
10861089
* @method Phaser.BitmapData#extract
1087-
* @param {Phaser.BitmapData} destination - The BitmapData that the extracts pixels will be drawn to.
1090+
* @param {Phaser.BitmapData} destination - The BitmapData that the extracted pixels will be drawn to.
10881091
* @param {number} r - The red color component, in the range 0 - 255.
10891092
* @param {number} g - The green color component, in the range 0 - 255.
10901093
* @param {number} b - The blue color component, in the range 0 - 255.
@@ -1183,6 +1186,7 @@ Phaser.BitmapData.prototype = {
11831186
* If you wish to suppress this functionality set BitmapData.disableTextureUpload to `true`.
11841187
*
11851188
* @method Phaser.BitmapData#render
1189+
* @return {Phaser.BitmapData} This BitmapData object for method chaining.
11861190
*/
11871191
render: function () {
11881192

@@ -1195,6 +1199,8 @@ Phaser.BitmapData.prototype = {
11951199
this.dirty = false;
11961200
}
11971201

1202+
return this;
1203+
11981204
},
11991205

12001206
/**

0 commit comments

Comments
 (0)