Update body collide event to correctly return collided bodies

pmndrs · Apr 6, 2020 · 1f0cef6 · 1f0cef6 · codynova · Apr 6, 2020
1 parent 02842c8
commit 1f0cef6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "use-cannon",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "physics based hooks for react-three-fiber",
   "keywords": [
     "cannon",

diff --git a/src/Provider.tsx b/src/Provider.tsx
@@ -38,8 +38,8 @@ export type WorkerCollideEvent = {
   data: {
     op: 'event'
     type: 'collide'
-    body: string
     target: string
+    body: string
     contact: {
       ni: number[]
       ri: number[]
@@ -143,10 +143,10 @@ export default function Provider({
         case 'event':
           switch (e.data.type) {
             case 'collide':
-              events[e.data.body]({
+              events[e.data.target]({
                 ...e.data,
-                body: refs[e.data.body],
                 target: refs[e.data.target],
+                body: refs[e.data.body],
               })
               break
             case 'rayhit':

diff --git a/src/worker.js b/src/worker.js
@@ -170,7 +170,7 @@ self.onmessage = (e) => {
         world.addBody(body)
 
         if (onCollide)
-          body.addEventListener('collide', ({ type, contact, target }) => {
+          body.addEventListener('collide', ({ type, body, target, contact }) => {
             const { ni, ri, rj } = contact
             self.postMessage({
               op: 'event',