@react-three/rapier 0.11.2 → 0.12.0

package/dist/react-three-rapier.cjs.prod.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var rapier3dCompat = require('@dimforge/rapier3d-compat');
 var fiber = require('@react-three/fiber');
-var React = require('react');
+var React$1 = require('react');
 var three = require('three');
 var useAsset = require('use-asset');
 var threeStdlib = require('three-stdlib');
@@ -29,7 +29,7 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var React__default = /*#__PURE__*/_interopDefault(React);
+var React__default = /*#__PURE__*/_interopDefault(React$1);
 
 function _defineProperty(obj, key, value) {
   if (key in obj) {
@@ -85,6 +85,12 @@ const vectorArrayToVector3 = arr => {
   const [x, y, z] = arr;
   return new three.Vector3(x, y, z);
 };
+const tupleToObject = (tuple, keys) => {
+  return keys.reduce((obj, key, i) => {
+    obj[key] = tuple[i];
+    return obj;
+  }, {});
+};
 const rapierVector3ToVector3 = ({
   x,
   y,
@@ -132,7 +138,7 @@ const vectorToTuple = v => {
   return [v];
 };
 function useConst(initialValue) {
-  const ref = React.useRef();
+  const ref = React$1.useRef();
 
   if (ref.current === undefined) {
     ref.current = {
@@ -242,7 +248,7 @@ const createInstancedRigidBodiesApi = bodiesGetter => ({
     return bodiesGetter.current().length;
   }
 
-}); // TODO: Flesh this out
+});
 const createWorldApi = ref => {
   return {
     raw: () => ref.current(),
@@ -275,8 +281,7 @@ const createWorldApi = ref => {
     },
     debugRender: () => ref.current().debugRender()
   };
-}; // TODO: Broken currently, waiting for Rapier3D to fix
-
+};
 const createJointApi = ref => {
   return {
     raw: () => ref.current(),
@@ -421,10 +426,10 @@ const setColliderOptions = (collider, options, states) => {
 };
 const useUpdateColliderOptions = (collidersRef, props, states) => {
   // TODO: Improve this, split each prop into its own effect
-  const mutablePropsAsFlatArray = React.useMemo(() => mutableColliderOptionKeys.flatMap(key => {
+  const mutablePropsAsFlatArray = React$1.useMemo(() => mutableColliderOptionKeys.flatMap(key => {
     return vectorToTuple(props[key]);
   }), [props]);
-  React.useEffect(() => {
+  React$1.useEffect(() => {
     collidersRef.current.forEach(collider => {
       setColliderOptions(collider, props, states);
     });
@@ -558,7 +563,7 @@ const useColliderEvents = (collidersRef, props, events) => {
     onIntersectionExit,
     onContactForce
   } = props;
-  React.useEffect(() => {
+  React$1.useEffect(() => {
     var _collidersRef$current;
 
     (_collidersRef$current = collidersRef.current) === null || _collidersRef$current === void 0 ? void 0 : _collidersRef$current.forEach(collider => {
@@ -698,10 +703,10 @@ const setRigidBodyOptions = (rigidBody, options, states, updateTranslations = tr
 };
 const useUpdateRigidBodyOptions = (rigidBodyRef, props, states, updateTranslations = true) => {
   // TODO: Improve this, split each prop into its own effect
-  const mutablePropsAsFlatArray = React.useMemo(() => mutableRigidBodyOptionKeys.flatMap(key => {
+  const mutablePropsAsFlatArray = React$1.useMemo(() => mutableRigidBodyOptionKeys.flatMap(key => {
     return vectorToTuple(props[key]);
   }), [props]);
-  React.useEffect(() => {
+  React$1.useEffect(() => {
     if (Array.isArray(rigidBodyRef.current)) {
       for (const rigidBody of rigidBodyRef.current) {
         setRigidBodyOptions(rigidBody, props, states, updateTranslations);
@@ -728,7 +733,7 @@ const useRigidBodyEvents = (rigidBodyRef, props, events) => {
     onIntersectionEnter,
     onIntersectionExit
   };
-  React.useEffect(() => {
+  React$1.useEffect(() => {
     if (Array.isArray(rigidBodyRef.current)) {
       for (const rigidBody of rigidBodyRef.current) {
         events.set(rigidBody.handle, eventHandlers);
@@ -750,11 +755,34 @@ const useRigidBodyEvents = (rigidBodyRef, props, events) => {
 };
 
 const useRapier = () => {
-  return React.useContext(RapierContext);
+  return React$1.useContext(rapierContext);
+};
+const useBeforePhysicsStep = callback => {
+  const {
+    beforeStepCallbacks
+  } = useRapier();
+  React$1.useEffect(() => {
+    beforeStepCallbacks.add(callback);
+    return () => {
+      beforeStepCallbacks.delete(callback);
+    };
+  }, []);
 };
+const useAfterPhysicsStep = callback => {
+  const {
+    afterStepCallbacks
+  } = useRapier();
+  React$1.useEffect(() => {
+    afterStepCallbacks.add(callback);
+    return () => {
+      afterStepCallbacks.delete(callback);
+    };
+  }, []);
+}; // Internal hooks
+
 const useChildColliderProps = (ref, options, ignoreMeshColliders = true) => {
-  const [colliderProps, setColliderProps] = React.useState([]);
-  React.useEffect(() => {
+  const [colliderProps, setColliderProps] = React$1.useState([]);
+  React$1.useEffect(() => {
     const object = ref.current;
 
     if (object && options.colliders !== false) {
@@ -774,16 +802,16 @@ const useRigidBody = (options = {}) => {
     physicsOptions,
     rigidBodyEvents
   } = useRapier();
-  const ref = React.useRef();
-  const mergedOptions = React.useMemo(() => {
+  const ref = React$1.useRef();
+  const mergedOptions = React$1.useMemo(() => {
     return _objectSpread2(_objectSpread2(_objectSpread2({}, physicsOptions), options), {}, {
       children: undefined
     });
   }, [physicsOptions, options]);
   const childColliderProps = useChildColliderProps(ref, mergedOptions); // Create rigidbody
 
-  const rigidBodyRef = React.useRef();
-  const getRigidBodyRef = React.useRef(() => {
+  const rigidBodyRef = React$1.useRef();
+  const getRigidBodyRef = React$1.useRef(() => {
     if (!rigidBodyRef.current) {
       const desc = rigidBodyDescFromOptions(options);
       const rigidBody = world.createRigidBody(desc);
@@ -793,7 +821,7 @@ const useRigidBody = (options = {}) => {
     return rigidBodyRef.current;
   }); // Setup
 
-  React.useEffect(() => {
+  React$1.useEffect(() => {
     const rigidBody = getRigidBodyRef.current();
     rigidBodyRef.current = rigidBody;
 
@@ -813,109 +841,8 @@ const useRigidBody = (options = {}) => {
   }, []);
   useUpdateRigidBodyOptions(rigidBodyRef, mergedOptions, rigidBodyStates);
   useRigidBodyEvents(rigidBodyRef, mergedOptions, rigidBodyEvents);
-  const api = React.useMemo(() => createRigidBodyApi(getRigidBodyRef), []);
+  const api = React$1.useMemo(() => createRigidBodyApi(getRigidBodyRef), []);
   return [ref, api, childColliderProps];
-}; // Joints
-
-const useImpulseJoint = (body1, body2, params) => {
-  const {
-    world
-  } = useRapier();
-  const jointRef = React.useRef();
-  const getJointRef = React.useRef(() => {
-    if (!jointRef.current) {
-      let rb1;
-      let rb2;
-
-      if ("current" in body1 && body1.current && "current" in body2 && body2.current) {
-        rb1 = world.getRigidBody(body1.current.handle);
-        rb2 = world.getRigidBody(body2.current.handle);
-        const newJoint = world.createImpulseJoint(params, rb1, rb2);
-        jointRef.current = newJoint;
-      }
-    }
-
-    return jointRef.current;
-  });
-  React.useEffect(() => {
-    const joint = getJointRef.current();
-    return () => {
-      if (joint) {
-        world.removeImpulseJoint(joint);
-        jointRef.current = undefined;
-      }
-    };
-  }, []);
-  const api = React.useMemo(() => createJointApi(getJointRef), []);
-  return api;
-};
-/**
- *
- * A fixed joint ensures that two rigid-bodies don't move relative to each other.
- * Fixed joints are characterized by one local frame (represented by an isometry) on each rigid-body.
- * The fixed-joint makes these frames coincide in world-space.
- */
-
-const useFixedJoint = (body1, body2, [body1Anchor, body1LocalFrame, body2Anchor, body2LocalFrame]) => {
-  const {
-    rapier
-  } = useRapier();
-  return useImpulseJoint(body1, body2, rapier.JointData.fixed(vectorArrayToVector3(body1Anchor), _objectSpread2(_objectSpread2({}, vectorArrayToVector3(body1LocalFrame)), {}, {
-    w: 1
-  }), vectorArrayToVector3(body2Anchor), _objectSpread2(_objectSpread2({}, vectorArrayToVector3(body2LocalFrame)), {}, {
-    w: 1
-  })));
-};
-/**
- * The spherical joint ensures that two points on the local-spaces of two rigid-bodies always coincide (it prevents any relative
- * translational motion at this points). This is typically used to simulate ragdolls arms, pendulums, etc.
- * They are characterized by one local anchor on each rigid-body. Each anchor represents the location of the
- * points that need to coincide on the local-space of each rigid-body.
- */
-
-const useSphericalJoint = (body1, body2, [body1Anchor, body2Anchor]) => {
-  const {
-    rapier
-  } = useRapier();
-  return useImpulseJoint(body1, body2, rapier.JointData.spherical(vectorArrayToVector3(body1Anchor), vectorArrayToVector3(body2Anchor)));
-};
-/**
- * The revolute joint prevents any relative movement between two rigid-bodies, except for relative
- * rotations along one axis. This is typically used to simulate wheels, fans, etc.
- * They are characterized by one local anchor as well as one local axis on each rigid-body.
- */
-
-const useRevoluteJoint = (body1, body2, [body1Anchor, body2Anchor, axis, limits]) => {
-  const {
-    rapier
-  } = useRapier();
-  const params = rapier.JointData.revolute(vectorArrayToVector3(body1Anchor), vectorArrayToVector3(body2Anchor), vectorArrayToVector3(axis));
-
-  if (limits) {
-    params.limitsEnabled = true;
-    params.limits = limits;
-  }
-
-  return useImpulseJoint(body1, body2, params);
-};
-/**
- * The prismatic joint prevents any relative movement between two rigid-bodies, except for relative translations along one axis.
- * It is characterized by one local anchor as well as one local axis on each rigid-body. In 3D, an optional
- * local tangent axis can be specified for each rigid-body.
- */
-
-const usePrismaticJoint = (body1, body2, [body1Anchor, body2Anchor, axis, limits]) => {
-  const {
-    rapier
-  } = useRapier();
-  const params = rapier.JointData.prismatic(vectorArrayToVector3(body1Anchor), vectorArrayToVector3(body2Anchor), vectorArrayToVector3(axis));
-
-  if (limits) {
-    params.limitsEnabled = true;
-    params.limits = limits;
-  }
-
-  return useImpulseJoint(body1, body2, params);
 };
 
 const calcForceByType = {
@@ -964,7 +891,7 @@ const applyAttractorForceOnRigidBody = (rigidBody, {
     }
   }
 };
-const Attractor = /*#__PURE__*/React.memo(props => {
+const Attractor = /*#__PURE__*/React$1.memo(props => {
   const {
     position = [0, 0, 0],
     strength = 1,
@@ -976,8 +903,8 @@ const Attractor = /*#__PURE__*/React.memo(props => {
   const {
     attractorStates
   } = useRapier();
-  const object = React.useRef(null);
-  React.useEffect(() => {
+  const object = React$1.useRef(null);
+  React$1.useEffect(() => {
     var _object$current;
 
     let uuid = ((_object$current = object.current) === null || _object$current === void 0 ? void 0 : _object$current.uuid) || "_";
@@ -1003,7 +930,7 @@ const Attractor = /*#__PURE__*/React.memo(props => {
   });
 });
 
-const RapierContext = /*#__PURE__*/React.createContext(undefined);
+const rapierContext = /*#__PURE__*/React$1.createContext(undefined);
 
 const getCollisionPayloadFromSource = (target, other) => {
   var _target$collider$stat, _target$rigidBody$sta, _other$collider$state, _other$rigidBody$stat, _other$collider$state2, _other$rigidBody$stat2;
@@ -1044,8 +971,8 @@ const Physics = ({
   interpolate: _interpolate = true
 }) => {
   const rapier = useAsset.useAsset(importRapier);
-  const worldRef = React.useRef();
-  const getWorldRef = React.useRef(() => {
+  const worldRef = React$1.useRef();
+  const getWorldRef = React$1.useRef(() => {
     if (!worldRef.current) {
       const world = new rapier.World(vectorArrayToVector3(_gravity));
       worldRef.current = world;
@@ -1058,9 +985,11 @@ const Physics = ({
   const rigidBodyEvents = useConst(() => new Map());
   const colliderEvents = useConst(() => new Map());
   const eventQueue = useConst(() => new rapier3dCompat.EventQueue(false));
-  const attractorStates = useConst(() => new Map()); // Init world
+  const attractorStates = useConst(() => new Map());
+  const beforeStepCallbacks = useConst(() => new Set());
+  const afterStepCallbacks = useConst(() => new Set()); // Init world
 
-  React.useEffect(() => {
+  React$1.useEffect(() => {
     const world = getWorldRef.current();
     return () => {
       if (world) {
@@ -1070,14 +999,15 @@ const Physics = ({
     };
   }, []); // Update gravity
 
-  React.useEffect(() => {
+  React$1.useEffect(() => {
     const world = worldRef.current;
 
     if (world) {
       world.gravity = vectorArrayToVector3(_gravity);
     }
   }, [_gravity]);
-  const getSourceFromColliderHandle = React.useCallback(handle => {
+  const api = React$1.useMemo(() => createWorldApi(getWorldRef), []);
+  const getSourceFromColliderHandle = React$1.useCallback(handle => {
     const world = worldRef.current;
 
     if (world) {
@@ -1105,11 +1035,11 @@ const Physics = ({
       return source;
     }
   }, []);
-  const [steppingState] = React.useState({
+  const [steppingState] = React$1.useState({
     previousState: {},
     accumulator: 0
   });
-  const step = React.useCallback(dt => {
+  const step = React$1.useCallback(dt => {
     const world = worldRef.current;
     if (!world) return;
     /* Check if the timestep is supposed to be variable. We'll do this here
@@ -1123,9 +1053,21 @@ const Physics = ({
 
     const clampedDelta = three.MathUtils.clamp(dt, 0, 0.2);
 
+    const stepWorld = () => {
+      // Trigger beforeStep callbacks
+      beforeStepCallbacks.forEach(callback => {
+        callback(api);
+      });
+      world.step(eventQueue); // Trigger afterStep callbacks
+
+      afterStepCallbacks.forEach(callback => {
+        callback(api);
+      });
+    };
+
     if (timeStepVariable) {
       world.timestep = clampedDelta;
-      world.step(eventQueue);
+      stepWorld();
     } else {
       world.timestep = _timeStep; // don't step time forwards if paused
       // Increase accumulator
@@ -1149,7 +1091,7 @@ const Physics = ({
             applyAttractorForceOnRigidBody(body, attractorState);
           });
         });
-        world.step(eventQueue);
+        stepWorld();
         steppingState.accumulator -= _timeStep;
       }
     }
@@ -1312,8 +1254,7 @@ const Physics = ({
   fiber.useFrame((_, dt) => {
     if (!_paused) step(dt);
   }, updatePriority);
-  const api = React.useMemo(() => createWorldApi(getWorldRef), []);
-  const context = React.useMemo(() => ({
+  const context = React$1.useMemo(() => ({
     rapier,
     world: api,
     physicsOptions: {
@@ -1325,10 +1266,12 @@ const Physics = ({
     rigidBodyEvents,
     colliderEvents,
     attractorStates,
+    beforeStepCallbacks,
+    afterStepCallbacks,
     isPaused: _paused,
     step
   }), [_paused, step]);
-  return /*#__PURE__*/React__default["default"].createElement(RapierContext.Provider, {
+  return /*#__PURE__*/React__default["default"].createElement(rapierContext.Provider, {
     value: context
   }, children);
 };
@@ -1385,7 +1328,7 @@ function _objectWithoutProperties(source, excluded) {
 }
 
 // Colliders
-const AnyCollider = /*#__PURE__*/React.memo( /*#__PURE__*/React__default["default"].forwardRef((props, forwardedRef) => {
+const AnyCollider = /*#__PURE__*/React$1.memo( /*#__PURE__*/React__default["default"].forwardRef((props, forwardedRef) => {
   const {
     children,
     position,
@@ -1400,8 +1343,8 @@ const AnyCollider = /*#__PURE__*/React.memo( /*#__PURE__*/React__default["defaul
     colliderStates
   } = useRapier();
   const rigidBodyContext = useRigidBodyContext();
-  const ref = React.useRef(null);
-  const collidersRef = React.useMemo(() => {
+  const ref = React$1.useRef(null);
+  const collidersRef = React$1.useMemo(() => {
     if (forwardedRef !== null) {
       return forwardedRef;
     }
@@ -1410,7 +1353,7 @@ const AnyCollider = /*#__PURE__*/React.memo( /*#__PURE__*/React__default["defaul
     result.current = [];
     return result;
   }, []);
-  React.useEffect(() => {
+  React$1.useEffect(() => {
     const object = ref.current;
     const worldScale = object.getWorldScale(new three.Vector3());
     const colliders = []; // If this is an InstancedRigidBody api
@@ -1442,7 +1385,7 @@ const AnyCollider = /*#__PURE__*/React.memo( /*#__PURE__*/React__default["defaul
       });
     };
   }, []);
-  const mergedProps = React.useMemo(() => {
+  const mergedProps = React$1.useMemo(() => {
     return _objectSpread2(_objectSpread2({}, rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options), props);
   }, [props, rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.options]);
   useUpdateColliderOptions(collidersRef, mergedProps, colliderStates);
@@ -1521,9 +1464,9 @@ CylinderCollider.displayName = "CylinderCollider";
 ConvexHullCollider.displayName = "ConvexHullCollider";
 
 const _excluded$1 = ["children", "type", "position", "rotation", "scale", "quaternion"];
-const RigidBodyContext = /*#__PURE__*/React.createContext(undefined);
-const useRigidBodyContext = () => React.useContext(RigidBodyContext);
-const RigidBody = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef((props, ref) => {
+const RigidBodyContext = /*#__PURE__*/React$1.createContext(undefined);
+const useRigidBodyContext = () => React$1.useContext(RigidBodyContext);
+const RigidBody = /*#__PURE__*/React$1.memo( /*#__PURE__*/React$1.forwardRef((props, ref) => {
   const {
     children,
     type,
@@ -1535,8 +1478,8 @@ const RigidBody = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef((props,
         objectProps = _objectWithoutProperties(props, _excluded$1);
 
   const [object, api, childColliderProps] = useRigidBody(props);
-  React.useImperativeHandle(ref, () => api);
-  const contextValue = React.useMemo(() => ({
+  React$1.useImperativeHandle(ref, () => api);
+  const contextValue = React$1.useMemo(() => ({
     ref: object,
     api,
     options: props
@@ -1556,7 +1499,7 @@ const RigidBody = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef((props,
 }));
 RigidBody.displayName = "RigidBody";
 
-const MeshCollider = props => {
+const MeshCollider = /*#__PURE__*/React$1.memo(props => {
   const {
     children,
     type
@@ -1565,11 +1508,11 @@ const MeshCollider = props => {
     physicsOptions,
     world
   } = useRapier();
-  const object = React.useRef(null);
+  const object = React$1.useRef(null);
   const {
     options
   } = useRigidBodyContext();
-  const mergedOptions = React.useMemo(() => {
+  const mergedOptions = React$1.useMemo(() => {
     return _objectSpread2(_objectSpread2(_objectSpread2({}, physicsOptions), options), {}, {
       children: undefined,
       colliders: type
@@ -1584,7 +1527,7 @@ const MeshCollider = props => {
   }, children, childColliderProps.map((colliderProps, index) => /*#__PURE__*/React__default["default"].createElement(AnyCollider, _extends({
     key: index
   }, colliderProps))));
-};
+});
 MeshCollider.displayName = "MeshCollider";
 
 function mapsEqual(map1, map2) {
@@ -1609,10 +1552,10 @@ const AttractorHelper = props => {
   const {
     scene
   } = fiber.useThree();
-  const ref = React.useRef(null);
-  const normalsHelper = React.useRef();
+  const ref = React$1.useRef(null);
+  const normalsHelper = React$1.useRef();
   const color = props.strength > 0 ? 0x0000ff : 0xff0000;
-  React.useEffect(() => {
+  React$1.useEffect(() => {
     if (ref.current) {
       normalsHelper.current = new threeStdlib.VertexNormalsHelper(ref.current, props.range, color);
       normalsHelper.current.frustumCulled = false;
@@ -1646,14 +1589,14 @@ const AttractorHelper = props => {
   }));
 };
 
-const Debug = () => {
+const Debug = /*#__PURE__*/React$1.memo(() => {
   const {
     world,
     attractorStates
   } = useRapier();
-  const ref = React.useRef(null);
-  const [attractors, setAttractors] = React.useState([]);
-  const currMap = React.useRef(new Map());
+  const ref = React$1.useRef(null);
+  const [attractors, setAttractors] = React$1.useState([]);
+  const currMap = React$1.useRef(new Map());
   fiber.useFrame(() => {
     const mesh = ref.current;
     if (!mesh) return;
@@ -1675,17 +1618,17 @@ const Debug = () => {
   }), /*#__PURE__*/React__default["default"].createElement("bufferGeometry", null)), attractors.map((attractor, i) => /*#__PURE__*/React__default["default"].createElement(AttractorHelper, _extends({
     key: attractor.object.uuid
   }, attractor))));
-};
+});
 
 const _excluded = ["positions", "rotations", "children"];
-const InstancedRigidBodies = /*#__PURE__*/React.forwardRef((props, ref) => {
+const InstancedRigidBodies = /*#__PURE__*/React$1.forwardRef((props, ref) => {
   const {
     world,
     rigidBodyStates,
     physicsOptions,
     rigidBodyEvents
   } = useRapier();
-  const object = React.useRef(null);
+  const object = React$1.useRef(null);
 
   const {
     positions,
@@ -1694,20 +1637,20 @@ const InstancedRigidBodies = /*#__PURE__*/React.forwardRef((props, ref) => {
   } = props,
         options = _objectWithoutProperties(props, _excluded);
 
-  const instancesRef = React.useRef([]);
-  const rigidBodyRefs = React.useRef([]);
-  const instancesRefGetter = React.useRef(() => {
+  const instancesRef = React$1.useRef([]);
+  const rigidBodyRefs = React$1.useRef([]);
+  const instancesRefGetter = React$1.useRef(() => {
     if (!instancesRef.current) {
       instancesRef.current = [];
     }
 
     return instancesRef.current;
   });
-  const mergedOptions = React.useMemo(() => {
+  const mergedOptions = React$1.useMemo(() => {
     return _objectSpread2(_objectSpread2({}, physicsOptions), options);
   }, [physicsOptions, options]);
   const childColliderProps = useChildColliderProps(object, mergedOptions);
-  React.useLayoutEffect(() => {
+  React$1.useLayoutEffect(() => {
     object.current.updateWorldMatrix(true, false);
     const instances = instancesRefGetter.current();
     const invertedWorld = object.current.matrixWorld.clone().invert();
@@ -1768,27 +1711,124 @@ const InstancedRigidBodies = /*#__PURE__*/React.forwardRef((props, ref) => {
       instancesRef.current = [];
     };
   }, []);
-  const api = React.useMemo(() => createInstancedRigidBodiesApi(instancesRefGetter), []);
-  React.useImperativeHandle(ref, () => api);
+  const api = React$1.useMemo(() => createInstancedRigidBodiesApi(instancesRefGetter), []);
+  React$1.useImperativeHandle(ref, () => api);
   useUpdateRigidBodyOptions(rigidBodyRefs, mergedOptions, rigidBodyStates, false);
   useRigidBodyEvents(rigidBodyRefs, mergedOptions, rigidBodyEvents);
-  const contextValue = React.useMemo(() => {
+  const contextValue = React$1.useMemo(() => {
     return {
       ref: object,
       api,
       options: mergedOptions
     };
   }, [api, mergedOptions]);
-  return /*#__PURE__*/React__default["default"].createElement(RigidBodyContext.Provider, {
+  return /*#__PURE__*/React.createElement(RigidBodyContext.Provider, {
     value: contextValue
-  }, /*#__PURE__*/React__default["default"].createElement("object3D", {
+  }, /*#__PURE__*/React.createElement("object3D", {
     ref: object
-  }, props.children, childColliderProps.map((colliderProps, index) => /*#__PURE__*/React__default["default"].createElement(AnyCollider, _extends({
+  }, props.children, childColliderProps.map((colliderProps, index) => /*#__PURE__*/React.createElement(AnyCollider, _extends({
     key: index
   }, colliderProps)))));
 });
 InstancedRigidBodies.displayName = "InstancedRigidBodies";
 
+const useImpulseJoint = (body1, body2, params) => {
+  const {
+    world
+  } = useRapier();
+  const jointRef = React$1.useRef();
+  const getJointRef = React$1.useRef(() => {
+    if (!jointRef.current) {
+      let rb1;
+      let rb2;
+
+      if ("current" in body1 && body1.current && "current" in body2 && body2.current) {
+        rb1 = world.getRigidBody(body1.current.handle);
+        rb2 = world.getRigidBody(body2.current.handle);
+        const newJoint = world.createImpulseJoint(params, rb1, rb2);
+        jointRef.current = newJoint;
+      }
+    }
+
+    return jointRef.current;
+  });
+  React$1.useEffect(() => {
+    const joint = getJointRef.current();
+    return () => {
+      if (joint) {
+        world.removeImpulseJoint(joint);
+        jointRef.current = undefined;
+      }
+    };
+  }, []);
+  const api = React$1.useMemo(() => createJointApi(getJointRef), []);
+  return api;
+};
+/**
+ *
+ * A fixed joint ensures that two rigid-bodies don't move relative to each other.
+ * Fixed joints are characterized by one local frame (represented by an isometry) on each rigid-body.
+ * The fixed-joint makes these frames coincide in world-space.
+ */
+
+const useFixedJoint = (body1, body2, [body1Anchor, body1LocalFrame, body2Anchor, body2LocalFrame]) => {
+  const {
+    rapier
+  } = useRapier();
+  return useImpulseJoint(body1, body2, rapier.JointData.fixed(vectorArrayToVector3(body1Anchor), tupleToObject(body1LocalFrame, ["x", "y", "z", "w"]), vectorArrayToVector3(body2Anchor), tupleToObject(body2LocalFrame, ["x", "y", "z", "w"])));
+};
+/**
+ * The spherical joint ensures that two points on the local-spaces of two rigid-bodies always coincide (it prevents any relative
+ * translational motion at this points). This is typically used to simulate ragdolls arms, pendulums, etc.
+ * They are characterized by one local anchor on each rigid-body. Each anchor represents the location of the
+ * points that need to coincide on the local-space of each rigid-body.
+ */
+
+const useSphericalJoint = (body1, body2, [body1Anchor, body2Anchor]) => {
+  const {
+    rapier
+  } = useRapier();
+  return useImpulseJoint(body1, body2, rapier.JointData.spherical(vectorArrayToVector3(body1Anchor), vectorArrayToVector3(body2Anchor)));
+};
+/**
+ * The revolute joint prevents any relative movement between two rigid-bodies, except for relative
+ * rotations along one axis. This is typically used to simulate wheels, fans, etc.
+ * They are characterized by one local anchor as well as one local axis on each rigid-body.
+ */
+
+const useRevoluteJoint = (body1, body2, [body1Anchor, body2Anchor, axis, limits]) => {
+  const {
+    rapier
+  } = useRapier();
+  const params = rapier.JointData.revolute(vectorArrayToVector3(body1Anchor), vectorArrayToVector3(body2Anchor), vectorArrayToVector3(axis));
+
+  if (limits) {
+    params.limitsEnabled = true;
+    params.limits = limits;
+  }
+
+  return useImpulseJoint(body1, body2, params);
+};
+/**
+ * The prismatic joint prevents any relative movement between two rigid-bodies, except for relative translations along one axis.
+ * It is characterized by one local anchor as well as one local axis on each rigid-body. In 3D, an optional
+ * local tangent axis can be specified for each rigid-body.
+ */
+
+const usePrismaticJoint = (body1, body2, [body1Anchor, body2Anchor, axis, limits]) => {
+  const {
+    rapier
+  } = useRapier();
+  const params = rapier.JointData.prismatic(vectorArrayToVector3(body1Anchor), vectorArrayToVector3(body2Anchor), vectorArrayToVector3(axis));
+
+  if (limits) {
+    params.limitsEnabled = true;
+    params.limits = limits;
+  }
+
+  return useImpulseJoint(body1, body2, params);
+};
+
 /**
  * Calculates an InteractionGroup bitmask for use in the `collisionGroups` or `solverGroups`
  * properties of RigidBody or Collider components. The first argument represents a list of
@@ -1854,11 +1894,11 @@ exports.RigidBody = RigidBody;
 exports.RoundCuboidCollider = RoundCuboidCollider;
 exports.TrimeshCollider = TrimeshCollider;
 exports.interactionGroups = interactionGroups;
-exports.useChildColliderProps = useChildColliderProps;
+exports.useAfterPhysicsStep = useAfterPhysicsStep;
+exports.useBeforePhysicsStep = useBeforePhysicsStep;
 exports.useFixedJoint = useFixedJoint;
 exports.useImpulseJoint = useImpulseJoint;
 exports.usePrismaticJoint = usePrismaticJoint;
 exports.useRapier = useRapier;
 exports.useRevoluteJoint = useRevoluteJoint;
-exports.useRigidBody = useRigidBody;
 exports.useSphericalJoint = useSphericalJoint;