melonjs 15.12.0 → 15.14.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/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/renderable/ui/uitextbutton.js

@@ -20,8 +20,8 @@ export default class UITextButton extends UIBaseElement {
      * @param {number} [settings.size=1] - The scale factor of the BitmapText
      * @param {string} [settings.text] - The text to display
      * @param {string} [settings.bindKey] - The key to bind the action to (default: none)
-     * @param {string} [settings.backgroundColor="#00aa0080"] - The css value of a background color
-     * @param {string} [settings.hoverColor="#00ff00ff"] - The css value of a color to be used if the pointer hovers over the button
+     * @param {string} [settings.hoverOffColor="#00aa0080"] - The css value of a color to be used if the pointer is not hovering over the button
+     * @param {string} [settings.hoverOnColor="#00ff00ff"] - The css value of a color to be used if the pointer hovers over the button
      * @param {string} [settings.borderStrokeColor="#000000"] - The css value of a color to be used to draw the border
      * @param {string} [settings.fillStyle] - The css value of a tint color to be used to tint the BitmapText
      * @param {string} [settings.textAlign="center"] - horizontal text alignment
@@ -38,6 +38,8 @@ export default class UITextButton extends UIBaseElement {
      *              // if you omit the next two, size is calculated by the size of the text
      *              borderWidth: 200,
      *              borderHeight: 20,
+     *              backgroundColor: '#00aa0080',
+     *              hoverColor: '#00ff00ff'
      *          });
      *      }
      *
@@ -58,16 +60,18 @@ export default class UITextButton extends UIBaseElement {
         this.bindKey = settings.bindKey || -1;
 
         /**
-         * The css value of a background color
+         * The css value of a color to be used if the pointer is nothovering over the button
          * @type {string}
          */
-        this.backgroundColor = settings.backgroundColor || "#00aa0080";
+        // keep settings.backgroundColor for backward compatibility
+        this.hoverOffColor = settings.hoverOffColor || settings.backgroundColor || "#00aa0080";
 
         /**
          * The css value of a color to be used if the pointer hovers over the button
          * @type {string}
          */
-        this.hoverColor = settings.hoverColor || "#00ff00ff";
+        // keep settings.hoverColor for backward compatibility
+        this.hoverOnColor = settings.hoverOnColor || settings.hoverColor || "#00ff00ff";
 
         /**
          * The css value of a color to be used to draw the border
@@ -122,16 +126,13 @@ export default class UITextButton extends UIBaseElement {
 
     draw(renderer) {
         if (this.hover === true) {
-            renderer.setColor(this.hoverColor);
+            renderer.setColor(this.hoverOnColor);
         } else {
-            renderer.setColor(this.backgroundColor);
+            renderer.setColor(this.hoverOffColor);
         }
         renderer.fill(this.border);
         renderer.setColor(this.borderStrokeColor);
         renderer.stroke(this.border);
-        this.bitmapText.preDraw(renderer);
-        this.bitmapText.draw(renderer);
-        this.bitmapText.postDraw(renderer);
         super.draw(renderer);
     }
 }

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,