melonjs 10.7.1 → 10.10.0

package/src/geometries/poly.js

@@ -1,6 +1,6 @@
 import earcut from "earcut";
 import Vector2d from "./../math/vector2.js";
-import * as pool from "./../system/pooling.js";
+import pool from "./../system/pooling.js";
 
 /**
  * @classdesc
@@ -25,16 +25,16 @@ class Polygon {
          * @public
          * @type {Vector2d}
          * @name pos
-         * @memberof Polygon#
+         * @memberof Polygon
          */
-        this.pos = new Vector2d();
+        this.pos = pool.pull("Vector2d");
 
         /**
          * The bounding rectangle for this shape
          * @ignore
          * @type {Bounds}
          * @name _bounds
-         * @memberof Polygon#
+         * @memberof Polygon
          */
         this._bounds;
 
@@ -44,7 +44,7 @@ class Polygon {
          * @public
          * @type {Vector2d[]}
          * @name points
-         * @memberof Polygon#
+         * @memberof Polygon
          */
         this.points = [];
 
@@ -83,7 +83,7 @@ class Polygon {
     /**
      * set new value to the Polygon
      * @name setShape
-     * @memberof Polygon.prototype
+     * @memberof Polygon
      * @function
      * @param {number} x position of the Polygon
      * @param {number} y position of the Polygon
@@ -99,7 +99,7 @@ class Polygon {
     /**
      * set the vertices defining this Polygon
      * @name setVertices
-     * @memberof Polygon.prototype
+     * @memberof Polygon
      * @function
      * @param {Vector2d[]} vertices array of vector or vertice defining the Polygon
      * @returns {Polygon} this instance for objecf chaining
@@ -117,13 +117,13 @@ class Polygon {
             if (typeof vertices[0] === "object") {
                 // array of {x,y} object
                 vertices.forEach((vertice) => {
-                   this.points.push(new Vector2d(vertice.x, vertice.y));
+                   this.points.push(pool.pull("Vector2d", vertice.x, vertice.y));
                 });
 
             } else {
                 // it's a flat array
                 for (var p = 0; p < vertices.length; p += 2) {
-                    this.points.push(new Vector2d(vertices[p], vertices[p + 1]));
+                    this.points.push(pool.pull("Vector2d", vertices[p], vertices[p + 1]));
                 }
             }
         } else {
@@ -139,7 +139,7 @@ class Polygon {
     /**
      * apply the given transformation matrix to this Polygon
      * @name transform
-     * @memberof Polygon.prototype
+     * @memberof Polygon
      * @function
      * @param {Matrix2d} m the transformation matrix
      * @returns {Polygon} Reference to this object for method chaining
@@ -158,7 +158,7 @@ class Polygon {
     /**
      * apply an isometric projection to this shape
      * @name toIso
-     * @memberof Polygon.prototype
+     * @memberof Polygon
      * @function
      * @returns {Polygon} Reference to this object for method chaining
      */
@@ -169,7 +169,7 @@ class Polygon {
     /**
      * apply a 2d projection to this shape
      * @name to2d
-     * @memberof Polygon.prototype
+     * @memberof Polygon
      * @function
      * @returns {Polygon} Reference to this object for method chaining
      */
@@ -180,7 +180,7 @@ class Polygon {
     /**
      * Rotate this Polygon (counter-clockwise) by the specified angle (in radians).
      * @name rotate
-     * @memberof Polygon.prototype
+     * @memberof Polygon
      * @function
      * @param {number} angle The angle to rotate (in radians)
      * @param {Vector2d|ObservableVector2d} [v] an optional point to rotate around
@@ -202,7 +202,7 @@ class Polygon {
     /**
      * Scale this Polygon by the given scalar.
      * @name scale
-     * @memberof Polygon.prototype
+     * @memberof Polygon
      * @function
      * @param {number} x
      * @param {number} [y=x]
@@ -224,7 +224,7 @@ class Polygon {
     /**
      * Scale this Polygon by the given vector
      * @name scaleV
-     * @memberof Polygon.prototype
+     * @memberof Polygon
      * @function
      * @param {Vector2d} v
      * @returns {Polygon} Reference to this object for method chaining
@@ -237,7 +237,7 @@ class Polygon {
      * Computes the calculated collision polygon.
      * This **must** be called if the `points` array, `angle`, or `offset` is modified manually.
      * @name recalc
-     * @memberof Polygon.prototype
+     * @memberof Polygon
      * @function
      * @returns {Polygon} Reference to this object for method chaining
      */
@@ -258,12 +258,12 @@ class Polygon {
         // Calculate the edges/normals
         for (i = 0; i < len; i++) {
             if (edges[i] === undefined) {
-                edges[i] = new Vector2d();
+                edges[i] = pool.pull("Vector2d");
             }
             edges[i].copy(points[(i + 1) % len]).sub(points[i]);
 
             if (normals[i] === undefined) {
-                normals[i] = new Vector2d();
+                normals[i] = pool.pull("Vector2d");
             }
             normals[i].copy(edges[i]).perp().normalize();
         }
@@ -281,7 +281,7 @@ class Polygon {
     /**
      * returns a list of indices for all triangles defined in this polygon
      * @name getIndices
-     * @memberof Polygon.prototype
+     * @memberof Polygon
      * @function
      * @returns {Array} an array of vertex indices for all triangles forming this polygon.
      */
@@ -295,7 +295,7 @@ class Polygon {
     /**
      * Returns true if the vertices composing this polygon form a convex shape (vertices must be in clockwise order).
      * @name isConvex
-     * @memberof Polygon.prototype
+     * @memberof Polygon
      * @function
      * @returns {boolean} true if the vertices are convex, false if not, null if not computable
      */
@@ -342,7 +342,7 @@ class Polygon {
     /**
      * translate the Polygon by the specified offset
      * @name translate
-     * @memberof Polygon.prototype
+     * @memberof Polygon
      * @function
      * @param {number} x x offset
      * @param {number} y y offset
@@ -351,7 +351,7 @@ class Polygon {
     /**
      * translate the Polygon by the specified vector
      * @name translate
-     * @memberof Polygon.prototype
+     * @memberof Polygon
      * @function
      * @param {Vector2d} v vector offset
      * @returns {Polygon} Reference to this object for method chaining
@@ -412,7 +412,7 @@ class Polygon {
      * (Note: it is highly recommended to first do a hit test on the corresponding <br>
      *  bounding rect, as the function can be highly consuming with complex shapes)
      * @name contains
-     * @memberof Polygon.prototype
+     * @memberof Polygon
      * @function
      * @param {Vector2d} point
      * @returns {boolean} true if contains
@@ -423,7 +423,7 @@ class Polygon {
      * (Note: it is highly recommended to first do a hit test on the corresponding <br>
      *  bounding rect, as the function can be highly consuming with complex shapes)
      * @name contains
-     * @memberof Polygon.prototype
+     * @memberof Polygon
      * @function
      * @param  {number} x x coordinate
      * @param  {number} y y coordinate
@@ -461,7 +461,7 @@ class Polygon {
     /**
      * returns the bounding box for this shape, the smallest Rectangle object completely containing this shape.
      * @name getBounds
-     * @memberof Polygon.prototype
+     * @memberof Polygon
      * @function
      * @returns {Bounds} this shape bounding box Rectangle object
      */
@@ -476,7 +476,7 @@ class Polygon {
      * update the bounding box for this shape.
      * @ignore
      * @name updateBounds
-     * @memberof Polygon.prototype
+     * @memberof Polygon
      * @function
      * @returns {Bounds} this shape bounding box Rectangle object
      */
@@ -492,7 +492,7 @@ class Polygon {
     /**
      * clone this Polygon
      * @name clone
-     * @memberof Polygon.prototype
+     * @memberof Polygon
      * @function
      * @returns {Polygon} new Polygon
      */

package/src/geometries/rectangle.js

@@ -1,4 +1,4 @@
-import Vector2d from "./../math/vector2.js";
+import pool from "./../system/pooling.js";
 import Polygon from "./poly.js";
 
 /**
@@ -16,10 +16,10 @@ class Rect extends Polygon {
     constructor(x, y, w, h) {
         // parent constructor
         super(x, y, [
-            new Vector2d(0, 0), // 0, 0
-            new Vector2d(w, 0), // 1, 0
-            new Vector2d(w, h), // 1, 1
-            new Vector2d(0, h)  // 0, 1
+            pool.pull("Vector2d", 0, 0), // 0, 0
+            pool.pull("Vector2d", w, 0), // 1, 0
+            pool.pull("Vector2d", w, h), // 1, 1
+            pool.pull("Vector2d", 0, h)  // 0, 1
         ]);
         this.shapeType = "Rectangle";
     }
@@ -32,7 +32,7 @@ class Rect extends Polygon {
     /**
      * set new value to the rectangle shape
      * @name setShape
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @param {number} x position of the Rectangle
      * @param {number} y position of the Rectangle
@@ -175,7 +175,7 @@ class Rect extends Polygon {
     /**
      * center the rectangle position around the given coordinates
      * @name centerOn
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @param {number} x the x coordinate around which to center this rectangle
      * @param {number} x the y coordinate around which to center this rectangle
@@ -190,7 +190,7 @@ class Rect extends Polygon {
     /**
      * resize the rectangle
      * @name resize
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @param {number} w new width of the rectangle
      * @param {number} h new height of the rectangle
@@ -205,7 +205,7 @@ class Rect extends Polygon {
     /**
      * scale the rectangle
      * @name scale
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @param {number} x a number representing the abscissa of the scaling vector.
      * @param {number} [y=x] a number representing the ordinate of the scaling vector.
@@ -220,7 +220,7 @@ class Rect extends Polygon {
     /**
      * clone this rectangle
      * @name clone
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @returns {Rect} new rectangle
      */
@@ -231,7 +231,7 @@ class Rect extends Polygon {
     /**
      * copy the position and size of the given rectangle into this one
      * @name copy
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @param {Rect} rect Source rectangle
      * @returns {Rect} new rectangle
@@ -243,7 +243,7 @@ class Rect extends Polygon {
     /**
      * merge this rectangle with another one
      * @name union
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @param {Rect} rect other rectangle to union with
      * @returns {Rect} the union(ed) rectangle
@@ -265,7 +265,7 @@ class Rect extends Polygon {
     /**
      * check if this rectangle is intersecting with the specified one
      * @name overlaps
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @param {Rect} rect
      * @returns {boolean} true if overlaps
@@ -282,7 +282,7 @@ class Rect extends Polygon {
     /**
      * Returns true if the rectangle contains the given rectangle
      * @name contains
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @param {Rect} rect
      * @returns {boolean} true if contains
@@ -291,7 +291,7 @@ class Rect extends Polygon {
     /**
      * Returns true if the rectangle contains the given point
      * @name contains
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @param  {number} x x coordinate
      * @param  {number} y y coordinate
@@ -337,7 +337,7 @@ class Rect extends Polygon {
     /**
      * check if this rectangle is identical to the specified one
      * @name equals
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @param {Rect} rect
      * @returns {boolean} true if equals
@@ -354,7 +354,7 @@ class Rect extends Polygon {
     /**
      * determines whether all coordinates of this rectangle are finite numbers.
      * @name isFinite
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @returns {boolean} false if all coordinates are positive or negative Infinity or NaN; otherwise, true.
      */
@@ -365,12 +365,12 @@ class Rect extends Polygon {
     /**
      * Returns a polygon whose edges are the same as this box.
      * @name toPolygon
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @returns {Polygon} a new Polygon that represents this rectangle.
      */
     toPolygon() {
-        return new Polygon(
+        return pool.pull("Polygon",
             this.pos.x, this.pos.y, this.points
         );
     }

package/src/geometries/roundrect.js

@@ -0,0 +1,164 @@
+import Rect from "./rectangle.js";
+
+// https://developer.chrome.com/blog/canvas2d/#round-rect
+
+/**
+ * @classdesc
+ * a rectangle object with rounded corners
+ * @augments Rect
+ */
+class RoundRect extends Rect {
+    /**
+     * @param {number} x position of the rounded rectangle
+     * @param {number} y position of the rounded rectangle
+     * @param {number} width the rectangle width
+     * @param {number} height the rectangle height
+     * @param {number} [radius=20] the radius of the rounded corner
+     */
+    constructor(x, y, width, height, radius = 20) {
+        // parent constructor
+        super(x, y, width, height);
+
+        // set the corner radius
+        this.radius = radius;
+    }
+
+    /** @ignore */
+    onResetEvent(x, y, w, h, radius) {
+        super.setShape(x, y, w, h);
+        this.radius = radius;
+    }
+
+
+    /**
+     * the radius of the rounded corner
+     * @public
+     * @type {number}
+     * @default 20
+     * @name radius
+     * @memberof RoundRect
+     */
+    get radius() {
+        return this._radius;
+    }
+    set radius(value) {
+        // verify the rectangle is at least as wide and tall as the rounded corners.
+        if (this.width < 2 * value) {
+            value = this.width / 2;
+        }
+        if (this.height < 2 * value) {
+            value = this.height / 2;
+        }
+        this._radius = value;
+    }
+
+    /**
+     * copy the position, size and radius of the given rounded rectangle into this one
+     * @name copy
+     * @memberof RoundRect
+     * @function
+     * @param {RoundRect} rrect source rounded rectangle
+     * @returns {RoundRect} new rectangle
+     */
+    copy(rrect) {
+        super.setShape(rrect.pos.x, rrect.pos.y, rrect.width, rrect.height);
+        this.radius = rrect.radius;
+        return this;
+    }
+
+    /**
+     * Returns true if the rounded rectangle contains the given point
+     * @name contains
+     * @memberof RoundRect
+     * @function
+     * @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
+     * @function
+     * @param {Vector2d} point
+     * @returns {boolean} true if contains
+     */
+    contains() {
+        var arg0 = arguments[0];
+        var _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 = arg0.x;
+                _y = arg0.y;
+             }
+        }
+
+        // check whether point is outside the bounding box
+        if (_x < this.left || _x >= this.right || _y < this.top || _y >= this.bottom) {
+            return false; // outside bounding box
+        }
+
+        // check whether point is within the bounding box minus radius
+        if ((_x >= this.left + this.radius && _x <= this.right - this.radius) || (_y >= this.top + this.radius && _y <= this.bottom - this.radius)) {
+            return true;
+        }
+
+        // check whether point is in one of the rounded corner areas
+        var tx, ty;
+        var radiusX =  Math.max(0, Math.min(this.radius, this.width / 2));
+        var radiusY =  Math.max(0, Math.min(this.radius, this.height / 2));
+
+        if (_x < this.left + radiusX && _y < this.top + radiusY) {
+            tx = _x - this.left - radiusX;
+            ty = _y - this.top - radiusY;
+        } else if (_x > this.right - radiusX && _y < this.top + radiusY) {
+            tx = _x - this.right + radiusX;
+            ty = _y - this.top - radiusY;
+        } else if (_x > this.right - radiusX && _y > this.bottom - radiusY) {
+            tx = _x - this.right + radiusX;
+            ty = _y - this.bottom + radiusY;
+        } else if (_x < this.left + radiusX && _y > this.bottom - radiusY) {
+            tx = _x - this.left - radiusX;
+            ty = _y - this.bottom + radiusY;
+        } else {
+            return false; // inside and not within the rounded corner area
+        }
+
+        // Pythagorean theorem.
+        return ((tx * tx) + (ty * ty) <= (radiusX * radiusY));
+    }
+
+    /**
+     * check if this RoundRect is identical to the specified one
+     * @name equals
+     * @memberof RoundRect
+     * @function
+     * @param {RoundRect} rrect
+     * @returns {boolean} true if equals
+     */
+    equals(rrect) {
+        return super.equals(rrect) && this.radius === rrect.radius;
+    }
+
+    /**
+     * clone this RoundRect
+     * @name clone
+     * @memberof RoundRect
+     * @function
+     * @returns {RoundRect} new RoundRect
+     */
+    clone() {
+        return new RoundRect(this.pos.x, this.pos.y, this.width, this.height, radius);
+    }
+};
+
+export default RoundRect;

package/src/index.js

@@ -15,7 +15,7 @@ import { plugin, plugins } from "./plugin/plugin.js";
 import * as video from "./video/video.js";
 import save from "./system/save.js";
 import timer from "./system/timer.js";
-import * as pool from "./system/pooling.js";
+import pool from "./system/pooling.js";
 import state from "./state/state.js";
 import level from "./level/level.js";
 
@@ -31,6 +31,7 @@ import Polygon from "./geometries/poly.js";
 import Line from "./geometries/line.js";
 import Ellipse from "./geometries/ellipse.js";
 import Rect from "./geometries/rectangle.js";
+import RoundRect from "./geometries/roundrect.js";
 import QuadTree from "./physics/quadtree.js";
 import Body from "./physics/body.js";
 import Bounds from "./physics/bounds.js";
@@ -40,7 +41,8 @@ import WebGLCompositor from "./video/webgl/webgl_compositor.js";
 import Renderer from "./video/renderer.js";
 import WebGLRenderer from "./video/webgl/webgl_renderer.js";
 import CanvasRenderer from "./video/canvas/canvas_renderer.js";
-import { TextureAtlas } from "./video/texture.js";
+import CanvasTexture from "./video/texture/canvas_texture.js";
+import { TextureAtlas } from "./video/texture/atlas.js";
 import Renderable from "./renderable/renderable.js";
 import Text from "./text/text.js";
 import BitmapText from "./text/bitmaptext.js";
@@ -52,6 +54,7 @@ import NineSliceSprite from "./renderable/nineslicesprite.js";
 import GUI_Object from "./renderable/GUI.js";
 import Collectable from "./renderable/collectable.js";
 import Trigger from "./renderable/trigger.js";
+import Light2d from "./renderable/light2d.js";
 import { Draggable, DropTarget } from "./renderable/dragndrop.js";
 import TMXRenderer from "./level/tiled/renderer/TMXRenderer.js";
 import TMXOrthogonalRenderer from "./level/tiled/renderer/TMXOrthogonalRenderer.js";
@@ -117,6 +120,7 @@ export {
     Line,
     Ellipse,
     Rect,
+    RoundRect,
     Tween,
     QuadTree,
     GLShader,
@@ -138,6 +142,7 @@ export {
     GUI_Object,
     Collectable,
     Trigger,
+    Light2d,
     Draggable,
     DropTarget,
     TMXRenderer,
@@ -200,6 +205,7 @@ export function boot() {
     pool.register("me.Entity", Entity);
     pool.register("me.Collectable", Collectable);
     pool.register("me.Trigger", Trigger);
+    pool.register("me.Light2d", Light2d);
     pool.register("me.Tween", Tween, true);
     pool.register("me.Color", Color, true);
     pool.register("me.Particle", Particle, true);
@@ -218,6 +224,7 @@ export function boot() {
     pool.register("me.Matrix2d", Matrix2d, true);
     pool.register("me.Matrix3d", Matrix3d, true);
     pool.register("me.Rect", Rect, true);
+    pool.register("me.RoundRect", RoundRect, true);
     pool.register("me.Polygon", Polygon, true);
     pool.register("me.Line", Line, true);
     pool.register("me.Ellipse", Ellipse, true);
@@ -227,6 +234,7 @@ export function boot() {
     pool.register("Entity", Entity);
     pool.register("Collectable", Collectable);
     pool.register("Trigger", Trigger);
+    pool.register("Light2d", Light2d);
     pool.register("Tween", Tween, true);
     pool.register("Color", Color, true);
     pool.register("Particle", Particle, true);
@@ -245,10 +253,12 @@ export function boot() {
     pool.register("Matrix2d", Matrix2d, true);
     pool.register("Matrix3d", Matrix3d, true);
     pool.register("Rect", Rect, true);
+    pool.register("RoundRect", RoundRect, true);
     pool.register("Polygon", Polygon, true);
     pool.register("Line", Line, true);
     pool.register("Ellipse", Ellipse, true);
     pool.register("Bounds", Bounds, true);
+    pool.register("CanvasTexture", CanvasTexture, true);
 
     // publish Boot notification
     event.emit(event.BOOT);

package/src/input/gamepad.js

@@ -57,8 +57,8 @@ var leadingZeroRE = /^0+/;
 function addMapping(id, mapping) {
     var expanded_id = id.replace(vendorProductRE, function (_, a, b) {
         return (
-            "000".substr(a.length - 1) + a + "-" +
-            "000".substr(b.length - 1) + b + "-"
+            "000".slice(a.length - 1) + a + "-" +
+            "000".slice(b.length - 1) + b + "-"
         );
     });
     var sparse_id = id.replace(vendorProductRE, function (_, a, b) {

package/src/input/pointerevent.js

@@ -5,7 +5,7 @@ import { throttle } from "./../utils/function.js";
 import { remove } from "./../utils/array.js";
 import * as event from "./../system/event.js";
 import timer from "./../system/timer.js";
-import * as pool from "./../system/pooling.js";
+import pool from "./../system/pooling.js";
 import device from "./../system/device.js";
 import Pointer from "./pointer.js";
 import Rect from "./../geometries/rectangle.js";

package/src/lang/deprecated.js

@@ -1,6 +1,6 @@
 import device from "./../system/device.js";
 import { requestPointerLock, exitPointerLock } from "./../input/input.js";
-import { TextureAtlas } from "./../video/texture.js";
+import { TextureAtlas } from "./../video/texture/atlas.js";
 import Renderer from "./../video/renderer.js";
 import { Draggable, DropTarget } from "./../renderable/dragndrop.js";
 
@@ -47,9 +47,10 @@ export function warning(deprecated, replacement, version) {
 
 /**
  * @public
- * @type {Function}
  * @name turnOnPointerLock
- * @memberof device
+ * @function
+ * @returns {boolean} return true if the request was successfully submitted
+ * @memberof device#
  * @deprecated since 10.3.0
  * @see input.requestPointerLock
  */
@@ -60,9 +61,10 @@ device.turnOnPointerLock = function () {
 
 /**
  * @public
- * @type {Function}
  * @name turnOffPointerLock
- * @memberof device
+ * @function
+ * @returns {boolean} return true if the request was successfully submitted
+ * @memberof device#
  * @deprecated since 10.3.0
  * @see input.exitPointerLock
  */
@@ -74,7 +76,7 @@ device.turnOffPointerLock = function () {
 /**
  * @public
  * @name Texture
- * @memberof Renderer
+ * @memberof Renderer#
  * @deprecated since 10.4.0
  * @see TextureAtlas
  */

package/src/level/tiled/TMXLayer.js

@@ -1,5 +1,5 @@
 import { createCanvas } from "./../../video/video.js";
-import * as pool from "./../../system/pooling.js";
+import pool from "./../../system/pooling.js";
 import * as TMXUtils from "./TMXUtils.js";
 import Tile from "./TMXTile.js";
 import Renderable from "./../../renderable/renderable.js";