melonjs 14.3.0 → 14.5.0

package/src/physics/bounds.js

@@ -7,7 +7,7 @@ import Vector2d from "./../math/vector2.js";
  */
  export default class Bounds {
     /**
-     * @param {Vector2d[]} [vertices] - an array of me.Vector2d points
+     * @param {Vector2d[]|Point[]} [vertices] - an array of Vector2d or Point
      */
     constructor(vertices) {
         // @ignore
@@ -32,8 +32,6 @@ import Vector2d from "./../math/vector2.js";
 
     /**
      * reset the bound
-     * @name clear
-     * @memberof Bounds
      */
     clear() {
         this.setMinMax(Infinity, Infinity, -Infinity, -Infinity);
@@ -42,8 +40,6 @@ import Vector2d from "./../math/vector2.js";
 
     /**
      * sets the bounds to the given min and max value
-     * @name setMinMax
-     * @memberof Bounds
      * @param {number} minX
      * @param {number} minY
      * @param {number} maxX
@@ -59,10 +55,7 @@ import Vector2d from "./../math/vector2.js";
 
     /**
      * x position of the bound
-     * @public
      * @type {number}
-     * @name x
-     * @memberof Bounds
      */
     get x() {
         return this.min.x;
@@ -76,10 +69,7 @@ import Vector2d from "./../math/vector2.js";
 
     /**
      * y position of the bounds
-     * @public
      * @type {number}
-     * @name y
-     * @memberof Bounds
      */
     get y() {
         return this.min.y;
@@ -94,10 +84,7 @@ import Vector2d from "./../math/vector2.js";
 
     /**
      * width of the bounds
-     * @public
      * @type {number}
-     * @name width
-     * @memberof Bounds
      */
     get width() {
         return this.max.x - this.min.x;
@@ -109,10 +96,7 @@ import Vector2d from "./../math/vector2.js";
 
     /**
      * width of the bounds
-     * @public
      * @type {number}
-     * @name width
-     * @memberof Bounds
      */
     get height() {
         return this.max.y - this.min.y;
@@ -124,10 +108,7 @@ import Vector2d from "./../math/vector2.js";
 
     /**
      * left coordinate of the bound
-     * @public
      * @type {number}
-     * @name left
-     * @memberof Bounds
      */
     get left() {
         return this.min.x;
@@ -135,10 +116,7 @@ import Vector2d from "./../math/vector2.js";
 
     /**
      * right coordinate of the bound
-     * @public
      * @type {number}
-     * @name right
-     * @memberof Bounds
      */
     get right() {
         return this.max.x;
@@ -146,10 +124,7 @@ import Vector2d from "./../math/vector2.js";
 
     /**
      * top coordinate of the bound
-     * @public
      * @type {number}
-     * @name top
-     * @memberof Bounds
      */
     get top() {
         return this.min.y;
@@ -157,10 +132,7 @@ import Vector2d from "./../math/vector2.js";
 
     /**
      * bottom coordinate of the bound
-     * @public
      * @type {number}
-     * @name bottom
-     * @memberof Bounds
      */
     get bottom() {
         return this.max.y;
@@ -168,10 +140,7 @@ import Vector2d from "./../math/vector2.js";
 
     /**
      * center position of the bound on the x axis
-     * @public
      * @type {number}
-     * @name centerX
-     * @memberof Bounds
      */
     get centerX() {
         return this.min.x + (this.width / 2);
@@ -179,10 +148,7 @@ import Vector2d from "./../math/vector2.js";
 
     /**
      * center position of the bound on the y axis
-     * @public
      * @type {number}
-     * @name centerY
-     * @memberof Bounds
      */
     get centerY() {
         return this.min.y + (this.height / 2);
@@ -190,20 +156,25 @@ import Vector2d from "./../math/vector2.js";
 
     /**
      * return the center position of the bound
-     * @public
      * @type {Vector2d}
-     * @name center
-     * @memberof Bounds
      */
     get center() {
         return this._center.set(this.centerX, this.centerY);
     }
 
+    /**
+     * center the bounds position around the given coordinates
+     * @param {number} x - the x coordinate around which to center this bounds
+     * @param {number} y - the y coordinate around which to center this bounds
+     */
+    centerOn(x, y) {
+        this.shift(x - this.width / 2, y - this.height / 2);
+        return this;
+    }
+
     /**
      * Updates bounds using the given vertices
-     * @name update
-     * @memberof Bounds
-     * @param {Vector2d[]} vertices - an array of me.Vector2d points
+     * @param {Vector2d[]|Point[]} vertices - an array of Vector2d or Point
      */
     update(vertices) {
         this.add(vertices, true);
@@ -211,9 +182,7 @@ import Vector2d from "./../math/vector2.js";
 
     /**
      * add the given vertices to the bounds definition.
-     * @name add
-     * @memberof Bounds
-     * @param {Vector2d[]} vertices - an array of me.Vector2d points
+     * @param {Vector2d[]|Point[]} vertices - an array of Vector2d or Point
      * @param {boolean} [clear=false] - either to reset the bounds before adding the new vertices
      */
     add(vertices, clear = false) {
@@ -231,8 +200,6 @@ import Vector2d from "./../math/vector2.js";
 
     /**
      * add the given bounds to the bounds definition.
-     * @name addBounds
-     * @memberof Bounds
      * @param {Bounds} bounds
      * @param {boolean} [clear=false] - either to reset the bounds before adding the new vertices
      */
@@ -252,13 +219,11 @@ import Vector2d from "./../math/vector2.js";
 
     /**
      * add the given point to the bounds definition.
-     * @name addPoint
-     * @memberof Bounds
-     * @param {Vector2d|Point} point - the point to be added to the bounds
-     * @param {Matrix2d} [m] - an optional transform to apply to the given point (only if the given point is a vector)
+     * @param {Vector2d|Point} point - the vector or point to be added to the bounds
+     * @param {Matrix2d} [m] - an optional transform to apply to the given point (if the given point is a Vector2d)
      */
     addPoint(point, m) {
-        if ((typeof m !== "undefined") && (typeof point.rotate === "function")) {
+        if ((typeof m !== "undefined")) {
             // only Vectors object have a rotate function
             point = m.apply(point);
         }
@@ -270,8 +235,6 @@ import Vector2d from "./../math/vector2.js";
 
     /**
      * add the given quad coordinates to this bound definition, multiplied by the given matrix
-     * @name addFrame
-     * @memberof Bounds
      * @param {number} x0 - left X coordinates of the quad
      * @param {number} y0 - top Y coordinates of the quad
      * @param {number} x1 - right X coordinates of the quad
@@ -279,9 +242,8 @@ import Vector2d from "./../math/vector2.js";
      * @param {Matrix2d} [m] - an optional transform to apply to the given frame coordinates
      */
     addFrame(x0, y0, x1, y1, m) {
-        var v = pool.pull("Vector2d");
+        var v = pool.pull("Point");
 
-        // transform all points and add to the bound definition
         this.addPoint(v.set(x0, y0), m);
         this.addPoint(v.set(x1, y0), m);
         this.addPoint(v.set(x0, y1), m);
@@ -300,8 +262,6 @@ import Vector2d from "./../math/vector2.js";
      */
     /**
      * Returns true if the bounds contains the given point.
-     * @name contains
-     * @memberof Bounds
      * @param {number} x
      * @param {number} y
      * @returns {boolean} True if the bounds contain the point, otherwise false
@@ -333,8 +293,6 @@ import Vector2d from "./../math/vector2.js";
 
     /**
      * Returns true if the two bounds intersect.
-     * @name overlaps
-     * @memberof Bounds
      * @param {Bounds|Rect} bounds
      * @returns {boolean} True if the bounds overlap, otherwise false
      */
@@ -345,8 +303,6 @@ import Vector2d from "./../math/vector2.js";
 
     /**
      * determines whether all coordinates of this bounds are finite numbers.
-     * @name isFinite
-     * @memberof Bounds
      * @returns {boolean} false if all coordinates are positive or negative Infinity or NaN; otherwise, true.
      */
     isFinite() {
@@ -362,8 +318,6 @@ import Vector2d from "./../math/vector2.js";
      */
     /**
      * Translates the bounds by x on the x axis, and y on the y axis
-     * @name translate
-     * @memberof Bounds
      * @param {number} x
      * @param {number} y
      */
@@ -393,8 +347,6 @@ import Vector2d from "./../math/vector2.js";
      */
     /**
      * Shifts the bounds to the given x, y position.
-     * @name shift
-     * @memberof Bounds
      * @param {number} x
      * @param {number} y
      */
@@ -422,8 +374,6 @@ import Vector2d from "./../math/vector2.js";
 
     /**
      * clone this bounds
-     * @name clone
-     * @memberof Bounds
      * @returns {Bounds}
      */
     clone() {
@@ -434,8 +384,6 @@ import Vector2d from "./../math/vector2.js";
 
     /**
      * Returns a polygon whose edges are the same as this bounds.
-     * @name toPolygon
-     * @memberof Bounds
      * @returns {Polygon} a new Polygon that represents this bounds.
      */
     toPolygon () {

package/src/physics/collision.js

@@ -117,7 +117,7 @@ var collision = {
      *        // ...
      *    }
      */
-    rayCast(line, result) { return game.world.rayCast(line, result); }
+    rayCast(line, result) { return game.world.detector.rayCast(line, result); }
 };
 
 export default collision;

package/src/renderable/container.js

@@ -129,7 +129,13 @@ let globalFloatingCounter = 0;
         // subscribe on the canvas resize event
         if (this.root === true) {
             // Workaround for not updating container child-bounds automatically (it's expensive!)
-            event.on(event.CANVAS_ONRESIZE, this.updateBounds.bind(this, true));
+            event.on(event.CANVAS_ONRESIZE, () => {
+                // temporarly enable the enableChildBoundsUpdate flag
+                this.enableChildBoundsUpdate === true;
+                // update bounds
+                this.updateBounds();
+                this.enableChildBoundsUpdate === false;
+            });
         }
     }
 
@@ -189,6 +195,10 @@ let globalFloatingCounter = 0;
 
         child.ancestor = this;
         this.getChildren().push(child);
+        if (typeof child.updateBounds === "function") {
+            // update child bounds to reflect the new ancestor
+            child.updateBounds();
+        }
 
         // set the child z value if required
         if (typeof(child.pos) !== "undefined") {
@@ -213,8 +223,8 @@ let globalFloatingCounter = 0;
         }
 
         // force bounds update if required
-        if (this.enableChildBoundsUpdate) {
-            this.updateBounds(true);
+        if (this.enableChildBoundsUpdate === true) {
+            this.updateBounds();
         }
 
         // if a physic body is defined, add it to the game world
@@ -262,8 +272,8 @@ let globalFloatingCounter = 0;
             }
 
             // force bounds update if required
-            if (this.enableChildBoundsUpdate) {
-                this.updateBounds(true);
+            if (this.enableChildBoundsUpdate === true) {
+                this.updateBounds();
             }
 
             // if a physic body is defined, add it to the game world
@@ -497,26 +507,25 @@ let globalFloatingCounter = 0;
     /**
      * update the bounding box for this shape.
      * @ignore
+     * @param {boolean} absolute - update the bounds size and position in (world) absolute coordinates
      * @returns {Bounds} this shape bounding box Rectangle object
      */
-    updateBounds(forceUpdateChildBounds = false) {
+    updateBounds(absolute = true) {
+        var bounds = this.getBounds();
 
         // call parent method
-        super.updateBounds();
+        super.updateBounds(absolute);
 
-        var bounds = this.getBounds();
-
-        if (forceUpdateChildBounds === true || this.enableChildBoundsUpdate === true) {
+        if (this.enableChildBoundsUpdate === true) {
             this.forEach((child) => {
                 if (child.isRenderable) {
                     var childBounds = child.getBounds();
                     if (childBounds.isFinite()) {
-                        bounds.addBounds(child.getBounds());
+                        bounds.addBounds(childBounds);
                     }
                 }
             });
         }
-
         return bounds;
     }
 
@@ -544,7 +553,7 @@ let globalFloatingCounter = 0;
      * update the cointainer's bounding rect (private)
      * @ignore
      */
-    updateBoundsPos(newX, newY) {
+    updateBoundsPos(newX = this.pos.x, newY = this.pos.y) {
         // call the parent method
         super.updateBoundsPos(newX, newY);
 
@@ -552,14 +561,11 @@ let globalFloatingCounter = 0;
         this.forEach((child) => {
             if (child.isRenderable) {
                 child.updateBoundsPos(
-                    // workaround on this.pos being updated after
-                    // the callback being triggered
                     child.pos.x + newX - this.pos.x,
                     child.pos.y + newY - this.pos.y
                 );
             }
         });
-        return this.getBounds();
     }
 
     /**
@@ -631,8 +637,8 @@ let globalFloatingCounter = 0;
             }
 
             // force bounds update if required
-            if (this.enableChildBoundsUpdate) {
-                this.updateBounds(true);
+            if (this.enableChildBoundsUpdate === true) {
+                this.updateBounds();
             }
 
             // triggered callback if defined

package/src/renderable/imagelayer.js

@@ -235,11 +235,17 @@ import * as stringUtil from "./../utils/string.js";
     preDraw(renderer) {
         // save the context
         renderer.save();
+
         // apply the defined alpha value
         renderer.setGlobalAlpha(renderer.globalAlpha() * this.getOpacity());
 
         // apply the defined tint, if any
         renderer.setTint(this.tint);
+
+        // apply blending if different from "normal"
+        if (this.blendMode !== renderer.getBlendMode()) {
+            renderer.setBlendMode(this.blendMode);
+        }
     }
 
     /**