@vpmedia/phaser 1.0.32 → 1.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vpmedia/phaser",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "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/index.js

@@ -20,7 +20,6 @@ import InputPointer from './phaser/core/input_pointer';
 import InputTouch from './phaser/core/input_touch';
 import Loader from './phaser/core/loader';
 import GameLoopRAF from './phaser/core/raf';
-import GameLoopTO from './phaser/core/raf_to';
 import ScaleManager from './phaser/core/scale_manager';
 import Scene from './phaser/core/scene';
 import SceneManager from './phaser/core/scene_manager';
@@ -89,7 +88,6 @@ export {
   InputTouch,
   Loader,
   GameLoopRAF,
-  GameLoopTO,
   MathUtils,
   StringUtils,
   ScaleManager,

package/src/phaser/core/device.js

@@ -7,7 +7,6 @@
 export default class {
 
   constructor() {
-    this.deviceReadyAt = 0;
     this.desktop = false;
     this.iOS = false;
     this.android = false;

package/src/phaser/core/device_util.js

@@ -264,52 +264,3 @@ export function initialize(device) {
   checkFullScreenSupport(device);
   checkInput(device);
 }
-
-/**
- * TBD
- */
-export function readyCheck() {
-  if (!document.body) {
-    window.setTimeout(readyCheck._monitor, 20);
-  } else if (!this.deviceReadyAt) {
-    this.deviceReadyAt = Date.now();
-    document.removeEventListener('deviceready', readyCheck._monitor);
-    document.removeEventListener('DOMContentLoaded', readyCheck._monitor);
-    window.removeEventListener('load', readyCheck._monitor);
-    initialize(this);
-    let item = readyCheck._queue.shift();
-    while (item) {
-      const callback = item[0];
-      const context = item[1];
-      callback.call(context, this);
-      item = readyCheck._queue.shift();
-    }
-  }
-}
-
-/**
- *
- * @param {object} device TBD
- * @param {Function} callback TBD
- * @param {object} context TBD
- * @param {boolean} nonPrimer TBD
- */
-export function whenReady(device, callback, context, nonPrimer) {
-  if (device.deviceReadyAt) {
-    callback.call(context, device);
-  } else if (readyCheck._monitor || nonPrimer) {
-    readyCheck._queue = readyCheck._queue || [];
-    readyCheck._queue.push([callback, context]);
-  } else {
-    readyCheck._monitor = readyCheck.bind(device);
-    readyCheck._queue = readyCheck._queue || [];
-    readyCheck._queue.push([callback, context]);
-    if (document.readyState === 'complete' || document.readyState === 'interactive') {
-      // Why is there an additional timeout here?
-      window.setTimeout(readyCheck._monitor, 0);
-    } else {
-      document.addEventListener('DOMContentLoaded', readyCheck._monitor, false);
-      window.addEventListener('load', readyCheck._monitor, false);
-    }
-  }
-}

package/src/phaser/core/game.js

@@ -12,7 +12,6 @@ import Input from './input';
 import Device from './device';
 import GameObjectFactory from './factory';
 import RequestAnimationFrame from './raf';
-import TimeOutAnimationFrame from './raf_to';
 import ScaleManager from './scale_manager';
 import SoundManager from './sound_manager';
 import SceneManager from './scene_manager';
@@ -69,7 +68,6 @@ export default class {
     this._nextFpsNotification = 0;
     this.parseConfig(gameConfig);
     checkOS(this.device);
-    // whenReady(this.device, this.boot, this);
     if (document.readyState === 'complete') {
       initialize(this.device);
       this.boot();
@@ -108,13 +106,9 @@ export default class {
     this.sound.boot();
     this.state.boot();
     this.isRunning = true;
-    if (this.config.forceSetTimeOut) {
-      this.raf = new TimeOutAnimationFrame(this);
-    } else {
-      this.raf = new RequestAnimationFrame(this);
-    }
+    this.raf = new RequestAnimationFrame(this);
     this.isKickStart = true;
-    if (window.focus && !this.config.isSkipWindowFocus) {
+    if (window.focus) {
       window.focus();
     }
     this.raf.start();
@@ -190,9 +184,6 @@ export default class {
 
   parseConfig(config) {
     /* game */
-    this.parseConfigElement(config, 'isSkipWindowFocus', false);
-    this.parseConfigElement(config, 'forceSetTimeOut', false);
-    this.parseConfigElement(config, 'lockRender', false);
     this.parseConfigElement(config, 'width', 800);
     this.parseConfigElement(config, 'height', 600);
     this.parseConfigElement(config, 'backgroundColor', 0x000000);
@@ -212,7 +203,7 @@ export default class {
     this.parseConfigElement(config, 'preserveDrawingBuffer', false);
     // Clear the Canvas each frame before rendering the display list.
     // You can set this to `false` to gain some performance if your game always contains a background that completely fills the display.
-    this.parseConfigElement(config, 'clearBeforeRender', true);
+    this.parseConfigElement(config, 'clearBeforeRender', false);
     // The Renderer this game will use. Either Const.RENDER_AUTO, Const.RENDER_CANVAS, Const.RENDER_WEBGL
     this.parseConfigElement(config, 'renderType', RENDER_AUTO);
     // Force audio disabled
@@ -341,9 +332,6 @@ export default class {
   }
 
   updateRender(elapsedTime) {
-    if (this.config.lockRender) {
-      return;
-    }
     this.state.preRender(elapsedTime);
     this.renderer.render(this.stage);
     this.state.render(elapsedTime);

package/src/phaser/core/raf.js

@@ -20,7 +20,6 @@ export default class {
       window.cancelAnimationFrame = window[vendors[x] + 'CancelAnimationFrame'];
     }
     this.updateBinded = this.update.bind(this);
-    // this.updateBinded = time => this.update(time);
   }
 
   start() {
@@ -37,8 +36,6 @@ export default class {
     if (!this.isRunning) {
       return;
     }
-    // floor the rafTime to make it equivalent to the Date.now() provided by updateSetTimeout (just below)
-    // this.game.update(Math.floor(rafTime));
     this.game.update(rafTime);
     this.timeoutId = window.requestAnimationFrame(this.updateBinded);
   }

package/src/phaser/core/time.js

@@ -87,14 +87,6 @@ export default class {
     this.now = time;
     // elapsed time between previous call and now - this could be a high resolution value
     this.elapsed = this.now - this.prevTime;
-    if (this.game.raf._isSetTimeOut) {
-      // console.log('Time isSet', this._desiredFps, 'te', this.timeExpected, 'time', time);
-      // time to call this function again in ms in case we're using timers instead of RequestAnimationFrame to update the game
-      this.timeToCall = Math.floor(Math.max(0, (1000.0 / this._desiredFps) - (this.timeExpected - time)));
-      // time when the next call is expected if using timers
-      this.timeExpected = time + this.timeToCall;
-      // console.log('Time expect', this.timeExpected);
-    }
     if (this.advancedTiming) {
       this.updateAdvancedTiming();
     }

package/src/phaser/display/canvas/renderer.js

@@ -36,7 +36,6 @@ export default class {
     };
     this.mapBlendModes();
     this.resize(this.width, this.height);
-    window.PhaserRegistry.DEFAULT_RENDERER = this;
   }
 
   render(root) {
@@ -67,7 +66,6 @@ export default class {
     this.view = null;
     this.context = null;
     this.renderSession = null;
-    window.PhaserRegistry.DEFAULT_RENDERER = null;
   }
 
   resize(width, height) {

package/src/phaser/display/webgl/render_texture.js

@@ -31,7 +31,7 @@ export default class extends Texture {
     this.resolution = res;
     this.frame = new Rectangle(0, 0, this.width * this.resolution, this.height * this.resolution);
     this.crop = new Rectangle(0, 0, this.width * this.resolution, this.height * this.resolution);
-    this.renderer = renderer || window.PhaserRegistry.DEFAULT_RENDERER;
+    this.renderer = renderer;
     if (this.renderer.type === RENDER_WEBGL) {
       const gl = this.renderer.gl;
       this.baseTexture._dirty[gl.id] = false;

package/src/phaser/display/webgl/renderer.js

@@ -54,7 +54,6 @@ export default class {
     this.renderSession.resolution = this.resolution;
     this.initContext();
     this.mapBlendModes();
-    window.PhaserRegistry.DEFAULT_RENDERER = this;
   }
 
   destroy() {
@@ -79,7 +78,6 @@ export default class {
     this.renderSession = null;
     remove(this);
     window.PhaserRegistry.INSTANCES[this.glContextId] = null;
-    window.PhaserRegistry.DEFAULT_RENDERER = null;
     window.PhaserRegistry.GL_CONTEXT_ID -= 1;
   }
 
@@ -129,7 +127,7 @@ export default class {
     }
     const gl = this.gl;
     // -- Does this need to be set every frame? -- //
-    gl.viewport(0, 0, this.width, this.height);
+    // gl.viewport(0, 0, this.width, this.height);
     // make sure we are bound to the main frame buffer
     gl.bindFramebuffer(gl.FRAMEBUFFER, null);
     if (this.clearBeforeRender) {

package/src/phaser/core/raf_fb.js

@@ -1,75 +0,0 @@
-/**
- * @author       Andras Csizmadia <andras@vpmedia.hu>
- * @author       Richard Davey <rich@photonstorm.com>
- * @copyright    Copyright (c) 2018-present Richard Davey, Photon Storm Ltd., Andras Csizmadia <andras@vpmedia.hu> (www.vpmedia.hu)
- */
-export default class {
-
-  constructor(game, forceSetTimeOut = false) {
-    this.game = game;
-    this.forceSetTimeOut = forceSetTimeOut;
-    this.isRunning = false;
-    this._isSetTimeOut = false;
-    this._onLoop = null;
-    this._timeOutID = null;
-    const vendors = [
-      'ms',
-      'moz',
-      'webkit',
-      'o',
-    ];
-    for (let x = 0; x < vendors.length && !window.requestAnimationFrame; x += 1) {
-      window.requestAnimationFrame = window[vendors[x] + 'RequestAnimationFrame'];
-      window.cancelAnimationFrame = window[vendors[x] + 'CancelAnimationFrame'];
-    }
-  }
-
-  start() {
-    const scope = this;
-    this.isRunning = true;
-    if (!window.requestAnimationFrame || this.forceSetTimeOut) {
-      this._isSetTimeOut = true;
-      this._onLoop = () => scope.updateSetTimeout();
-      this._timeOutID = window.setTimeout(this._onLoop, 0);
-    } else {
-      this._isSetTimeOut = false;
-      this._onLoop = time => scope.updateRAF(time);
-      this._timeOutID = window.requestAnimationFrame(this._onLoop);
-    }
-  }
-
-  stop() {
-    this.isRunning = false;
-    if (this._isSetTimeOut) {
-      window.clearTimeout(this._timeOutID);
-    } else {
-      window.cancelAnimationFrame(this._timeOutID);
-    }
-  }
-
-  updateRAF(rafTime) {
-    if (!this.isRunning) {
-      return;
-    }
-    // floor the rafTime to make it equivalent to the Date.now() provided by updateSetTimeout (just below)
-    this.game.update(Math.floor(rafTime));
-    this._timeOutID = window.requestAnimationFrame(this._onLoop);
-  }
-
-  updateSetTimeout() {
-    if (!this.isRunning) {
-      return;
-    }
-    this.game.update(Date.now());
-    this._timeOutID = window.setTimeout(this._onLoop, this.game.time.timeToCall);
-  }
-
-  isSetTimeOut() {
-    return this._isSetTimeOut;
-  }
-
-  isRAF() {
-    return this._isSetTimeOut === false;
-  }
-
-}

package/src/phaser/core/raf_to.js

@@ -1,34 +0,0 @@
-/**
- * @author       Andras Csizmadia <andras@vpmedia.hu>
- * @author       Richard Davey <rich@photonstorm.com>
- * @copyright    Copyright (c) 2018-present Richard Davey, Photon Storm Ltd., Andras Csizmadia <andras@vpmedia.hu> (www.vpmedia.hu)
- */
-export default class {
-
-  constructor(game) {
-    this.game = game;
-    this.isRunning = false;
-    this.isSetTimeOut = true;
-    this.timeoutId = null;
-  }
-
-  start() {
-    this.isRunning = true;
-    this.timeoutId = window.setTimeout(this.update, 0);
-  }
-
-  stop() {
-    window.clearTimeout(this.timeoutId);
-    this.isRunning = false;
-  }
-
-  update() {
-    if (!this.isRunning) {
-      return;
-    }
-    this.game.update(Date.now());
-    this.timeoutId = window.setTimeout(this.update, this.game.time.timeToCall);
-  }
-
-
-}