@vpmedia/phaser 1.0.35 → 1.0.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vpmedia/phaser",
-  "version": "1.0.35",
+  "version": "1.0.36",
   "description": "@vpmedia/phaser is the modern ECMAScript port of the popular Phaser game engine v2.6.2",
   "author": "Andras Csizmadia <andras@vpmedia.hu> (www.vpmedia.hu)",
   "license": "MIT",

package/src/phaser/core/animation_parser.js

@@ -59,32 +59,6 @@ export function spriteSheet(game, key, frameWidth, frameHeight, frameMax, margin
   return data;
 }
 
-/**
- *
- * @param {object} game TBD
- * @param {object} json TBD
- * @returns {object} TBD
- */
-export function JSONData(game, json) {
-  //  Malformed?
-  if (!json.frames) {
-    return null;
-  }
-  //  Let's create some frames then
-  const data = new FrameData();
-  //  By this stage frames is a fully parsed array
-  const frames = json.frames;
-  let newFrame;
-  for (let i = 0; i < frames.length; i += 1) {
-    newFrame = data.addFrame(new Frame(i, frames[i].frame.x, frames[i].frame.y, frames[i].frame.w, frames[i].frame.h, frames[i].filename));
-    if (frames[i].trimmed) {
-      newFrame.setTrim(frames[i].trimmed, frames[i].sourceSize.w, frames[i].sourceSize.h, frames[i].spriteSourceSize.x, frames[i].spriteSourceSize.y, frames[i].spriteSourceSize.w, frames[i].spriteSourceSize.h);
-    }
-  }
-  return data;
-
-}
-
 /**
  *
  * @param {object} game TBD

package/src/phaser/core/cache.js

@@ -8,7 +8,7 @@ import BaseTexture from '../display/webgl/base_texture';
 import Signal from './signal';
 import Frame from './frame';
 import FrameData from './frame_data';
-import { JSONData, JSONDataHash } from './animation_parser';
+import { JSONDataHash } from './animation_parser';
 import { jsonBitmapFont, xmlBitmapFont } from './loader_parser';
 
 export const CANVAS = 1;
@@ -113,12 +113,7 @@ export default class {
       data,
       base: new BaseTexture(data),
     };
-    if (Array.isArray(atlasData.frames)) {
-      //  Let's just work it out from the frames array
-      obj.frameData = JSONData(this.game, atlasData, key);
-    } else {
-      obj.frameData = JSONDataHash(this.game, atlasData, key);
-    }
+    obj.frameData = JSONDataHash(this.game, atlasData, key);
     this._cache.image[key] = obj;
     this._resolveURL(url, obj);
   }

package/src/phaser/core/const.js

@@ -96,5 +96,4 @@ export const ROPE = 20; // deprecated
 export const CREATURE = 27; // deprecated
 export const PENDING_ATLAS = -1;
 // sprite sheet atlas
-export const TEXTURE_ATLAS_JSON_ARRAY = 0;
 export const TEXTURE_ATLAS_JSON_HASH = 1;

package/src/phaser/core/loader.js

@@ -6,7 +6,7 @@
 import Signal from './signal';
 import Rectangle from '../geom/rectangle';
 import { canPlayAudio } from './device_util';
-import { TEXTURE_ATLAS_JSON_ARRAY, TEXTURE_ATLAS_JSON_HASH } from './const';
+import { TEXTURE_ATLAS_JSON_HASH } from './const';
 
 export const TILED_JSON = 6;
 export const TILEMAP_CSV = 7;
@@ -311,20 +311,7 @@ export default class {
     return this;
   }
 
-  atlasJSONArray(key, textureURL, atlasURL, atlasData) {
-    return this.atlas(key, textureURL, atlasURL, atlasData, TEXTURE_ATLAS_JSON_ARRAY);
-  }
-
-  atlasJSONHash(key, textureURL, atlasURL, atlasData) {
-    return this.atlas(key, textureURL, atlasURL, atlasData, TEXTURE_ATLAS_JSON_HASH);
-  }
-
-  atlasXML() {
-    // TODO
-    console.warn('loader.atlasXML() is not implemented');
-  }
-
-  atlas(key, textureURL, atlasURL = null, atlasData = null, format = TEXTURE_ATLAS_JSON_ARRAY) {
+  atlas(key, textureURL, atlasURL = null, atlasData = null, format = TEXTURE_ATLAS_JSON_HASH) {
     if (textureURL === undefined || textureURL === null) {
       textureURL = key + '.png';
     }
@@ -335,9 +322,6 @@ export default class {
     if (atlasURL) {
       this.addToFileList('textureatlas', key, textureURL, { atlasURL, format });
     } else {
-      if (format === TEXTURE_ATLAS_JSON_ARRAY && typeof atlasData === 'string') {
-        atlasData = JSON.parse(atlasData);
-      }
       this.addToFileList('textureatlas', key, textureURL, { atlasURL: null, atlasData, format });
     }
     return this;
@@ -555,7 +539,7 @@ export default class {
           this.bitmapFont(file.key, file.textureURL, file.atlasURL, file.atlasData, file.xSpacing, file.ySpacing);
           break;
         case "atlas":
-          this.atlas(file.key, file.textureURL, file.atlasURL, file.atlasData, file.format === 'TEXTURE_ATLAS_JSON_HASH' ? TEXTURE_ATLAS_JSON_HASH : TEXTURE_ATLAS_JSON_ARRAY);
+          this.atlas(file.key, file.textureURL, file.atlasURL, file.atlasData, TEXTURE_ATLAS_JSON_HASH);
           break;
         case "shader":
           this.shader(file.key, file.url, file.overwrite);
@@ -762,7 +746,7 @@ export default class {
         } else {
           //  Load the JSON or XML before carrying on with the next file
           loadNext = false;
-          if (file.format === TEXTURE_ATLAS_JSON_ARRAY || file.format === TEXTURE_ATLAS_JSON_HASH) {
+          if (file.format === TEXTURE_ATLAS_JSON_HASH) {
             this.xhrLoad(file, this.transformUrl(file.atlasURL, file), 'text', this.jsonLoadComplete);
           } else {
             throw new Error('Invalid Texture Atlas format: ' + file.format);