melonjs 14.5.0 → 15.1.0

package/src/level/tiled/TMXObject.js

@@ -191,7 +191,7 @@ export default class TMXObject {
      */
     setTile(tilesets) {
         // get the corresponding tileset
-        var tileset = tilesets.getTilesetByGid(this.gid);
+        let tileset = tilesets.getTilesetByGid(this.gid);
 
         if (tileset.isCollection === false) {
             // set width and height equal to tile size
@@ -209,8 +209,8 @@ export default class TMXObject {
      * @returns {Polygon[]|Line[]|Ellipse[]} an array of shape objects
      */
     parseTMXShapes() {
-        var i = 0;
-        var shapes = [];
+        let i = 0;
+        let shapes = [];
 
         // add an ellipse shape
         if (this.isEllipse === true) {
@@ -226,7 +226,7 @@ export default class TMXObject {
         } else {
             // add a polygon
             if (this.isPolygon === true) {
-                var _polygon = pool.pull("Polygon", 0, 0, this.points);
+                let _polygon = pool.pull("Polygon", 0, 0, this.points);
                 // make sure it's a convex polygon
                 if (_polygon.isConvex() === false ) {
                     throw new Error("collision polygones in Tiled should be defined as Convex");
@@ -234,9 +234,9 @@ export default class TMXObject {
                 shapes.push(_polygon.rotate(this.rotation));
 
             } else if (this.isPolyLine === true) {
-                var p = this.points;
-                var p1, p2;
-                var segments = p.length - 1;
+                let p = this.points;
+                let p1, p2;
+                let segments = p.length - 1;
                 for (i = 0; i < segments; i++) {
                     // clone the value before, as [i + 1]
                     // is reused later by the next segment

package/src/level/tiled/TMXTile.js

@@ -16,14 +16,14 @@ import { TMX_FLIP_V, TMX_FLIP_H, TMX_FLIP_AD, TMX_CLEAR_BIT_MASK } from "./const
      * @param {TMXTileset} tileset - the corresponding tileset object
      */
     constructor(x, y, gid, tileset) {
-        var width, height;
+        let width, height;
 
         // call the parent constructor
         super();
 
         // determine the tile size
         if (tileset.isCollection) {
-            var image = tileset.getTileImage(gid & TMX_CLEAR_BIT_MASK);
+            let image = tileset.getTileImage(gid & TMX_CLEAR_BIT_MASK);
             width = image.width;
             height = image.height;
         } else {
@@ -120,12 +120,12 @@ import { TMX_FLIP_V, TMX_FLIP_H, TMX_FLIP_AD, TMX_CLEAR_BIT_MASK } from "./const
      * @returns {Renderable} a me.Sprite object
      */
     getRenderable(settings) {
-        var renderable;
-        var tileset = this.tileset;
+        let renderable;
+        let tileset = this.tileset;
 
         if (tileset.animations.has(this.tileId)) {
-            var frames = [];
-            var frameId = [];
+            let frames = [];
+            let frameId = [];
             (tileset.animations.get(this.tileId).frames).forEach((frame) => {
                 frameId.push(frame.tileid);
                 frames.push({
@@ -139,7 +139,7 @@ import { TMX_FLIP_V, TMX_FLIP_H, TMX_FLIP_AD, TMX_CLEAR_BIT_MASK } from "./const
 
         } else {
             if (tileset.isCollection === true) {
-                var image = tileset.getTileImage(this.tileId);
+                let image = tileset.getTileImage(this.tileId);
                 renderable = new Sprite(0, 0,
                     Object.assign({
                         image: image

package/src/level/tiled/TMXTileMap.js

@@ -31,7 +31,7 @@ function readImageLayer(map, data, z) {
     applyTMXProperties(data.properties, data);
 
     // create the layer
-    var imageLayer = pool.pull("ImageLayer",
+    let imageLayer = pool.pull("ImageLayer",
         // x/y is deprecated since 0.15 and replace by offsetx/y
         +data.offsetx || +data.x || 0,
         +data.offsety || +data.y || 0,
@@ -47,7 +47,7 @@ function readImageLayer(map, data, z) {
 
 
     // set some additional flags
-    var visible = typeof(data.visible) !== "undefined" ? data.visible : true;
+    let visible = typeof(data.visible) !== "undefined" ? data.visible : true;
     imageLayer.setOpacity(visible ? +data.opacity : 0);
 
     return imageLayer;
@@ -80,7 +80,7 @@ function readObjectGroup(map, data, z) {
      * @param {object} data - TMX map in JSON format
      * @example
      * // create a new level object based on the TMX JSON object
-     * var level = new me.TMXTileMap(levelId, me.loader.getTMX(levelId));
+     * let level = new me.TMXTileMap(levelId, me.loader.getTMX(levelId));
      * // add the level to the game world container
      * level.addTo(me.game.world, true);
      */
@@ -242,7 +242,7 @@ function readObjectGroup(map, data, z) {
         }
 
         // to automatically increment z index
-        var zOrder = 0;
+        let zOrder = 0;
 
         // Tileset information
         if (!this.tilesets) {
@@ -252,7 +252,7 @@ function readObjectGroup(map, data, z) {
 
         // parse all tileset objects
         if (typeof (data.tilesets) !== "undefined") {
-            var tilesets = data.tilesets;
+            let tilesets = data.tilesets;
             tilesets.forEach((tileset) => {
                 // add the new tileset
                 this.tilesets.add(readTileset(tileset));
@@ -309,15 +309,15 @@ function readObjectGroup(map, data, z) {
      * @param {boolean} [setViewportBounds=false] - if true, set the viewport bounds to the map size, this should be set to true especially if adding a level to the game world container.
      * @example
      * // create a new level object based on the TMX JSON object
-     * var level = new me.TMXTileMap(levelId, me.loader.getTMX(levelId));
+     * let level = new me.TMXTileMap(levelId, me.loader.getTMX(levelId));
      * // add the level to the game world container
      * level.addTo(me.game.world, true, true);
      */
     addTo(container, flatten, setViewportBounds) {
-        var _sort = container.autoSort;
-        var _depth = container.autoDepth;
+        let _sort = container.autoSort;
+        let _depth = container.autoDepth;
 
-        var levelBounds = this.getBounds();
+        let levelBounds = this.getBounds();
 
         // disable auto-sort and auto-depth
         container.autoSort = false;
@@ -383,15 +383,15 @@ function readObjectGroup(map, data, z) {
      * @returns {Renderable[]} Array of Objects
      */
     getObjects(flatten) {
-        var objects = [];
-        var isCollisionGroup = false;
-        var targetContainer;
+        let objects = [];
+        let isCollisionGroup = false;
+        let targetContainer;
 
         // parse the map for objects
         this.readMapObjects(this.data);
 
-        for (var g = 0; g < this.objectGroups.length; g++) {
-            var group = this.objectGroups[g];
+        for (let g = 0; g < this.objectGroups.length; g++) {
+            let group = this.objectGroups[g];
 
             // check if this is the collision shape group
             isCollisionGroup = group.name.toLowerCase().includes(COLLISION_GROUP);
@@ -415,13 +415,13 @@ function readObjectGroup(map, data, z) {
 
             // iterate through the group and add all object into their
             // corresponding target Container
-            for (var o = 0; o < group.objects.length; o++) {
+            for (let o = 0; o < group.objects.length; o++) {
                 // TMX object settings
-                var settings = group.objects[o];
+                let settings = group.objects[o];
                 // reference to the instantiated object
-                var obj;
+                let obj;
                 // a reference to the default shape
-                var shape;
+                let shape;
 
                 // Tiled uses 0,0 by default
                 if (typeof (settings.anchorPoint) === "undefined") {

package/src/level/tiled/TMXTileset.js

@@ -13,7 +13,7 @@ import { getTMX, getImage } from "./../../loader/loader.js";
      *  @param {object} tileset - tileset data in JSON format ({@link http://docs.mapeditor.org/en/stable/reference/tmx-map-format/#tileset})
      */
     constructor(tileset) {
-        var i = 0;
+        let i = 0;
         // first gid
 
         // tile properties (collidable, etc..)
@@ -26,8 +26,8 @@ import { getTMX, getImage } from "./../../loader/loader.js";
 
         // check if an external tileset is defined
         if (typeof(tileset.source) !== "undefined") {
-            var src = tileset.source;
-            var ext = fileUtil.getExtension(src);
+            let src = tileset.source;
+            let ext = fileUtil.getExtension(src);
             if (ext === "tsx" || ext === "json") {
                 // load the external tileset (TSX/JSON)
                 tileset = getTMX(fileUtil.getBasename(src));
@@ -76,7 +76,7 @@ import { getTMX, getImage } from "./../../loader/loader.js";
          */
         this._lastUpdate = 0;
 
-        var tiles = tileset.tiles;
+        let tiles = tileset.tiles;
         for (i in tiles) {
             if (tiles.hasOwnProperty(i)) {
                 if ("animation" in tiles[i]) {
@@ -91,8 +91,8 @@ import { getTMX, getImage } from "./../../loader/loader.js";
                 // set tile properties, if any
                 if ("properties" in tiles[i]) {
                     if (Array.isArray(tiles[i].properties)) { // JSON (new format)
-                        var tileProperty = {};
-                        for (var j in tiles[i].properties) {
+                        let tileProperty = {};
+                        for (let j in tiles[i].properties) {
                             tileProperty[tiles[i].properties[j].name] = tiles[i].properties[j].value;
                         }
                         this.setTileProperty(+tiles[i].id + this.firstgid, tileProperty);
@@ -101,7 +101,7 @@ import { getTMX, getImage } from "./../../loader/loader.js";
                     }
                 }
                 if ("image" in tiles[i]) {
-                    var image = getImage(tiles[i].image);
+                    let image = getImage(tiles[i].image);
                     if (!image) {
                         throw new Error("melonJS: '" + tiles[i].image + "' file for tile '" + (+i + this.firstgid) + "' not found!");
                     }
@@ -112,14 +112,14 @@ import { getTMX, getImage } from "./../../loader/loader.js";
 
         this.isCollection = this.imageCollection.length > 0;
 
-        var offset = tileset.tileoffset;
+        let offset = tileset.tileoffset;
         if (offset) {
             this.tileoffset.x = +offset.x;
             this.tileoffset.y = +offset.y;
         }
 
         // set tile properties, if any (JSON old format)
-        var tileInfo = tileset.tileproperties;
+        let tileInfo = tileset.tileproperties;
         if (tileInfo) {
             for (i in tileInfo) {
                 if (tileInfo.hasOwnProperty(i)) {
@@ -148,8 +148,8 @@ import { getTMX, getImage } from "./../../loader/loader.js";
             this.atlas = this.texture.getAtlas();
 
             // calculate the number of tiles per horizontal line
-            var hTileCount = +tileset.columns || Math.round(this.image.width / (this.tilewidth + this.spacing));
-            var vTileCount = Math.round(this.image.height / (this.tileheight + this.spacing));
+            let hTileCount = +tileset.columns || Math.round(this.image.width / (this.tilewidth + this.spacing));
+            let vTileCount = Math.round(this.image.height / (this.tileheight + this.spacing));
             if (tileset.tilecount % hTileCount > 0) {
                 ++vTileCount;
             }
@@ -198,7 +198,7 @@ import { getTMX, getImage } from "./../../loader/loader.js";
      * @returns {number} View tile ID
      */
     getViewTileId(gid) {
-        var localId = gid - this.firstgid;
+        let localId = gid - this.firstgid;
 
         if (this.animations.has(localId)) {
             // return the current corresponding tile id if animated
@@ -219,7 +219,7 @@ import { getTMX, getImage } from "./../../loader/loader.js";
 
     // update tile animations
     update(dt) {
-        var duration = 0,
+        let duration = 0,
             now = timer.getTime(),
             result = false;
 
@@ -267,7 +267,7 @@ import { getTMX, getImage } from "./../../loader/loader.js";
             );
         } else {
             // use the tileset texture
-            var offset = this.atlas[this.getViewTileId(tmxTile.tileId)].offset;
+            let offset = this.atlas[this.getViewTileId(tmxTile.tileId)].offset;
             // draw the tile
             renderer.drawImage(
                 this.image,

package/src/level/tiled/TMXTilesetGroup.js

@@ -36,13 +36,13 @@ import { TMX_CLEAR_BIT_MASK } from "./constants";
      * @returns {TMXTileset} corresponding tileset
      */
     getTilesetByGid(gid) {
-        var invalidRange = -1;
+        let invalidRange = -1;
 
         // clear the gid of all flip/rotation flags
         gid &= TMX_CLEAR_BIT_MASK;
 
         // cycle through all tilesets
-        for (var i = 0, len = this.tilesets.length; i < len; i++) {
+        for (let i = 0, len = this.tilesets.length; i < len; i++) {
             // return the corresponding tileset if matching
             if (this.tilesets[i].contains(gid)) {
                 return this.tilesets[i];

package/src/level/tiled/TMXUtils.js

@@ -1,11 +1,11 @@
-import { isBoolean, isNumeric } from "../../utils/string";
+import utils from "../../utils/utils.js";
 
 /**
  * set and interpret a TMX property value
  * @ignore
  */
 function setTMXValue(name, type, value) {
-    var match;
+    let match;
 
     if (typeof(value) !== "string") {
         // Value is already normalized (e.g. with JSON maps)
@@ -25,11 +25,11 @@ function setTMXValue(name, type, value) {
 
         default :
             // try to parse it anyway
-            if (!value || isBoolean(value)) {
+            if (!value || utils.string.isBoolean(value)) {
                 // if value not defined or boolean
                 value = value ? (value === "true") : true;
             }
-            else if (isNumeric(value)) {
+            else if (utils.string.isNumeric(value)) {
                 // check if numeric
                 value = Number(value);
             }
@@ -82,8 +82,8 @@ function setTMXValue(name, type, value) {
 function parseAttributes(obj, elt) {
     // do attributes
     if (elt.attributes && elt.attributes.length > 0) {
-        for (var j = 0; j < elt.attributes.length; j++) {
-            var attribute = elt.attributes.item(j);
+        for (let j = 0; j < elt.attributes.length; j++) {
+            let attribute = elt.attributes.item(j);
             if (typeof(attribute.name) !== "undefined") {
                 // DOM4 (Attr no longer inherit from Node)
                 obj[attribute.name] = attribute.value;
@@ -96,14 +96,19 @@ function parseAttributes(obj, elt) {
 }
 
 /**
- * decompress zlib/gzip data (NOT IMPLEMENTED)
+ * decompress and decode zlib/gzip data
  * @ignore
  * @name decompress
- * @param  {number[]} data- -  Array of bytes
- * @param  {string} format- -  compressed data format ("gzip","zlib")
+ * @param {string} input - Base64 encoded and compressed data
+ * @param {string} format - compressed data format ("gzip","zlib", "zstd")
+ * @returns {Uint32Array} Decoded and decompress data
  */
-export function decompress() {
-    throw new Error("GZIP/ZLIB compressed TMX Tile Map not supported!");
+export function decompress(data, format) {
+    if (typeof utils.inflateb64 === "function") {
+        return utils.inflateb64(data, format);
+    } else {
+        throw new Error("GZIP/ZLIB compressed TMX Tile Map not supported!");
+    }
 }
 
 /**
@@ -114,10 +119,10 @@ export function decompress() {
  * @returns {number[]} Decoded data
  */
 export function decodeCSV(input) {
-    var entries = input.replace("\n", "").trim().split(",");
+    let entries = input.replace("\n", "").trim().split(",");
 
-    var result = [];
-    for (var i = 0; i < entries.length; i++) {
+    let result = [];
+    for (let i = 0; i < entries.length; i++) {
         result.push(+entries[i]);
     }
     return result;
@@ -134,9 +139,9 @@ export function decodeCSV(input) {
 export function decodeBase64AsArray(input, bytes) {
     bytes = bytes || 1;
 
-    var i, j, len;
-    var dec = globalThis.atob(input.replace(/[^A-Za-z0-9\+\/\=]/g, ""));
-    var ar = new Uint32Array(dec.length / bytes);
+    let i, j, len;
+    let dec = globalThis.atob(input.replace(/[^A-Za-z0-9\+\/\=]/g, ""));
+    let ar = new Uint32Array(dec.length / bytes);
 
     for (i = 0, len = dec.length / bytes; i < len; i++) {
         ar[i] = 0;
@@ -160,12 +165,12 @@ export function decode(data, encoding, compression) {
             return decodeCSV(data);
 
         case "base64":
-            var decoded = decodeBase64AsArray(data, 4);
-            return (
-                (compression === "none") ?
-                decoded :
-                decompress(decoded, compression)
-            );
+            if (compression !== "none") {
+                data = decompress(data, compression);
+            } else {
+                data = decodeBase64AsArray(data, 4);
+            }
+            return data;
 
         case "none":
             return data;
@@ -183,11 +188,11 @@ export function decode(data, encoding, compression) {
  * @ignore
  */
 export function normalize(obj, item) {
-    var nodeName = item.nodeName;
+    let nodeName = item.nodeName;
 
     switch (nodeName) {
         case "data":
-            var data = parse(item);
+            var data = parse(item);  // <= "Unexpected lexical declaration in case block" if using let
 
             data.encoding = data.encoding || "xml";
 
@@ -225,7 +230,7 @@ export function normalize(obj, item) {
         case "layer":
         case "objectgroup":
         case "group":
-            var layer = parse(item);
+            var layer = parse(item); //  // <= "Unexpected lexical declaration in case block" if using let
             layer.type = (nodeName === "layer" ? "tilelayer" : nodeName);
             if (layer.image) {
                 layer.image = layer.image.source;
@@ -241,13 +246,13 @@ export function normalize(obj, item) {
 
         case "frame":
         case "object":
-            var name = nodeName + "s";
+            var name = nodeName + "s";  // <= "Unexpected lexical declaration in case block" if using let
             obj[name] = obj[name] || [];
             obj[name].push(parse(item));
             break;
 
         case "tile":
-            var tile = parse(item);
+            var tile = parse(item);  // <= "Unexpected lexical declaration in case block" if using let
             if (tile.image) {
                 tile.imagewidth = tile.image.width;
                 tile.imageheight = tile.image.height;
@@ -258,7 +263,7 @@ export function normalize(obj, item) {
             break;
 
         case "tileset":
-            var tileset = parse(item);
+            var tileset = parse(item);  // <= "Unexpected lexical declaration in case block" if using let
             if (tileset.image) {
                 tileset.imagewidth = tileset.image.width;
                 tileset.imageheight = tileset.image.height;
@@ -274,10 +279,10 @@ export function normalize(obj, item) {
             obj[nodeName] = [];
 
             // Get a point array
-            var points = parse(item).points.split(" ");
+            var points = parse(item).points.split(" ");  // <= "Unexpected lexical declaration in case block" if using let
 
             // And normalize them into an array of vectors
-            for (var i = 0, v; i < points.length; i++) {
+            for (let i = 0, v; i < points.length; i++) {
                 v = points[i].split(",");
                 obj[nodeName].push({
                     "x" : +v[0],
@@ -292,7 +297,7 @@ export function normalize(obj, item) {
             break;
 
         case "property":
-            var property = parse(item);
+            var property = parse(item);  // <= "Unexpected lexical declaration in case block" if using let
             // for custom properties, text is used
             var value = (typeof property.value !== "undefined") ? property.value : property.text;
 
@@ -316,9 +321,9 @@ export function normalize(obj, item) {
  */
 export function parse(xml) {
     // Create the return object
-    var obj = {};
+    let obj = {};
 
-    var text = "";
+    let text = "";
 
     if (xml.nodeType === 1) {
         // do attributes
@@ -353,14 +358,14 @@ export function parse(xml) {
  * @ignore
  */
 export function applyTMXProperties(obj, data) {
-    var properties = data.properties;
-    var types = data.propertytypes;
+    let properties = data.properties;
+    let types = data.propertytypes;
     if (typeof(properties) !== "undefined") {
-        for (var property in properties) {
+        for (let property in properties) {
             if (properties.hasOwnProperty(property)) {
-                var type = "string";
-                var name = property;
-                var value = properties[property];
+                let type = "string";
+                let name = property;
+                let value = properties[property];
                 // proof-check for new and old JSON format
                 if (typeof properties[property].name !== "undefined") {
                     name = properties[property].name;