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

Removed un-needed cache arguments and fixed jshint error.

Browse source
This commit is contained in:
photonstorm 2015-07-16 14:58:51 +01:00
parent f552615982
commit 7271eb5e2d
2 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/loader/Cache.js
View file

@ -560,7 +560,7 @@ Phaser.Cache.prototype = {
data: data,
frameWidth: frameWidth,
frameHeight: frameHeight,
margin: margin,
margin: margin,
spacing: spacing,
base: new PIXI.BaseTexture(data),
frameData: Phaser.AnimationParser.spriteSheet(this.game, data, frameWidth, frameHeight, frameMax, margin, spacing)
@ -1415,9 +1415,7 @@ Phaser.Cache.prototype = {
*/
getFrameCount: function (key) {
if (map === undefined) { map = Phaser.Cache.IMAGE; }
var data = this.getFrameData(key, map);
var data = this.getFrameData(key);
if (data)
{
@ -1431,7 +1429,7 @@ Phaser.Cache.prototype = {
},
/**
* Gets a Phaser.FrameData object from the cache.
* Gets a Phaser.FrameData object from the Image Cache.
*
* The object is looked-up based on the key given.
*
@ -1439,30 +1437,24 @@ Phaser.Cache.prototype = {
*
* @method Phaser.Cache#getFrameData
* @param {string} key - Asset key of the frame data to retrieve from the Cache.
* @param {integer} [cache=Phaser.Cache.IMAGE] - The cache to search. One of the Cache consts such as `Phaser.Cache.IMAGE` or `Phaser.Cache.SOUND`.
* @return {Phaser.FrameData} The frame data.
*/
getFrameData: function (key, cache) {
getFrameData: function (key) {
if (cache === undefined) { cache = Phaser.Cache.IMAGE; }
return this.getItem(key, cache, 'getFrameData', 'frameData');
return this.getItem(key, Phaser.Cache.IMAGE, 'getFrameData', 'frameData');
},
/**
* Check if the FrameData for the given key exists in the cache.
* Check if the FrameData for the given key exists in the Image Cache.
*
* @method Phaser.Cache#hasFrameData
* @param {string} key - Asset key of the frame data to retrieve from the Cache.
* @param {integer} [cache=Phaser.Cache.IMAGE] - The cache to search. One of the Cache consts such as `Phaser.Cache.IMAGE` or `Phaser.Cache.SOUND`.
* @return {boolean} True if the given key has frameData in the cache, otherwise false.
*/
hasFrameData: function (key, cache) {
hasFrameData: function (key) {
if (cache === undefined) { cache = Phaser.Cache.IMAGE; }
return (this.getItem(key, cache, '', 'frameData') !== null);
return (this.getItem(key, Phaser.Cache.IMAGE, '', 'frameData') !== null);
},
@ -1491,12 +1483,11 @@ Phaser.Cache.prototype = {
* @method Phaser.Cache#getFrameByIndex
* @param {string} key - Asset key of the frame data to retrieve from the Cache.
* @param {number} index - The index of the frame you want to get.
* @param {integer} [cache=Phaser.Cache.IMAGE] - The cache to search. One of the Cache consts such as `Phaser.Cache.IMAGE` or `Phaser.Cache.SOUND`.
* @return {Phaser.Frame} The frame object.
*/
getFrameByIndex: function (key, index, cache) {
getFrameByIndex: function (key, index) {
var data = this.getFrameData(key, cache);
var data = this.getFrameData(key);
if (data)
{
@ -1515,12 +1506,11 @@ Phaser.Cache.prototype = {
* @method Phaser.Cache#getFrameByName
* @param {string} key - Asset key of the frame data to retrieve from the Cache.
* @param {string} name - The name of the frame you want to get.
* @param {integer} [cache=Phaser.Cache.IMAGE] - The cache to search. One of the Cache consts such as `Phaser.Cache.IMAGE` or `Phaser.Cache.SOUND`.
* @return {Phaser.Frame} The frame object.
*/
getFrameByName: function (key, name, cache) {
getFrameByName: function (key, name) {
var data = this.getFrameData(key, cache);
var data = this.getFrameData(key);
if (data)
{

8
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-15
// Type definitions for Phaser 2.4.0 2015-Jul-16
// Project: https://github.com/photonstorm/phaser
declare class Phaser {
@ -433,10 +433,10 @@ declare module Phaser {
getBitmapFont(key: string): Phaser.RetroFont;
getCanvas(key: string): any;
getFrame(key: string): Phaser.Frame;
getFrameByIndex(key: string, index: number, cache?: number): Phaser.Frame;
getFrameByName(key: string, name: string, cache?: number): Phaser.Frame;
getFrameByIndex(key: string, index: number): Phaser.Frame;
getFrameByName(key: string, name: string): Phaser.Frame;
getFrameCount(key: string): number;
getFrameData(key: string, cache?: string): Phaser.FrameData;
getFrameData(key: string): Phaser.FrameData;
getImage(key: string, full?: boolean): Phaser.Image;
getItem(key: string, cache: number, method?: string, property?: string): any;
getJSON(key: string, clone?: boolean): any;