Merge pull request #73 from isaac-mason/feat/update-rt-rapier

feat: bump @react-three/rapier from 1.3.1 to 1.4.0

Author: ErdongChen-Andrew

example/FloatingPlatform.tsx

@@ -1,14 +1,13 @@
 import {
   CuboidCollider,
-  RapierRigidBody,
   RigidBody,
   useRapier,
 } from "@react-three/rapier";
 import { useEffect, useRef, useMemo } from "react";
 import * as THREE from "three";
 import { useFrame } from "@react-three/fiber";
 import { Text } from "@react-three/drei";
-import type { RayColliderToi } from "@dimforge/rapier3d-compat";
+import type { RayColliderHit } from "@dimforge/rapier3d-compat";
 
 export default function FloatingPlatform() {
   // Preset
@@ -27,22 +26,22 @@ export default function FloatingPlatform() {
   const springDirVec = useMemo(() => new THREE.Vector3(), []);
   const origin = useMemo(() => new THREE.Vector3(), []);
   const rayCast = new rapier.Ray(origin, rayDir);
-  let rayHit: RayColliderToi = null;
+  let rayHit: RayColliderHit | null = null;
   const floatingDis = 0.8;
   const springK = 2.5;
   const dampingC = 0.15;
   // Platform 2
   const springDirVec2 = useMemo(() => new THREE.Vector3(), []);
   const origin2 = useMemo(() => new THREE.Vector3(), []);
   const rayCast2 = new rapier.Ray(origin2, rayDir);
-  let rayHit2: RayColliderToi = null;
+  let rayHit2: RayColliderHit | null = null;
   // Moving Platform
   const springDirVecMove = useMemo(() => new THREE.Vector3(), []);
   const originMove = useMemo(() => new THREE.Vector3(), []);
   const rayCastMove = new rapier.Ray(originMove, rayDir);
   const movingVel = useMemo(() => new THREE.Vector3(), []);
   let movingDir = 1;
-  let rayHitMove: RayColliderToi = null;
+  let rayHitMove: RayColliderHit | null = null;
 
   useEffect(() => {
     // Loack platform 1 rotation
@@ -74,8 +73,8 @@ export default function FloatingPlatform() {
         rayCast,
         rayLength,
         false,
-        null,
-        null,
+        undefined,
+        undefined,
         floatingPlateRef.current,
         floatingPlateRef.current
       );
@@ -91,8 +90,8 @@ export default function FloatingPlatform() {
         rayCast2,
         rayLength,
         false,
-        null,
-        null,
+        undefined,
+        undefined,
         floatingPlateRef2.current,
         floatingPlateRef2.current
       );
@@ -108,8 +107,8 @@ export default function FloatingPlatform() {
         rayCastMove,
         rayLength,
         false,
-        null,
-        null,
+        undefined,
+        undefined,
         floatingMovingPlateRef.current,
         floatingMovingPlateRef.current
       );
@@ -138,7 +137,7 @@ export default function FloatingPlatform() {
     if (rayHit) {
       if (rayHit.collider.parent()) {
         const floatingForce =
-          springK * (floatingDis - rayHit.toi) -
+          springK * (floatingDis - rayHit.timeOfImpact) -
           floatingPlateRef.current.linvel().y * dampingC;
         floatingPlateRef.current.applyImpulse(
           springDirVec.set(0, floatingForce, 0),
@@ -151,7 +150,7 @@ export default function FloatingPlatform() {
     if (rayHit2) {
       if (rayHit2.collider.parent()) {
         const floatingForce2 =
-          springK * (floatingDis - rayHit2.toi) -
+          springK * (floatingDis - rayHit2.timeOfImpact) -
           floatingPlateRef2.current.linvel().y * dampingC;
         floatingPlateRef2.current.applyImpulse(
           springDirVec2.set(0, floatingForce2, 0),
@@ -164,7 +163,7 @@ export default function FloatingPlatform() {
     if (rayHitMove) {
       if (rayHitMove.collider.parent()) {
         const floatingForceMove =
-          springK * (floatingDis - rayHitMove.toi) -
+          springK * (floatingDis - rayHitMove.timeOfImpact) -
           floatingMovingPlateRef.current.linvel().y * dampingC;
         floatingMovingPlateRef.current.applyImpulse(
           springDirVecMove.set(0, floatingForceMove, 0),

package-lock.json

@@ -48,7 +48,7 @@
   "peerDependencies": {
     "@react-three/drei": ">=9.0",
     "@react-three/fiber": ">=8.0",
-    "@react-three/rapier": ">=1.0",
+    "@react-three/rapier": ">=1.4.0",
     "react": ">=18",
     "react-dom": ">=18.0",
     "three": ">=0.153"

package.json

@@ -17,7 +17,7 @@ import { useGame } from "./stores/useGame";
 import { useJoystickControls } from "./stores/useJoystickControls";
 import type {
   Collider,
-  RayColliderToi,
+  RayColliderHit,
   Vector,
 } from "@dimforge/rapier3d-compat";
 import React from "react";
@@ -569,7 +569,7 @@ const Ecctrl: ForwardRefRenderFunction<RapierRigidBody, EcctrlProps> = ({
   const characterMassForce: THREE.Vector3 = useMemo(() => new THREE.Vector3(), []);
   const rayOrigin: THREE.Vector3 = useMemo(() => new THREE.Vector3(), []);
   const rayCast = new rapier.Ray(rayOrigin, rayDir);
-  let rayHit: RayColliderToi = null;
+  let rayHit: RayColliderHit | null = null;
 
   /**Test shape ray */
   // const shape = new rapier.Capsule(0.2,0.1)
@@ -585,7 +585,7 @@ const Ecctrl: ForwardRefRenderFunction<RapierRigidBody, EcctrlProps> = ({
   const slopeRayOriginRef = useRef<THREE.Mesh>();
   const slopeRayorigin: THREE.Vector3 = useMemo(() => new THREE.Vector3(), []);
   const slopeRayCast = new rapier.Ray(slopeRayorigin, slopeRayDir);
-  let slopeRayHit: RayColliderToi = null;
+  let slopeRayHit: RayColliderHit | null = null;
 
   /**
    * Point to move setup
@@ -1127,7 +1127,7 @@ const Ecctrl: ForwardRefRenderFunction<RapierRigidBody, EcctrlProps> = ({
     //   characterRef.current
     // );
 
-    if (rayHit && rayHit.toi < floatingDis + rayHitForgiveness) {
+    if (rayHit && rayHit.timeOfImpact < floatingDis + rayHitForgiveness) {
       if (slopeRayHit && actualSlopeAngle < slopeMaxAngle) {
         canJump = true;
       }
@@ -1143,7 +1143,7 @@ const Ecctrl: ForwardRefRenderFunction<RapierRigidBody, EcctrlProps> = ({
         // Getting the standing force apply point
         standingForcePoint.set(
           rayOrigin.x,
-          rayOrigin.y - rayHit.toi,
+          rayOrigin.y - rayHit.timeOfImpact,
           rayOrigin.z
         );
         const rayHitObjectBodyType = rayHit.collider.parent().bodyType();
@@ -1260,12 +1260,12 @@ const Ecctrl: ForwardRefRenderFunction<RapierRigidBody, EcctrlProps> = ({
         actualSlopeAngle = actualSlopeNormalVec?.angleTo(floorNormal);
       }
     }
-    if (slopeRayHit && rayHit && slopeRayHit.toi < floatingDis + 0.5) {
+    if (slopeRayHit && rayHit && slopeRayHit.timeOfImpact < floatingDis + 0.5) {
       if (canJump) {
         // Round the slope angle to 2 decimal places
         slopeAngle = Number(
           Math.atan(
-            (rayHit.toi - slopeRayHit.toi) / slopeRayOriginOffest
+            (rayHit.timeOfImpact - slopeRayHit.timeOfImpact) / slopeRayOriginOffest
           ).toFixed(2)
         );
       } else {
@@ -1281,7 +1281,7 @@ const Ecctrl: ForwardRefRenderFunction<RapierRigidBody, EcctrlProps> = ({
     if (rayHit != null) {
       if (canJump && rayHit.collider.parent()) {
         floatingForce =
-          springK * (floatingDis - rayHit.toi) -
+          springK * (floatingDis - rayHit.timeOfImpact) -
           characterRef.current.linvel().y * dampingC;
         characterRef.current.applyImpulse(
           springDirVec.set(0, floatingForce, 0),