Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2025-02-17 06:28:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

TS defs updates for the Cache changes.

Browse source
This commit is contained in:
Richard Davey 2015-07-15 23:22:51 +01:00
parent 6921b30d94
commit 5e33a2ea92
3 changed files with 32 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/Filter.js
View file

@ -11,7 +11,7 @@
* @constructor
* @param {Phaser.Game} game - A reference to the currently running game.
* @param {object} uniforms - Uniform mappings object
* @param {Array} fragmentSrc - The fragment shader code.
* @param {Array|string} fragmentSrc - The fragment shader code. Either an array, one element per line of code, or a string.
*/
Phaser.Filter = function (game, uniforms, fragmentSrc) {
@ -90,9 +90,9 @@ Phaser.Filter = function (game, uniforms, fragmentSrc) {
}
/**
* @property {array} fragmentSrc - The fragment shader code.
* @property {array|string} fragmentSrc - The fragment shader code.
*/
this.fragmentSrc = fragmentSrc || [];
this.fragmentSrc = fragmentSrc || '';
};

4
src/loader/Cache.js
View file

@ -272,7 +272,7 @@ Phaser.Cache.prototype = {
frameData: new Phaser.FrameData()
};
img.frameData.addFrame(new Phaser.Frame(0, 0, 0, data.width, data.height, url);
img.frameData.addFrame(new Phaser.Frame(0, 0, 0, data.width, data.height, url));
this._cache.image[key] = img;
@ -1372,7 +1372,7 @@ Phaser.Cache.prototype = {
*/
getShader: function (key) {
return this.getItem(key, Phaser.Cache.SHADER, 'getShader');
return this.getItem(key, Phaser.Cache.SHADER, 'getShader', 'data');
},

35
typescript/phaser.d.ts vendored
View file

@ -1,7 +1,7 @@
/// <reference path="pixi.d.ts" />
/// <reference path="p2.d.ts" />
// Type definitions for Phaser 2.4.0 2015-Jul-12
// Type definitions for Phaser 2.4.0 2015-Jul-15
// Project: https://github.com/photonstorm/phaser
declare class Phaser {
@ -376,12 +376,16 @@ declare module Phaser {
static IMAGE: number;
static JSON: number;
static PHYSICS: number;
static VIDEO: number;
static RENDER_TEXTURE: number;
static SHADER: number;
static SOUND: number;
static SPRITE_SHEET: number;
static TEXT: number;
static TEXTURE: number;
static TEXTURE_ATLAS: number;
static TILEMAP: number;
static XML: number;
static VIDEO: number;
autoResolveURL: boolean;
game: Phaser.Game;
@ -398,6 +402,7 @@ declare module Phaser {
addMissingImage(): void;
addPhysicsData(key: string, url: string, JSONData: any, format: number): void;
addRenderTexture(key: string, texture: RenderTexture): void;
addShader(key: string, url: string, data: any): void;
addSound(key: string, url: string, data: any, webAudio: boolean, audioTag: boolean): void;
addSpriteSheet(key: string, url: string, data: any, frameWidth: number, frameHeight: number, frameMax?: number, margin?: number, spacing?: number): void;
addText(key: string, url: string, data: any): void;
@ -410,33 +415,41 @@ declare module Phaser {
checkCanvasKey(key: string): boolean;
checkImageKey(key: string): boolean;
checkJSONKey(key: string): boolean;
checkKey(type: number, key: string): boolean;
checkKey(cache: number, key: string): boolean;
checkPhysicsKey(key: string): boolean;
checkRenderTextureKey(key: string): boolean;
checkShaderKey(key: string): boolean;
checkSoundKey(key: string): boolean;
checkSpriteSheetKey(key: string): boolean;
checkTextKey(key: string): boolean;
checkTextureKey(key: string): boolean;
checkTextureAtlasKey(key: string): boolean;
checkTilemapKey(key: string): boolean;
checkURL(url: string): any;
checkUrl(url: string): any;
checkXMLKey(key: string): boolean;
checkVideoKey(key: string): boolean;
decodedSound(key: string, data: any): void;
destroy(): void;
getBaseTexture(key: string, cache?: number): PIXI.BaseTexture;
getBinary(key: string): any;
getBitmapData(key: string): Phaser.BitmapData;
getBitmapFont(key: string): Phaser.RetroFont;
getCanvas(key: string): any;
getFrame(key: string): Phaser.Frame;
getFrameByIndex(key: string, frame: string): Phaser.Frame;
getFrameByName(key: string, frame: string): Phaser.Frame;
getFrameByIndex(key: string, index: number, cache?: number): Phaser.Frame;
getFrameByName(key: string, name: string, cache?: number): Phaser.Frame;
getFrameCount(key: string): number;
getFrameData(key: string, map?: string): Phaser.FrameData;
getFrameData(key: string, cache?: string): Phaser.FrameData;
getImage(key: string): Phaser.Image;
getItem(key: string, cache: number, method?: string, property?: string): any;
getJSON(key: string, clone?: boolean): any;
getKeys(type: number): string[];
getKeys(cache: number): string[];
getPixiTexture(key: string): PIXI.Texture;
getPixiBaseTexture(key: string): PIXI.BaseTexture;
getPhysicsData(key: string, object?: string, fixtureKey?: string): any[];
getRenderTexture(key: string): Phaser.RenderTexture;
getShader(key: string): string;
getSound(key: string): Phaser.Sound;
getSoundData(key: string): any;
getText(key: string): string;
@ -448,6 +461,7 @@ declare module Phaser {
getURL(url: string): any;
getXML(key: string): any;
getVideo(key: string): Phaser.Video;
hasFrameData(key: string, cache?: string): boolean;
isSoundDecoded(key: string): boolean;
isSoundReady(key: string): boolean;
isSpriteSheet(key: string): boolean;
@ -460,12 +474,16 @@ declare module Phaser {
removeImage(key: string, removeFromPixi?: boolean): void;
removeJSON(key: string): void;
removePhysics(key: string): void;
removeRenderTexture(key: string): void;
removeShader(key: string): void;
removeSound(key: string): void;
removeSpriteSheet(key: string): void;
removeText(key: string): void;
removeTextureAtlas(key: string): void;
removeTilemap(key: string): void;
removeXML(key: string): void;
removeVideo(key: string): void;
updateFrameData(key: string, frameData: any): void;
updateFrameData(key: string, frameData: any, cache?: number): void;
updateSound(key: string, property: string, value: Phaser.Sound): void;
}
@ -2108,6 +2126,7 @@ declare module Phaser {
reset(hard?: boolean, clearEvents?: boolean): void;
resize(): void;
script(key: string, url?: String, callback?: Function, callbackContext?: any): Phaser.Loader;
shader(key: string, url?: String, overwrite?: boolean): Phaser.Loader;
setPreloadSprite(sprite: Phaser.Sprite|Phaser.Image, direction?: number): void;
spritesheet(key: string, url: string, frameWidth: number, frameHeight: number, frameMax?: number, margin?: number, spacing?: number): Phaser.Loader;
start(): void;