melonjs 14.0.0 → 14.0.1

package/dist/melonjs.module.js

@@ -1,5 +1,5 @@
 /*!
- * melonJS Game Engine - v14.0.0
+ * melonJS Game Engine - v14.0.1
  * http://www.melonjs.org
  * melonjs is licensed under the MIT License.
  * http://www.opensource.org/licenses/mit-license
@@ -9636,13 +9636,16 @@ class Bounds {
      */
     addBounds(bounds, clear = false) {
         if (clear === true) {
-            this.clear();
+            this.max.x = bounds.max.x;
+            this.min.x = bounds.min.x;
+            this.max.y = bounds.max.y;
+            this.min.y = bounds.min.y;
+        } else {
+            if (bounds.max.x > this.max.x) this.max.x = bounds.max.x;
+            if (bounds.min.x < this.min.x) this.min.x = bounds.min.x;
+            if (bounds.max.y > this.max.y) this.max.y = bounds.max.y;
+            if (bounds.min.y < this.min.y) this.min.y = bounds.min.y;
         }
-
-        if (bounds.max.x > this.max.x) this.max.x = bounds.max.x;
-        if (bounds.min.x < this.min.x) this.min.x = bounds.min.x;
-        if (bounds.max.y > this.max.y) this.max.y = bounds.max.y;
-        if (bounds.min.y < this.min.y) this.min.y = bounds.min.y;
     }
 
     /**
@@ -19436,6 +19439,9 @@ let dummyObj = {
     }
 };
 
+let boundsA = new Bounds();
+let boundsB = new Bounds();
+
 // the global response object used for collisions
 let globalResponse = new ResponseObject();
 
@@ -19450,12 +19456,16 @@ let globalResponse = new ResponseObject();
  * @returns {boolean} true if they should collide, false otherwise
  */
 function shouldCollide(a, b) {
+    var bodyA = a.body,
+        bodyB = b.body;
     return (
+        a !== b &&
         a.isKinematic !== true && b.isKinematic !== true &&
-        typeof a.body === "object" && typeof b.body === "object" &&
-        !(a.body.isStatic === true && b.body.isStatic === true) &&
-        (a.body.collisionMask & b.body.collisionType) !== 0 &&
-        (a.body.collisionType & b.body.collisionMask) !== 0
+        typeof bodyA === "object" && typeof bodyB === "object" &&
+        bodyA.shapes.length > 0 && bodyB.shapes.length > 0 &&
+        !(bodyA.isStatic === true && bodyB.isStatic === true) &&
+        (bodyA.collisionMask & bodyB.collisionType) !== 0 &&
+        (bodyA.collisionType & bodyB.collisionMask) !== 0
     );
 }
 
@@ -19474,60 +19484,52 @@ function collisionCheck(objA, response = globalResponse) {
     // retreive a list of potential colliding objects from the game world
     var candidates = game.world.broadphase.retrieve(objA);
 
-    for (var i = candidates.length, objB; i--, (objB = candidates[i]);) {
+    boundsA.addBounds(objA.getBounds(), true);
+    boundsA.addBounds(objA.body.getBounds());
 
+    candidates.forEach((objB) => {
         // check if both objects "should" collide
-        if ((objB !== objA) && shouldCollide(objA, objB) &&
-            // fast AABB check if both bounding boxes are overlaping
-            objA.body.getBounds().overlaps(objB.body.getBounds())) {
+        if (shouldCollide(objA, objB)) {
 
-            // go trough all defined shapes in A
-            var aLen = objA.body.shapes.length;
-            var bLen = objB.body.shapes.length;
-            if (aLen === 0 || bLen === 0) {
-                continue;
-            }
+            boundsB.addBounds(objB.getBounds(), true);
+            boundsB.addBounds(objB.body.getBounds());
 
-            var indexA = 0;
-            do {
-                var shapeA = objA.body.getShape(indexA);
-                // go through all defined shapes in B
-                var indexB = 0;
-                do {
-                    var shapeB = objB.body.getShape(indexB);
-
-                    // full SAT collision check
-                    if (SAT["test" + shapeA.shapeType + shapeB.shapeType]
-                        .call(
-                            this,
-                            objA, // a reference to the object A
-                            shapeA,
-                            objB,  // a reference to the object B
-                            shapeB,
-                             // clear response object before reusing
-                            response.clear()) === true
-                    ) {
-                        // we touched something !
-                        collisionCounter++;
-
-                        // set the shape index
-                        response.indexShapeA = indexA;
-                        response.indexShapeB = indexB;
-
-                        // execute the onCollision callback
-                        if (objA.onCollision && objA.onCollision(response, objB) !== false && objA.body.isStatic === false) {
-                            objA.body.respondToCollision.call(objA.body, response);
-                        }
-                        if (objB.onCollision && objB.onCollision(response, objA) !== false && objB.body.isStatic === false) {
-                            objB.body.respondToCollision.call(objB.body, response);
+            // fast AABB check if both bounding boxes are overlaping
+            if (boundsA.overlaps(boundsB)) {
+                // for each shape in body A
+                objA.body.shapes.forEach((shapeA, indexA) => {
+                    // for each shape in body B
+                    objB.body.shapes.forEach((shapeB, indexB) => {
+                        // full SAT collision check
+                        if (SAT["test" + shapeA.shapeType + shapeB.shapeType].call(
+                                this,
+                                objA, // a reference to the object A
+                                shapeA,
+                                objB,  // a reference to the object B
+                                shapeB,
+                                // clear response object before reusing
+                                response.clear()) === true
+                        ) {
+                            // we touched something !
+                            collisionCounter++;
+
+                            // set the shape index
+                            response.indexShapeA = indexA;
+                            response.indexShapeB = indexB;
+
+                            // execute the onCollision callback
+                            if (objA.onCollision && objA.onCollision(response, objB) !== false && objA.body.isStatic === false) {
+                                objA.body.respondToCollision.call(objA.body, response);
+                            }
+                            if (objB.onCollision && objB.onCollision(response, objA) !== false && objB.body.isStatic === false) {
+                                objB.body.respondToCollision.call(objB.body, response);
+                            }
                         }
-                    }
-                    indexB++;
-                } while (indexB < bLen);
-                indexA++;
-            } while (indexA < aLen);
+                    });
+                });
+            }
         }
-    }
+    });
     // we could return the amount of objects we collided with ?
     return collisionCounter > 0;
 }
@@ -21555,7 +21557,7 @@ class QuadTree {
         if (item.isFloating === true) {
             pos = this.world.app.viewport.localToWorld(bounds.left, bounds.top, QT_VECTOR);
         } else {
-            pos = QT_VECTOR.set(item.left, item.top);
+            pos = QT_VECTOR.set(bounds.left, bounds.top);
         }
 
         var index = -1,
@@ -33047,10 +33049,10 @@ class BasePlugin {
          * this can be overridden by the plugin
          * @public
          * @type {string}
-         * @default "14.0.0"
+         * @default "14.0.1"
          * @name plugin.Base#version
          */
-        this.version = "14.0.0";
+        this.version = "14.0.1";
     }
 }
 
@@ -38181,7 +38183,7 @@ Renderer.prototype.getScreenContext = function()  {
  * @name version
  * @type {string}
  */
-const version = "14.0.0";
+const version = "14.0.1";
 
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "melonjs",
-  "version": "14.0.0",
+  "version": "14.0.1",
   "description": "melonJS Game Engine",
   "homepage": "http://www.melonjs.org/",
   "type": "module",
@@ -69,12 +69,12 @@
     "cross-env": "^7.0.3",
     "del-cli": "^5.0.0",
     "eslint": "^8.25.0",
-    "expect": "^29.1.2",
+    "expect": "^29.2.0",
     "expect-mocha-image-snapshot": "^2.0.14",
-    "fastify": "^4.8.1",
-    "mocha": "^10.0.0",
+    "fastify": "^4.9.1",
+    "mocha": "^10.1.0",
     "npm-self-link": "^1.1.7",
-    "puppeteer": "^18.2.1",
+    "puppeteer": "^19.0.0",
     "rollup": "^2.79.1",
     "rollup-plugin-bundle-size": "^1.0.3",
     "rollup-plugin-string": "^3.0.0",

package/src/physics/bounds.js

@@ -238,13 +238,16 @@ class Bounds {
      */
     addBounds(bounds, clear = false) {
         if (clear === true) {
-            this.clear();
+            this.max.x = bounds.max.x;
+            this.min.x = bounds.min.x;
+            this.max.y = bounds.max.y;
+            this.min.y = bounds.min.y;
+        } else {
+            if (bounds.max.x > this.max.x) this.max.x = bounds.max.x;
+            if (bounds.min.x < this.min.x) this.min.x = bounds.min.x;
+            if (bounds.max.y > this.max.y) this.max.y = bounds.max.y;
+            if (bounds.min.y < this.min.y) this.min.y = bounds.min.y;
         }
-
-        if (bounds.max.x > this.max.x) this.max.x = bounds.max.x;
-        if (bounds.min.x < this.min.x) this.min.x = bounds.min.x;
-        if (bounds.max.y > this.max.y) this.max.y = bounds.max.y;
-        if (bounds.min.y < this.min.y) this.min.y = bounds.min.y;
     }
 
     /**

package/src/physics/detector.js

@@ -2,6 +2,8 @@ import * as SAT from "./sat.js";
 import ResponseObject from "./response.js";
 import Vector2d from "./../math/vector2.js";
 import game from "./../game.js";
+import Bounds from "./bounds.js";
+
 
 // a dummy object when using Line for raycasting
 let dummyObj = {
@@ -14,6 +16,9 @@ let dummyObj = {
     }
 };
 
+let boundsA = new Bounds();
+let boundsB = new Bounds();
+
 // the global response object used for collisions
 let globalResponse = new ResponseObject();
 
@@ -28,12 +33,16 @@ let globalResponse = new ResponseObject();
  * @returns {boolean} true if they should collide, false otherwise
  */
 function shouldCollide(a, b) {
+    var bodyA = a.body,
+        bodyB = b.body;
     return (
+        a !== b &&
         a.isKinematic !== true && b.isKinematic !== true &&
-        typeof a.body === "object" && typeof b.body === "object" &&
-        !(a.body.isStatic === true && b.body.isStatic === true) &&
-        (a.body.collisionMask & b.body.collisionType) !== 0 &&
-        (a.body.collisionType & b.body.collisionMask) !== 0
+        typeof bodyA === "object" && typeof bodyB === "object" &&
+        bodyA.shapes.length > 0 && bodyB.shapes.length > 0 &&
+        !(bodyA.isStatic === true && bodyB.isStatic === true) &&
+        (bodyA.collisionMask & bodyB.collisionType) !== 0 &&
+        (bodyA.collisionType & bodyB.collisionMask) !== 0
     );
 }
 
@@ -52,60 +61,52 @@ export function collisionCheck(objA, response = globalResponse) {
     // retreive a list of potential colliding objects from the game world
     var candidates = game.world.broadphase.retrieve(objA);
 
-    for (var i = candidates.length, objB; i--, (objB = candidates[i]);) {
+    boundsA.addBounds(objA.getBounds(), true);
+    boundsA.addBounds(objA.body.getBounds());
 
+    candidates.forEach((objB) => {
         // check if both objects "should" collide
-        if ((objB !== objA) && shouldCollide(objA, objB) &&
-            // fast AABB check if both bounding boxes are overlaping
-            objA.body.getBounds().overlaps(objB.body.getBounds())) {
+        if (shouldCollide(objA, objB)) {
 
-            // go trough all defined shapes in A
-            var aLen = objA.body.shapes.length;
-            var bLen = objB.body.shapes.length;
-            if (aLen === 0 || bLen === 0) {
-                continue;
-            }
+            boundsB.addBounds(objB.getBounds(), true);
+            boundsB.addBounds(objB.body.getBounds());
 
-            var indexA = 0;
-            do {
-                var shapeA = objA.body.getShape(indexA);
-                // go through all defined shapes in B
-                var indexB = 0;
-                do {
-                    var shapeB = objB.body.getShape(indexB);
-
-                    // full SAT collision check
-                    if (SAT["test" + shapeA.shapeType + shapeB.shapeType]
-                        .call(
-                            this,
-                            objA, // a reference to the object A
-                            shapeA,
-                            objB,  // a reference to the object B
-                            shapeB,
-                             // clear response object before reusing
-                            response.clear()) === true
-                    ) {
-                        // we touched something !
-                        collisionCounter++;
-
-                        // set the shape index
-                        response.indexShapeA = indexA;
-                        response.indexShapeB = indexB;
-
-                        // execute the onCollision callback
-                        if (objA.onCollision && objA.onCollision(response, objB) !== false && objA.body.isStatic === false) {
-                            objA.body.respondToCollision.call(objA.body, response);
-                        }
-                        if (objB.onCollision && objB.onCollision(response, objA) !== false && objB.body.isStatic === false) {
-                            objB.body.respondToCollision.call(objB.body, response);
+            // fast AABB check if both bounding boxes are overlaping
+            if (boundsA.overlaps(boundsB)) {
+                // for each shape in body A
+                objA.body.shapes.forEach((shapeA, indexA) => {
+                    // for each shape in body B
+                    objB.body.shapes.forEach((shapeB, indexB) => {
+                        // full SAT collision check
+                        if (SAT["test" + shapeA.shapeType + shapeB.shapeType].call(
+                                this,
+                                objA, // a reference to the object A
+                                shapeA,
+                                objB,  // a reference to the object B
+                                shapeB,
+                                // clear response object before reusing
+                                response.clear()) === true
+                        ) {
+                            // we touched something !
+                            collisionCounter++;
+
+                            // set the shape index
+                            response.indexShapeA = indexA;
+                            response.indexShapeB = indexB;
+
+                            // execute the onCollision callback
+                            if (objA.onCollision && objA.onCollision(response, objB) !== false && objA.body.isStatic === false) {
+                                objA.body.respondToCollision.call(objA.body, response);
+                            }
+                            if (objB.onCollision && objB.onCollision(response, objA) !== false && objB.body.isStatic === false) {
+                                objB.body.respondToCollision.call(objB.body, response);
+                            }
                         }
-                    }
-                    indexB++;
-                } while (indexB < bLen);
-                indexA++;
-            } while (indexA < aLen);
+                    });
+                });
+            }
         }
-    }
+    });
     // we could return the amount of objects we collided with ?
     return collisionCounter > 0;
 }

package/src/physics/quadtree.js

@@ -156,7 +156,7 @@ class QuadTree {
         if (item.isFloating === true) {
             pos = this.world.app.viewport.localToWorld(bounds.left, bounds.top, QT_VECTOR);
         } else {
-            pos = QT_VECTOR.set(item.left, item.top);
+            pos = QT_VECTOR.set(bounds.left, bounds.top);
         }
 
         var index = -1,