Skip to content

Commit 53de7c2

Browse files
committed
Small code tidy + TS defs for phaserjs#2763
1 parent 6f67744 commit 53de7c2

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

src/animation/AnimationParser.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,17 @@ Phaser.AnimationParser = {
5757
var column = Math.floor((height - margin) / (frameHeight + spacing));
5858
var total = row * column;
5959

60-
console.assert(typeof skipFrames === "number");
61-
if (skipFrames > total || skipFrames < -total) {
60+
if (skipFrames > total || skipFrames < -total)
61+
{
6262
console.warn(
6363
"Phaser.AnimationParser.spriteSheet: skipFrames = " +
6464
skipFrames.toString() + " is larger than total sprite number " +
6565
total.toString());
6666
return null;
6767
}
68-
if (skipFrames < 0) {
68+
69+
if (skipFrames < 0)
70+
{
6971
// Allow negative skipframes.
7072
skipFrames = total + skipFrames;
7173
}

typescript/phaser.d.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ declare module Phaser {
171171
static JSONData(game: Phaser.Game, json: any): Phaser.FrameData;
172172
static JSONDataHash(game: Phaser.Game, json: any): Phaser.FrameData;
173173
static JSONDataPyxel(game: Phaser.Game, json: any): Phaser.FrameData;
174-
static spriteSheet(game: Phaser.Game, key: string, frameWidth: number, frameHeight: number, frameMax?: number, margin?: number, spacing?: number): Phaser.FrameData;
174+
static spriteSheet(game: Phaser.Game, key: string, frameWidth: number, frameHeight: number, frameMax?: number, margin?: number, spacing?: number, skipFrames?: number): Phaser.FrameData;
175175
static XMLData(game: Phaser.Game, xml: any): Phaser.FrameData;
176176

177177
}
@@ -533,7 +533,7 @@ declare module Phaser {
533533
addRenderTexture(key: string, texture: RenderTexture): void;
534534
addShader(key: string, url: string, data: any): void;
535535
addSound(key: string, url: string, data: any, webAudio: boolean, audioTag: boolean): void;
536-
addSpriteSheet(key: string, url: string, data: any, frameWidth: number, frameHeight: number, frameMax?: number, margin?: number, spacing?: number): void;
536+
addSpriteSheet(key: string, url: string, data: any, frameWidth: number, frameHeight: number, frameMax?: number, margin?: number, spacing?: number, skipFrames?: number): void;
537537
addText(key: string, url: string, data: any): void;
538538
addTextureAtlas(key: string, url: string, data: any, atlasData: any, format: number): void;
539539
addTilemap(key: string, url: string, mapData: any, format: number): void;
@@ -2502,7 +2502,7 @@ declare module Phaser {
25022502
script(key: string, url?: String, callback?: Function, callbackContext?: any): Phaser.Loader;
25032503
shader(key: string, url?: String, overwrite?: boolean): Phaser.Loader;
25042504
setPreloadSprite(sprite: Phaser.Sprite | Phaser.Image, direction?: number): void;
2505-
spritesheet(key: string, url: string, frameWidth: number, frameHeight: number, frameMax?: number, margin?: number, spacing?: number): Phaser.Loader;
2505+
spritesheet(key: string, url: string, frameWidth: number, frameHeight: number, frameMax?: number, margin?: number, spacing?: number, skipFrames?: number): Phaser.Loader;
25062506
start(): void;
25072507
text(key: string, url?: string, overwrite?: boolean): Phaser.Loader;
25082508
texture(key: string, object: any, overwrite?: boolean): Phaser.Loader;

0 commit comments

Comments
 (0)