@vpmedia/phaser 1.0.36 → 1.0.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vpmedia/phaser",
-  "version": "1.0.36",
+  "version": "1.0.38",
   "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;
@@ -55,8 +54,9 @@ export default class {
     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 +81,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 +102,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 +245,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 +253,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
@@ -354,27 +347,14 @@ export default class {
   }
 
   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/loader.js

@@ -8,15 +8,11 @@ import Rectangle from '../geom/rectangle';
 import { canPlayAudio } from './device_util';
 import { TEXTURE_ATLAS_JSON_HASH } from './const';
 
-export const TILED_JSON = 6;
-export const TILEMAP_CSV = 7;
-
 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';
@@ -509,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;
@@ -527,23 +496,12 @@ 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, TEXTURE_ATLAS_JSON_HASH);
           break;
-        case "shader":
-          this.shader(file.key, file.url, file.overwrite);
-          break;
       }
     }
   }
@@ -583,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;
@@ -788,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;
@@ -825,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);

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);
   }
 
 }