melonjs 15.1.4 → 15.1.5

package/src/input/pointerevent.js

@@ -210,7 +210,7 @@ function enablePointerEvent() {
  */
 function findActiveEvent(activeEventList, eventTypes) {
     for (let i = 0; i < eventTypes.length; i++) {
-        let event = activeEventList.indexOf(eventTypes[i]);
+        const event = activeEventList.indexOf(eventTypes[i]);
         if (event !== -1) {
             return eventTypes[i];
         }
@@ -223,7 +223,7 @@ function findActiveEvent(activeEventList, eventTypes) {
 function findAllActiveEvents(activeEventList, eventTypes) {
     let events = [];
     for (let i = 0; i < eventTypes.length; i++) {
-        let event = activeEventList.indexOf(eventTypes[i]);
+        const event = activeEventList.indexOf(eventTypes[i]);
         if (event !== -1) {
             events.push(eventTypes[i]);
         }
@@ -293,10 +293,10 @@ function dispatchEvent(normalizedEvents) {
 
         for (let c = candidates.length, candidate; c--, (candidate = candidates[c]);) {
             if (eventHandlers.has(candidate) && (candidate.isKinematic !== true)) {
-                let handlers = eventHandlers.get(candidate);
-                let region = handlers.region;
-                let ancestor = region.ancestor;
-                let bounds = region.getBounds();
+                const handlers = eventHandlers.get(candidate);
+                const region = handlers.region;
+                const ancestor = region.ancestor;
+                const bounds = region.getBounds();
                 let eventInBounds = false;
 
                 if (region.isFloating === true) {
@@ -404,7 +404,7 @@ function normalizeEvent(originalEvent) {
     if (device.touchEvent && originalEvent.changedTouches) {
         // iOS/Android Touch event
         for (let i = 0, l = originalEvent.changedTouches.length; i < l; i++) {
-            let touchEvent = originalEvent.changedTouches[i];
+            const touchEvent = originalEvent.changedTouches[i];
             _pointer = T_POINTERS.pop();
             _pointer.setEvent(
                 originalEvent,
@@ -682,7 +682,7 @@ export function registerPointerEvent(eventType, region, callback) {
     // allocate array if not defined
     let handlers = eventHandlers.get(region);
     for (let i = 0; i < eventTypes.length; i++) {
-        eventType = eventTypes[i];
+        const eventType = eventTypes[i];
         if (handlers.callbacks[eventType]) {
             handlers.callbacks[eventType].push(callback);
         } else {
@@ -715,7 +715,7 @@ export function releasePointerEvent(eventType, region, callback) {
     let handlers = eventHandlers.get(region);
     if (typeof (handlers) !== "undefined") {
         for (let i = 0; i < eventTypes.length; i++) {
-            eventType = eventTypes[i];
+            const eventType = eventTypes[i];
             if (handlers.callbacks[eventType]) {
                 if (typeof (callback) !== "undefined") {
                     remove(handlers.callbacks[eventType], callback);

package/src/level/tiled/TMXLayer.js

@@ -42,7 +42,7 @@ function setLayerData(layer, bounds, data) {
     for (let y = 0; y < height; y++) {
         for (let x = 0; x < width; x++) {
             // get the value of the gid
-            let gid = data[idx++];
+            const gid = data[idx++];
             // fill the array
             if (gid !== 0) {
                 // add a new tile to the layer
@@ -61,7 +61,7 @@ function preRenderLayer(layer, renderer) {
     for (let y = 0; y < layer.rows; y++) {
         for (let x = 0; x < layer.cols; x++) {
             // get the value of the gid
-            let tile = layer.layerData[x][y];
+            const tile = layer.layerData[x][y];
             // draw the tile if defined
             if (tile instanceof Tile) {
                 // add a new tile to the layer
@@ -128,7 +128,7 @@ function preRenderLayer(layer, renderer) {
             "height" : 0
         };
         for (let i = 0; i < this.tilesets.length; i++) {
-            let tileset = this.tilesets.getTilesetByIndex(i);
+            const tileset = this.tilesets.getTilesetByIndex(i);
             this.maxTileSize.width = Math.max(this.maxTileSize.width, tileset.tilewidth);
             this.maxTileSize.height = Math.max(this.maxTileSize.height, tileset.tileheight);
         }

package/src/level/tiled/TMXUtils.js

@@ -83,7 +83,7 @@ function parseAttributes(obj, elt) {
     // do attributes
     if (elt.attributes && elt.attributes.length > 0) {
         for (let j = 0; j < elt.attributes.length; j++) {
-            let attribute = elt.attributes.item(j);
+            const attribute = elt.attributes.item(j);
             if (typeof(attribute.name) !== "undefined") {
                 // DOM4 (Attr no longer inherit from Node)
                 obj[attribute.name] = attribute.value;
@@ -282,8 +282,8 @@ export function normalize(obj, item) {
             var points = parse(item).points.split(" ");  // <= "Unexpected lexical declaration in case block" if using let
 
             // And normalize them into an array of vectors
-            for (let i = 0, v; i < points.length; i++) {
-                v = points[i].split(",");
+            for (let i = 0; i < points.length; i++) {
+                const v = points[i].split(",");
                 obj[nodeName].push({
                     "x" : +v[0],
                     "y" : +v[1]

package/src/level/tiled/renderer/TMXHexagonalRenderer.js

@@ -284,7 +284,7 @@ const offsetsStaggerY = [
         let nearest = 0;
         let minDist = Number.MAX_VALUE;
         for (let i = 0; i < 4; ++i) {
-            let dc = this.centers[i].sub(rel).length2();
+            const dc = this.centers[i].sub(rel).length2();
             if (dc < minDist) {
                 minDist = dc;
                 nearest = i;

package/src/loader/loader.js

@@ -104,8 +104,9 @@ function onLoadingError(res) {
  * an asset definition to be used with the loader
  * @typedef {object} loader.Asset
  * @property {string} name - name of the asset
- * @property {string} type  - the type of the asset : "audio", binary", "image", "json","js", "tmx", "tsx", "fontface"
- * @property {string} src  - path and/or file name of the resource (for audio assets only the path is required)
+ * @property {string} type  - the type of the asset : "audio", binary", "image", "json", "js", "tmx", "tmj", "tsx", "tsj", "fontface"
+ * @property {string} [src]  - path and/or file name of the resource (for audio assets only the path is required)
+ * @property {string} [data]  - TMX data if not provided through a src url
  * @property {boolean} [stream] - Set to true to force HTML5 Audio, which allows not to wait for large file to be downloaded before playing.
  * @see loader.preload
  * @see loader.load

package/src/physics/bounds.js

@@ -190,7 +190,7 @@ import Vector2d from "./../math/vector2.js";
             this.clear();
         }
         for (let i = 0; i < vertices.length; i++) {
-            let vertex = vertices[i];
+            const vertex = vertices[i];
             if (vertex.x > this.max.x) this.max.x = vertex.x;
             if (vertex.x < this.min.x) this.min.x = vertex.x;
             if (vertex.y > this.max.y) this.max.y = vertex.y;

package/src/physics/detector.js

@@ -170,7 +170,7 @@ export default class Detector {
             if (objB.body && line.getBounds().overlaps(objB.getBounds())) {
 
                 // go trough all defined shapes in B (if any)
-                let bLen = objB.body.shapes.length;
+                const bLen = objB.body.shapes.length;
                 if ( objB.body.shapes.length === 0) {
                     continue;
                 }

package/src/physics/quadtree.js

@@ -352,7 +352,7 @@ let QT_VECTOR = new Vector2d();
      */
     hasChildren() {
         for (let i = 0; i < this.nodes.length; i = i + 1) {
-            let subnode = this.nodes[i];
+            const subnode = this.nodes[i];
             if (subnode.length > 0 || subnode.objects.length > 0) {
                 return true;
             }

package/src/physics/sat.js

@@ -58,7 +58,7 @@ function flattenPointsOn(points, normal, result) {
     let len = points.length;
     for (let i = 0; i < len; i++) {
         // The magnitude of the projection of the point onto the normal
-        let dot = points[i].dot(normal);
+        const dot = points[i].dot(normal);
         if (dot < min) { min = dot; }
         if (dot > max) { max = dot; }
     }
@@ -305,8 +305,8 @@ export function testPolygonEllipse(a, polyA, b, ellipseB, response) {
 
     // For each edge in the polygon:
     for (let i = 0; i < len; i++) {
-        let next = i === len - 1 ? 0 : i + 1;
-        let prev = i === 0 ? len - 1 : i - 1;
+        const next = i === len - 1 ? 0 : i + 1;
+        const prev = i === 0 ? len - 1 : i - 1;
         let overlap = 0;
         let overlapN = null;
 

package/src/renderable/container.js

@@ -193,10 +193,16 @@ let globalFloatingCounter = 0;
             }
         }
 
+        // add the new child
         child.ancestor = this;
         this.getChildren().push(child);
+
+        // update child bounds to reflect the new ancestor
         if (typeof child.updateBounds === "function") {
-            // update child bounds to reflect the new ancestor
+            if (this.isFloating === true) {
+                // only parent container can be floating
+                child.floating = false;
+            }
             child.updateBounds();
         }
 
@@ -217,12 +223,7 @@ let globalFloatingCounter = 0;
             child.onActivateEvent();
         }
 
-        // force repaint in case this is a static non-animated object
-        if (this.isAttachedToRoot() === true) {
-            this.isDirty = true;
-        }
-
-        // force bounds update if required
+        // force container bounds update if required
         if (this.enableChildBoundsUpdate === true) {
             this.updateBounds();
         }
@@ -245,6 +246,9 @@ let globalFloatingCounter = 0;
             }
         }
 
+        // mark the container for repaint
+        this.isDirty = true;
+
         // triggered callback if defined
         this.onChildChange.call(this, this.getChildren().length - 1);
 
@@ -271,20 +275,25 @@ let globalFloatingCounter = 0;
                     child.GUID = utils.createGUID();
                 }
             }
-            child.ancestor = this;
 
+            // add the new child
+            child.ancestor = this;
             this.getChildren().splice(index, 0, child);
 
-            if (typeof child.onActivateEvent === "function" && this.isAttachedToRoot()) {
-                child.onActivateEvent();
+            // update child bounds to reflect the new ancestor
+            if (typeof child.updateBounds === "function") {
+                if (this.isFloating === true) {
+                    // only parent container can be floating
+                    child.floating = false;
+                }
+                child.updateBounds();
             }
 
-            // force repaint in case this is a static non-animated object
-            if (this.isAttachedToRoot() === true) {
-                this.isDirty = true;
+            if (typeof child.onActivateEvent === "function" && this.isAttachedToRoot()) {
+                child.onActivateEvent();
             }
 
-            // force bounds update if required
+            // force container bounds update if required
             if (this.enableChildBoundsUpdate === true) {
                 this.updateBounds();
             }
@@ -307,6 +316,9 @@ let globalFloatingCounter = 0;
                 }
             }
 
+            // mark the container for repaint
+            this.isDirty = true;
+
             // triggered callback if defined
             this.onChildChange.call(this, index);
 
@@ -531,10 +543,9 @@ let globalFloatingCounter = 0;
     }
 
     /**
-     * update the bounding box for this shape.
-     * @ignore
-     * @param {boolean} absolute - update the bounds size and position in (world) absolute coordinates
-     * @returns {Bounds} this shape bounding box Rectangle object
+     * update the bounding box for this container.
+     * @param {boolean} [absolute=true] - update the bounds size and position in (world) absolute coordinates
+     * @returns {Bounds} this container bounding box Rectangle object
      */
     updateBounds(absolute = true) {
         let bounds = this.getBounds();
@@ -545,13 +556,14 @@ let globalFloatingCounter = 0;
         if (this.enableChildBoundsUpdate === true) {
             this.forEach((child) => {
                 if (child.isRenderable) {
-                    let childBounds = child.getBounds();
+                    let childBounds = child.updateBounds(true);
                     if (childBounds.isFinite()) {
                         bounds.addBounds(childBounds);
                     }
                 }
             });
         }
+
         return bounds;
     }
 
@@ -675,16 +687,14 @@ let globalFloatingCounter = 0;
                 child.ancestor = undefined;
             }
 
-            // force repaint in case this is a static non-animated object
-            if (this.isAttachedToRoot() === true) {
-                this.isDirty = true;
-            }
-
             // force bounds update if required
             if (this.enableChildBoundsUpdate === true) {
                 this.updateBounds();
             }
 
+            // mark the container for repaint
+            this.isDirty = true;
+
             // triggered callback if defined
             this.onChildChange.call(this, childIndex);
         }

package/src/renderable/renderable.js

@@ -263,12 +263,12 @@ import Color from "./../math/color.js";
     }
 
     /**
-     * Whether the renderable object is floating, or contained in a floating container
+     * Whether the renderable object is floating (i.e. used screen coordinates), or contained in a floating parent container
      * @see Renderable#floating
      * @type {boolean}
      */
     get isFloating() {
-        return this.floating === true || (typeof this.ancestor !== "undefined" && this.ancestor.floating === true);
+        return this.floating === true || (typeof this.ancestor !== "undefined" && this.ancestor.isFloating === true);
     }
 
     /**
@@ -577,11 +577,8 @@ import Color from "./../math/color.js";
             }
 
             if (absolute === true) {
-                bounds.centerOn(this.pos.x + bounds.x + bounds.width / 2,  this.pos.y + bounds.y + bounds.height / 2);
-                if (typeof this.ancestor !== "undefined" && typeof this.ancestor.addChild === "function" && this.floating !== true) {
-                     bounds.translate(this.ancestor.getAbsolutePosition());
-                }
-
+                var absPos = this.getAbsolutePosition();
+                bounds.centerOn(absPos.x + bounds.x + bounds.width / 2,  absPos.y + bounds.y + bounds.height / 2);
             }
             return bounds;
 
@@ -610,7 +607,7 @@ import Color from "./../math/color.js";
           }
           // XXX Cache me or something
           this._absPos.set(this.pos.x, this.pos.y);
-          if (typeof this.ancestor !== "undefined" && typeof this.ancestor.addChild === "function" && this.floating !== true) {
+          if (typeof this.ancestor !== "undefined" && typeof this.ancestor.getAbsolutePosition === "function" && this.floating !== true) {
               this._absPos.add(this.ancestor.getAbsolutePosition());
           }
           return this._absPos;

package/src/renderable/ui/uibaseelement.js

@@ -64,7 +64,7 @@ import pool from "../../system/pooling.js";
 
         /**
          * UI base elements use screen coordinates by default
-         * (Note: any child elements added to a UIBaseElement should set their floating property to false)
+         * (Note: any child elements added to a UIBaseElement should have their floating property to false)
          * @see Renderable.floating
          * @type {boolean}
          * @default true
@@ -76,6 +76,9 @@ import pool from "../../system/pooling.js";
 
         // enable event detection
         this.isKinematic = false;
+
+        // update container and children bounds automatically
+        this.enableChildBoundsUpdate = true;
     }
 
     /**
@@ -110,7 +113,7 @@ import pool from "../../system/pooling.js";
      * @returns {boolean} return false if we need to stop propagating the event
      */
     onClick(event) { // eslint-disable-line no-unused-vars
-        return false;
+        return true;
     }
 
     /**
@@ -203,7 +206,7 @@ import pool from "../../system/pooling.js";
      * @returns {boolean} return false if we need to stop propagating the event
      */
     onRelease() {
-        return false;
+        return true;
     }
 
     /**

package/src/renderable/ui/uispriteelement.js

@@ -73,7 +73,13 @@ import { registerPointerEvent, releasePointerEvent} from "./../../input/input.js
         this.holdTimeout = -1;
         this.released = true;
 
-        // GUI items use screen coordinates
+        /**
+         * if this UISpriteElement should use screen coordinates or local coordinates
+         * (Note: any UISpriteElement elements added to a floating parent container should have their floating property to false)
+         * @see Renderable.floating
+         * @type {boolean}
+         * @default true
+         */
         this.floating = true;
 
         // enable event detection

package/src/text/bitmaptext.js

@@ -232,7 +232,7 @@ import TextMetrics from "./textmetrics.js";
         }
 
         if (absolute === true) {
-            if (typeof this.ancestor !== "undefined" && typeof this.ancestor.addChild === "function" && this.floating !== true) {
+            if (typeof this.ancestor !== "undefined" && typeof this.ancestor.getAbsolutePosition === "function" && this.floating !== true) {
                  bounds.translate(this.ancestor.getAbsolutePosition());
             }
         }
@@ -311,7 +311,7 @@ import TextMetrics from "./textmetrics.js";
 
         for (let i = 0; i < this._text.length; i++) {
             x = lX;
-            let string = this._text[i].trimEnd();
+            const string = this._text[i].trimEnd();
             // adjust x pos based on alignment value
             let stringWidth = this.metrics.lineWidth(string);
             switch (this.textAlign) {

package/src/text/text.js

@@ -375,7 +375,7 @@ const toPX = [12, 24, 0.75, 1];
         setContextStyle(context, this);
 
         for (let i = 0; i < text.length; i++) {
-            let string = text[i].trimEnd();
+            const string = text[i].trimEnd();
             // draw the string
             if (this.fillStyle.alpha > 0) {
                 context.fillText(string, x, y);

package/src/video/canvas/canvas_renderer.js

@@ -392,9 +392,8 @@ import * as event from "./../../system/event.js";
         this.translate(poly.pos.x, poly.pos.y);
         context.beginPath();
         context.moveTo(poly.points[0].x, poly.points[0].y);
-        let point;
         for (let i = 1; i < poly.points.length; i++) {
-            point = poly.points[i];
+            const point = poly.points[i];
             context.lineTo(point.x, point.y);
         }
         context.lineTo(poly.points[0].x, poly.points[0].y);
@@ -689,11 +688,9 @@ import * as event from "./../../system/event.js";
         } else {
             // polygon
             const _x = mask.pos.x, _y = mask.pos.y;
-            let point;
-
             context.moveTo(_x + mask.points[0].x, _y + mask.points[0].y);
             for (let i = 1; i < mask.points.length; i++) {
-                point = mask.points[i];
+                const point = mask.points[i];
                 context.lineTo(_x + point.x, _y + point.y);
             }
         }

package/src/video/texture/canvas_texture.js

@@ -38,7 +38,7 @@ class CanvasTexture {
          * the rendering context of this CanvasTexture
          * @type {CanvasRenderingContext2D}
          */
-        this.context = this.canvas.getContext("2d", { willReadFrequently: attributes.willReadFrequently });
+        this.context = this.canvas.getContext(attributes.context, { willReadFrequently: attributes.willReadFrequently });
 
         // enable or disable antiAlias if specified
         this.setAntiAlias(attributes.antiAlias);