@vpmedia/phaser 1.0.40 → 1.0.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vpmedia/phaser",
-  "version": "1.0.40",
+  "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/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/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 = {};