Do not use ??, restore ordering of AddRaycastVehicleMessage values

pmndrs · Jan 4, 2022 · e58acaf · e58acaf
1 parent 4ee9eb8
commit e58acaf
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 25 deletions.
diff --git a/examples/src/demos/RaycastVehicle/Vehicle.tsx b/examples/src/demos/RaycastVehicle/Vehicle.tsx
@@ -7,7 +7,7 @@ import { Wheel } from './Wheel'
 import type { BoxProps, WheelInfoOptions } from '@react-three/cannon'
 import type { Object3D } from 'three'
 
-export type VehicleProps = Pick<BoxProps, 'angularVelocity' | 'position' | 'rotation'> & {
+export type VehicleProps = Required<Pick<BoxProps, 'angularVelocity' | 'position' | 'rotation'>> & {
   radius?: number
   width?: number
   height?: number
@@ -114,10 +114,10 @@ function Vehicle({
     }
 
     if (reset) {
-      chassisApi.position.set(0, 0.5, 0)
+      chassisApi.position.set(...position)
       chassisApi.velocity.set(0, 0, 0)
-      chassisApi.angularVelocity.set(0, 0.5, 0)
-      chassisApi.rotation.set(0, -Math.PI / 4, 0)
+      chassisApi.angularVelocity.set(...angularVelocity)
+      chassisApi.rotation.set(...rotation)
     }
   })
 

diff --git a/examples/yarn.lock b/examples/yarn.lock
@@ -350,10 +350,10 @@
   integrity sha512-W/YMJMX35XgGGzX0gKORBTwnvQ+1loDOFN3XlZkW5fgpEY+7VkRUpPyqPWXQr3n6lHrsLmHIGdpznqZi54ACTQ==
 
 "@react-three/cannon@file:..":
-  version "4.3.0"
+  version "4.4.0"
   dependencies:
     cannon-es "^0.18.0"
-    cannon-es-debugger "^0.1.4"
+    cannon-es-debugger "^1.0.0"
 
 "@react-three/drei@^8.3.1":
   version "8.3.1"
@@ -605,10 +605,10 @@ caniuse-lite@^1.0.30001286:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001289.tgz#d62a20175c4d9e740feda12a78b7c8df7866329e"
   integrity sha512-hV6x4IfrYViN8cJbGFVbjD7KCrhS/O7wfDgvevYRanJ/IN+hhxpTcXXqaxy3CzPNFe5rlqdimdEB/k7H0YzxHg==
 
-cannon-es-debugger@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/cannon-es-debugger/-/cannon-es-debugger-0.1.4.tgz#22c79ae14c52de44465690988ff647c51c79c62b"
-  integrity sha512-RefSPWX6gDMQsx3UWoQpkGW3R03Wwn8p1JteexQUYxDC5DnOS3U3iKhns2vVpFp6Q3AKiSSmRf7NIXnGN8L0RA==
+cannon-es-debugger@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/cannon-es-debugger/-/cannon-es-debugger-1.0.0.tgz#28c6679b30dcf608e978225239f447a8fe55ccb4"
+  integrity sha512-sE9lDOBAYFKlh+0w+cvWKwUhJef8HYnUSVPWPL0jD15MAuVRQKno4QYZSGxgOoJkMR3mQqxL4bxys2b3RSWH8g==
 
 cannon-es@^0.18.0:
   version "0.18.0"

diff --git a/src/hooks.ts b/src/hooks.ts
@@ -794,24 +794,24 @@ export function useRaycastVehicle(
 
     const currentWorker = worker
     const uuid: string[] = [ref.current.uuid]
-    const raycastVehicleProps = fn()
-
-    const chassisBodyUUID = getUUID(raycastVehicleProps.chassisBody)
-    const wheelUUIDs = raycastVehicleProps.wheels.map((ref) => getUUID(ref))
+    const {
+      chassisBody,
+      indexForwardAxis = 2,
+      indexRightAxis = 0,
+      indexUpAxis = 1,
+      wheelInfos,
+      wheels,
+    } = fn()
+
+    const chassisBodyUUID = getUUID(chassisBody)
+    const wheelUUIDs = wheels.map((ref) => getUUID(ref))
 
     if (!chassisBodyUUID || !wheelUUIDs.every(isString)) return
 
     currentWorker.postMessage({
       op: 'addRaycastVehicle',
       uuid,
-      props: [
-        chassisBodyUUID,
-        wheelUUIDs,
-        raycastVehicleProps.wheelInfos,
-        raycastVehicleProps?.indexRightAxis ?? 2,
-        raycastVehicleProps?.indexForwardAxis ?? 0,
-        raycastVehicleProps?.indexUpAxis ?? 1,
-      ],
+      props: [chassisBodyUUID, wheelUUIDs, wheelInfos, indexForwardAxis, indexRightAxis, indexUpAxis],
     })
     return () => {
       currentWorker.postMessage({ op: 'removeRaycastVehicle', uuid })

diff --git a/src/worker.js b/src/worker.js
@@ -452,9 +452,9 @@ self.onmessage = (e) => {
       const [chassisBody, wheels, wheelInfos, indexForwardAxis, indexRightAxis, indexUpAxis] = props
       const vehicle = new RaycastVehicle({
         chassisBody: state.bodies[chassisBody],
-        indexForwardAxis: indexForwardAxis,
-        indexRightAxis: indexRightAxis,
-        indexUpAxis: indexUpAxis,
+        indexForwardAxis,
+        indexRightAxis,
+        indexUpAxis,
       })
       vehicle.world = state.world
       for (let i = 0; i < wheelInfos.length; i++) {