melonjs 15.13.0 → 15.15.0

package/src/loader/loader.js

@@ -45,6 +45,18 @@ export let onload;
  */
 export let onProgress;
 
+/**
+ * onError callback<br>
+ * each time a resource loading is failed, the loader will fire the specified function giving the actual asset as argument.
+ * @default undefined
+ * @memberof loader
+ * @type {function}
+ * @example
+ * // set a callback for error notification
+ * me.loader.onError = this.loaderError.bind(this);
+ */
+export let onError;
+
 /**
  * list of parser function for supported format type
  */
@@ -60,6 +72,10 @@ let resourceCount = 0;
 let loadCount = 0;
 let timerId = 0;
 
+/**
+ * Assets uploaded with an error
+ */
+const failureLoadedAssets = {};
 
 /**
  * init all supported parsers
@@ -111,6 +127,7 @@ function checkLoadStatus(onloadcb) {
  * @ignore
  */
 function onResourceLoaded(res) {
+    delete failureLoadedAssets[res.src];
     // increment the loading counter
     loadCount++;
 
@@ -127,9 +144,15 @@ function onResourceLoaded(res) {
 
 /**
  * on error callback for image loading
+ * @param {loader.Asset} asset - asset that loaded with failure
  * @ignore
  */
 function onLoadingError(res) {
+    failureLoadedAssets[res.src] = res;
+    if (this.onError) {
+        this.onError(res);
+    }
+    event.emit(event.LOADER_ERROR, res);
     throw new Error("Failed loading resource " + res.src);
 }
 
@@ -267,6 +290,35 @@ export function preload(assets, onloadcb, switchToLoadState = true) {
     checkLoadStatus(onload);
 }
 
+/**
+ * retry loading assets after a loading failure
+ * @memberof loader
+ * @param {string} src - src of asset to reload
+ * @example
+ *  event.on(
+ *      event.LOADER_ERROR,
+ *      (res) => {
+ *          // custom function
+ *          showErrorNotification({
+ *              text: `Error during loading content: ${res.name}`,
+ *              done: loader.reload(res.src);
+ *          })
+ *      }
+ *  );
+**/
+export function reload(src) {
+    const assetToReload = failureLoadedAssets[src];
+    this.unload(assetToReload);
+    resourceCount -= 1;
+    resourceCount += this.load(
+        assetToReload,
+        this.onResourceLoaded.bind(this, assetToReload),
+        this.onLoadingError.bind(this, assetToReload)
+    );
+    // check load status
+    checkLoadStatus(this.onload);
+}
+
 /**
  * Load a single asset (to be used if you need to load additional asset(s) during the game)
  * @memberof loader

package/src/loader/parsers/image.js

@@ -17,6 +17,11 @@ import { crossOrigin, nocache } from "../settings.js";
  * ]);
  */
 export function preloadImage(img, onload, onerror) {
+    if (typeof imgList[img.name] !== "undefined") {
+        // already loaded
+        return 0;
+    }
+
     // create new Image object and add to list
     imgList[img.name] = new Image();
     if (typeof onload === "function") {

package/src/loader/parsers/json.js

@@ -11,6 +11,11 @@ import { nocache, withCredentials } from "../settings.js";
  * @ignore
  */
 export function preloadJSON(data, onload, onerror) {
+    if (typeof jsonList[data.name] !== "undefined") {
+        // already loaded
+        return 0;
+    }
+
     let xmlhttp = new XMLHttpRequest();
 
     if (xmlhttp.overrideMimeType) {

package/src/loader/parsers/tmx.js

@@ -15,6 +15,11 @@ import { nocache, withCredentials } from "../settings.js";
  * @ignore
  */
 export function preloadTMX(tmxData, onload, onerror) {
+    if (typeof tmxList[tmxData.name] !== "undefined") {
+        // already loaded
+        return 0;
+    }
+
     /**
      * @ignore
      */

package/src/renderable/imagelayer.js

@@ -124,14 +124,12 @@ export default class ImageLayer extends Sprite {
         event.on(event.VIEWPORT_ONCHANGE, this.updateLayer, this);
         event.on(event.VIEWPORT_ONRESIZE, this.resize, this);
         // force a first refresh when the level is loaded
-        event.once(event.LEVEL_LOADED, () => {
-            this.updateLayer(game.viewport.pos);
-        });
+        event.on(event.LEVEL_LOADED, this.updateLayer, this);
         // in case the level is not added to the root container,
         // the onActivateEvent call happens after the LEVEL_LOADED event
         // so we need to force a first update
         if (this.ancestor.root !== true) {
-            this.updateLayer(game.viewport.pos);
+            this.updateLayer();
         }
     }
 
@@ -159,10 +157,12 @@ export default class ImageLayer extends Sprite {
      * updateLayer function
      * @ignore
      */
-    updateLayer(vpos) {
+    updateLayer() {
         const rx = this.ratio.x,
             ry = this.ratio.y;
 
+        const viewport = game.viewport;
+
         if (rx === 0 && ry === 0) {
             // static image
             return;
@@ -170,8 +170,8 @@ export default class ImageLayer extends Sprite {
 
         const width = this.width,
             height = this.height,
-            bw = game.viewport.bounds.width,
-            bh = game.viewport.bounds.height,
+            bw = viewport.bounds.width,
+            bh = viewport.bounds.height,
             ax = this.anchorPoint.x,
             ay = this.anchorPoint.y,
 
@@ -181,8 +181,8 @@ export default class ImageLayer extends Sprite {
              * See https://github.com/melonjs/melonJS/issues/741#issuecomment-138431532
              * for a thorough description of how this works.
              */
-            x = ax * (rx - 1) * (bw - game.viewport.width) + this.offset.x - rx * vpos.x,
-            y = ay * (ry - 1) * (bh - game.viewport.height) + this.offset.y - ry * vpos.y;
+            x = ax * (rx - 1) * (bw - viewport.width) + this.offset.x - rx * viewport.pos.x,
+            y = ay * (ry - 1) * (bh - viewport.height) + this.offset.y - ry * viewport.pos.y;
 
 
         // Repeat horizontally; start drawing from left boundary
@@ -263,6 +263,7 @@ export default class ImageLayer extends Sprite {
         // cancel all event subscriptions
         event.off(event.VIEWPORT_ONCHANGE, this.updateLayer);
         event.off(event.VIEWPORT_ONRESIZE, this.resize);
+        event.off(event.LEVEL_LOADED, this.updateLayer);
     }
 
     /**

package/src/renderable/renderable.js

@@ -258,6 +258,9 @@ export default class Renderable extends Rect {
         // viewport flag
         this._inViewport = false;
 
+        // cache value for the parentApp
+        this._parentApp = undefined;
+
         // renderable cache tint value used by the getter/setter
         this._tint = pool.pull("Color", 255, 255, 255, 1.0);
 
@@ -265,6 +268,20 @@ export default class Renderable extends Rect {
         this.setOpacity(1.0);
     }
 
+    /**
+     * returns the parent application (or game) to which this renderable is attached to
+     * @return {Application} the parent application or undefined if not attached to any container/app
+     */
+    get parentApp() {
+        if (typeof this._parentApp === "undefined") {
+            if (typeof this.ancestor !== "undefined" && typeof this.ancestor.getRootAncestor === "function") {
+                // the `app` property is only defined in the world "root" container
+                this._parentApp = this.ancestor.getRootAncestor().app;
+            }
+        }
+        return this._parentApp;
+    }
+
     /**
      * Whether the renderable object is floating (i.e. used screen coordinates), or contained in a floating parent container
      * @see Renderable#floating
@@ -790,6 +807,7 @@ export default class Renderable extends Rect {
         }
 
         this.ancestor = undefined;
+        this._parentApp = undefined;
 
         // destroy the physic body if defined and is a builtin body object
         if ((typeof this.body !== "undefined") && (typeof this.body.destroy === "function")) {

package/src/renderable/text/bitmaptext.js

@@ -206,7 +206,7 @@ export default class BitmapText extends Renderable {
                     break;
 
                 default :
-                    ax = this.metrics.width * 0.0;
+                    ax = 0; //this.metrics.width * 0.0;
                     break;
             }
 
@@ -223,7 +223,7 @@ export default class BitmapText extends Renderable {
                     break;
 
                 default :
-                    ay = this.metrics.height * 0.0;
+                    ay = 0; //this.metrics.height * 0.0;
                     break;
             }
 

package/src/system/event.js

@@ -279,6 +279,18 @@ export const LOADER_COMPLETE = "me.loader.onload";
  */
 export const LOADER_PROGRESS = "me.loader.onProgress";
 
+/**
+ * Event for when an error occur during preloading <br>
+ * Data passed : {Resource} resource object<br>
+ * @public
+ * @constant
+ * @type {string}
+ * @name LOADER_ERROR
+ * @memberof event
+ * @see event.on
+ */
+export const LOADER_ERROR = "me.loader.onError";
+
 /**
  * Event for pressing a binded key <br>
  * Data passed : {string} user-defined action, {number} keyCode,