@react-three/rapier 0.8.2 → 0.9.0

package/dist/react-three-rapier.esm.js

@@ -1,9 +1,9 @@
-import { EventQueue, RigidBodyDesc, ColliderDesc, ActiveEvents } from '@dimforge/rapier3d-compat';
+import { EventQueue, ColliderDesc, ActiveEvents, RigidBodyDesc } from '@dimforge/rapier3d-compat';
 export { CoefficientCombineRule, Collider as RapierCollider, RigidBody as RapierRigidBody } from '@dimforge/rapier3d-compat';
-import React, { useRef, useState, useEffect, useMemo, createContext, useContext, memo, forwardRef, useImperativeHandle, useLayoutEffect } from 'react';
-import { useAsset } from 'use-asset';
 import { useFrame } from '@react-three/fiber';
+import React, { useRef, useState, useEffect, useCallback, useMemo, createContext, useContext, memo, forwardRef, useImperativeHandle, useLayoutEffect } from 'react';
 import { Quaternion, Euler, Vector3, Object3D, Matrix4, MathUtils, InstancedMesh, BufferAttribute, DynamicDrawUsage } from 'three';
+import { useAsset } from 'use-asset';
 import { mergeVertices } from 'three-stdlib';
 
 const _quaternion = new Quaternion();
@@ -227,7 +227,8 @@ const Physics = ({
   children,
   timeStep: _timeStep = 1 / 60,
   paused: _paused = false,
-  updatePriority
+  updatePriority,
+  interpolate: _interpolate = true
 }) => {
   const rapier = useAsset(importRapier);
   const worldRef = useRef();
@@ -263,12 +264,40 @@ const Physics = ({
     }
   }, [_gravity]);
   const [steppingState] = useState({
+    previousState: {},
     accumulator: 0
   });
   /* Check if the timestep is supposed to be variable. We'll do this here
   once so we don't have to string-check every frame. */
 
   const timeStepVariable = _timeStep === "vary";
+  const getSourceFromColliderHandle = useCallback(handle => {
+    const world = worldRef.current;
+
+    if (world) {
+      var _collider$parent;
+
+      const collider = world.getCollider(handle);
+      const colEvents = colliderEvents.get(handle);
+      const colliderState = colliderStates.get(handle);
+      const rigidBodyHandle = collider === null || collider === void 0 ? void 0 : (_collider$parent = collider.parent()) === null || _collider$parent === void 0 ? void 0 : _collider$parent.handle;
+      const rigidBody = rigidBodyHandle ? world.getRigidBody(rigidBodyHandle) : undefined;
+      const rbEvents = rigidBody && rigidBodyHandle ? rigidBodyEvents.get(rigidBodyHandle) : undefined;
+      const rigidBodyState = rigidBodyHandle ? rigidBodyStates.get(rigidBodyHandle) : undefined;
+      return {
+        collider: {
+          object: collider,
+          events: colEvents,
+          state: colliderState
+        },
+        rigidBody: {
+          object: rigidBody,
+          events: rbEvents,
+          state: rigidBodyState
+        }
+      };
+    }
+  }, []);
   useFrame((_, dt) => {
     const world = worldRef.current;
     if (!world) return;
@@ -290,13 +319,25 @@ const Physics = ({
 
       if (!_paused) {
         while (steppingState.accumulator >= _timeStep) {
+          if (_interpolate) {
+            // Set up previous state
+            // needed for accurate interpolations if the world steps more than once
+            steppingState.previousState = {};
+            world.forEachRigidBody(body => {
+              steppingState.previousState[body.handle] = {
+                position: body.translation(),
+                rotation: body.rotation()
+              };
+            });
+          }
+
           world.step(eventQueue);
           steppingState.accumulator -= _timeStep;
         }
       }
     }
 
-    const interpolationAlpha = timeStepVariable ? 1 : steppingState.accumulator % _timeStep / _timeStep; // Update meshes
+    const interpolationAlpha = timeStepVariable || !_interpolate ? 1 : steppingState.accumulator / _timeStep; // Update meshes
 
     rigidBodyStates.forEach((state, handle) => {
       const rigidBody = world.getRigidBody(handle);
@@ -323,7 +364,20 @@ const Physics = ({
       }
 
       let t = rigidBody.translation();
-      let r = rigidBody.rotation(); // Get new position
+      let r = rigidBody.rotation();
+      let previousState = steppingState.previousState[handle];
+
+      if (previousState) {
+        // Get previous simulated world position
+        _matrix4.compose(previousState.position, rapierQuaternionToQuaternion(previousState.rotation), state.scale).premultiply(state.invertedWorldMatrix).decompose(_position, _rotation, _scale); // Apply previous tick position
+
+
+        if (!(state.object instanceof InstancedMesh)) {
+          state.object.position.copy(_position);
+          state.object.quaternion.copy(_rotation);
+        }
+      } // Get new position
+
 
       _matrix4.compose(t, rapierQuaternionToQuaternion(r), state.scale).premultiply(state.invertedWorldMatrix).decompose(_position, _rotation, _scale);
 
@@ -331,146 +385,182 @@ const Physics = ({
         state.setMatrix(_matrix4);
         state.object.instanceMatrix.needsUpdate = true;
       } else {
-        // Interpolate from last position
+        // Interpolate to new position
         state.object.position.lerp(_position, interpolationAlpha);
         state.object.quaternion.slerp(_rotation, interpolationAlpha);
       }
     });
     eventQueue.drainCollisionEvents((handle1, handle2, started) => {
-      var _collider1$parent, _collider2$parent;
-
-      const collider1 = world.getCollider(handle1);
-      const collider2 = world.getCollider(handle2);
-      const rigidBodyHandle1 = (_collider1$parent = collider1.parent()) === null || _collider1$parent === void 0 ? void 0 : _collider1$parent.handle;
-      const rigidBodyHandle2 = (_collider2$parent = collider2.parent()) === null || _collider2$parent === void 0 ? void 0 : _collider2$parent.handle; // Collision Events
+      const source1 = getSourceFromColliderHandle(handle1);
+      const source2 = getSourceFromColliderHandle(handle2); // Collision Events
 
-      if (!collider1 || !collider2) {
+      if (!(source1 !== null && source1 !== void 0 && source1.collider.object) || !(source2 !== null && source2 !== void 0 && source2.collider.object)) {
         return;
       }
 
-      const collider1Events = colliderEvents.get(collider1.handle);
-      const collider2Events = colliderEvents.get(collider2.handle);
-      const rigidBody1 = rigidBodyHandle1 ? world.getRigidBody(rigidBodyHandle1) : undefined;
-      const rigidBody2 = rigidBodyHandle2 ? world.getRigidBody(rigidBodyHandle2) : undefined;
-      const rigidBody1Events = rigidBodyHandle1 ? rigidBodyEvents.get(rigidBodyHandle1) : undefined;
-      const rigidBody2Events = rigidBodyHandle2 ? rigidBodyEvents.get(rigidBodyHandle2) : undefined;
-      const collider1State = colliderStates.get(collider1.handle);
-      const collider2State = colliderStates.get(collider2.handle);
-      const rigidBody1State = rigidBodyHandle1 ? rigidBodyStates.get(rigidBodyHandle1) : undefined;
-      const rigidBody2State = rigidBodyHandle2 ? rigidBodyStates.get(rigidBodyHandle2) : undefined;
-
       if (started) {
-        world.contactPair(collider1, collider2, (manifold, flipped) => {
-          var _rigidBody1Events$onC, _rigidBody2Events$onC, _collider1Events$onCo, _collider2Events$onCo;
+        world.contactPair(source1.collider.object, source2.collider.object, (manifold, flipped) => {
+          var _source1$rigidBody$ev, _source1$rigidBody$ev2, _source2$collider$sta, _source2$rigidBody$st, _source2$rigidBody$ev, _source2$rigidBody$ev2, _source1$collider$sta, _source1$rigidBody$st, _source1$collider$eve, _source1$collider$eve2, _source2$collider$sta2, _source2$rigidBody$st2, _source2$collider$eve, _source2$collider$eve2, _source1$collider$sta2, _source1$rigidBody$st2;
 
           /* RigidBody events */
-          rigidBody1Events === null || rigidBody1Events === void 0 ? void 0 : (_rigidBody1Events$onC = rigidBody1Events.onCollisionEnter) === null || _rigidBody1Events$onC === void 0 ? void 0 : _rigidBody1Events$onC.call(rigidBody1Events, {
-            rigidBody: rigidBody2,
-            collider: collider2,
-            colliderObject: collider2State === null || collider2State === void 0 ? void 0 : collider2State.object,
-            rigidBodyObject: rigidBody2State === null || rigidBody2State === void 0 ? void 0 : rigidBody2State.object,
+          (_source1$rigidBody$ev = source1.rigidBody.events) === null || _source1$rigidBody$ev === void 0 ? void 0 : (_source1$rigidBody$ev2 = _source1$rigidBody$ev.onCollisionEnter) === null || _source1$rigidBody$ev2 === void 0 ? void 0 : _source1$rigidBody$ev2.call(_source1$rigidBody$ev, {
+            rigidBody: source2.rigidBody.object,
+            collider: source2.collider.object,
+            colliderObject: (_source2$collider$sta = source2.collider.state) === null || _source2$collider$sta === void 0 ? void 0 : _source2$collider$sta.object,
+            rigidBodyObject: (_source2$rigidBody$st = source2.rigidBody.state) === null || _source2$rigidBody$st === void 0 ? void 0 : _source2$rigidBody$st.object,
             manifold,
             flipped
           });
-          rigidBody2Events === null || rigidBody2Events === void 0 ? void 0 : (_rigidBody2Events$onC = rigidBody2Events.onCollisionEnter) === null || _rigidBody2Events$onC === void 0 ? void 0 : _rigidBody2Events$onC.call(rigidBody2Events, {
-            rigidBody: rigidBody1,
-            collider: collider1,
-            colliderObject: collider1State === null || collider1State === void 0 ? void 0 : collider1State.object,
-            rigidBodyObject: rigidBody1State === null || rigidBody1State === void 0 ? void 0 : rigidBody1State.object,
+          (_source2$rigidBody$ev = source2.rigidBody.events) === null || _source2$rigidBody$ev === void 0 ? void 0 : (_source2$rigidBody$ev2 = _source2$rigidBody$ev.onCollisionEnter) === null || _source2$rigidBody$ev2 === void 0 ? void 0 : _source2$rigidBody$ev2.call(_source2$rigidBody$ev, {
+            rigidBody: source1.rigidBody.object,
+            collider: source1.collider.object,
+            colliderObject: (_source1$collider$sta = source1.collider.state) === null || _source1$collider$sta === void 0 ? void 0 : _source1$collider$sta.object,
+            rigidBodyObject: (_source1$rigidBody$st = source1.rigidBody.state) === null || _source1$rigidBody$st === void 0 ? void 0 : _source1$rigidBody$st.object,
             manifold,
             flipped
           });
           /* Collider events */
 
-          collider1Events === null || collider1Events === void 0 ? void 0 : (_collider1Events$onCo = collider1Events.onCollisionEnter) === null || _collider1Events$onCo === void 0 ? void 0 : _collider1Events$onCo.call(collider1Events, {
-            rigidBody: rigidBody2,
-            collider: collider2,
-            colliderObject: collider2State === null || collider2State === void 0 ? void 0 : collider2State.object,
-            rigidBodyObject: rigidBody2State === null || rigidBody2State === void 0 ? void 0 : rigidBody2State.object,
+          (_source1$collider$eve = source1.collider.events) === null || _source1$collider$eve === void 0 ? void 0 : (_source1$collider$eve2 = _source1$collider$eve.onCollisionEnter) === null || _source1$collider$eve2 === void 0 ? void 0 : _source1$collider$eve2.call(_source1$collider$eve, {
+            rigidBody: source2.rigidBody.object,
+            collider: source2.collider.object,
+            colliderObject: (_source2$collider$sta2 = source2.collider.state) === null || _source2$collider$sta2 === void 0 ? void 0 : _source2$collider$sta2.object,
+            rigidBodyObject: (_source2$rigidBody$st2 = source2.rigidBody.state) === null || _source2$rigidBody$st2 === void 0 ? void 0 : _source2$rigidBody$st2.object,
             manifold,
             flipped
           });
-          collider2Events === null || collider2Events === void 0 ? void 0 : (_collider2Events$onCo = collider2Events.onCollisionEnter) === null || _collider2Events$onCo === void 0 ? void 0 : _collider2Events$onCo.call(collider2Events, {
-            rigidBody: rigidBody1,
-            collider: collider1,
-            colliderObject: collider1State === null || collider1State === void 0 ? void 0 : collider1State.object,
-            rigidBodyObject: rigidBody1State === null || rigidBody1State === void 0 ? void 0 : rigidBody1State.object,
+          (_source2$collider$eve = source2.collider.events) === null || _source2$collider$eve === void 0 ? void 0 : (_source2$collider$eve2 = _source2$collider$eve.onCollisionEnter) === null || _source2$collider$eve2 === void 0 ? void 0 : _source2$collider$eve2.call(_source2$collider$eve, {
+            rigidBody: source1.rigidBody.object,
+            collider: source1.collider.object,
+            colliderObject: (_source1$collider$sta2 = source1.collider.state) === null || _source1$collider$sta2 === void 0 ? void 0 : _source1$collider$sta2.object,
+            rigidBodyObject: (_source1$rigidBody$st2 = source1.rigidBody.state) === null || _source1$rigidBody$st2 === void 0 ? void 0 : _source1$rigidBody$st2.object,
             manifold,
             flipped
           });
         });
       } else {
-        var _rigidBody1Events$onC2, _rigidBody2Events$onC2, _collider1Events$onCo2, _collider2Events$onCo2;
+        var _source1$rigidBody$ev3, _source1$rigidBody$ev4, _source2$rigidBody$ev3, _source2$rigidBody$ev4, _source1$collider$eve3, _source1$collider$eve4, _source2$collider$eve3, _source2$collider$eve4;
 
-        rigidBody1Events === null || rigidBody1Events === void 0 ? void 0 : (_rigidBody1Events$onC2 = rigidBody1Events.onCollisionExit) === null || _rigidBody1Events$onC2 === void 0 ? void 0 : _rigidBody1Events$onC2.call(rigidBody1Events, {
-          rigidBody: rigidBody2,
-          collider: collider2
+        (_source1$rigidBody$ev3 = source1.rigidBody.events) === null || _source1$rigidBody$ev3 === void 0 ? void 0 : (_source1$rigidBody$ev4 = _source1$rigidBody$ev3.onCollisionExit) === null || _source1$rigidBody$ev4 === void 0 ? void 0 : _source1$rigidBody$ev4.call(_source1$rigidBody$ev3, {
+          rigidBody: source2.rigidBody.object,
+          collider: source2.collider.object
         });
-        rigidBody2Events === null || rigidBody2Events === void 0 ? void 0 : (_rigidBody2Events$onC2 = rigidBody2Events.onCollisionExit) === null || _rigidBody2Events$onC2 === void 0 ? void 0 : _rigidBody2Events$onC2.call(rigidBody2Events, {
-          rigidBody: rigidBody1,
-          collider: collider1
+        (_source2$rigidBody$ev3 = source2.rigidBody.events) === null || _source2$rigidBody$ev3 === void 0 ? void 0 : (_source2$rigidBody$ev4 = _source2$rigidBody$ev3.onCollisionExit) === null || _source2$rigidBody$ev4 === void 0 ? void 0 : _source2$rigidBody$ev4.call(_source2$rigidBody$ev3, {
+          rigidBody: source1.rigidBody.object,
+          collider: source1.collider.object
         });
-        collider1Events === null || collider1Events === void 0 ? void 0 : (_collider1Events$onCo2 = collider1Events.onCollisionExit) === null || _collider1Events$onCo2 === void 0 ? void 0 : _collider1Events$onCo2.call(collider1Events, {
-          rigidBody: rigidBody2,
-          collider: collider2
+        (_source1$collider$eve3 = source1.collider.events) === null || _source1$collider$eve3 === void 0 ? void 0 : (_source1$collider$eve4 = _source1$collider$eve3.onCollisionExit) === null || _source1$collider$eve4 === void 0 ? void 0 : _source1$collider$eve4.call(_source1$collider$eve3, {
+          rigidBody: source2.rigidBody.object,
+          collider: source2.collider.object
         });
-        collider2Events === null || collider2Events === void 0 ? void 0 : (_collider2Events$onCo2 = collider2Events.onCollisionExit) === null || _collider2Events$onCo2 === void 0 ? void 0 : _collider2Events$onCo2.call(collider2Events, {
-          rigidBody: rigidBody1,
-          collider: collider1
+        (_source2$collider$eve3 = source2.collider.events) === null || _source2$collider$eve3 === void 0 ? void 0 : (_source2$collider$eve4 = _source2$collider$eve3.onCollisionExit) === null || _source2$collider$eve4 === void 0 ? void 0 : _source2$collider$eve4.call(_source2$collider$eve3, {
+          rigidBody: source1.rigidBody.object,
+          collider: source1.collider.object
         });
       } // Sensor Intersections
 
 
       if (started) {
-        if (world.intersectionPair(collider1, collider2)) {
-          var _rigidBody1Events$onI, _rigidBody2Events$onI, _collider1Events$onIn, _collider2Events$onIn;
-
-          rigidBody1Events === null || rigidBody1Events === void 0 ? void 0 : (_rigidBody1Events$onI = rigidBody1Events.onIntersectionEnter) === null || _rigidBody1Events$onI === void 0 ? void 0 : _rigidBody1Events$onI.call(rigidBody1Events, {
-            rigidBody: rigidBody2,
-            collider: collider2,
-            colliderObject: collider2State === null || collider2State === void 0 ? void 0 : collider2State.object,
-            rigidBodyObject: rigidBody2State === null || rigidBody2State === void 0 ? void 0 : rigidBody2State.object
+        if (world.intersectionPair(source1.collider.object, source2.collider.object)) {
+          var _source1$rigidBody$ev5, _source1$rigidBody$ev6, _source2$collider$sta3, _source2$rigidBody$st3, _source2$rigidBody$ev5, _source2$rigidBody$ev6, _source1$collider$sta3, _source1$rigidBody$st3, _source1$collider$eve5, _source1$collider$eve6, _source2$collider$sta4, _source2$rigidBody$st4, _source2$collider$eve5, _source2$collider$eve6, _source1$collider$sta4, _source1$rigidBody$st4;
+
+          (_source1$rigidBody$ev5 = source1.rigidBody.events) === null || _source1$rigidBody$ev5 === void 0 ? void 0 : (_source1$rigidBody$ev6 = _source1$rigidBody$ev5.onIntersectionEnter) === null || _source1$rigidBody$ev6 === void 0 ? void 0 : _source1$rigidBody$ev6.call(_source1$rigidBody$ev5, {
+            rigidBody: source2.rigidBody.object,
+            collider: source2.collider.object,
+            colliderObject: (_source2$collider$sta3 = source2.collider.state) === null || _source2$collider$sta3 === void 0 ? void 0 : _source2$collider$sta3.object,
+            rigidBodyObject: (_source2$rigidBody$st3 = source2.rigidBody.state) === null || _source2$rigidBody$st3 === void 0 ? void 0 : _source2$rigidBody$st3.object
           });
-          rigidBody2Events === null || rigidBody2Events === void 0 ? void 0 : (_rigidBody2Events$onI = rigidBody2Events.onIntersectionEnter) === null || _rigidBody2Events$onI === void 0 ? void 0 : _rigidBody2Events$onI.call(rigidBody2Events, {
-            rigidBody: rigidBody1,
-            collider: collider1,
-            colliderObject: collider1State === null || collider1State === void 0 ? void 0 : collider1State.object,
-            rigidBodyObject: rigidBody1State === null || rigidBody1State === void 0 ? void 0 : rigidBody1State.object
+          (_source2$rigidBody$ev5 = source2.rigidBody.events) === null || _source2$rigidBody$ev5 === void 0 ? void 0 : (_source2$rigidBody$ev6 = _source2$rigidBody$ev5.onIntersectionEnter) === null || _source2$rigidBody$ev6 === void 0 ? void 0 : _source2$rigidBody$ev6.call(_source2$rigidBody$ev5, {
+            rigidBody: source1.rigidBody.object,
+            collider: source1.collider.object,
+            colliderObject: (_source1$collider$sta3 = source1.collider.state) === null || _source1$collider$sta3 === void 0 ? void 0 : _source1$collider$sta3.object,
+            rigidBodyObject: (_source1$rigidBody$st3 = source1.rigidBody.state) === null || _source1$rigidBody$st3 === void 0 ? void 0 : _source1$rigidBody$st3.object
           });
-          collider1Events === null || collider1Events === void 0 ? void 0 : (_collider1Events$onIn = collider1Events.onIntersectionEnter) === null || _collider1Events$onIn === void 0 ? void 0 : _collider1Events$onIn.call(collider1Events, {
-            rigidBody: rigidBody2,
-            collider: collider2,
-            colliderObject: collider2State === null || collider2State === void 0 ? void 0 : collider2State.object,
-            rigidBodyObject: rigidBody2State === null || rigidBody2State === void 0 ? void 0 : rigidBody2State.object
+          (_source1$collider$eve5 = source1.collider.events) === null || _source1$collider$eve5 === void 0 ? void 0 : (_source1$collider$eve6 = _source1$collider$eve5.onIntersectionEnter) === null || _source1$collider$eve6 === void 0 ? void 0 : _source1$collider$eve6.call(_source1$collider$eve5, {
+            rigidBody: source2.rigidBody.object,
+            collider: source2.collider.object,
+            colliderObject: (_source2$collider$sta4 = source2.collider.state) === null || _source2$collider$sta4 === void 0 ? void 0 : _source2$collider$sta4.object,
+            rigidBodyObject: (_source2$rigidBody$st4 = source2.rigidBody.state) === null || _source2$rigidBody$st4 === void 0 ? void 0 : _source2$rigidBody$st4.object
           });
-          collider2Events === null || collider2Events === void 0 ? void 0 : (_collider2Events$onIn = collider2Events.onIntersectionEnter) === null || _collider2Events$onIn === void 0 ? void 0 : _collider2Events$onIn.call(collider2Events, {
-            rigidBody: rigidBody1,
-            collider: collider1,
-            colliderObject: collider1State === null || collider1State === void 0 ? void 0 : collider1State.object,
-            rigidBodyObject: rigidBody1State === null || rigidBody1State === void 0 ? void 0 : rigidBody1State.object
+          (_source2$collider$eve5 = source2.collider.events) === null || _source2$collider$eve5 === void 0 ? void 0 : (_source2$collider$eve6 = _source2$collider$eve5.onIntersectionEnter) === null || _source2$collider$eve6 === void 0 ? void 0 : _source2$collider$eve6.call(_source2$collider$eve5, {
+            rigidBody: source1.rigidBody.object,
+            collider: source1.collider.object,
+            colliderObject: (_source1$collider$sta4 = source1.collider.state) === null || _source1$collider$sta4 === void 0 ? void 0 : _source1$collider$sta4.object,
+            rigidBodyObject: (_source1$rigidBody$st4 = source1.rigidBody.state) === null || _source1$rigidBody$st4 === void 0 ? void 0 : _source1$rigidBody$st4.object
           });
         }
       } else {
-        var _rigidBody1Events$onI2, _rigidBody2Events$onI2, _collider1Events$onIn2, _collider2Events$onIn2;
+        var _source1$rigidBody$ev7, _source1$rigidBody$ev8, _source2$rigidBody$ev7, _source2$rigidBody$ev8, _source1$collider$eve7, _source1$collider$eve8, _source2$collider$eve7, _source2$collider$eve8;
 
-        rigidBody1Events === null || rigidBody1Events === void 0 ? void 0 : (_rigidBody1Events$onI2 = rigidBody1Events.onIntersectionExit) === null || _rigidBody1Events$onI2 === void 0 ? void 0 : _rigidBody1Events$onI2.call(rigidBody1Events, {
-          rigidBody: rigidBody2,
-          collider: collider2
+        (_source1$rigidBody$ev7 = source1.rigidBody.events) === null || _source1$rigidBody$ev7 === void 0 ? void 0 : (_source1$rigidBody$ev8 = _source1$rigidBody$ev7.onIntersectionExit) === null || _source1$rigidBody$ev8 === void 0 ? void 0 : _source1$rigidBody$ev8.call(_source1$rigidBody$ev7, {
+          rigidBody: source2.rigidBody.object,
+          collider: source2.collider.object
         });
-        rigidBody2Events === null || rigidBody2Events === void 0 ? void 0 : (_rigidBody2Events$onI2 = rigidBody2Events.onIntersectionExit) === null || _rigidBody2Events$onI2 === void 0 ? void 0 : _rigidBody2Events$onI2.call(rigidBody2Events, {
-          rigidBody: rigidBody1,
-          collider: collider1
+        (_source2$rigidBody$ev7 = source2.rigidBody.events) === null || _source2$rigidBody$ev7 === void 0 ? void 0 : (_source2$rigidBody$ev8 = _source2$rigidBody$ev7.onIntersectionExit) === null || _source2$rigidBody$ev8 === void 0 ? void 0 : _source2$rigidBody$ev8.call(_source2$rigidBody$ev7, {
+          rigidBody: source1.rigidBody.object,
+          collider: source1.collider.object
         });
-        collider1Events === null || collider1Events === void 0 ? void 0 : (_collider1Events$onIn2 = collider1Events.onIntersectionExit) === null || _collider1Events$onIn2 === void 0 ? void 0 : _collider1Events$onIn2.call(collider1Events, {
-          rigidBody: rigidBody2,
-          collider: collider2
+        (_source1$collider$eve7 = source1.collider.events) === null || _source1$collider$eve7 === void 0 ? void 0 : (_source1$collider$eve8 = _source1$collider$eve7.onIntersectionExit) === null || _source1$collider$eve8 === void 0 ? void 0 : _source1$collider$eve8.call(_source1$collider$eve7, {
+          rigidBody: source2.rigidBody.object,
+          collider: source2.collider.object
         });
-        collider2Events === null || collider2Events === void 0 ? void 0 : (_collider2Events$onIn2 = collider2Events.onIntersectionExit) === null || _collider2Events$onIn2 === void 0 ? void 0 : _collider2Events$onIn2.call(collider2Events, {
-          rigidBody: rigidBody1,
-          collider: collider1
+        (_source2$collider$eve7 = source2.collider.events) === null || _source2$collider$eve7 === void 0 ? void 0 : (_source2$collider$eve8 = _source2$collider$eve7.onIntersectionExit) === null || _source2$collider$eve8 === void 0 ? void 0 : _source2$collider$eve8.call(_source2$collider$eve7, {
+          rigidBody: source1.rigidBody.object,
+          collider: source1.collider.object
         });
       }
     });
+    eventQueue.drainContactForceEvents(event => {
+      var _source1$rigidBody$ev9, _source1$rigidBody$ev10, _source2$collider$sta5, _source2$rigidBody$st5, _source2$rigidBody$ev9, _source2$rigidBody$ev10, _source1$collider$sta5, _source1$rigidBody$st5, _source1$collider$eve9, _source1$collider$eve10, _source2$collider$sta6, _source2$rigidBody$st6, _source2$collider$eve9, _source2$collider$eve10, _source1$collider$sta6, _source1$rigidBody$st6;
+
+      const source1 = getSourceFromColliderHandle(event.collider1());
+      const source2 = getSourceFromColliderHandle(event.collider2()); // Collision Events
+
+      if (!(source1 !== null && source1 !== void 0 && source1.collider.object) || !(source2 !== null && source2 !== void 0 && source2.collider.object)) {
+        return;
+      }
+
+      (_source1$rigidBody$ev9 = source1.rigidBody.events) === null || _source1$rigidBody$ev9 === void 0 ? void 0 : (_source1$rigidBody$ev10 = _source1$rigidBody$ev9.onContactForce) === null || _source1$rigidBody$ev10 === void 0 ? void 0 : _source1$rigidBody$ev10.call(_source1$rigidBody$ev9, {
+        rigidBody: source2.rigidBody.object,
+        collider: source2.collider.object,
+        colliderObject: (_source2$collider$sta5 = source2.collider.state) === null || _source2$collider$sta5 === void 0 ? void 0 : _source2$collider$sta5.object,
+        rigidBodyObject: (_source2$rigidBody$st5 = source2.rigidBody.state) === null || _source2$rigidBody$st5 === void 0 ? void 0 : _source2$rigidBody$st5.object,
+        totalForce: event.totalForce(),
+        totalForceMagnitude: event.totalForceMagnitude(),
+        maxForceDirection: event.maxForceDirection(),
+        maxForceMagnitude: event.maxForceMagnitude()
+      });
+      (_source2$rigidBody$ev9 = source2.rigidBody.events) === null || _source2$rigidBody$ev9 === void 0 ? void 0 : (_source2$rigidBody$ev10 = _source2$rigidBody$ev9.onContactForce) === null || _source2$rigidBody$ev10 === void 0 ? void 0 : _source2$rigidBody$ev10.call(_source2$rigidBody$ev9, {
+        rigidBody: source1.rigidBody.object,
+        collider: source1.collider.object,
+        colliderObject: (_source1$collider$sta5 = source1.collider.state) === null || _source1$collider$sta5 === void 0 ? void 0 : _source1$collider$sta5.object,
+        rigidBodyObject: (_source1$rigidBody$st5 = source1.rigidBody.state) === null || _source1$rigidBody$st5 === void 0 ? void 0 : _source1$rigidBody$st5.object,
+        totalForce: event.totalForce(),
+        totalForceMagnitude: event.totalForceMagnitude(),
+        maxForceDirection: event.maxForceDirection(),
+        maxForceMagnitude: event.maxForceMagnitude()
+      });
+      (_source1$collider$eve9 = source1.collider.events) === null || _source1$collider$eve9 === void 0 ? void 0 : (_source1$collider$eve10 = _source1$collider$eve9.onContactForce) === null || _source1$collider$eve10 === void 0 ? void 0 : _source1$collider$eve10.call(_source1$collider$eve9, {
+        rigidBody: source2.rigidBody.object,
+        collider: source2.collider.object,
+        colliderObject: (_source2$collider$sta6 = source2.collider.state) === null || _source2$collider$sta6 === void 0 ? void 0 : _source2$collider$sta6.object,
+        rigidBodyObject: (_source2$rigidBody$st6 = source2.rigidBody.state) === null || _source2$rigidBody$st6 === void 0 ? void 0 : _source2$rigidBody$st6.object,
+        totalForce: event.totalForce(),
+        totalForceMagnitude: event.totalForceMagnitude(),
+        maxForceDirection: event.maxForceDirection(),
+        maxForceMagnitude: event.maxForceMagnitude()
+      });
+      (_source2$collider$eve9 = source2.collider.events) === null || _source2$collider$eve9 === void 0 ? void 0 : (_source2$collider$eve10 = _source2$collider$eve9.onContactForce) === null || _source2$collider$eve10 === void 0 ? void 0 : _source2$collider$eve10.call(_source2$collider$eve9, {
+        rigidBody: source1.rigidBody.object,
+        collider: source1.collider.object,
+        colliderObject: (_source1$collider$sta6 = source1.collider.state) === null || _source1$collider$sta6 === void 0 ? void 0 : _source1$collider$sta6.object,
+        rigidBodyObject: (_source1$rigidBody$st6 = source1.rigidBody.state) === null || _source1$rigidBody$st6 === void 0 ? void 0 : _source1$rigidBody$st6.object,
+        totalForce: event.totalForce(),
+        totalForceMagnitude: event.totalForceMagnitude(),
+        maxForceDirection: event.maxForceDirection(),
+        maxForceMagnitude: event.maxForceMagnitude()
+      });
+    });
   }, updatePriority);
   const api = useMemo(() => createWorldApi(getWorldRef), []);
   const context = useMemo(() => ({
@@ -583,148 +673,6 @@ function _objectSpread2(target) {
   return target;
 }
 
-const rigidBodyDescFromOptions = options => {
-  const type = rigidBodyTypeFromString((options === null || options === void 0 ? void 0 : options.type) || "dynamic");
-  const desc = new RigidBodyDesc(type);
-  return desc;
-};
-const createRigidBodyState = ({
-  rigidBody,
-  object,
-  setMatrix,
-  getMatrix,
-  worldScale
-}) => {
-  object.updateWorldMatrix(true, false);
-  const invertedWorldMatrix = object.parent.matrixWorld.clone().invert();
-  return {
-    object,
-    rigidBody,
-    invertedWorldMatrix,
-    setMatrix: setMatrix ? setMatrix : matrix => {
-      object.matrix.copy(matrix);
-    },
-    getMatrix: getMatrix ? getMatrix : matrix => matrix.copy(object.matrix),
-    scale: worldScale || object.getWorldScale(_scale).clone(),
-    isSleeping: false
-  };
-};
-const mutableRigidBodyOptions = {
-  gravityScale: (rb, value) => {
-    rb.setGravityScale(value, true);
-  },
-  linearDamping: (rb, value) => {
-    rb.setLinearDamping(value);
-  },
-  angularDamping: (rb, value) => {
-    rb.setAngularDamping(value);
-  },
-  enabledRotations: (rb, [x, y, z]) => {
-    rb.setEnabledRotations(x, y, z, true);
-  },
-  enabledTranslations: (rb, [x, y, z]) => {
-    rb.setEnabledTranslations(x, y, z, true);
-  },
-  angularVelocity: (rb, [x, y, z]) => {
-    rb.setAngvel({
-      x,
-      y,
-      z
-    }, true);
-  },
-  linearVelocity: (rb, [x, y, z]) => {
-    rb.setLinvel({
-      x,
-      y,
-      z
-    }, true);
-  },
-  ccd: (rb, value) => {
-    rb.enableCcd(value);
-  },
-  position: () => {},
-  rotation: () => {},
-  quaternion: () => {},
-  scale: () => {}
-};
-const mutableRigidBodyOptionKeys = Object.keys(mutableRigidBodyOptions);
-const setRigidBodyOptions = (rigidBody, options, states, updateTranslations = true) => {
-  if (!rigidBody) {
-    return;
-  }
-
-  const state = states.get(rigidBody.handle);
-
-  if (state) {
-    if (updateTranslations) {
-      state.object.updateWorldMatrix(true, false);
-
-      _matrix4.copy(state.object.matrixWorld).decompose(_position, _rotation, _scale);
-
-      rigidBody.setTranslation(_position, false);
-      rigidBody.setRotation(_rotation, false);
-    }
-
-    mutableRigidBodyOptionKeys.forEach(key => {
-      if (key in options) {
-        mutableRigidBodyOptions[key](rigidBody, options[key]);
-      }
-    });
-  }
-};
-const useUpdateRigidBodyOptions = (rigidBodyRef, props, states, updateTranslations = true) => {
-  // TODO: Improve this, split each prop into its own effect
-  const mutablePropsAsFlatArray = useMemo(() => mutableRigidBodyOptionKeys.flatMap(key => {
-    return vectorToTuple(props[key]);
-  }), [props]);
-  useEffect(() => {
-    if (Array.isArray(rigidBodyRef.current)) {
-      for (const rigidBody of rigidBodyRef.current) {
-        setRigidBodyOptions(rigidBody, props, states, updateTranslations);
-      }
-    } else if (rigidBodyRef.current) {
-      setRigidBodyOptions(rigidBodyRef.current, props, states, updateTranslations);
-    }
-  }, mutablePropsAsFlatArray);
-};
-const useRigidBodyEvents = (rigidBodyRef, props, events) => {
-  const {
-    onWake,
-    onSleep,
-    onCollisionEnter,
-    onCollisionExit,
-    onIntersectionEnter,
-    onIntersectionExit
-  } = props;
-  const eventHandlers = {
-    onWake,
-    onSleep,
-    onCollisionEnter,
-    onCollisionExit,
-    onIntersectionEnter,
-    onIntersectionExit
-  };
-  useEffect(() => {
-    if (Array.isArray(rigidBodyRef.current)) {
-      for (const rigidBody of rigidBodyRef.current) {
-        events.set(rigidBody.handle, eventHandlers);
-      }
-    } else if (rigidBodyRef.current) {
-      events.set(rigidBodyRef.current.handle, eventHandlers);
-    }
-
-    return () => {
-      if (Array.isArray(rigidBodyRef.current)) {
-        for (const rigidBody of rigidBodyRef.current) {
-          events.delete(rigidBody.handle);
-        }
-      } else if (rigidBodyRef.current) {
-        events.delete(rigidBodyRef.current.handle);
-      }
-    };
-  }, [onWake, onSleep, onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit]);
-};
-
 const scaleColliderArgs = (shape, args, scale) => {
   const newArgs = args.slice(); // Heightfield uses a vector
 
@@ -981,21 +929,30 @@ const useColliderEvents = (collidersRef, props, events) => {
     onCollisionEnter,
     onCollisionExit,
     onIntersectionEnter,
-    onIntersectionExit
+    onIntersectionExit,
+    onContactForce
   } = props;
   useEffect(() => {
     var _collidersRef$current;
 
     (_collidersRef$current = collidersRef.current) === null || _collidersRef$current === void 0 ? void 0 : _collidersRef$current.forEach(collider => {
-      if (onCollisionEnter || onCollisionExit || onIntersectionEnter || onIntersectionExit) {
+      const hasCollisionEvent = !!(onCollisionEnter || onCollisionExit || onIntersectionEnter || onIntersectionExit);
+      const hasContactForceEvent = !!onContactForce;
+
+      if (hasCollisionEvent && hasContactForceEvent) {
+        collider.setActiveEvents(ActiveEvents.COLLISION_EVENTS | ActiveEvents.CONTACT_FORCE_EVENTS);
+      } else if (hasCollisionEvent) {
         collider.setActiveEvents(ActiveEvents.COLLISION_EVENTS);
+      } else if (hasContactForceEvent) {
+        collider.setActiveEvents(ActiveEvents.CONTACT_FORCE_EVENTS);
       }
 
       events.set(collider.handle, {
         onCollisionEnter,
         onCollisionExit,
         onIntersectionEnter,
-        onIntersectionExit
+        onIntersectionExit,
+        onContactForce
       });
     });
     return () => {
@@ -1003,7 +960,152 @@ const useColliderEvents = (collidersRef, props, events) => {
 
       (_collidersRef$current2 = collidersRef.current) === null || _collidersRef$current2 === void 0 ? void 0 : _collidersRef$current2.forEach(collider => events.delete(collider.handle));
     };
-  }, [onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit]);
+  }, [onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit, onContactForce]);
+};
+
+const rigidBodyDescFromOptions = options => {
+  const type = rigidBodyTypeFromString((options === null || options === void 0 ? void 0 : options.type) || "dynamic");
+  const desc = new RigidBodyDesc(type);
+  return desc;
+};
+const createRigidBodyState = ({
+  rigidBody,
+  object,
+  setMatrix,
+  getMatrix,
+  worldScale
+}) => {
+  object.updateWorldMatrix(true, false);
+  const invertedWorldMatrix = object.parent.matrixWorld.clone().invert();
+  return {
+    object,
+    rigidBody,
+    invertedWorldMatrix,
+    setMatrix: setMatrix ? setMatrix : matrix => {
+      object.matrix.copy(matrix);
+    },
+    getMatrix: getMatrix ? getMatrix : matrix => matrix.copy(object.matrix),
+    scale: worldScale || object.getWorldScale(_scale).clone(),
+    isSleeping: false
+  };
+};
+const mutableRigidBodyOptions = {
+  gravityScale: (rb, value) => {
+    rb.setGravityScale(value, true);
+  },
+  linearDamping: (rb, value) => {
+    rb.setLinearDamping(value);
+  },
+  angularDamping: (rb, value) => {
+    rb.setAngularDamping(value);
+  },
+  enabledRotations: (rb, [x, y, z]) => {
+    rb.setEnabledRotations(x, y, z, true);
+  },
+  enabledTranslations: (rb, [x, y, z]) => {
+    rb.setEnabledTranslations(x, y, z, true);
+  },
+  angularVelocity: (rb, [x, y, z]) => {
+    rb.setAngvel({
+      x,
+      y,
+      z
+    }, true);
+  },
+  linearVelocity: (rb, [x, y, z]) => {
+    rb.setLinvel({
+      x,
+      y,
+      z
+    }, true);
+  },
+  ccd: (rb, value) => {
+    rb.enableCcd(value);
+  },
+  userData: (rb, value) => {
+    rb.userData = value;
+  },
+  position: () => {},
+  rotation: () => {},
+  quaternion: () => {},
+  scale: () => {}
+};
+const mutableRigidBodyOptionKeys = Object.keys(mutableRigidBodyOptions);
+const setRigidBodyOptions = (rigidBody, options, states, updateTranslations = true) => {
+  if (!rigidBody) {
+    return;
+  }
+
+  const state = states.get(rigidBody.handle);
+
+  if (state) {
+    if (updateTranslations) {
+      state.object.updateWorldMatrix(true, false);
+
+      _matrix4.copy(state.object.matrixWorld).decompose(_position, _rotation, _scale);
+
+      rigidBody.setTranslation(_position, false);
+      rigidBody.setRotation(_rotation, false);
+    }
+
+    mutableRigidBodyOptionKeys.forEach(key => {
+      if (key in options) {
+        mutableRigidBodyOptions[key](rigidBody, options[key]);
+      }
+    });
+  }
+};
+const useUpdateRigidBodyOptions = (rigidBodyRef, props, states, updateTranslations = true) => {
+  // TODO: Improve this, split each prop into its own effect
+  const mutablePropsAsFlatArray = useMemo(() => mutableRigidBodyOptionKeys.flatMap(key => {
+    return vectorToTuple(props[key]);
+  }), [props]);
+  useEffect(() => {
+    if (Array.isArray(rigidBodyRef.current)) {
+      for (const rigidBody of rigidBodyRef.current) {
+        setRigidBodyOptions(rigidBody, props, states, updateTranslations);
+      }
+    } else if (rigidBodyRef.current) {
+      setRigidBodyOptions(rigidBodyRef.current, props, states, updateTranslations);
+    }
+  }, mutablePropsAsFlatArray);
+};
+const useRigidBodyEvents = (rigidBodyRef, props, events) => {
+  const {
+    onWake,
+    onSleep,
+    onCollisionEnter,
+    onCollisionExit,
+    onIntersectionEnter,
+    onIntersectionExit
+  } = props;
+  const eventHandlers = {
+    onWake,
+    onSleep,
+    onCollisionEnter,
+    onCollisionExit,
+    onIntersectionEnter,
+    onIntersectionExit
+  };
+  useEffect(() => {
+    if (Array.isArray(rigidBodyRef.current)) {
+      for (const rigidBody of rigidBodyRef.current) {
+        events.set(rigidBody.handle, eventHandlers);
+      }
+    } else if (rigidBodyRef.current) {
+      events.set(rigidBodyRef.current.handle, eventHandlers);
+    }
+
+    return () => {
+      if (Array.isArray(rigidBodyRef.current)) {
+        for (const rigidBody of rigidBodyRef.current) {
+          events.delete(rigidBody.handle);
+        }
+      } else if (rigidBodyRef.current) {
+        events.delete(rigidBodyRef.current.handle);
+      }
+    };
+  }, [onWake, onSleep, onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit]);
 };
 
 const useRapier = () => {
@@ -1056,10 +1158,8 @@ const useRigidBody = (options = {}) => {
 
     if (!ref.current) {
       ref.current = new Object3D();
-    } // isSleeping used for onSleep and onWake events
-
+    }
 
-    ref.current.userData.isSleeping = false;
     rigidBodyStates.set(rigidBody.handle, createRigidBodyState({
       rigidBody,
       object: ref.current
@@ -1170,7 +1270,8 @@ const AnyCollider = /*#__PURE__*/memo( /*#__PURE__*/React.forwardRef((props, for
     position,
     rotation,
     quaternion,
-    scale
+    scale,
+    name
   } = props;
   const {
     world,
@@ -1230,7 +1331,8 @@ const AnyCollider = /*#__PURE__*/memo( /*#__PURE__*/React.forwardRef((props, for
     rotation: rotation,
     quaternion: quaternion,
     scale: scale,
-    ref: ref
+    ref: ref,
+    name: name
   }, children);
 }));
 const CuboidCollider = /*#__PURE__*/React.forwardRef((props, ref) => {