melonjs 10.8.0 → 10.11.0

package/src/geometries/poly.js

@@ -9,9 +9,9 @@ import pool from "./../system/pooling.js";
  * A polygon is convex when all line segments connecting two points in the interior do not cross any edge of the polygon
  * (which means that all angles are less than 180 degrees), as described here below : <br>
  * <center><img src="images/convex_polygon.png"/></center><br>
+ *
  * A polygon's `winding` is clockwise iff its vertices (points) are declared turning to the right. The image above shows COUNTERCLOCKWISE winding.
  */
-
 class Polygon {
 
     /**
@@ -25,16 +25,16 @@ class Polygon {
          * @public
          * @type {Vector2d}
          * @name pos
-         * @memberof Polygon.prototype
+         * @memberof Polygon
          */
         this.pos = pool.pull("Vector2d");
 
         /**
          * The bounding rectangle for this shape
          * @ignore
-         * @type {Bounds}
+         * @member {Bounds}
          * @name _bounds
-         * @memberof Polygon.prototype
+         * @memberof Polygon
          */
         this._bounds;
 
@@ -44,7 +44,7 @@ class Polygon {
          * @public
          * @type {Vector2d[]}
          * @name points
-         * @memberof Polygon.prototype
+         * @memberof Polygon
          */
         this.points = [];
 
@@ -83,8 +83,7 @@ class Polygon {
     /**
      * set new value to the Polygon
      * @name setShape
-     * @memberof Polygon.prototype
-     * @function
+     * @memberof Polygon
      * @param {number} x position of the Polygon
      * @param {number} y position of the Polygon
      * @param {Vector2d[]|number[]} points array of vector or vertice defining the Polygon
@@ -99,8 +98,7 @@ class Polygon {
     /**
      * set the vertices defining this Polygon
      * @name setVertices
-     * @memberof Polygon.prototype
-     * @function
+     * @memberof Polygon
      * @param {Vector2d[]} vertices array of vector or vertice defining the Polygon
      * @returns {Polygon} this instance for objecf chaining
      */
@@ -139,8 +137,7 @@ class Polygon {
     /**
      * apply the given transformation matrix to this Polygon
      * @name transform
-     * @memberof Polygon.prototype
-     * @function
+     * @memberof Polygon
      * @param {Matrix2d} m the transformation matrix
      * @returns {Polygon} Reference to this object for method chaining
      */
@@ -158,8 +155,7 @@ class Polygon {
     /**
      * apply an isometric projection to this shape
      * @name toIso
-     * @memberof Polygon.prototype
-     * @function
+     * @memberof Polygon
      * @returns {Polygon} Reference to this object for method chaining
      */
     toIso() {
@@ -169,8 +165,7 @@ class Polygon {
     /**
      * apply a 2d projection to this shape
      * @name to2d
-     * @memberof Polygon.prototype
-     * @function
+     * @memberof Polygon
      * @returns {Polygon} Reference to this object for method chaining
      */
     to2d() {
@@ -180,8 +175,7 @@ class Polygon {
     /**
      * Rotate this Polygon (counter-clockwise) by the specified angle (in radians).
      * @name rotate
-     * @memberof Polygon.prototype
-     * @function
+     * @memberof Polygon
      * @param {number} angle The angle to rotate (in radians)
      * @param {Vector2d|ObservableVector2d} [v] an optional point to rotate around
      * @returns {Polygon} Reference to this object for method chaining
@@ -202,8 +196,7 @@ class Polygon {
     /**
      * Scale this Polygon by the given scalar.
      * @name scale
-     * @memberof Polygon.prototype
-     * @function
+     * @memberof Polygon
      * @param {number} x
      * @param {number} [y=x]
      * @returns {Polygon} Reference to this object for method chaining
@@ -224,8 +217,7 @@ class Polygon {
     /**
      * Scale this Polygon by the given vector
      * @name scaleV
-     * @memberof Polygon.prototype
-     * @function
+     * @memberof Polygon
      * @param {Vector2d} v
      * @returns {Polygon} Reference to this object for method chaining
      */
@@ -237,8 +229,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
-     * @function
+     * @memberof Polygon
      * @returns {Polygon} Reference to this object for method chaining
      */
     recalc() {
@@ -281,8 +272,7 @@ class Polygon {
     /**
      * returns a list of indices for all triangles defined in this polygon
      * @name getIndices
-     * @memberof Polygon.prototype
-     * @function
+     * @memberof Polygon
      * @returns {Array} an array of vertex indices for all triangles forming this polygon.
      */
     getIndices() {
@@ -295,8 +285,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
-     * @function
+     * @memberof Polygon
      * @returns {boolean} true if the vertices are convex, false if not, null if not computable
      */
     isConvex() {
@@ -342,8 +331,8 @@ class Polygon {
     /**
      * translate the Polygon by the specified offset
      * @name translate
-     * @memberof Polygon.prototype
-     * @function
+     * @memberof Polygon
+     * @method
      * @param {number} x x offset
      * @param {number} y y offset
      * @returns {Polygon} this Polygon
@@ -351,8 +340,7 @@ class Polygon {
     /**
      * translate the Polygon by the specified vector
      * @name translate
-     * @memberof Polygon.prototype
-     * @function
+     * @memberof Polygon
      * @param {Vector2d} v vector offset
      * @returns {Polygon} Reference to this object for method chaining
      */
@@ -379,15 +367,14 @@ class Polygon {
     /**
      * Shifts the Polygon to the given position vector.
      * @name shift
-     * @memberof Polygon.prototype
-     * @function
+     * @memberof Polygon
+     * @method
      * @param {Vector2d} position
      */
     /**
      * Shifts the Polygon to the given x, y position.
      * @name shift
-     * @memberof Polygon.prototype
-     * @function
+     * @memberof Polygon
      * @param {number} x
      * @param {number} y
      */
@@ -412,8 +399,8 @@ 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
-     * @function
+     * @memberof Polygon
+     * @method
      * @param {Vector2d} point
      * @returns {boolean} true if contains
      */
@@ -423,8 +410,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
-     * @function
+     * @memberof Polygon
      * @param  {number} x x coordinate
      * @param  {number} y y coordinate
      * @returns {boolean} true if contains
@@ -461,8 +447,7 @@ class Polygon {
     /**
      * returns the bounding box for this shape, the smallest Rectangle object completely containing this shape.
      * @name getBounds
-     * @memberof Polygon.prototype
-     * @function
+     * @memberof Polygon
      * @returns {Bounds} this shape bounding box Rectangle object
      */
     getBounds() {
@@ -476,8 +461,7 @@ class Polygon {
      * update the bounding box for this shape.
      * @ignore
      * @name updateBounds
-     * @memberof Polygon.prototype
-     * @function
+     * @memberof Polygon
      * @returns {Bounds} this shape bounding box Rectangle object
      */
     updateBounds() {
@@ -492,8 +476,7 @@ class Polygon {
     /**
      * clone this Polygon
      * @name clone
-     * @memberof Polygon.prototype
-     * @function
+     * @memberof Polygon
      * @returns {Polygon} new Polygon
      */
     clone() {

package/src/geometries/rectangle.js

@@ -32,8 +32,7 @@ class Rect extends Polygon {
     /**
      * set new value to the rectangle shape
      * @name setShape
-     * @memberof Rect.prototype
-     * @function
+     * @memberof Rect
      * @param {number} x position of the Rectangle
      * @param {number} y position of the Rectangle
      * @param {number|Vector2d[]} w width of the rectangle, or an array of vector defining the rectangle
@@ -63,7 +62,7 @@ class Rect extends Polygon {
      * @public
      * @type {number}
      * @name left
-     * @memberof Rect.prototype
+     * @memberof Rect
      */
     get left() {
         return this.pos.x;
@@ -74,7 +73,7 @@ class Rect extends Polygon {
      * @public
      * @type {number}
      * @name right
-     * @memberof Rect.prototype
+     * @memberof Rect
      */
     get right() {
         var w = this.width;
@@ -86,7 +85,7 @@ class Rect extends Polygon {
      * @public
      * @type {number}
      * @name top
-     * @memberof Rect.prototype
+     * @memberof Rect
      */
     get top() {
         return this.pos.y;
@@ -97,7 +96,7 @@ class Rect extends Polygon {
      * @public
      * @type {number}
      * @name bottom
-     * @memberof Rect.prototype
+     * @memberof Rect
      */
     get bottom() {
         var h = this.height;
@@ -109,7 +108,7 @@ class Rect extends Polygon {
      * @public
      * @type {number}
      * @name width
-     * @memberof Rect.prototype
+     * @memberof Rect
      */
     get width() {
         return this.points[2].x;
@@ -125,7 +124,7 @@ class Rect extends Polygon {
      * @public
      * @type {number}
      * @name height
-     * @memberof Rect.prototype
+     * @memberof Rect
      */
     get height() {
         return this.points[2].y;
@@ -141,7 +140,7 @@ class Rect extends Polygon {
      * @public
      * @type {number}
      * @name centerX
-     * @memberof Rect.prototype
+     * @memberof Rect
      */
     get centerX() {
         if (isFinite(this.width)) {
@@ -159,7 +158,7 @@ class Rect extends Polygon {
      * @public
      * @type {number}
      * @name centerY
-     * @memberof Rect.prototype
+     * @memberof Rect
      */
     get centerY() {
         if (isFinite(this.height)) {
@@ -175,8 +174,7 @@ class Rect extends Polygon {
     /**
      * center the rectangle position around the given coordinates
      * @name centerOn
-     * @memberof Rect.prototype
-     * @function
+     * @memberof Rect
      * @param {number} x the x coordinate around which to center this rectangle
      * @param {number} x the y coordinate around which to center this rectangle
      * @returns {Rect} this rectangle
@@ -190,8 +188,7 @@ class Rect extends Polygon {
     /**
      * resize the rectangle
      * @name resize
-     * @memberof Rect.prototype
-     * @function
+     * @memberof Rect
      * @param {number} w new width of the rectangle
      * @param {number} h new height of the rectangle
      * @returns {Rect} this rectangle
@@ -205,8 +202,7 @@ class Rect extends Polygon {
     /**
      * scale the rectangle
      * @name scale
-     * @memberof Rect.prototype
-     * @function
+     * @memberof Rect
      * @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.
      * @returns {Rect} this rectangle
@@ -220,8 +216,7 @@ class Rect extends Polygon {
     /**
      * clone this rectangle
      * @name clone
-     * @memberof Rect.prototype
-     * @function
+     * @memberof Rect
      * @returns {Rect} new rectangle
      */
     clone() {
@@ -231,8 +226,7 @@ class Rect extends Polygon {
     /**
      * copy the position and size of the given rectangle into this one
      * @name copy
-     * @memberof Rect.prototype
-     * @function
+     * @memberof Rect
      * @param {Rect} rect Source rectangle
      * @returns {Rect} new rectangle
      */
@@ -243,8 +237,7 @@ class Rect extends Polygon {
     /**
      * merge this rectangle with another one
      * @name union
-     * @memberof Rect.prototype
-     * @function
+     * @memberof Rect
      * @param {Rect} rect other rectangle to union with
      * @returns {Rect} the union(ed) rectangle
      */
@@ -265,8 +258,7 @@ class Rect extends Polygon {
     /**
      * check if this rectangle is intersecting with the specified one
      * @name overlaps
-     * @memberof Rect.prototype
-     * @function
+     * @memberof Rect
      * @param {Rect} rect
      * @returns {boolean} true if overlaps
      */
@@ -282,8 +274,8 @@ class Rect extends Polygon {
     /**
      * Returns true if the rectangle contains the given rectangle
      * @name contains
-     * @memberof Rect.prototype
-     * @function
+     * @memberof Rect
+     * @method
      * @param {Rect} rect
      * @returns {boolean} true if contains
      */
@@ -291,8 +283,8 @@ class Rect extends Polygon {
     /**
      * Returns true if the rectangle contains the given point
      * @name contains
-     * @memberof Rect.prototype
-     * @function
+     * @memberof Rect
+     * @method
      * @param  {number} x x coordinate
      * @param  {number} y y coordinate
      * @returns {boolean} true if contains
@@ -301,8 +293,7 @@ class Rect extends Polygon {
     /**
      * Returns true if the rectangle contains the given point
      * @name contains
-     * @memberof Rect.prototype
-     * @function
+     * @memberof Rect
      * @param {Vector2d} point
      * @returns {boolean} true if contains
      */
@@ -337,8 +328,7 @@ class Rect extends Polygon {
     /**
      * check if this rectangle is identical to the specified one
      * @name equals
-     * @memberof Rect.prototype
-     * @function
+     * @memberof Rect
      * @param {Rect} rect
      * @returns {boolean} true if equals
      */
@@ -354,8 +344,7 @@ class Rect extends Polygon {
     /**
      * determines whether all coordinates of this rectangle are finite numbers.
      * @name isFinite
-     * @memberof Rect.prototype
-     * @function
+     * @memberof Rect
      * @returns {boolean} false if all coordinates are positive or negative Infinity or NaN; otherwise, true.
      */
     isFinite() {
@@ -365,8 +354,7 @@ class Rect extends Polygon {
     /**
      * Returns a polygon whose edges are the same as this box.
      * @name toPolygon
-     * @memberof Rect.prototype
-     * @function
+     * @memberof Rect
      * @returns {Polygon} a new Polygon that represents this rectangle.
      */
     toPolygon() {

package/src/geometries/roundrect.js

@@ -36,7 +36,7 @@ class RoundRect extends Rect {
      * @type {number}
      * @default 20
      * @name radius
-     * @memberof RoundRect.prototype
+     * @memberof RoundRect
      */
     get radius() {
         return this._radius;
@@ -52,11 +52,104 @@ class RoundRect extends Rect {
         this._radius = value;
     }
 
+    /**
+     * 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
+     */
+    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
+     * @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
+     */
+    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
+     * @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.prototype
-     * @function
+     * @memberof RoundRect
      * @returns {RoundRect} new RoundRect
      */
     clone() {

package/src/index.js

@@ -41,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";
@@ -53,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";
@@ -140,6 +142,7 @@ export {
     GUI_Object,
     Collectable,
     Trigger,
+    Light2d,
     Draggable,
     DropTarget,
     TMXRenderer,
@@ -190,7 +193,6 @@ export var skipAutoInit = false;
  * @name boot
  * @see skipAutoInit
  * @public
- * @function
  */
 export function boot() {
     // don't do anything if already initialized (should not happen anyway)
@@ -202,6 +204,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);
@@ -230,6 +233,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);
@@ -253,6 +257,7 @@ export function boot() {
     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) {
@@ -86,10 +86,7 @@ var remap = new Map();
 
 var updateEventHandler;
 
-/**
- * Default gamepad mappings
- * @ignore
- */
+// Default gamepad mappings
 [
     // Firefox mappings
     [
@@ -261,18 +258,14 @@ var updateGamepads = function () {
     });
 };
 
-/**
- * gamepad connected callback
- * @ignore
- */
+// gamepad connected callback
 if (globalThis.navigator && typeof globalThis.navigator.getGamepads === "function") {
     globalThis.addEventListener("gamepadconnected", function (e) {
         event.emit(event.GAMEPAD_CONNECTED, e.gamepad);
     }, false);
 
-    /**
+    /*
      * gamepad disconnected callback
-     * @ignore
      */
     globalThis.addEventListener("gamepaddisconnected", function (e) {
         event.emit(event.GAMEPAD_DISCONNECTED, e.gamepad);
@@ -362,7 +355,6 @@ export var GAMEPAD = {
  * @name bindGamepad
  * @memberof input
  * @public
- * @function
  * @param {number} index Gamepad index
  * @param {object} button Button/Axis definition
  * @param {string} button.type "buttons" or "axes"
@@ -437,7 +429,6 @@ export function bindGamepad(index, button, keyCode) {
  * @name unbindGamepad
  * @memberof input
  * @public
- * @function
  * @param {number} index Gamepad index
  * @param {number} button (See {@link input.GAMEPAD.BUTTONS})
  * @example
@@ -456,7 +447,6 @@ export function unbindGamepad(index, button) {
  * @name setGamepadDeadzone
  * @memberof input
  * @public
- * @function
  * @param {number} value Deadzone value
  */
 export function setGamepadDeadzone(value) {
@@ -470,7 +460,6 @@ export function setGamepadDeadzone(value) {
  * @name setGamepadMapping
  * @memberof input
  * @public
- * @function
  * @param {string} id Gamepad id string
  * @param {object} mapping A hash table
  * @param {number[]} mapping.axes Standard analog control stick axis locations