@vpmedia/phaser 1.0.11 → 1.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vpmedia/phaser",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "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",
@@ -32,7 +32,7 @@
     "husky": "^8.0.2",
     "jest": "^29.3.1",
     "lint-staged": "^13.0.3",
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.0",
     "webpack": "^5.75.0",
     "webpack-cli": "^4.10.0"
   },

package/src/phaser/core/animation_parser.js

@@ -68,8 +68,6 @@ export function spriteSheet(game, key, frameWidth, frameHeight, frameMax, margin
 export function JSONData(game, json) {
   //  Malformed?
   if (!json.frames) {
-    console.warn('AnimationParser.JSONData: Invalid Texture Atlas JSON given, missing frames array');
-    console.log(json);
     return null;
   }
   //  Let's create some frames then

package/src/phaser/core/const.js

@@ -58,7 +58,6 @@ export const BLEND_LUMINOSITY = 16;
 export const RENDER_AUTO = 0;
 export const RENDER_CANVAS = 1;
 export const RENDER_WEBGL = 2;
-export const RENDER_HEADLESS = 3;
 // pointer modes
 export const POINTER_CURSOR = 1;
 export const POINTER_CONTACT = 2;

package/src/phaser/core/device.js

@@ -10,8 +10,6 @@ export default class {
     this.deviceReadyAt = 0;
     this.desktop = false;
     this.iOS = false;
-    this.iOSVersion = 0;
-    this.node = false;
     this.android = false;
     this.chromeOS = false;
     this.linux = false;
@@ -24,14 +22,9 @@ export default class {
     this.mspointer = false;
     this.wheelEvent = null;
     this.chrome = false;
-    this.chromeVersion = 0;
     this.firefox = false;
-    this.firefoxVersion = 0;
     this.edge = false;
-    this.mobileSafari = false;
     this.safari = false;
-    this.safariVersion = 0;
-    this.webApp = false;
     this.silk = false;
     this.ogg = false;
     this.opus = false;

package/src/phaser/core/device_util.js

@@ -60,12 +60,12 @@ export function checkOS(device) {
     device.chromeOS = true;
   } else if (/iP[ao]d|iPhone/i.test(ua)) {
     device.iOS = true;
-    (navigator.appVersion).match(/OS (\d+)/);
-    device.iOSVersion = parseInt(RegExp.$1, 10);
-  } else if (/Linux/.test(ua)) {
-    device.linux = true;
+  } else if (navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1) {
+    device.iOS = true;
   } else if (/Mac OS/.test(ua)) {
     device.macOS = true;
+  } else if (/Linux/.test(ua)) {
+    device.linux = true;
   } else if (/Windows/.test(ua)) {
     device.windows = true;
   }
@@ -80,12 +80,8 @@ export function checkOS(device) {
   if (device.windows || device.macOS || (device.linux && !silk) || device.chromeOS) {
     device.desktop = true;
   }
-  //  Windows Phone / Table reset
-  if (device.windowsPhone || ((/Windows NT/i.test(ua)) && (/Touch/i.test(ua)))) {
-    device.desktop = false;
-  }
-  // VPMedia Special override
-  if (window.location.pathname.indexOf('/mobile/') > -1) {
+  // iOS / Windows Phone / Tablet reset
+  if (device.android || device.iOS || device.windowsPhone || ((/Windows NT/i.test(ua)) && (/Touch/i.test(ua)))) {
     device.desktop = false;
   }
 }
@@ -171,29 +167,15 @@ export function checkBrowser(device) {
     device.edge = true;
   } else if (/Chrome\/(\d+)/.test(ua) && !device.windowsPhone) {
     device.chrome = true;
-    device.chromeVersion = parseInt(RegExp.$1, 10);
   } else if (/Firefox\D+(\d+)/.test(ua)) {
     device.firefox = true;
-    device.firefoxVersion = parseInt(RegExp.$1, 10);
-  } else if (/AppleWebKit/.test(ua) && device.iOS) {
-    device.mobileSafari = true;
   } else if (/Safari\/(\d+)/.test(ua) && !device.windowsPhone) {
     device.safari = true;
-    if (/Version\/(\d+)\./.test(ua)) {
-      device.safariVersion = parseInt(RegExp.$1, 10);
-    }
   }
   //  Silk gets its own if clause because its ua also contains 'Safari'
   if (/Silk/.test(ua)) {
     device.silk = true;
   }
-  //  WebApp mode in iOS
-  if (navigator.standalone) {
-    device.webApp = true;
-  }
-  if (typeof process !== 'undefined' && typeof require !== 'undefined') {
-    device.node = true;
-  }
 }
 
 /**
@@ -257,16 +239,8 @@ export function checkAudio(device) {
         device.webm = true;
       }
       if (audioElement.canPlayType('audio/mp4;codecs="ec-3"') !== '') {
-        if (device.edge) {
+        if (device.edge || device.safari) {
           device.dolby = true;
-        } else if (device.safari && device.safariVersion >= 9) {
-          if (/Mac OS X (\d+)_(\d+)/.test(navigator.userAgent)) {
-            const major = parseInt(RegExp.$1, 10);
-            const minor = parseInt(RegExp.$2, 10);
-            if ((major === 10 && minor >= 11) || major > 10) {
-              device.dolby = true;
-            }
-          }
         }
       }
     }

package/src/phaser/core/game.js

@@ -20,7 +20,7 @@ import Time from './time';
 import TweenManager from './tween_manager';
 import World from './world';
 import Stage from './stage';
-import { RENDER_AUTO, RENDER_WEBGL, RENDER_CANVAS, RENDER_HEADLESS } from './const';
+import { RENDER_AUTO, RENDER_WEBGL } from './const';
 import { create, removeFromDOM, addToDOM, setTouchAction } from '../display/canvas/util';
 import { initialize, checkOS } from './device_util';
 
@@ -143,7 +143,14 @@ export default class {
         isWebGlReady = true;
       } catch (e) {
         isWebGlReady = false;
-        this.exceptionHandler(e);
+        const tags = {};
+        if (window.PhaserRegistry?.GL_PROGRAM_INFO_LOG) {
+          tags.gl_program_log = window.PhaserRegistry.GL_PROGRAM_INFO_LOG;
+        }
+        if (window.PhaserRegistry?.GL_SHADER_INFO_LOG) {
+          tags.gl_shader_log = window.PhaserRegistry.GL_SHADER_INFO_LOG;
+        }
+        this.exceptionHandler(e, tags);
       }
       /*
       this.renderer = new WebGLRenderer(this);
@@ -168,11 +175,9 @@ export default class {
       this.renderer = new CanvasRenderer(this);
       this.context = this.renderer.context;
     }
-    if (this.config.renderType !== RENDER_HEADLESS) {
-      this.stage.smoothed = this.config.antialias;
-      addToDOM(this.canvas, this.parent, false);
-      setTouchAction(this.canvas);
-    }
+    this.stage.smoothed = this.config.antialias;
+    addToDOM(this.canvas, this.parent, false);
+    setTouchAction(this.canvas);
   }
 
   parseConfigElement(config, key, defaultValue) {
@@ -209,7 +214,7 @@ export default class {
     // 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);
-    // The Renderer this game will use. Either PowerGamer.Const.RENDER_AUTO, PowerGamer.Const.RENDER_CANVAS, PowerGamer.Const.RENDER_WEBGL, or PowerGamer.Const.RENDER_HEADLESS.
+    // The Renderer this game will use. Either PowerGamer.Const.RENDER_AUTO, PowerGamer.Const.RENDER_CANVAS, PowerGamer.Const.RENDER_WEBGL
     this.parseConfigElement(config, 'renderType', RENDER_AUTO);
     // Force audio disabled
     this.parseConfigElement(config, 'isForceDisabledAudio', false);
@@ -219,8 +224,8 @@ export default class {
     if (config.exceptionHandler) {
       this.exceptionHandler = config.exceptionHandler;
     } else {
-      this.exceptionHandler = (e) => {
-        console.error(e);
+      this.exceptionHandler = (e, tags) => {
+        console.error(e, tags);
       };
     }
     if (config.parent) {
@@ -339,9 +344,6 @@ export default class {
       return;
     }
     this.state.preRender(elapsedTime);
-    if (this.config.renderType === RENDER_HEADLESS) {
-      return;
-    }
     this.renderer.render(this.stage);
     this.state.render(elapsedTime);
   }

package/src/phaser/core/scale_manager.js

@@ -95,16 +95,6 @@ export default class {
     // Configure device-dependent compatibility
     const compat = this.compatibility;
     compat.supportsFullScreen = this.game.device.fullscreen;
-    //  We can't do anything about the status bars in iPads, web apps or desktops
-    /*
-    if (!this.game.device.iPad && !this.game.device.webApp && !this.game.device.desktop) {
-      if (this.game.device.android && !this.game.device.chrome) {
-        compat.scrollTo = new Point(0, 1);
-      } else {
-        compat.scrollTo = new Point(0, 0);
-      }
-    }
-    */
     if (this.game.device.desktop) {
       compat.orientationFallback = 'screen';
       compat.clickTrampoline = 'when-not-mouse';

package/src/phaser/core/sound.js

@@ -196,12 +196,7 @@ export default class {
         if (this._sound.stop === undefined) {
           this._sound.noteOff(0);
         } else {
-          try {
-            this._sound.stop(0);
-          } catch (e) {
-            // pass
-            this.game.exceptionHandler(e);
-          }
+          this._sound.stop(0);
         }
         if (this.externalNode) {
           this._sound.disconnect(this.externalNode);
@@ -360,12 +355,7 @@ export default class {
           this._sound.noteGrainOn(0, p, duration);
           // this._sound.noteOn(0); // the zero is vitally important, crashes iOS6 without it
         } else if (this.loop && this.game.device.chrome) {
-          // Handle chrome bug: https://code.google.com/p/chromium/issues/detail?id=457099
-          if (this.game.device.chromeVersion === 42) {
-            this._sound.start(0);
-          } else {
-            this._sound.start(0, p);
-          }
+          this._sound.start(0, p);
         } else {
           this._sound.start(0, p, duration);
         }
@@ -383,12 +373,7 @@ export default class {
         if (this._sound.stop === undefined) {
           this._sound.noteOff(0);
         } else {
-          try {
-            this._sound.stop(0);
-          } catch (e) {
-            // pass
-            this.game.exceptionHandler(e);
-          }
+          this._sound.stop(0);
         }
         if (this.externalNode) {
           this._sound.disconnect(this.externalNode);

package/src/phaser/core/sound_manager.js

@@ -94,8 +94,11 @@ export default class {
     if (this.noAudio) {
       return;
     }
-    if (this.context.state === 'suspended') {
-      this.context.resume();
+    const state = this.context.state;
+    if (state === 'suspended') {
+      this.context.resume().catch((e) => {
+        this.game.exceptionHandler(e, { state });
+      });
     }
   }
 
@@ -162,7 +165,7 @@ export default class {
             this.onSoundDecode.dispatch(key, sound);
           })
           .catch((e) => {
-            this.game.exceptionHandler(e);
+            this.game.exceptionHandler(e, { key });
           });
       }
     }
@@ -202,7 +205,9 @@ export default class {
       this._unlockSource = null;
       this.resumeAudioContext();
     } else if (this.context.state === 'interrupted') {
-      this.context.resume();
+      this.context.resume().catch((e) => {
+        this.game.exceptionHandler(e, { state: this.context.state });
+      });
     }
     for (let i = 0; i < this._sounds.length; i += 1) {
       this._sounds[i].update();

package/src/phaser/display/display_object.js

@@ -274,11 +274,6 @@ export default class {
       if (child.visible) {
         childVisible = true;
         childBounds = this.children[i].getBounds();
-        /*
-        if (isNaN(childBounds.x) && this.children[i].type !== 7) {
-          console.log(this.children[i]);
-        }
-        */
         minX = (minX < childBounds.x) ? minX : childBounds.x;
         minY = (minY < childBounds.y) ? minY : childBounds.y;
         childMaxX = childBounds.width + childBounds.x;

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

@@ -539,9 +539,7 @@ export function updateGraphics(graphics, gl) {
           if (data.points.length < stencilBufferLimit * 2) {
             webGLData = switchMode(webGL, 0);
             const canDrawUsingSimple = buildPoly(data, webGLData);
-            // console.log(canDrawUsingSimple);
             if (!canDrawUsingSimple) {
-              // console.log("<>>>")
               webGLData = switchMode(webGL, 1);
               buildComplexPoly(data, webGLData);
             }

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

@@ -27,7 +27,9 @@ export function compileShader(gl, shaderSrc, shaderType) {
   gl.shaderSource(shader, src);
   gl.compileShader(shader);
   if (!gl.getShaderParameter(shader, gl.COMPILE_STATUS)) {
-    console.log(gl.getShaderInfoLog(shader));
+    if (window.PhaserRegistry) {
+      window.PhaserRegistry.GL_SHADER_INFO_LOG = gl.getShaderInfoLog(shader);
+    }
     return null;
   }
   return shader;
@@ -71,8 +73,9 @@ export function compileProgram(gl, vertexSrc, fragmentSrc) {
   gl.linkProgram(shaderProgram);
 
   if (!gl.getProgramParameter(shaderProgram, gl.LINK_STATUS)) {
-    console.log(gl.getProgramInfoLog(shaderProgram));
-    console.log('Could not initialise shaders');
+    if (window.PhaserRegistry) {
+      window.PhaserRegistry.GL_PROGRAM_INFO_LOG = gl.getProgramInfoLog(shaderProgram);
+    }
   }
   return shaderProgram;
 }