@vpmedia/phaser 1.0.37 → 1.0.39

package/package.json

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

@@ -37,7 +37,6 @@ export default class {
     this.renderer = null;
     this.state = null;
     this.isBooted = false;
-    this.isRunning = false;
     this.raf = null;
     this.add = null;
     this.cache = null;
@@ -52,11 +51,9 @@ export default class {
     this.device = new Device();
     this.canvas = null;
     this.context = null;
-    this.isStepping = false;
-    this.isPendingStep = false;
-    this.stepCount = 0;
-    this.onPause = null;
-    this.onResume = null;
+    this.onPause = new Signal();
+    this.onResume = new Signal();
+    this.onBoot = new Signal();
     this.isPaused = false;
     this.currentUpdateID = 0;
     this.updatesThisFrame = 1;
@@ -81,12 +78,9 @@ export default class {
 
   boot() {
     if (this.isBooted) {
-      console.warn('Game already booted.');
       return;
     }
     this.isBooted = true;
-    this.onPause = new Signal();
-    this.onResume = new Signal();
     this.scale = new ScaleManager(this, this.config.width, this.config.height);
     this.stage = new Stage(this);
     this.initRenderer();
@@ -105,13 +99,15 @@ export default class {
     this.input.boot();
     this.sound.boot();
     this.state.boot();
-    this.isRunning = true;
-    this.raf = new RequestAnimationFrame(this);
     this.isKickStart = true;
     if (window.focus) {
       window.focus();
     }
-    this.raf.start();
+    if (!this.config.isSkipTicker) {
+      this.raf = new RequestAnimationFrame(this);
+      this.raf.start();
+    }
+    this.onBoot.dispatch(this);
   }
 
   initRenderer() {
@@ -246,12 +242,6 @@ export default class {
   }
 
   update(time) {
-    if (this.isPendingDestroy) {
-      this.destroyDelayed();
-      return;
-    } else if (!this.isBooted) {
-      return;
-    }
     this.time.update(time);
     if (this.isKickStart) {
       this.updateLogic(this.time.desiredFpsMult);
@@ -260,7 +250,7 @@ export default class {
       this.isKickStart = false;
       return;
     }
-    if (this._spiraling > 1 && !this.config.forceSingleUpdate) {
+    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
@@ -310,10 +300,7 @@ export default class {
   }
 
   updateLogic(timeStep) {
-    if (!this.isPaused && !this.isPendingStep) {
-      if (this.isStepping) {
-        this.isPendingStep = true;
-      }
+    if (!this.isPaused) {
       this.scale.preUpdate();
       this.state.preUpdate(timeStep);
       this.stage.preUpdate();
@@ -337,44 +324,15 @@ export default class {
     this.state.render(elapsedTime);
   }
 
-  enableStep() {
-    this.isStepping = true;
-    this.isPendingStep = false;
-    this.stepCount = 0;
-  }
-
-  disableStep() {
-    this.isStepping = false;
-    this.isPendingStep = false;
-  }
-
-  step() {
-    this.isPendingStep = false;
-    this.stepCount += 1;
-  }
-
   destroy() {
-    if (this.isPendingDestroy) {
-      return;
-    }
-    this.isPendingDestroy = true;
-  }
-
-  destroyDelayed() {
-    if (!this.isPendingDestroy) {
-      return;
-    }
-    this.isPendingDestroy = false;
-
     this.isPaused = true;
-    this.isBooted = false;
-    this.isRunning = false;
 
-    if (!this.raf) {
+    if (!this.cache) {
       return;
     }
-
-    this.raf.stop();
+    if (this.raf) {
+      this.raf.stop();
+    }
 
     this.time.destroy();
     this.state.destroy();

package/src/phaser/core/raf.js

@@ -7,37 +7,21 @@ export default class {
 
   constructor(game) {
     this.game = game;
-    this.isRunning = false;
-    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'];
-    }
+    this.rafId = 0;
     this.updateBinded = this.update.bind(this);
   }
 
   start() {
-    this.isRunning = true;
-    this.timeoutId = window.requestAnimationFrame(this.updateBinded);
+    this.rafId = requestAnimationFrame(this.updateBinded);
   }
 
   stop() {
-    window.cancelAnimationFrame(this.timeoutId);
-    this.isRunning = false;
+    cancelAnimationFrame(this.rafId);
   }
 
   update(rafTime) {
-    if (!this.isRunning) {
-      return;
-    }
     this.game.update(rafTime);
-    this.timeoutId = window.requestAnimationFrame(this.updateBinded);
+    this.rafId = requestAnimationFrame(this.updateBinded);
   }
 
 }