fix: callback in separate body even if trigger

Prozi · Sep 14, 2024 · 015301f · 015301f
1 parent 0f9ea6b
commit 015301f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/dist/demo/demo.js b/dist/demo/demo.js
@@ -4031,7 +4031,7 @@ which is good.	See: http://baagoe.com/en/RandomMusings/hash/avalanche.xhtml
             const offsets = { x: 0, y: 0 };
             const addOffsets = (collision) => {
               // when is not trigger and callback returns true it continues
-              if (!collision.b.isTrigger && callback(collision)) {
+              if (callback(collision) && !collision.b.isTrigger) {
                 offsets.x += collision.overlapV.x;
                 offsets.y += collision.overlapV.y;
               }

diff --git a/dist/system.js b/dist/system.js
@@ -46,7 +46,7 @@ class System extends base_system_1.BaseSystem {
     const offsets = { x: 0, y: 0 };
     const addOffsets = (collision) => {
       // when is not trigger and callback returns true it continues
-      if (!collision.b.isTrigger && callback(collision)) {
+      if (callback(collision) && !collision.b.isTrigger) {
         offsets.x += collision.overlapV.x;
         offsets.y += collision.overlapV.y;
       }

diff --git a/docs/demo/demo.js b/docs/demo/demo.js
@@ -4031,7 +4031,7 @@ which is good.	See: http://baagoe.com/en/RandomMusings/hash/avalanche.xhtml
             const offsets = { x: 0, y: 0 };
             const addOffsets = (collision) => {
               // when is not trigger and callback returns true it continues
-              if (!collision.b.isTrigger && callback(collision)) {
+              if (callback(collision) && !collision.b.isTrigger) {
                 offsets.x += collision.overlapV.x;
                 offsets.y += collision.overlapV.y;
               }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "detect-collisions",
-  "version": "9.15.0",
+  "version": "9.15.1",
   "description": "Detect collisions between different shapes such as Points, Lines, Boxes, Polygons (including concave), Ellipses, and Circles. Features include RayCasting and support for offsets, rotation, scaling, bounding box padding, with options for static and trigger bodies (non-colliding).",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/src/system.ts b/src/system.ts
@@ -80,7 +80,7 @@ export class System<TBody extends Body = Body> extends BaseSystem<TBody> {
     const offsets = { x: 0, y: 0 };
     const addOffsets = (collision: Response) => {
       // when is not trigger and callback returns true it continues
-      if (!collision.b.isTrigger && callback(collision)) {
+      if (callback(collision) && !collision.b.isTrigger) {
         offsets.x += collision.overlapV.x;
         offsets.y += collision.overlapV.y;
       }