@vpmedia/phaser 1.0.39 → 1.0.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vpmedia/phaser",
-  "version": "1.0.39",
+  "version": "1.0.41",
   "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/cache.js

@@ -11,20 +11,16 @@ import FrameData from './frame_data';
 import { JSONDataHash } from './animation_parser';
 import { jsonBitmapFont, xmlBitmapFont } from './loader_parser';
 
-export const CANVAS = 1;
-export const IMAGE = 2;
-export const TEXTURE = 3;
-export const SOUND = 4;
-export const TEXT = 5;
-export const PHYSICS = 6;
-export const TILEMAP = 7;
-export const BINARY = 8;
-export const BITMAPDATA = 9;
-export const BITMAPFONT = 10;
-export const JSON = 11;
-export const XML = 12;
-export const SHADER = 14;
-export const RENDER_TEXTURE = 15;
+export const CANVAS = 0;
+export const IMAGE = 1;
+export const TEXTURE = 2;
+export const SOUND = 3;
+export const TEXT = 4;
+export const BITMAPDATA = 5;
+export const BITMAPFONT = 6;
+export const JSON = 7;
+export const XML = 8;
+export const RENDER_TEXTURE = 9;
 
 export default class {
 
@@ -39,12 +35,8 @@ export default class {
       text: {},
       json: {},
       xml: {},
-      physics: {},
-      tilemap: {},
-      binary: {},
       bitmapData: {},
       bitmapFont: {},
-      shader: {},
       renderTexture: {},
     };
     this._urlMap = {};
@@ -57,14 +49,10 @@ export default class {
     this._cacheMap[TEXTURE] = this._cache.texture;
     this._cacheMap[SOUND] = this._cache.sound;
     this._cacheMap[TEXT] = this._cache.text;
-    this._cacheMap[PHYSICS] = this._cache.physics;
-    this._cacheMap[TILEMAP] = this._cache.tilemap;
-    this._cacheMap[BINARY] = this._cache.binary;
     this._cacheMap[BITMAPDATA] = this._cache.bitmapData;
     this._cacheMap[BITMAPFONT] = this._cache.bitmapFont;
     this._cacheMap[JSON] = this._cache.json;
     this._cacheMap[XML] = this._cache.xml;
-    this._cacheMap[SHADER] = this._cache.shader;
     this._cacheMap[RENDER_TEXTURE] = this._cache.renderTexture;
     this.addDefaultImage();
     this.addMissingImage();
@@ -134,10 +122,6 @@ export default class {
     this._resolveURL(url, this._cache.text[key]);
   }
 
-  addBinary(key, binaryData) {
-    this._cache.binary[key] = binaryData;
-  }
-
   addBitmapFont(key, url, data, atlasData, atlasType, xSpacing = 0, ySpacing = 0) {
     const obj = {
       url,
@@ -250,14 +234,6 @@ export default class {
     return this.checkKey(TEXT, key);
   }
 
-  checkTilemapKey(key) {
-    return this.checkKey(TILEMAP, key);
-  }
-
-  checkBinaryKey(key) {
-    return this.checkKey(BINARY, key);
-  }
-
   checkBitmapDataKey(key) {
     return this.checkKey(BITMAPDATA, key);
   }
@@ -317,14 +293,6 @@ export default class {
     return this.getItem(key, TEXT, 'getText', 'data');
   }
 
-  getTilemapData(key) {
-    return this.getItem(key, TILEMAP, 'getTilemapData');
-  }
-
-  getBinary(key) {
-    return this.getItem(key, BINARY, 'getBinary');
-  }
-
   getBitmapData(key) {
     return this.getItem(key, BITMAPDATA, 'getBitmapData', 'data');
   }
@@ -342,10 +310,6 @@ export default class {
     return this.getItem(key, XML, 'getXML', 'data');
   }
 
-  getShader(key) {
-    return this.getItem(key, SHADER, 'getShader', 'data');
-  }
-
   getRenderTexture(key) {
     return this.getItem(key, RENDER_TEXTURE, 'getRenderTexture');
   }
@@ -443,18 +407,6 @@ export default class {
     delete this._cache.text[key];
   }
 
-  removePhysics(key) {
-    delete this._cache.physics[key];
-  }
-
-  removeTilemap(key) {
-    delete this._cache.tilemap[key];
-  }
-
-  removeBinary(key) {
-    delete this._cache.binary[key];
-  }
-
   removeBitmapData(key) {
     delete this._cache.bitmapData[key];
   }
@@ -471,10 +423,6 @@ export default class {
     delete this._cache.xml[key];
   }
 
-  removeShader(key) {
-    delete this._cache.shader[key];
-  }
-
   removeRenderTexture(key) {
     delete this._cache.renderTexture[key];
   }

package/src/phaser/core/const.js

@@ -87,13 +87,4 @@ export const GEOM_ROUNDED_RECTANGLE = 26;
 export const GEOM_LINE = 23;
 export const GEOM_MATRIX = 24;
 export const GEOM_POINT = 25;
-export const BITMAP_DATA = 13; // deprecated
-export const TILEMAP = 9; // deprecated
-export const TILEMAP_LAYER = 10; // deprecated
-export const EMITTER = 11; // deprecated
-export const RETROFONT = 18; // deprecated
-export const ROPE = 20; // deprecated
-export const CREATURE = 27; // deprecated
 export const PENDING_ATLAS = -1;
-// sprite sheet atlas
-export const TEXTURE_ATLAS_JSON_HASH = 1;

package/src/phaser/core/game.js

@@ -245,31 +245,21 @@ export default class {
     this.time.update(time);
     if (this.isKickStart) {
       this.updateLogic(this.time.desiredFpsMult);
-      // call the game render update exactly once every frame
-      this.updateRender(this.time.slowMotion * this.time.desiredFps);
+      this.renderer.render(this.stage);
       this.isKickStart = false;
       return;
     }
     if (!this.config.forceSingleUpdate && this._spiraling > 1) {
-      // cause an event to warn the program that this CPU can't keep up with the current desiredFps rate
       if (this.time.time > this._nextFpsNotification) {
-        // only permit one fps notification per 10 seconds
         this._nextFpsNotification = this.time.time + 10000;
-        // dispatch the notification signal
         this.fpsProblemNotifier.dispatch();
       }
-      // reset the _deltaTime accumulator which will cause all pending dropped frames to be permanently skipped
       this._deltaTime = 0;
       this._spiraling = 0;
-      // call the game render update exactly once every frame
-      this.updateRender(this.time.slowMotion * this.time.desiredFps);
+      this.renderer.render(this.stage);
     } else {
-      // step size taking into account the slow motion speed
       const slowStep = this.time.slowMotion * 1000.0 / this.time.desiredFps;
-      // accumulate time until the slowStep threshold is met or exceeded... up to a limit of 3 catch-up frames at slowStep intervals
       this._deltaTime += Math.max(Math.min(slowStep * 3, this.time.elapsed), 0);
-      // call the game update logic multiple times if necessary to "catch up" with dropped frames
-      // unless forceSingleUpdate is true
       let count = 0;
       this.updatesThisFrame = Math.floor(this._deltaTime / slowStep);
       if (this.config.forceSingleUpdate) {
@@ -286,16 +276,13 @@ export default class {
           this.time.refresh();
         }
       }
-      // detect spiraling (if the catch-up loop isn't fast enough, the number of iterations will increase constantly)
       if (count > this._lastCount) {
         this._spiraling += 1;
       } else if (count < this._lastCount) {
-        // looks like it caught up successfully, reset the spiral alert counter
         this._spiraling = 0;
       }
       this._lastCount = count;
-      // call the game render update exactly once every frame unless we're playing catch-up from a spiral condition
-      this.updateRender(this._deltaTime / slowStep);
+      this.renderer.render(this.stage);
     }
   }
 
@@ -318,12 +305,6 @@ export default class {
     this.stage.updateTransform();
   }
 
-  updateRender(elapsedTime) {
-    this.state.preRender(elapsedTime);
-    this.renderer.render(this.stage);
-    this.state.render(elapsedTime);
-  }
-
   destroy() {
     this.isPaused = true;
 

package/src/phaser/core/loader.js

@@ -6,7 +6,8 @@
 import Signal from './signal';
 import Rectangle from '../geom/rectangle';
 import { canPlayAudio } from './device_util';
-import { TEXTURE_ATLAS_JSON_HASH } from './const';
+
+const TEXTURE_ATLAS_JSON_HASH = 1;
 
 export default class {
 
@@ -687,7 +688,6 @@ export default class {
         if (file.atlasURL == null) {
           this.cache.addTextureAtlas(file.key, file.url, file.data, file.atlasData, file.format);
         } else {
-          //  Load the JSON or XML before carrying on with the next file
           loadNext = false;
           if (file.format === TEXTURE_ATLAS_JSON_HASH) {
             this.xhrLoad(file, this.transformUrl(file.atlasURL, file), 'text', this.jsonLoadComplete);

package/src/phaser/core/scene.js

@@ -18,14 +18,6 @@ export default class {
     // inherit
   }
 
-  loadUpdate() {
-    // inherit
-  }
-
-  loadRender() {
-    // inherit
-  }
-
   create() {
     // inherit
   }
@@ -34,26 +26,10 @@ export default class {
     // inherit
   }
 
-  preRender() {
-    // inherit
-  }
-
-  render() {
-    // inherit
-  }
-
   resize() {
     // inherit
   }
 
-  paused() {
-    // inherit
-  }
-
-  resumed() {
-    // inherit
-  }
-
   pauseUpdate() {
     // inherit
   }

package/src/phaser/core/scene_manager.js

@@ -24,13 +24,7 @@ export default class {
     this.onPreloadCallback = null;
     this.onCreateCallback = null;
     this.onUpdateCallback = null;
-    this.onRenderCallback = null;
     this.onResizeCallback = null;
-    this.onPreRenderCallback = null;
-    this.onLoadUpdateCallback = null;
-    this.onLoadRenderCallback = null;
-    this.onPausedCallback = null;
-    this.onResumedCallback = null;
     this.onPauseUpdateCallback = null;
     this.onShutDownCallback = null;
   }
@@ -68,15 +62,9 @@ export default class {
       this.onInitCallback = null;
       this.onShutDownCallback = null;
       this.onPreloadCallback = null;
-      this.onLoadRenderCallback = null;
-      this.onLoadUpdateCallback = null;
       this.onCreateCallback = null;
       this.onUpdateCallback = null;
-      this.onPreRenderCallback = null;
-      this.onRenderCallback = null;
       this.onResizeCallback = null;
-      this.onPausedCallback = null;
-      this.onResumedCallback = null;
       this.onPauseUpdateCallback = null;
     }
     delete this.states[key];
@@ -179,15 +167,9 @@ export default class {
     //  Used when the state is set as being the current active state
     this.onInitCallback = this.callbackContext.init || this.dummy;
     this.onPreloadCallback = this.callbackContext.preload || null;
-    this.onLoadRenderCallback = this.callbackContext.loadRender || null;
-    this.onLoadUpdateCallback = this.callbackContext.loadUpdate || null;
     this.onCreateCallback = this.callbackContext.create || null;
     this.onUpdateCallback = this.callbackContext.update || null;
-    this.onPreRenderCallback = this.callbackContext.preRender || null;
-    this.onRenderCallback = this.callbackContext.render || null;
     this.onResizeCallback = this.callbackContext.resize || null;
-    this.onPausedCallback = this.callbackContext.paused || null;
-    this.onResumedCallback = this.callbackContext.resumed || null;
     this.onPauseUpdateCallback = this.callbackContext.pauseUpdate || null;
     this.onShutDownCallback = this.callbackContext.shutdown || this.dummy;
     this.current = key;
@@ -204,9 +186,6 @@ export default class {
   }
 
   loadComplete() {
-    if (this._created === false && this.onLoadUpdateCallback) {
-      this.onLoadUpdateCallback.call(this.callbackContext, this.game);
-    }
     if (this._created === false && this.onCreateCallback) {
       this._created = true;
       this.onCreateCallback.call(this.callbackContext, this.game);
@@ -215,41 +194,15 @@ export default class {
     }
   }
 
-  pause() {
-    if (this._created && this.onPausedCallback) {
-      this.onPausedCallback.call(this.callbackContext, this.game);
-    }
-  }
-
-  resume() {
-    if (this._created && this.onResumedCallback) {
-      this.onResumedCallback.call(this.callbackContext, this.game);
-    }
-  }
-
   update() {
-    if (this._created) {
-      if (this.onUpdateCallback) {
-        this.onUpdateCallback.call(this.callbackContext, this.game);
-      }
-    } else if (this.onLoadUpdateCallback) {
-      this.onLoadUpdateCallback.call(this.callbackContext, this.game);
+    if (this._created && this.onUpdateCallback) {
+      this.onUpdateCallback.call(this.callbackContext, this.game);
     }
   }
 
   pauseUpdate() {
-    if (this._created) {
-      if (this.onPauseUpdateCallback) {
-        this.onPauseUpdateCallback.call(this.callbackContext, this.game);
-      }
-    } else if (this.onLoadUpdateCallback) {
-      this.onLoadUpdateCallback.call(this.callbackContext, this.game);
-    }
-  }
-
-  preRender(elapsedTime) {
-    if (this._created && this.onPreRenderCallback) {
-      this.onPreRenderCallback.call(this.callbackContext, this.game, elapsedTime);
+    if (this._created && this.onPauseUpdateCallback) {
+      this.onPauseUpdateCallback.call(this.callbackContext, this.game);
     }
   }
 
@@ -259,23 +212,6 @@ export default class {
     }
   }
 
-  render() {
-    if (this._created) {
-      if (this.onRenderCallback) {
-        if (this.game.renderer.type === RENDER_CANVAS) {
-          this.game.context.save();
-          this.game.context.setTransform(1, 0, 0, 1, 0, 0);
-          this.onRenderCallback.call(this.callbackContext, this.game);
-          this.game.context.restore();
-        } else {
-          this.onRenderCallback.call(this.callbackContext, this.game);
-        }
-      }
-    } else if (this.onLoadRenderCallback) {
-      this.onLoadRenderCallback.call(this.callbackContext, this.game);
-    }
-  }
-
   destroy() {
     this._clearWorld = true;
     this._clearCache = true;
@@ -284,13 +220,8 @@ export default class {
     this.onInitCallback = null;
     this.onShutDownCallback = null;
     this.onPreloadCallback = null;
-    this.onLoadRenderCallback = null;
-    this.onLoadUpdateCallback = null;
     this.onCreateCallback = null;
     this.onUpdateCallback = null;
-    this.onRenderCallback = null;
-    this.onPausedCallback = null;
-    this.onResumedCallback = null;
     this.onPauseUpdateCallback = null;
     this.game = null;
     this.states = {};

package/src/phaser/core/time.js

@@ -14,8 +14,6 @@ export default class {
     this.now = 0;
     this.elapsed = 0;
     this.elapsedMS = 0;
-    this.physicsElapsed = 1 / 60;
-    this.physicsElapsedMS = (1 / 60) * 1000;
     this.desiredFpsMult = 1.0 / 60;
     this._desiredFps = 60;
     this.suggestedFps = this.desiredFps;
@@ -185,10 +183,6 @@ export default class {
 
   set desiredFps(value) {
     this._desiredFps = value;
-    //  Set the physics elapsed time... this will always be 1 / this.desiredFps
-    //  because we're using fixed time steps in game.update
-    this.physicsElapsed = 1 / value;
-    this.physicsElapsedMS = this.physicsElapsed * 1000;
     this.desiredFpsMult = 1.0 / value;
   }
 

package/src/phaser/core/tween.js

@@ -29,7 +29,6 @@ export default class {
     this.properties = {};
     this.chainedTween = null;
     this.isPaused = false;
-    this.frameBased = manager.frameBased;
     this._onUpdateCallback = null;
     this._onUpdateCallbackContext = null;
     this._pausedTime = 0;

package/src/phaser/core/tween_data.js

@@ -129,7 +129,7 @@ export default class {
       //  Is Running, but is waiting to repeat
       return TWEEN_RUNNING;
     }
-    const ms = (this.parent.frameBased) ? this.game.time.physicsElapsedMS : this.game.time.elapsedMS;
+    const ms = this.game.time.elapsedMS;
     if (this.parent.reverse) {
       this.dt -= ms * this.parent.timeScale;
       this.dt = Math.max(this.dt, 0);

package/src/phaser/core/tween_manager.js

@@ -23,7 +23,6 @@ export default class {
 
   constructor(game) {
     this.game = game;
-    this.frameBased = false;
     this._tweens = [];
     this._add = [];
     this.easeMap = {