melonjs 14.4.0 → 15.0.0

package/src/loader/loadingscreen.js

@@ -4,7 +4,7 @@ import * as event from "./../system/event.js";
 import Sprite from "./../renderable/sprite.js";
 import Renderable from "./../renderable/renderable.js";
 import Stage from "./../state/stage.js";
-import loader from "./loader.js";
+import { load, unload } from "./loader.js";
 import logo_url from "./melonjs_logo.png";
 
 
@@ -86,7 +86,7 @@ class DefaultLoadingScreen extends Stage {
         ), 1);
 
         // load the melonJS logo
-        loader.load({name: "melonjs_logo", type: "image", src: logo_url}, () => {
+        load({name: "melonjs_logo", type: "image", src: logo_url}, () => {
             // melonJS logo
             game.world.addChild(new Sprite(
                 renderer.getWidth() / 2,
@@ -105,7 +105,7 @@ class DefaultLoadingScreen extends Stage {
      */
     onDestroyEvent() {
         // cancel the callback
-        loader.unload({name: "melonjs_logo", type:"image"});
+        unload({name: "melonjs_logo", type:"image"});
     }
 }
 

package/src/loader/parser.js

@@ -0,0 +1,279 @@
+import * as fileUtil from "../utils/file.js";
+import { ua } from "../system/platform.js";
+import level from "../level/level.js";
+import * as TMXUtils from "../level/tiled/TMXUtils.js";
+import { isDataUrl } from "../utils/string.js";
+import { imgList, tmxList, binList, jsonList } from "./cache.js";
+import { crossOrigin, nocache, withCredentials } from "./settings.js";
+
+
+/**
+ * load Images
+ * @example
+ * preloadImages([
+ *     { name : 'image1', src : 'images/image1.png'},
+ *     { name : 'image2', src : 'images/image2.png'},
+ *     { name : 'image3', src : 'images/image3.png'},
+ *     { name : 'image4', src : 'images/image4.png'}
+ * ]);
+ * @ignore
+ */
+export function preloadImage(img, onload, onerror) {
+    // create new Image object and add to list
+    imgList[img.name] = new Image();
+    if (typeof onload === "function") {
+        imgList[img.name].onload = onload;
+    }
+    if (typeof onerror === "function") {
+        imgList[img.name].onerror = onerror;
+    }
+    if (typeof (crossOrigin) === "string") {
+        imgList[img.name].crossOrigin = crossOrigin;
+    }
+    imgList[img.name].src = img.src + nocache;
+}
+
+/**
+ * load a font face
+ * @example
+ * preloadFontFace(
+ *     name: "'kenpixel'", type: "fontface",  src: "url('data/font/kenvector_future.woff2')"
+ * ]);
+ * @ignore
+ */
+export function preloadFontFace(data, onload, onerror) {
+
+    if (isDataUrl(data.src) === true) {
+        // make sure it in the `url(data:[<mediatype>][;base64],<data>)` format as expected by FontFace
+        if (!data.src.startsWith("url(")) {
+            data.src = "url(" + data.src + ")";
+        }
+    }
+
+    var font = new FontFace(data.name, data.src);
+
+    // loading promise
+    font.load().then(() => {
+        // apply the font after the font has finished downloading
+        document.fonts.add(font);
+        document.body.style.fontFamily = data.name;
+        if (typeof onload === "function") {
+            // onloaded callback
+            onload();
+        }
+    }, () => {
+        if (typeof onerror === "function") {
+            // rejected
+            onerror(data.name);
+        }
+    });
+}
+
+/**
+ * preload TMX files
+ * @ignore
+ */
+export function preloadTMX(tmxData, onload, onerror) {
+    /**
+     * @ignore
+     */
+    function addToTMXList(data) {
+        // set the TMX content
+        tmxList[tmxData.name] = data;
+
+        // add the tmx to the level manager
+        if (tmxData.type === "tmx") {
+            level.add(tmxData.type, tmxData.name);
+        }
+    }
+
+
+    //if the data is in the tmxData object, don't get it via a XMLHTTPRequest
+    if (tmxData.data) {
+        addToTMXList(tmxData.data);
+        if (typeof onload === "function") {
+            onload();
+        }
+        return;
+    }
+
+    var xmlhttp = new XMLHttpRequest();
+    // check the data format ('tmx', 'json')
+    var format = fileUtil.getExtension(tmxData.src);
+
+    if (xmlhttp.overrideMimeType) {
+        if (format === "json") {
+            xmlhttp.overrideMimeType("application/json");
+        }
+        else {
+            xmlhttp.overrideMimeType("text/xml");
+        }
+    }
+
+    xmlhttp.open("GET", tmxData.src + nocache, true);
+    xmlhttp.withCredentials = withCredentials;
+    // set the callbacks
+    xmlhttp.ontimeout = onerror;
+    xmlhttp.onreadystatechange = function () {
+        if (xmlhttp.readyState === 4) {
+            // status = 0 when file protocol is used, or cross-domain origin,
+            // (With Chrome use "--allow-file-access-from-files --disable-web-security")
+            if ((xmlhttp.status === 200) || ((xmlhttp.status === 0) && xmlhttp.responseText)) {
+                var result = null;
+
+                // parse response
+                switch (format) {
+                    case "xml":
+                    case "tmx":
+                    case "tsx":
+                        // ie9 does not fully implement the responseXML
+                        if (ua.match(/msie/i) || !xmlhttp.responseXML) {
+                            if (globalThis.DOMParser) {
+                                // manually create the XML DOM
+                                result = (new DOMParser()).parseFromString(xmlhttp.responseText, "text/xml");
+                            } else {
+                                throw new Error("XML file format loading not supported, use the JSON file format instead");
+                            }
+                        }
+                        else {
+                            result = xmlhttp.responseXML;
+                        }
+                        // converts to a JS object
+                        var data = TMXUtils.parse(result);
+                        switch (format) {
+                            case "tmx":
+                                result = data.map;
+                                break;
+
+                            case "tsx":
+                                result = data.tilesets[0];
+                                break;
+                        }
+
+                        break;
+
+                    case "json":
+                    case "tmj":
+                    case "tsj":
+                        result = JSON.parse(xmlhttp.responseText);
+                        break;
+
+                    default:
+                        throw new Error("TMX file format " + format + " not supported !");
+                }
+
+                //set the TMX content
+                addToTMXList(result);
+
+                // fire the callback
+                if (typeof onload === "function") {
+                    onload();
+                }
+            }
+            else if (typeof onerror === "function") {
+                onerror(tmxData.name);
+            }
+        }
+    };
+    // send the request
+    xmlhttp.send();
+}
+
+/**
+ * preload JSON files
+ * @ignore
+ */
+export function preloadJSON(data, onload, onerror) {
+    var xmlhttp = new XMLHttpRequest();
+
+    if (xmlhttp.overrideMimeType) {
+        xmlhttp.overrideMimeType("application/json");
+    }
+
+    xmlhttp.open("GET", data.src + nocache, true);
+    xmlhttp.withCredentials = withCredentials;
+
+    // set the callbacks
+    xmlhttp.ontimeout = onerror;
+    xmlhttp.onreadystatechange = function () {
+        if (xmlhttp.readyState === 4) {
+            // status = 0 when file protocol is used, or cross-domain origin,
+            // (With Chrome use "--allow-file-access-from-files --disable-web-security")
+            if ((xmlhttp.status === 200) || ((xmlhttp.status === 0) && xmlhttp.responseText)) {
+                // get the Texture Packer Atlas content
+                jsonList[data.name] = JSON.parse(xmlhttp.responseText);
+                if (typeof onload === "function") {
+                    // fire the callback
+                    onload();
+                }
+            }
+            else if (typeof onerror === "function") {
+                onerror(data.name);
+            }
+        }
+    };
+    // send the request
+    xmlhttp.send();
+}
+
+/**
+ * preload Binary files
+ * @ignore
+ */
+export function preloadBinary(data, onload, onerror) {
+    var httpReq = new XMLHttpRequest();
+
+    // load our file
+    httpReq.open("GET", data.src + nocache, true);
+    httpReq.withCredentials = withCredentials;
+    httpReq.responseType = "arraybuffer";
+    httpReq.onerror = onerror;
+    httpReq.onload = function () {
+        var arrayBuffer = httpReq.response;
+        if (arrayBuffer) {
+            var byteArray = new Uint8Array(arrayBuffer);
+            var buffer = [];
+            for (var i = 0; i < byteArray.byteLength; i++) {
+                buffer[i] = String.fromCharCode(byteArray[i]);
+            }
+            binList[data.name] = buffer.join("");
+            if (typeof onload === "function") {
+                // callback
+                onload();
+            }
+
+        }
+    };
+    httpReq.send();
+}
+
+/**
+ * preload Binary files
+ * @ignore
+ */
+export function preloadJavascript(data, onload, onerror) {
+    var script = document.createElement("script");
+
+    script.src = data.src;
+    script.type = "text/javascript";
+    if (typeof (crossOrigin) === "string") {
+        script.crossOrigin = crossOrigin;
+    }
+    script.defer = true;
+
+    if (typeof onload === "function") {
+        script.onload = () => {
+            // callback
+            onload();
+        };
+    }
+
+    if (typeof onerror === "function") {
+        script.onerror = () => {
+            // callback
+            onerror(data.name);
+        };
+    }
+
+    document.getElementsByTagName("body")[0].appendChild(script);
+}

package/src/loader/settings.js

@@ -0,0 +1,85 @@
+
+//  to enable/disable caching
+export let nocache = "";
+
+// baseURL
+export let baseURL = {};
+
+
+/**
+ * crossOrigin attribute to configure the CORS requests for Image data element.
+ * By default (that is, when the attribute is not specified), CORS is not used at all.
+ * The "anonymous" keyword means that there will be no exchange of user credentials via cookies,
+ * client-side SSL certificates or HTTP authentication as described in the Terminology section of the CORS specification.<br>
+ * @type {string}
+ * @name crossOrigin
+ * @default undefined
+ * @memberof loader
+ * @see https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_settings_attributes
+ * @example
+ *  // allow for cross-origin texture loading in WebGL
+ * me.loader.crossOrigin = "anonymous";
+ *
+ * // set all ressources to be loaded
+ * me.loader.preload(game.resources, this.loaded.bind(this));
+ */
+export let crossOrigin;
+
+/**
+ * indicates whether or not cross-site Access-Control requests should be made using credentials such as cookies,
+ * authorization headers or TLS client certificates. Setting withCredentials has no effect on same-site requests.
+ * @public
+ * @type {boolean}
+ * @name withCredentials
+ * @default false
+ * @memberof loader
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/withCredentials
+ * @example
+ *  // enable withCredentials
+ * me.loader.withCredentials = true;
+ *
+ * // set all ressources to be loaded
+ * me.loader.preload(game.resources, this.loaded.bind(this));
+ */
+export let withCredentials = false;
+
+/**
+ * enable the nocache mechanism
+ * @ignore
+ */
+export function setNocache(enable = false) {
+    nocache = enable ? "?" + ~~(Math.random() * 10000000) : "";
+}
+
+/**
+ * change the default baseURL for the given asset type.<br>
+ * (this will prepend the asset URL and must finish with a '/')
+ * @name setBaseURL
+ * @memberof loader
+ * @public
+ * @param {string} type  - "*", "audio", binary", "image", "json", "js", "tmx", "tsx"
+ * @param {string} [url="./"] - default base URL
+ * @example
+ * // change the base URL relative address for audio assets
+ * me.loader.setBaseURL("audio", "data/audio/");
+ * // change the base URL absolute address for all object types
+ * me.loader.setBaseURL("*", "http://myurl.com/")
+ */
+export function setBaseURL(type, url) {
+    if (type !== "*") {
+        baseURL[type] = url;
+    } else {
+        // "wildcards"
+        baseURL["audio"] = url;
+        baseURL["binary"] = url;
+        baseURL["image"] = url;
+        baseURL["json"] = url;
+        baseURL["js"] = url;
+        baseURL["tmx"] = url;
+        baseURL["tsx"] = url;
+        // XXX ?
+        //baseURL["fontface"] = url;
+    }
+}
+
+

package/src/math/color.js

@@ -250,8 +250,8 @@ var cssToRGB = new Map();
         return this.glArray[3];
     }
 
-    set alpha(value) {
-        this.glArray[3] = typeof(value) === "undefined" ? 1.0 : clamp(+value, 0, 1.0);
+    set alpha(value = 1.0) {
+        this.glArray[3] = clamp(+value, 0, 1.0);
     }
 
 
@@ -534,12 +534,13 @@ var cssToRGB = new Map();
      * @returns {number}
      */
     toUint32(alpha = 1.0) {
-        var ur = this.r & 0xff;
-        var ug = this.g & 0xff;
-        var ub = this.b & 0xff;
-        var ua = (alpha * 255) & 0xff;
+        var a = this.glArray;
 
-        return (ua << 24) + (ur << 16) + (ug << 8) + ub;
+        var ur = (a[0] * 255) & 0xff;
+        var ug = (a[1] * 255) & 0xff;
+        var ub = (a[2] * 255) & 0xff;
+
+        return (((alpha * 255) & 0xff) << 24) + (ur << 16) + (ug << 8) + ub;
     }
 
     /**

package/src/math/matrix2.js

@@ -296,15 +296,13 @@ import Matrix3d from "./matrix3.js";
      * @param {number} [y=x] - a number representing the ordinate of the scaling vector.
      * @returns {Matrix2d} Reference to this object for method chaining
      */
-    scale(x, y) {
-        var a = this.val,
-           _x = x,
-           _y = typeof(y) === "undefined" ? _x : y;
+    scale(x, y = x) {
+        var a = this.val;
 
-        a[0] *= _x;
-        a[1] *= _x;
-        a[3] *= _y;
-        a[4] *= _y;
+        a[0] *= x;
+        a[1] *= x;
+        a[3] *= y;
+        a[4] *= y;
 
         return this;
     }

package/src/math/matrix3.js

@@ -394,26 +394,23 @@ import { EPSILON } from "./math.js";
      * @param {number} [z=0] - a number representing the depth vector
      * @returns {Matrix3d} Reference to this object for method chaining
      */
-    scale(x, y, z) {
-        var a = this.val,
-           _x = x,
-           _y = typeof(y) === "undefined" ? _x : y,
-           _z = typeof(z) === "undefined" ?  0 : z;
-
-        a[0] = a[0] * _x;
-        a[1] = a[1] * _x;
-        a[2] = a[2] * _x;
-        a[3] = a[3] * _x;
-
-        a[4] = a[4] * _y;
-        a[5] = a[5] * _y;
-        a[6] = a[6] * _y;
-        a[7] = a[7] * _y;
-
-        a[8] = a[8] * _z;
-        a[9] = a[9] * _z;
-        a[10] = a[10] * _z;
-        a[11] = a[11] * _z;
+    scale(x, y = x, z = 0) {
+        var a = this.val;
+
+        a[0] = a[0] * x;
+        a[1] = a[1] * x;
+        a[2] = a[2] * x;
+        a[3] = a[3] * x;
+
+        a[4] = a[4] * y;
+        a[5] = a[5] * y;
+        a[6] = a[6] * y;
+        a[7] = a[7] * y;
+
+        a[8] = a[8] * z;
+        a[9] = a[9] * z;
+        a[10] = a[10] * z;
+        a[11] = a[11] * z;
 
         return this;
     }

package/src/math/observable_vector2.js

@@ -156,8 +156,8 @@ import {clamp} from "./math.js";
      * @param {number} [y=x]
      * @returns {ObservableVector2d} Reference to this object for method chaining
      */
-    scale(x, y) {
-        return this._set(this._x * x, this._y * (typeof (y) !== "undefined" ? y : x));
+    scale(x, y = x) {
+        return this._set(this._x * x, this._y * y);
     }
 
     /**

package/src/math/observable_vector3.js

@@ -186,9 +186,8 @@ import pool from "./../system/pooling.js";
      * @param {number} [z=1]
      * @returns {ObservableVector3d} Reference to this object for method chaining
      */
-    scale(x, y, z) {
-        y = (typeof (y) !== "undefined" ? y : x);
-        return this._set(this._x * x, this._y * y, this._z * (z || 1));
+    scale(x, y = x, z = 1) {
+        return this._set(this._x * x, this._y * y, this._z * z);
     }
 
     /**

package/src/math/vector2.js

@@ -120,8 +120,8 @@ import pool from "./../system/pooling.js";
      * @param {number} [y=x]
      * @returns {Vector2d} Reference to this object for method chaining
      */
-    scale(x, y) {
-        return this._set(this.x * x, this.y * (typeof (y) !== "undefined" ? y : x));
+    scale(x, y = x) {
+        return this._set(this.x * x, this.y * y);
     }
 
     /**

package/src/math/vector3.js

@@ -134,9 +134,8 @@ import pool from "./../system/pooling.js";
      * @param {number} [z=1]
      * @returns {Vector3d} Reference to this object for method chaining
      */
-    scale(x, y, z) {
-        y = (typeof (y) !== "undefined" ? y : x);
-        return this._set(this.x * x, this.y * y, this.z * (z || 1));
+    scale(x, y = x, z = 1) {
+        return this._set(this.x * x, this.y * y, this.z * z);
     }
 
     /**

package/src/particles/emitter.js

@@ -161,7 +161,7 @@ function createDefaultParticleTexture(w = 8, h = 8) {
 
     /**
      * Launch particles from emitter constantly (e.g. for stream)
-     * @param {number} duration - [optional] time that the emitter releases particles in ms
+     * @param {number} [duration] - time that the emitter releases particles in ms
      */
     streamParticles(duration) {
         this._enabled = true;
@@ -179,7 +179,7 @@ function createDefaultParticleTexture(w = 8, h = 8) {
 
     /**
      * Launch all particles from emitter and stop (e.g. for explosion)
-     * @param {number} total - [optional] number of particles to launch
+     * @param {number} [total] - number of particles to launch
      */
     burstParticles(total) {
         this._enabled = true;

package/src/physics/body.js

@@ -558,20 +558,24 @@ import Point from "../geometries/point.js";
      * @returns {Body} Reference to this object for method chaining
      */
     rotate(angle, v = this.getBounds().center) {
-        this.bounds.clear();
-        this.forEach((shape) => {
-            shape.rotate(angle, v);
-            this.bounds.addBounds(shape.getBounds());
-            if (shape instanceof Ellipse) {
-                // use bounds position as ellipse position is center
-                this.bounds.translate(
-                    shape.getBounds().x,
-                    shape.getBounds().y
-                );
-            } else {
-                this.bounds.translate(shape.pos);
+        if (angle !== 0) {
+            this.bounds.clear();
+            this.forEach((shape) => {
+                shape.rotate(angle, v);
+                this.bounds.addBounds(shape.getBounds());
+                /*
+                if (!(shape instanceof Ellipse)) {
+                    // ellipse position is center
+                    this.bounds.translate(shape.pos);
+                }
+                */
+            });
+            /*
+            if (typeof this.onBodyUpdate === "function") {
+                this.onBodyUpdate(this);
             }
-        });
+            */
+        }
         return this;
     }