@vpmedia/phaser 1.0.35 → 1.0.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vpmedia/phaser",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "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,17 +6,13 @@
 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';
-
-export const TILED_JSON = 6;
-export const TILEMAP_CSV = 7;
+import { TEXTURE_ATLAS_JSON_HASH } from './const';
 
 export default class {
 
   constructor(game) {
     this.game = game;
     this.cache = game.cache;
-    this.resetLocked = false;
     this.isLoading = false;
     this.hasLoaded = false;
     this.preloadSprite = null;
@@ -100,9 +96,6 @@ export default class {
   }
 
   reset(hard, clearEvents = false) {
-    if (this.resetLocked) {
-      return;
-    }
     if (hard) {
       this.preloadSprite = null;
     }
@@ -232,22 +225,10 @@ export default class {
     return this.addToFileList('json', key, url, undefined, overwrite, '.json');
   }
 
-  shader(key, url, overwrite) {
-    return this.addToFileList('shader', key, url, undefined, overwrite, '.frag');
-  }
-
   xml(key, url, overwrite) {
     return this.addToFileList('xml', key, url, undefined, overwrite, '.xml');
   }
 
-  script(key, url, callback = false, callbackContext = this) {
-    return this.addToFileList('script', key, url, { syncPoint: true, callback, callbackContext }, false, '.js');
-  }
-
-  binary(key, url, callback = false, callbackContext = this) {
-    return this.addToFileList('binary', key, url, { callback, callbackContext }, false, '.bin');
-  }
-
   spritesheet(key, url, frameWidth, frameHeight, frameMax = -1, margin = 0, spacing = 0) {
     return this.addToFileList('spritesheet', key, url, { frameWidth, frameHeight, frameMax, margin, spacing }, false, '.png');
   }
@@ -278,12 +259,6 @@ export default class {
     return this;
   }
 
-  tilemap() {
-    // TODO
-    console.warn('loader.tilemap() is not implemented');
-    return this;
-  }
-
   bitmapFont(key, textureURL = null, atlasURL = null, atlasData = null, xSpacing = 0, ySpacing = 0) {
     if (textureURL === undefined || textureURL === null) {
       textureURL = key + '.png';
@@ -311,20 +286,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 +297,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;
@@ -525,12 +484,6 @@ export default class {
         case "xml":
           this.xml(file.key, file.url, file.overwrite);
           break;
-        case "script":
-          this.script(file.key, file.url, file.callback, pack.callbackContext || this);
-          break;
-        case "binary":
-          this.binary(file.key, file.url, file.callback, pack.callbackContext || this);
-          break;
         case "spritesheet":
           this.spritesheet(file.key, file.url, file.frameWidth, file.frameHeight, file.frameMax, file.margin, file.spacing);
           break;
@@ -543,22 +496,11 @@ export default class {
         case "audioSprite":
           this.audioSprite(file.key, file.audioURL, file.jsonURL, file.jsonData);
           break;
-        case "tilemap":
-          // TODO
-          // this.tilemap(file.key, file.url, file.data, Phaser.Tilemap[file.format]);
-          break;
-        case "physics":
-          // TODO
-          // this.physics(file.key, file.url, file.data, Phaser.Loader[file.format]);
-          break;
         case "bitmapFont":
           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);
-          break;
-        case "shader":
-          this.shader(file.key, file.url, file.overwrite);
+          this.atlas(file.key, file.textureURL, file.atlasURL, file.atlasData, TEXTURE_ATLAS_JSON_HASH);
           break;
       }
     }
@@ -599,24 +541,9 @@ export default class {
       case 'xml':
         this.xhrLoad(file, this.transformUrl(file.url, file), 'text', this.xmlLoadComplete);
         break;
-      case 'tilemap':
-        if (file.format === TILED_JSON) {
-          this.xhrLoad(file, this.transformUrl(file.url, file), 'text', this.jsonLoadComplete);
-        } else if (file.format === TILEMAP_CSV) {
-          this.xhrLoad(file, this.transformUrl(file.url, file), 'text', this.csvLoadComplete);
-        } else {
-          this.asyncComplete(file, 'invalid Tilemap format: ' + file.format);
-        }
-        break;
       case 'text':
-      case 'script':
-      case 'shader':
-      case 'physics':
         this.xhrLoad(file, this.transformUrl(file.url, file), 'text', this.fileComplete);
         break;
-      case 'binary':
-        this.xhrLoad(file, this.transformUrl(file.url, file), 'arraybuffer', this.fileComplete);
-        break;
       default:
         // pass
         break;
@@ -762,7 +689,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);
@@ -804,32 +731,6 @@ export default class {
         file.data = xhr.responseText;
         this.cache.addText(file.key, file.url, file.data);
         break;
-      case 'shader':
-        file.data = xhr.responseText;
-        this.cache.addShader(file.key, file.url, file.data);
-        break;
-      case 'physics':
-        this.cache.addPhysicsData(file.key, file.url, JSON.parse(xhr.responseText), file.format);
-        break;
-      case 'script':
-        file.data = document.createElement('script');
-        file.data.language = 'javascript';
-        file.data.type = 'text/javascript';
-        file.data.defer = false;
-        file.data.text = xhr.responseText;
-        document.head.appendChild(file.data);
-        if (file.callback) {
-          file.data = file.callback.call(file.callbackContext, file.key, xhr.responseText);
-        }
-        break;
-      case 'binary':
-        if (file.callback) {
-          file.data = file.callback.call(file.callbackContext, file.key, xhr.response);
-        } else {
-          file.data = xhr.response;
-        }
-        this.cache.addBinary(file.key, file.data);
-        break;
       default:
         // pass
         break;
@@ -841,9 +742,7 @@ export default class {
 
   jsonLoadComplete(file, xhr) {
     const data = JSON.parse(xhr.responseText);
-    if (file.type === 'tilemap') {
-      this.cache.addTilemap(file.key, file.url, data, file.format);
-    } else if (file.type === 'bitmapfont') {
+    if (file.type === 'bitmapfont') {
       this.cache.addBitmapFont(file.key, file.url, file.data, data, file.atlasType, file.xSpacing, file.ySpacing);
     } else if (file.type === 'json') {
       this.cache.addJSON(file.key, file.url, data);