@vpmedia/phaser 1.0.33 → 1.0.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vpmedia/phaser",
-  "version": "1.0.33",
+  "version": "1.0.35",
   "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",
@@ -23,7 +23,7 @@
     "@babel/preset-env": "^7.20.2",
     "@babel/register": "^7.18.9",
     "babel-loader": "^8.3.0",
-    "eslint": "^8.28.0",
+    "eslint": "^8.29.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jest": "^27.1.6",
@@ -31,7 +31,7 @@
     "eslint-plugin-prettier": "^4.2.1",
     "husky": "^8.0.2",
     "jest": "^29.3.1",
-    "lint-staged": "^13.0.4",
+    "lint-staged": "^13.1.0",
     "prettier": "^2.8.0",
     "webpack": "^5.75.0",
     "webpack-cli": "^4.10.0"

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/animation_parser.js

@@ -85,14 +85,6 @@ export function JSONData(game, json) {
 
 }
 
-/**
- *
- */
-export function JSONDataPyxel() {
-  // TODO
-  console.warn('animation_parser.JSONDataPyxel() is not implemented');
-}
-
 /**
  *
  * @param {object} game TBD
@@ -121,11 +113,3 @@ export function JSONDataHash(game, json) {
   }
   return data;
 }
-
-/**
- *
- */
-export function XMLData() {
-  // TODO
-  console.warn('animation_parser.XMLData() is not implemented');
-}

package/src/phaser/core/cache.js

@@ -8,8 +8,7 @@ import BaseTexture from '../display/webgl/base_texture';
 import Signal from './signal';
 import Frame from './frame';
 import FrameData from './frame_data';
-import { XMLData, JSONData, JSONDataHash, JSONDataPyxel } from './animation_parser';
-import { TEXTURE_ATLAS_XML_STARLING, TEXTURE_ATLAS_JSON_PYXEL } from './const';
+import { JSONData, JSONDataHash } from './animation_parser';
 import { jsonBitmapFont, xmlBitmapFont } from './loader_parser';
 
 export const CANVAS = 1;
@@ -24,7 +23,6 @@ export const BITMAPDATA = 9;
 export const BITMAPFONT = 10;
 export const JSON = 11;
 export const XML = 12;
-export const VIDEO = 13;
 export const SHADER = 14;
 export const RENDER_TEXTURE = 15;
 
@@ -38,7 +36,6 @@ export default class {
       image: {},
       texture: {},
       sound: {},
-      video: {},
       text: {},
       json: {},
       xml: {},
@@ -67,7 +64,6 @@ export default class {
     this._cacheMap[BITMAPFONT] = this._cache.bitmapFont;
     this._cacheMap[JSON] = this._cache.json;
     this._cacheMap[XML] = this._cache.xml;
-    this._cacheMap[VIDEO] = this._cache.video;
     this._cacheMap[SHADER] = this._cache.shader;
     this._cacheMap[RENDER_TEXTURE] = this._cache.renderTexture;
     this.addDefaultImage();
@@ -110,18 +106,14 @@ export default class {
     return img;
   }
 
-  addTextureAtlas(key, url, data, atlasData, format) {
+  addTextureAtlas(key, url, data, atlasData) {
     const obj = {
       key,
       url,
       data,
       base: new BaseTexture(data),
     };
-    if (format === TEXTURE_ATLAS_XML_STARLING) {
-      obj.frameData = XMLData(this.game, atlasData, key);
-    } else if (format === TEXTURE_ATLAS_JSON_PYXEL) {
-      obj.frameData = JSONDataPyxel(this.game, atlasData, key);
-    } else if (Array.isArray(atlasData.frames)) {
+    if (Array.isArray(atlasData.frames)) {
       //  Let's just work it out from the frames array
       obj.frameData = JSONData(this.game, atlasData, key);
     } else {
@@ -287,8 +279,6 @@ export default class {
     return this.checkKey(XML, key);
   }
 
-  // TODO video shader rendertexture physics
-
   // GET
 
   getItem(key, cache, method, property = null) {
@@ -357,10 +347,6 @@ export default class {
     return this.getItem(key, XML, 'getXML', 'data');
   }
 
-  getVideo(key) {
-    return this.getItem(key, VIDEO, 'getVideo');
-  }
-
   getShader(key) {
     return this.getItem(key, SHADER, 'getShader', 'data');
   }
@@ -490,10 +476,6 @@ export default class {
     delete this._cache.xml[key];
   }
 
-  removeVideo(key) {
-    delete this._cache.video[key];
-  }
-
   removeShader(key) {
     delete this._cache.shader[key];
   }

package/src/phaser/core/const.js

@@ -94,12 +94,7 @@ export const EMITTER = 11; // deprecated
 export const RETROFONT = 18; // deprecated
 export const ROPE = 20; // deprecated
 export const CREATURE = 27; // deprecated
-export const VIDEO = 28; // deprecated
 export const PENDING_ATLAS = -1;
 // sprite sheet atlas
 export const TEXTURE_ATLAS_JSON_ARRAY = 0;
 export const TEXTURE_ATLAS_JSON_HASH = 1;
-export const TEXTURE_ATLAS_XML_STARLING = 2;
-export const PHYSICS_LIME_CORONA_JSON = 3; // deprecated
-export const PHYSICS_PHASER_JSON = 4; // deprecated
-export const TEXTURE_ATLAS_JSON_PYXEL = 5;

package/src/phaser/core/device.js

@@ -31,12 +31,6 @@ export default class {
     this.m4a = false;
     this.webm = false;
     this.dolby = false;
-    this.oggVideo = false;
-    this.h264Video = false;
-    this.mp4Video = false;
-    this.webmVideo = false;
-    this.vp9Video = false;
-    this.hlsVideo = false;
     this.iPhone = false;
     this.iPad = false;
     this.pixelRatio = 1;

package/src/phaser/core/device_util.js

@@ -29,25 +29,6 @@ export function canPlayAudio(device, type) {
   return false;
 }
 
-/**
- *
- * @param {object} device TBD
- * @param {string} type TBD
- * @returns {boolean} TBD
- */
-export function canPlayVideo(device, type) {
-  if (type === 'webm' && (device.webmVideo || device.vp9Video)) {
-    return true;
-  } else if (type === 'mp4' && (device.mp4Video || device.h264Video)) {
-    return true;
-  } else if ((type === 'ogg' || type === 'ogv') && device.oggVideo) {
-    return true;
-  } else if (type === 'mpeg' && device.hlsVideo) {
-    return true;
-  }
-  return false;
-}
-
 /**
  *
  * @param {object} device TBD
@@ -170,37 +151,6 @@ export function checkBrowser(device) {
   }
 }
 
-/**
- *
- * @param {object} device TBD
- */
-export function checkVideo(device) {
-  const videoElement = document.createElement('video');
-  try {
-    if (videoElement.canPlayType) {
-      if (videoElement.canPlayType('video/ogg; codecs="theora"').replace(/^no$/, '')) {
-        device.oggVideo = true;
-      }
-      if (videoElement.canPlayType('video/mp4; codecs="avc1.42E01E"').replace(/^no$/, '')) {
-        // Without QuickTime, this value will be `undefined`. github.com/Modernizr/Modernizr/issues/546
-        device.h264Video = true;
-        device.mp4Video = true;
-      }
-      if (videoElement.canPlayType('video/webm; codecs="vp8, vorbis"').replace(/^no$/, '')) {
-        device.webmVideo = true;
-      }
-      if (videoElement.canPlayType('video/webm; codecs="vp9"').replace(/^no$/, '')) {
-        device.vp9Video = true;
-      }
-      if (videoElement.canPlayType('application/x-mpegURL; codecs="avc1.42E01E"').replace(/^no$/, '')) {
-        device.hlsVideo = true;
-      }
-    }
-  } catch (e) {
-    // pass
-  }
-}
-
 /**
  *
  * @param {object} device TBD
@@ -259,7 +209,6 @@ export function initialize(device) {
   checkOS(device);
   checkBrowser(device);
   checkAudio(device);
-  checkVideo(device);
   checkDevice(device);
   checkFullScreenSupport(device);
   checkInput(device);

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';
@@ -107,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();
@@ -189,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);
@@ -211,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
@@ -340,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/loader.js

@@ -6,7 +6,7 @@
 import Signal from './signal';
 import Rectangle from '../geom/rectangle';
 import { canPlayAudio } from './device_util';
-import { TEXTURE_ATLAS_JSON_ARRAY, TEXTURE_ATLAS_JSON_HASH, TEXTURE_ATLAS_XML_STARLING, TEXTURE_ATLAS_JSON_PYXEL } from './const';
+import { TEXTURE_ATLAS_JSON_ARRAY, TEXTURE_ATLAS_JSON_HASH } from './const';
 
 export const TILED_JSON = 6;
 export const TILEMAP_CSV = 7;
@@ -278,12 +278,6 @@ export default class {
     return this;
   }
 
-  video() {
-    // TODO
-    console.warn('loader.video() is not implemented');
-    return this;
-  }
-
   tilemap() {
     // TODO
     console.warn('loader.tilemap() is not implemented');
@@ -335,36 +329,14 @@ export default class {
       textureURL = key + '.png';
     }
     if (!atlasURL && !atlasData) {
-      if (format === TEXTURE_ATLAS_XML_STARLING) {
-        atlasURL = key + '.xml';
-      } else {
-        atlasURL = key + '.json';
-      }
+      atlasURL = key + '.json';
     }
     //  A URL to a json/xml file has been given
     if (atlasURL) {
       this.addToFileList('textureatlas', key, textureURL, { atlasURL, format });
     } else {
-      switch (format) {
-        //  A json string or object has been given
-        case TEXTURE_ATLAS_JSON_ARRAY:
-          if (typeof atlasData === 'string') {
-            atlasData = JSON.parse(atlasData);
-          }
-          break;
-        //  An xml string or object has been given
-        case TEXTURE_ATLAS_XML_STARLING:
-          if (typeof atlasData === 'string') {
-            const xml = this.parseXml(atlasData);
-            if (!xml) {
-              throw new Error('Invalid Texture Atlas XML given');
-            }
-            atlasData = xml;
-          }
-          break;
-        default:
-          // pass
-          break;
+      if (format === TEXTURE_ATLAS_JSON_ARRAY && typeof atlasData === 'string') {
+        atlasData = JSON.parse(atlasData);
       }
       this.addToFileList('textureatlas', key, textureURL, { atlasURL: null, atlasData, format });
     }
@@ -562,9 +534,6 @@ export default class {
         case "spritesheet":
           this.spritesheet(file.key, file.url, file.frameWidth, file.frameHeight, file.frameMax, file.margin, file.spacing);
           break;
-        case "video":
-          this.video(file.key, file.urls ? file.urls : file.url);
-          break;
         case "audio":
           this.audio(file.key, file.urls ? file.urls : file.url);
           break;
@@ -624,18 +593,6 @@ export default class {
           this.fileError(file, null, 'No supported audio URL specified or device does not have audio playback support');
         }
         break;
-      case 'video':
-        file.url = this.getVideoURL(file.url);
-        if (file.url) {
-          if (file.asBlob) {
-            this.xhrLoad(file, this.transformUrl(file.url, file), 'blob', this.fileComplete);
-          } else {
-            this.loadVideoTag(file);
-          }
-        } else {
-          this.fileError(file, null, 'No supported video URL specified or device does not have video playback support');
-        }
-        break;
       case 'json':
         this.xhrLoad(file, this.transformUrl(file.url, file), 'text', this.jsonLoadComplete);
         break;
@@ -690,11 +647,6 @@ export default class {
     file.data.src = this.transformUrl(file.url, file);
   }
 
-  loadVideoTag() {
-    // TODO
-    console.warn('loader.loadVideoTag() is not implemented');
-  }
-
   xhrLoad(file, url, type, onload, onerror) {
     const xhr = new XMLHttpRequest();
     xhr.open('GET', url, true);
@@ -810,10 +762,8 @@ export default class {
         } else {
           //  Load the JSON or XML before carrying on with the next file
           loadNext = false;
-          if (file.format === TEXTURE_ATLAS_JSON_ARRAY || file.format === TEXTURE_ATLAS_JSON_HASH || file.format === TEXTURE_ATLAS_JSON_PYXEL) {
+          if (file.format === TEXTURE_ATLAS_JSON_ARRAY || file.format === TEXTURE_ATLAS_JSON_HASH) {
             this.xhrLoad(file, this.transformUrl(file.atlasURL, file), 'text', this.jsonLoadComplete);
-          } else if (file.format === TEXTURE_ATLAS_XML_STARLING) {
-            this.xhrLoad(file, this.transformUrl(file.atlasURL, file), 'text', this.xmlLoadComplete);
           } else {
             throw new Error('Invalid Texture Atlas format: ' + file.format);
           }
@@ -843,16 +793,6 @@ export default class {
           });
         }
         break;
-      case 'video':
-        if (file.asBlob) {
-          try {
-            file.data = xhr.response;
-          } catch (e) {
-            throw new Error('Unable to parse video file as Blob: ' + file.key);
-          }
-        }
-        this.cache.addVideo(file.key, file.url, file.data, file.asBlob);
-        break;
       case 'audio':
         file.data = xhr.response;
         this.cache.addSound(file.key, file.url, file.data);

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

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