melonjs 15.3.0 → 15.4.0

package/src/geometries/roundrect.js

@@ -32,11 +32,8 @@ export default class RoundRect extends Rect {
 
     /**
      * the radius of the rounded corner
-     * @public
      * @type {number}
      * @default 20
-     * @name radius
-     * @memberof RoundRect
      */
     get radius() {
         return this._radius;
@@ -54,8 +51,6 @@ export default class RoundRect extends Rect {
 
     /**
      * copy the position, size and radius of the given rounded rectangle into this one
-     * @name copy
-     * @memberof RoundRect
      * @param {RoundRect} rrect - source rounded rectangle
      * @returns {RoundRect} new rectangle
      */
@@ -66,38 +61,38 @@ export default class RoundRect extends Rect {
     }
 
     /**
-     * Returns true if the rounded rectangle contains the given point
-     * @name contains
-     * @memberof RoundRect
-     * @method
-     * @param  {number} x -  x coordinate
-     * @param  {number} y -  y coordinate
-     * @returns {boolean} true if contains
-     */
-
-    /**
-     * Returns true if the rounded rectangle contains the given point
-     * @name contains
-     * @memberof RoundRect
-     * @param {Vector2d} point
-     * @returns {boolean} true if contains
+     * Returns true if the rounded rectangle contains the given point or rectangle
+     * @param {number|Vector2d|Rect} x -  x coordinate or a vector point, or a Rect to test
+     * @param {number} [y] - y coordinate
+     * @returns {boolean} True if the rounded rectangle contain the given point or rectangle, otherwise false
+     * @example
+     * if (rect.contains(10, 10)) {
+     *   // do something
+     * }
+     * // or
+     * if (rect.contains(myVector2d)) {
+     *   // do something
+     * }
+     * if (rect.contains(myRect)) {
+     *   // do something
+     * }
      */
     contains() {
         let arg0 = arguments[0];
         let _x, _y;
         if (arguments.length === 2) {
-             // x, y
-             _x = arg0;
-             _y = arguments[1];
-         } else {
-             if (arg0 instanceof Rect) {
-                 // good enough
-                 return super.contains(arg0);
-             } else {
-                 // vector
+            // x, y
+            _x = arg0;
+            _y = arguments[1];
+        } else {
+            if ((typeof arg0.radius === "undefined") && (typeof arg0.bottom === "number")) {
+                // it's a rect
+                return super.contains(arg0);
+            } else {
+                // else a vector or point
                 _x = arg0.x;
                 _y = arg0.y;
-             }
+            }
         }
 
         // check whether point is outside the bounding box
@@ -137,8 +132,6 @@ export default class RoundRect extends Rect {
 
     /**
      * check if this RoundRect is identical to the specified one
-     * @name equals
-     * @memberof RoundRect
      * @param {RoundRect} rrect
      * @returns {boolean} true if equals
      */
@@ -148,8 +141,6 @@ export default class RoundRect extends Rect {
 
     /**
      * clone this RoundRect
-     * @name clone
-     * @memberof RoundRect
      * @returns {RoundRect} new RoundRect
      */
     clone() {

package/src/index.js

@@ -39,9 +39,9 @@ import UISpriteElement from "./renderable/ui/uispriteelement.js";
 import Collectable from "./renderable/collectable.js";
 import Trigger from "./renderable/trigger.js";
 import Light2d from "./renderable/light2d.js";
-import Text from "./text/text.js";
-import BitmapText from "./text/bitmaptext.js";
-import BitmapTextData from "./text/bitmaptextdata.js";
+import Text from "./renderable/text/text.js";
+import BitmapText from "./renderable/text/bitmaptext.js";
+import BitmapTextData from "./renderable/text/bitmaptextdata.js";
 import { Draggable } from "./renderable/draggable.js";
 import { DropTarget } from "./renderable/dragndrop.js";
 import TMXRenderer from "./level/tiled/renderer/TMXRenderer.js";
@@ -310,6 +310,6 @@ export function boot() {
 // call the library init function when ready
 device.onReady(() => {
     if (skipAutoInit === false) {
-       boot();
+        boot();
     }
 });

package/src/input/keyboard.js

@@ -95,14 +95,14 @@ let keyUpEvent = function (e, keyCode, mouseButton) {
  * PUBLIC STUFF
  */
 
- /**
+/**
   * the default target element for keyboard events (usually the window element in which the game is running)
   * @public
   * @type {EventTarget}
   * @name keyBoardEventTarget
   * @memberof input
   */
- export let keyBoardEventTarget = null;
+export let keyBoardEventTarget = null;
 
 /**
  * standard keyboard constants

package/src/input/pointer.js

@@ -130,7 +130,7 @@ class Pointer extends Bounds {
          */
         this.clientX = 0;
 
-       /**
+        /**
         * the vertical coordinate within the application's client area at which the event occurred
         * @public
         * @type {number}
@@ -150,7 +150,7 @@ class Pointer extends Bounds {
          */
         this.movementX = 0;
 
-       /**
+        /**
         * the difference in the Y coordinate of the pointer since the previous move event
         * @public
         * @type {number}
@@ -274,7 +274,7 @@ class Pointer extends Bounds {
          */
         this.gameLocalY = 0;
 
-       /**
+        /**
         * The unique identifier of the contact for a touch, mouse or pen
         * @public
         * @type {number}

package/src/input/pointerevent.js

@@ -158,10 +158,9 @@ function enablePointerEvent() {
         }
 
         // if time interval <= 16, disable the feature
-        let i;
         let events = findAllActiveEvents(activeEventList, POINTER_MOVE);
         if (throttlingInterval < 17) {
-            for (i = 0; i < events.length; i++) {
+            for (let i = 0; i < events.length; i++) {
                 if (activeEventList.indexOf(events[i]) !== -1) {
                     pointerEventTarget.addEventListener(
                         events[i],
@@ -173,7 +172,7 @@ function enablePointerEvent() {
             }
         }
         else {
-            for (i = 0; i < events.length; i++) {
+            for (let i = 0; i < events.length; i++) {
                 if (activeEventList.indexOf(events[i]) !== -1) {
                     pointerEventTarget.addEventListener(
                         events[i],
@@ -483,14 +482,14 @@ function onPointerEvent(e) {
  * PUBLIC STUFF
  */
 
- /**
+/**
   * the default target element for pointer events (usually the canvas element in which the game is rendered)
   * @public
   * @type {EventTarget}
   * @name pointerEventTarget
   * @memberof input
   */
- export let pointerEventTarget = null;
+export let pointerEventTarget = null;
 
 /**
  * Pointer information (current position and size)
@@ -613,7 +612,7 @@ export function unbindPointer(button) {
     // clear the event status
     pointer.bind[
         typeof(button) === "undefined" ?
-        pointer.LEFT : button
+            pointer.LEFT : button
     ] = null;
 }
 

package/src/lang/deprecated.js

@@ -100,7 +100,7 @@ Renderer.prototype.getScreenContext = function()  {
  * @deprecated since 14.0.0
  * @see UISpriteElement
  */
- export class GUI_Object extends UISpriteElement {
+export class GUI_Object extends UISpriteElement {
     /**
      * @param {number} x - the x coordinate of the GUI Object
      * @param {number} y - the y coordinate of the GUI Object

package/src/level/tiled/TMXLayer.js

@@ -4,7 +4,6 @@ import * as TMXUtils from "./TMXUtils.js";
 import Tile from "./TMXTile.js";
 import Renderable from "./../../renderable/renderable.js";
 import CanvasRenderer from "./../../video/canvas/canvas_renderer";
-import { game } from "../../index.js";
 
 /**
  * Create required arrays for the given layer object
@@ -52,32 +51,13 @@ function setLayerData(layer, bounds, data) {
     }
 }
 
-/**
- * preRender a tile layer using the given renderer
- * @ignore
- */
-function preRenderLayer(layer, renderer) {
-    // set everything
-    for (let y = 0; y < layer.rows; y++) {
-        for (let x = 0; x < layer.cols; x++) {
-            // get the value of the gid
-            const tile = layer.layerData[x][y];
-            // draw the tile if defined
-            if (tile instanceof Tile) {
-                // add a new tile to the layer
-                layer.getRenderer().drawTile(renderer, x, y, tile);
-            }
-        }
-    }
-}
-
 /**
  * @classdesc
  * a TMX Tile Layer Object
  * Tiled QT 0.7.x format
  * @augments Renderable
  */
- export default class TMXLayer extends Renderable {
+export default class TMXLayer extends Renderable {
     /**
      * @param {object} map - layer data in JSON format ({@link http://docs.mapeditor.org/en/stable/reference/tmx-map-format/#layer})
      * @param {object} data - layer data in JSON format ({@link http://docs.mapeditor.org/en/stable/reference/tmx-map-format/#layer})
@@ -192,11 +172,6 @@ function preRenderLayer(layer, renderer) {
         // check if we have any user-defined properties
         TMXUtils.applyTMXProperties(this, data);
 
-        // check for the correct rendering method
-        if (typeof (this.preRender) === "undefined") {
-            this.preRender = game.world.preRender;
-        }
-
         // set a renderer
         this.setRenderer(map.getRenderer());
 
@@ -251,8 +226,11 @@ function preRenderLayer(layer, renderer) {
 
         this.isAnimated = this.animatedTilesets.length > 0;
 
-        // Force pre-render off when tileset animation is used
-        if (this.isAnimated) {
+        // check for the correct rendering method
+        if (typeof this.preRender === "undefined" && this.isAnimated === false) {
+            this.preRender = this.ancestor.getRootAncestor().preRender;
+        } else {
+            // Force pre-render off when tileset animation is used
             this.preRender = false;
         }
 
@@ -264,8 +242,11 @@ function preRenderLayer(layer, renderer) {
                 heigth : this.height,
                 transparent : true
             });
-            preRenderLayer(this, this.canvasRenderer);
+            // pre render the layer on the canvas
+            this.getRenderer().drawTileLayer(this.canvasRenderer, this, this);
         }
+
+        this.isDirty = true;
     }
 
     // called when the layer is removed from the game world or a container
@@ -285,6 +266,7 @@ function preRenderLayer(layer, renderer) {
      */
     setRenderer(renderer) {
         this.renderer = renderer;
+        this.isDirty = true;
     }
 
     /**
@@ -337,6 +319,7 @@ function preRenderLayer(layer, renderer) {
      */
     setTile(tile, x, y) {
         this.layerData[x][y] = tile;
+        this.isDirty = true;
         return tile;
     }
 
@@ -395,6 +378,7 @@ function preRenderLayer(layer, renderer) {
         if (this.preRender) {
             this.canvasRenderer.clearRect(x * this.tilewidth, y * this.tileheight, this.tilewidth, this.tileheight);
         }
+        this.isDirty = true;
     }
 
     /**
@@ -402,14 +386,13 @@ function preRenderLayer(layer, renderer) {
      * @ignore
      */
     update(dt) {
+        let result = this.isDirty;
         if (this.isAnimated) {
-            let result = false;
             for (let i = 0; i < this.animatedTilesets.length; i++) {
                 result = this.animatedTilesets[i].update(dt) || result;
             }
-            return result;
         }
-        return false;
+        return result;
     }
 
     /**

package/src/level/tiled/TMXObject.js

@@ -209,7 +209,6 @@ export default class TMXObject {
      * @returns {Polygon[]|Line[]|Ellipse[]} an array of shape objects
      */
     parseTMXShapes() {
-        let i = 0;
         let shapes = [];
 
         // add an ellipse shape
@@ -237,7 +236,7 @@ export default class TMXObject {
                 let p = this.points;
                 let p1, p2;
                 let segments = p.length - 1;
-                for (i = 0; i < segments; i++) {
+                for (let i = 0; i < segments; i++) {
                     // clone the value before, as [i + 1]
                     // is reused later by the next segment
                     p1 = pool.pull("Vector2d", p[i].x, p[i].y);
@@ -264,7 +263,7 @@ export default class TMXObject {
 
         // Apply isometric projection
         if (this.orientation === "isometric") {
-            for (i = 0; i < shapes.length; i++) {
+            for (let i = 0; i < shapes.length; i++) {
                 if (typeof shapes[i].toIso === "function") {
                     shapes[i].toIso();
                 }

package/src/level/tiled/TMXTile.js

@@ -8,7 +8,7 @@ import { TMX_FLIP_V, TMX_FLIP_H, TMX_FLIP_AD, TMX_CLEAR_BIT_MASK } from "./const
  * a basic tile object
  * @augments Bounds
  */
- export default class Tile extends Bounds {
+export default class Tile extends Bounds {
     /**
      * @param {number} x - x index of the Tile in the map
      * @param {number} y - y index of the Tile in the map
@@ -108,8 +108,8 @@ import { TMX_FLIP_V, TMX_FLIP_H, TMX_FLIP_AD, TMX_CLEAR_BIT_MASK } from "./const
         }
         if (this.flippedY) {
             transform.scale(
-                 this.flippedAD ? -1 : 1, this.flippedAD ? 1 : -1
-             );
+                this.flippedAD ? -1 : 1, this.flippedAD ? 1 : -1
+            );
         }
         transform.translate(-this.width / 2, -this.height / 2);
     }

package/src/level/tiled/TMXTileMap.js

@@ -74,7 +74,7 @@ function readObjectGroup(map, data, z) {
  * a TMX Tile Map Object
  * Tiled QT +0.7.x format
  */
- export default class TMXTileMap {
+export default class TMXTileMap {
     /**
      * @param {string} levelId - name of TMX map
      * @param {object} data - TMX map in JSON format
@@ -269,7 +269,7 @@ function readObjectGroup(map, data, z) {
                         image : this.background_image,
                         z : zOrder++
                     }
-            ));
+                ));
         }
 
         data.layers.forEach((layer) => {

package/src/level/tiled/TMXTileset.js

@@ -8,14 +8,11 @@ import { getTMX, getImage } from "./../../loader/loader.js";
  * @classdesc
  * a TMX Tile Set Object
  */
- export default class TMXTileset {
+export default class TMXTileset {
     /**
      *  @param {object} tileset - tileset data in JSON format ({@link http://docs.mapeditor.org/en/stable/reference/tmx-map-format/#tileset})
      */
     constructor(tileset) {
-        let i = 0;
-        // first gid
-
         // tile properties (collidable, etc..)
         this.TileProperties = [];
 
@@ -77,7 +74,7 @@ import { getTMX, getImage } from "./../../loader/loader.js";
         this._lastUpdate = 0;
 
         let tiles = tileset.tiles;
-        for (i in tiles) {
+        for (let i in tiles) {
             if (tiles.hasOwnProperty(i)) {
                 if ("animation" in tiles[i]) {
                     this.isAnimated = true;
@@ -121,7 +118,7 @@ import { getTMX, getImage } from "./../../loader/loader.js";
         // set tile properties, if any (JSON old format)
         let tileInfo = tileset.tileproperties;
         if (tileInfo) {
-            for (i in tileInfo) {
+            for (let i in tileInfo) {
                 if (tileInfo.hasOwnProperty(i)) {
                     this.setTileProperty(+i + this.firstgid, tileInfo[i]);
                 }

package/src/level/tiled/TMXTilesetGroup.js

@@ -4,7 +4,7 @@ import { TMX_CLEAR_BIT_MASK } from "./constants";
  * @classdesc
  * an object containing all tileset
  */
- export default class TMXTilesetGroup {
+export default class TMXTilesetGroup {
 
     constructor() {
         this.tilesets = [];

package/src/level/tiled/TMXUtils.js

@@ -109,8 +109,8 @@ function normalize(obj, item) {
     let nodeName = item.nodeName;
 
     switch (nodeName) {
-        case "data":
-            var data = parse(item);  // <= "Unexpected lexical declaration in case block" if using let
+        case "data": {
+            let data = parse(item);
 
             data.encoding = data.encoding || "xml";
 
@@ -138,7 +138,7 @@ function normalize(obj, item) {
                 obj.encoding = "none";
             }
             break;
-
+        }
         case "chunk":
             obj.chunks = obj.chunks || [];
             obj.chunks.push(parse(item));
@@ -147,8 +147,8 @@ function normalize(obj, item) {
         case "imagelayer":
         case "layer":
         case "objectgroup":
-        case "group":
-            var layer = parse(item); //  // <= "Unexpected lexical declaration in case block" if using let
+        case "group": {
+            let layer = parse(item);
             layer.type = (nodeName === "layer" ? "tilelayer" : nodeName);
             if (layer.image) {
                 layer.image = layer.image.source;
@@ -157,20 +157,20 @@ function normalize(obj, item) {
             obj.layers = obj.layers || [];
             obj.layers.push(layer);
             break;
-
+        }
         case "animation":
             obj.animation = parse(item).frames;
             break;
 
         case "frame":
-        case "object":
-            var name = nodeName + "s";  // <= "Unexpected lexical declaration in case block" if using let
+        case "object": {
+            const name = nodeName + "s";
             obj[name] = obj[name] || [];
             obj[name].push(parse(item));
             break;
-
-        case "tile":
-            var tile = parse(item);  // <= "Unexpected lexical declaration in case block" if using let
+        }
+        case "tile": {
+            let tile = parse(item);
             if (tile.image) {
                 tile.imagewidth = tile.image.width;
                 tile.imageheight = tile.image.height;
@@ -179,9 +179,9 @@ function normalize(obj, item) {
             obj.tiles = obj.tiles || {};
             obj.tiles[tile.id] = tile;
             break;
-
-        case "tileset":
-            var tileset = parse(item);  // <= "Unexpected lexical declaration in case block" if using let
+        }
+        case "tileset": {
+            let tileset = parse(item);
             if (tileset.image) {
                 tileset.imagewidth = tileset.image.width;
                 tileset.imageheight = tileset.image.height;
@@ -191,13 +191,13 @@ function normalize(obj, item) {
             obj.tilesets = obj.tilesets || [];
             obj.tilesets.push(tileset);
             break;
-
+        }
         case "polygon":
-        case "polyline":
+        case "polyline": {
             obj[nodeName] = [];
 
             // Get a point array
-            var points = parse(item).points.split(" ");  // <= "Unexpected lexical declaration in case block" if using let
+            let points = parse(item).points.split(" ");
 
             // And normalize them into an array of vectors
             for (let i = 0; i < points.length; i++) {
@@ -209,15 +209,15 @@ function normalize(obj, item) {
             }
 
             break;
-
+        }
         case "properties":
             obj.properties = parse(item);
             break;
 
-        case "property":
-            var property = parse(item);  // <= "Unexpected lexical declaration in case block" if using let
+        case "property": {
+            const property = parse(item);
             // for custom properties, text is used
-            var value = (typeof property.value !== "undefined") ? property.value : property.text;
+            const value = (typeof property.value !== "undefined") ? property.value : property.text;
 
             obj[property.name] = setTMXValue(
                 property.name,
@@ -226,7 +226,7 @@ function normalize(obj, item) {
                 value
             );
             break;
-
+        }
         default:
             obj[nodeName] = parse(item);
             break;
@@ -276,16 +276,13 @@ function decodeCSV(input) {
  * @param {number} [bytes] - number of bytes per array entry
  * @returns {Uint32Array} Decoded data
  */
-function decodeBase64AsArray(input, bytes) {
-    bytes = bytes || 1;
-
-    let i, j, len;
+function decodeBase64AsArray(input, bytes = 1) {
     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++) {
+    for (let i = 0, len = dec.length / bytes; i < len; i++) {
         ar[i] = 0;
-        for (j = bytes - 1; j >= 0; --j) {
+        for (let j = bytes - 1; j >= 0; --j) {
             ar[i] += dec.charCodeAt((i * bytes) + j) << (j << 3);
         }
     }

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

@@ -24,7 +24,7 @@ const offsetsStaggerY = [
  * an Hexagonal Map Renderder
  * @augments TMXRenderer
  */
- export default class TMXHexagonalRenderer extends TMXRenderer {
+export default class TMXHexagonalRenderer extends TMXRenderer {
     /**
      * @param {TMXTileMap} map - the TMX map
      */
@@ -390,7 +390,7 @@ const offsetsStaggerY = [
         let rowTile = startTile.clone();
         let rowPos = startPos.clone();
 
-       /* Determine in which half of the tile the top-left corner of the area we
+        /* Determine in which half of the tile the top-left corner of the area we
         * need to draw is. If we're in the upper half, we need to start one row
         * up due to those tiles being visible as well. How we go up one row
         * depends on whether we're in the left or right half of the tile.

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

@@ -9,7 +9,7 @@ import TMXLayer from "./../TMXLayer.js";
  * an Isometric Map Renderder
  * @augments TMXRenderer
  */
- export default class TMXIsometricRenderer extends TMXRenderer {
+export default class TMXIsometricRenderer extends TMXRenderer {
     /**
      * @param {TMXTileMap} map - the TMX map
      */

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

@@ -7,7 +7,7 @@ import TMXRenderer from "./TMXRenderer.js";
  * an Orthogonal Map Renderder
  * @augments TMXRenderer
  */
- export default class TMXOrthogonalRenderer extends TMXRenderer {
+export default class TMXOrthogonalRenderer extends TMXRenderer {
     /**
      * @param {TMXTileMap} map - the TMX map
      */

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

@@ -8,7 +8,7 @@ import Bounds from "./../../../physics/bounds.js";
  * @classdesc
  * The map renderer base class
  */
- export default class TMXRenderer {
+export default class TMXRenderer {
     /**
      * @param {number} cols - width of the tilemap in tiles
      * @param {number} rows - height of the tilemap in tiles

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

@@ -9,7 +9,7 @@ import { degToRad } from "./../../../math/math.js";
  * a Staggered Map Renderder
  * @augments TMXHexagonalRenderer
  */
- export default class TMXStaggeredRenderer extends TMXHexagonalRenderer {
+export default class TMXStaggeredRenderer extends TMXHexagonalRenderer {
 
     /**
      * return true if the renderer can render the specified layer