melonjs 14.3.0 → 14.5.0

package/src/input/gamepad.js

@@ -55,23 +55,17 @@ var leadingZeroRE = /^0+/;
  * @ignore
  */
 function addMapping(id, mapping) {
-    var expanded_id = id.replace(vendorProductRE, (_, a, b) => {
-        return (
-            "000".slice(a.length - 1) + a + "-" +
-            "000".slice(b.length - 1) + b + "-"
-        );
-    });
-    var sparse_id = id.replace(vendorProductRE, (_, a, b) => {
-        return (
-            a.replace(leadingZeroRE, "") + "-" +
-            b.replace(leadingZeroRE, "") + "-"
-        );
-    });
+    var expanded_id = id.replace(vendorProductRE, (_, a, b) =>
+        "000".slice(a.length - 1) + a + "-" +
+        "000".slice(b.length - 1) + b + "-"
+    );
+    var sparse_id = id.replace(vendorProductRE, (_, a, b) =>
+        a.replace(leadingZeroRE, "") + "-" +
+        b.replace(leadingZeroRE, "") + "-"
+    );
 
     // Normalize optional parameters
-    mapping.analog = mapping.analog || mapping.buttons.map(() => {
-        return -1;
-    });
+    mapping.analog = mapping.analog || mapping.buttons.map(() => -1);
     mapping.normalize_fn = mapping.normalize_fn || function (value) { return value; };
 
     remap.set(expanded_id, mapping);

package/src/input/pointerevent.js

@@ -315,21 +315,7 @@ function dispatchEvent(normalizedEvents) {
                     pointer.gameLocalY = pointer.gameY - parentBounds.y;
                 }
 
-                var gameX = pointer.gameX;
-                var gameY = pointer.gameY;
-
-                // apply inverse transformation for renderable
-                if (typeof region.currentTransform !== "undefined") {
-                    if (!region.currentTransform.isIdentity()) {
-                        var invV = region.currentTransform.applyInverse(
-                            pool.pull("Vector2d", gameX, gameY)
-                        );
-                        gameX = invV.x;
-                        gameY = invV.y;
-                        pool.push(invV);
-                    }
-                }
-                eventInBounds = bounds.contains(gameX, gameY);
+                eventInBounds = bounds.contains(pointer.gameX, pointer.gameY);
 
                 switch (pointer.type) {
                     case POINTER_MOVE[0]:

package/src/lang/console.js

@@ -0,0 +1,36 @@
+
+/**
+ * display a deprecation warning in the console
+ * @param {string} deprecated - deprecated class,function or property name
+ * @param {string} replacement - the replacement class, function, or property name
+ * @param {string} version - the version since when the lass,function or property is deprecated
+ */
+export function warning(deprecated, replacement, version) {
+    var msg = "melonJS: %s is deprecated since version %s, please use %s";
+    var stack = new Error().stack;
+
+    if (console.groupCollapsed) {
+        console.groupCollapsed(
+            "%c" + msg,
+            "font-weight:normal;color:yellow;",
+            deprecated,
+            version,
+            replacement
+        );
+    } else {
+        console.warn(
+            msg,
+            deprecated,
+            version,
+            replacement
+        );
+    }
+
+    if (typeof stack !== "undefined") {
+        console.warn(stack);
+    }
+
+    if (console.groupCollapsed) {
+        console.groupEnd();
+    }
+}

package/src/lang/deprecated.js

@@ -2,47 +2,12 @@ import { TextureAtlas } from "./../video/texture/atlas.js";
 import Renderer from "./../video/renderer.js";
 import { Draggable, DropTarget } from "./../renderable/dragndrop.js";
 import UISpriteElement from "./../renderable/ui/uispriteelement.js";
+import { warning } from "./console.js";
+
 /*
  * placeholder for all deprecated classes and corresponding alias for backward compatibility
  */
 
-/**
- * display a deprecation warning in the console
- * @ignore
- * @param {string} deprecated - deprecated class,function or property name
- * @param {string} replacement - the replacement class, function, or property name
- * @param {string} version - the version since when the lass,function or property is deprecated
- */
-export function warning(deprecated, replacement, version) {
-    var msg = "melonJS: %s is deprecated since version %s, please use %s";
-    var stack = new Error().stack;
-
-    if (console.groupCollapsed) {
-        console.groupCollapsed(
-            "%c" + msg,
-            "font-weight:normal;color:yellow;",
-            deprecated,
-            version,
-            replacement
-        );
-    } else {
-        console.warn(
-            msg,
-            deprecated,
-            version,
-            replacement
-        );
-    }
-
-    if (typeof stack !== "undefined") {
-        console.warn(stack);
-    }
-
-    if (console.groupCollapsed) {
-        console.groupEnd();
-    }
-}
-
 /**
  * Alias of {@link TextureAtlas}
  * @public

package/src/level/level.js

@@ -1,7 +1,7 @@
 import utils from "./../utils/utils.js";
 import * as event from "./../system/event.js";
 import state from "./../state/state.js";
-import loader from "./../loader/loader.js";
+import { getTMX } from "./../loader/loader.js";
 import { game } from "../index.js";
 import TMXTileMap from "./tiled/TMXTileMap.js";
 
@@ -95,7 +95,7 @@ var level = {
                 // just load the level with the XML stuff
                 if (levels[levelId] == null) {
                     //console.log("loading "+ levelId);
-                    levels[levelId] = new TMXTileMap(levelId, loader.getTMX(levelId));
+                    levels[levelId] = new TMXTileMap(levelId, getTMX(levelId));
                     // level index
                     levelIdx.push(levelId);
                 }

package/src/level/tiled/TMXGroup.js

@@ -15,66 +15,45 @@ export default class TMXGroup {
 
         /**
          * group name
-         * @public
          * @type {string}
-         * @name name
-         * @memberof TMXGroup
          */
         this.name = data.name;
 
         /**
          * group width
-         * @public
          * @type {number}
-         * @name width
-         * @memberof TMXGroup
          */
         this.width = data.width || 0;
 
         /**
          * group height
-         * @public
          * @type {number}
-         * @name height
-         * @memberof TMXGroup
          */
         this.height = data.height || 0;
 
         /**
          * tint color
-         * @public
          * @type {string}
-         * @name tintcolor
-         * @memberof TMXGroup
          */
         this.tintcolor = data.tintcolor;
 
 
         /**
          * the group class
-         * @public
          * @type {string}
-         * @name class
-         * @memberof TMXGroup
          */
         this.class = data.class;
 
         /**
          * group z order
-         * @public
          * @type {number}
-         * @name z
-         * @memberof TMXGroup
          */
         this.z = z;
 
         /**
          * group objects list definition
          * @see TMXObject
-         * @public
          * @type {object[]}
-         * @name name
-         * @memberof TMXGroup
          */
         this.objects = [];
 

package/src/level/tiled/TMXLayer.js

@@ -10,34 +10,43 @@ import { game } from "../../index.js";
  * Create required arrays for the given layer object
  * @ignore
  */
-function initArray(layer) {
+function initArray(rows, cols) {
     // initialize the array
-    layer.layerData = new Array(layer.cols);
-    for (var x = 0; x < layer.cols; x++) {
-        layer.layerData[x] = new Array(layer.rows);
-        for (var y = 0; y < layer.rows; y++) {
-            layer.layerData[x][y] = null;
+    var array = new Array(cols);
+    for (var col = 0; col < cols; col++) {
+        array[col] = new Array(rows);
+        for (var row = 0; row < rows; row++) {
+            array[col][row] = null;
         }
     }
+    return array;
 }
 
 /**
  * Set a tiled layer Data
  * @ignore
  */
-function setLayerData(layer, data) {
+function setLayerData(layer, bounds, data) {
     var idx = 0;
-    // initialize the data array
-    initArray(layer);
+    var width, height;
+
+    // layer provide rows and cols, chunk width and height
+    if (typeof bounds.rows === "undefined") {
+        width = bounds.width;
+        height = bounds.height;
+    } else {
+        width = bounds.cols;
+        height = bounds.rows;
+    }
     // set everything
-    for (var y = 0; y < layer.rows; y++) {
-        for (var x = 0; x < layer.cols; x++) {
+    for (var y = 0; y < height; y++) {
+        for (var x = 0; x < width; x++) {
             // get the value of the gid
             var gid = data[idx++];
             // fill the array
             if (gid !== 0) {
                 // add a new tile to the layer
-                layer.layerData[x][y] = layer.getTileById(gid, x, y);
+                layer.layerData[x + bounds.x][y + bounds.y] = layer.getTileById(gid, x + bounds.x, y + bounds.y);
             }
         }
     }
@@ -89,11 +98,23 @@ function preRenderLayer(layer, renderer) {
         // layer orientation
         this.orientation = orientation;
 
+        /**
+         * Horizontal layer offset in tiles
+         * @default 0
+         * @type {number}
+         */
+        this.x = 0;
+
+        /**
+         * Vertical layer offset in tiles
+         * @default 0
+         * @type {number}
+         */
+        this.y = 0;
+
         /**
          * The Layer corresponding Tilesets
-         * @public
          * @type {TMXTilesetGroup}
-         * @name TMXLayer#tilesets
          */
         this.tilesets = tilesets;
 
@@ -114,36 +135,27 @@ function preRenderLayer(layer, renderer) {
 
         /**
          * All animated tilesets in this layer
-         * @ignore
          * @type {TMXTileset[]}
-         * @name TMXLayer#animatedTilesets
          */
         this.animatedTilesets = [];
 
         /**
          * Layer contains tileset animations
-         * @public
          * @type {boolean}
-         * @name TMXLayer#isAnimated
          */
         this.isAnimated = false;
 
         /**
          * the order in which tiles on orthogonal tile layers are rendered.
          * (valid values are "left-down", "left-up", "right-down", "right-up")
-         * @public
          * @type {string}
          * @default "right-down"
-         * @name TMXLayer#renderorder
          */
         this.renderorder = data.renderorder || "right-down";
 
         /**
          * the layer class
-         * @public
          * @type {string}
-         * @name class
-         * @name TMXLayer#class
          */
         this.class = data.class;
 
@@ -189,16 +201,37 @@ function preRenderLayer(layer, renderer) {
         this.setRenderer(map.getRenderer());
 
 
-        // initialize and set the layer data
-        setLayerData(this,
-            TMXUtils.decode(
-                data.data,
-                data.encoding,
-                data.compression
-            )
-        );
-    }
+        // initialize the data array
+        this.layerData = initArray(this.rows, this.cols);
 
+        if (map.infinite === 0) {
+            // initialize and set the layer data
+            setLayerData(
+                this,
+                this,
+                TMXUtils.decode(
+                    data.data,
+                    data.encoding,
+                    data.compression
+                )
+            );
+        } else if (map.infinite === 1) {
+            // infinite map, initialize per chunk
+            data.chunks.forEach((chunk) => {
+                // initialize and set the layer data
+                setLayerData(
+                    this,
+                    chunk,
+                    TMXUtils.decode(
+                        chunk.data,
+                        data.encoding,
+                        data.compression
+                    )
+                );
+            });
+        }
+
+    }
 
     // called when the layer is added to the game world or a container
     onActivateEvent() {
@@ -223,10 +256,6 @@ function preRenderLayer(layer, renderer) {
             this.preRender = false;
         }
 
-        // Resize the bounding rect
-        this.getBounds().addBounds(this.getRenderer().getBounds(), true);
-        this.getBounds().shift(this.pos);
-
         // if pre-rendering method is use, create an offline canvas/renderer
         if ((this.preRender === true) && (!this.canvasRenderer)) {
             this.canvasRenderer = new CanvasRenderer({
@@ -248,9 +277,6 @@ function preRenderLayer(layer, renderer) {
 
     /**
      * Set the TMX renderer for this layer object
-     * @name setRenderer
-     * @memberof TMXLayer
-     * @public
      * @param {TMXRenderer} renderer
      * @example
      * // use the parent map default renderer
@@ -263,21 +289,14 @@ function preRenderLayer(layer, renderer) {
 
     /**
      * Return the layer current renderer object
-     * @name getRenderer
-     * @memberof TMXLayer
-     * @public
      * @returns {TMXRenderer} renderer
      */
     getRenderer() {
         return this.renderer;
     }
 
-
     /**
      * Return the TileId of the Tile at the specified position
-     * @name getTileId
-     * @memberof TMXLayer
-     * @public
      * @param {number} x - X coordinate (in world/pixels coordinates)
      * @param {number} y - Y coordinate (in world/pixels coordinates)
      * @returns {number} TileId or null if there is no Tile at the given position
@@ -289,9 +308,6 @@ function preRenderLayer(layer, renderer) {
 
     /**
      * Return the Tile object at the specified position
-     * @name getTile
-     * @memberof TMXLayer
-     * @public
      * @param {number} x - X coordinate (in world/pixels coordinates)
      * @param {number} y - Y coordinate (in world/pixels coordinates)
      * @returns {Tile} corresponding tile or null if there is no defined tile at the coordinate or if outside of the layer bounds
@@ -314,9 +330,6 @@ function preRenderLayer(layer, renderer) {
 
     /**
      * assign the given Tile object to the specified position
-     * @name getTile
-     * @memberof TMXLayer
-     * @public
      * @param {Tile} tile - the tile object to be assigned
      * @param {number} x - x coordinate (in world/pixels coordinates)
      * @param {number} y - y coordinate (in world/pixels coordinates)
@@ -329,9 +342,6 @@ function preRenderLayer(layer, renderer) {
 
     /**
      * return a new the Tile object corresponding to the given tile id
-     * @name setTile
-     * @memberof TMXLayer
-     * @public
      * @param {number} tileId - tileId
      * @param {number} x - X coordinate (in world/pixels coordinates)
      * @param {number} y - Y coordinate (in world/pixels coordinates)
@@ -347,9 +357,6 @@ function preRenderLayer(layer, renderer) {
 
     /**
      * Return the Tile object at the specified tile coordinates
-     * @name cellAt
-     * @memberof TMXLayer
-     * @public
      * @param {number} x - x position of the tile (in Tile unit)
      * @param {number} y - x position of the tile (in Tile unit)
      * @param {number} [boundsCheck=true] - check first if within the layer bounds
@@ -373,9 +380,6 @@ function preRenderLayer(layer, renderer) {
 
     /**
      * clear the tile at the specified position
-     * @name clearTile
-     * @memberof TMXLayer
-     * @public
      * @param {number} x - X coordinate (in map coordinates: row/column)
      * @param {number} y - Y coordinate (in map coordinates: row/column)
      * @example
@@ -405,7 +409,6 @@ function preRenderLayer(layer, renderer) {
             }
             return result;
         }
-
         return false;
     }
 

package/src/level/tiled/TMXObject.js

@@ -15,185 +15,125 @@ export default class TMXObject {
 
         /**
          * point list in JSON format
-         * @public
          * @type {object[]}
-         * @name points
-         * @memberof TMXObject
          */
         this.points = undefined;
 
         /**
          * object name
-         * @public
          * @type {string}
-         * @name name
-         * @memberof TMXObject
          */
         this.name = settings.name;
 
         /**
          * object x position
-         * @public
          * @type {number}
-         * @name x
-         * @memberof TMXObject
          */
         this.x = +settings.x;
 
         /**
          * object y position
-         * @public
          * @type {number}
-         * @name y
-         * @memberof TMXObject
          */
         this.y = +settings.y;
 
         /**
          * object z order
-         * @public
          * @type {number}
-         * @name z
-         * @memberof TMXObject
          */
         this.z = +z;
 
         /**
          * object width
-         * @public
          * @type {number}
-         * @name width
-         * @memberof TMXObject
          */
         this.width = +settings.width || 0;
 
         /**
          * object height
-         * @public
          * @type {number}
-         * @name height
-         * @memberof TMXObject
          */
         this.height = +settings.height || 0;
 
         /**
          * object gid value
          * when defined the object is a tiled object
-         * @public
          * @type {number}
-         * @name gid
-         * @memberof TMXObject
          */
         this.gid = +settings.gid || null;
 
         /**
          * tint color
-         * @public
          * @type {string}
-         * @name tintcolor
-         * @memberof TMXObject
          */
         this.tintcolor = settings.tintcolor;
 
         /**
          * object type
-         * @public
          * @type {string}
          * @deprecated since Tiled 1.9
          * @see https://docs.mapeditor.org/en/stable/reference/tmx-changelog/#tiled-1-9
-         * @name type
-         * @memberof TMXObject
          */
         this.type = settings.type;
 
         /**
          * the object class
-         * @public
          * @type {string}
-         * @name class
-         * @memberof TMXObject
          */
         this.class = typeof settings.class !== "undefined" ? settings.class : settings.type;
 
         /**
          * object text
-         * @public
          * @type {object}
          * @see http://docs.mapeditor.org/en/stable/reference/tmx-map-format/#text
-         * @name text
-         * @memberof TMXObject
          */
         this.text = undefined;
 
         /**
          * The rotation of the object in radians clockwise (defaults to 0)
-         * @public
          * @type {number}
-         * @name rotation
-         * @memberof TMXObject
          */
         this.rotation = degToRad(+settings.rotation || 0);
 
         /**
          * object unique identifier per level (Tiled 0.11.x+)
-         * @public
          * @type {number}
-         * @name id
-         * @memberof TMXObject
          */
         this.id = +settings.id || undefined;
 
         /**
          * object orientation (orthogonal or isometric)
-         * @public
          * @type {string}
-         * @name orientation
-         * @memberof TMXObject
          */
         this.orientation = map.orientation;
 
         /**
          * the collision shapes defined for this object
-         * @public
          * @type {object[]}
-         * @name shapes
-         * @memberof TMXObject
          */
         this.shapes = undefined;
 
         /**
          * if true, the object is an Ellipse
-         * @public
          * @type {boolean}
-         * @name isEllipse
-         * @memberof TMXObject
          */
         this.isEllipse = false;
 
         /**
          * if true, the object is a Point
-         * @public
          * @type {boolean}
-         * @name isPoint
-         * @memberof TMXObject
          */
         this.isPoint = false;
 
         /**
          * if true, the object is a Polygon
-         * @public
          * @type {boolean}
-         * @name isPolygon
-         * @memberof TMXObject
          */
         this.isPolygon = false;
 
         /**
          * if true, the object is a PolyLine
-         * @public
          * @type {boolean}
-         * @name isPolyLine
-         * @memberof TMXObject
          */
         this.isPolyLine = false;
 
@@ -265,8 +205,6 @@ export default class TMXObject {
 
     /**
      * parses the TMX shape definition and returns a corresponding array of me.Shape object
-     * @name parseTMXShapes
-     * @memberof TMXObject
      * @private
      * @returns {Polygon[]|Line[]|Ellipse[]} an array of shape objects
      */