@react-three/rapier 0.11.3 → 0.12.1

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

@@ -223,7 +223,7 @@ const createInstancedRigidBodiesApi = bodiesGetter => ({
     return bodiesGetter.current().length;
   }
 
-}); // TODO: Flesh this out
+});
 const createWorldApi = ref => {
   return {
     raw: () => ref.current(),
@@ -256,8 +256,7 @@ const createWorldApi = ref => {
     },
     debugRender: () => ref.current().debugRender()
   };
-}; // TODO: Broken currently, waiting for Rapier3D to fix
-
+};
 const createJointApi = ref => {
   return {
     raw: () => ref.current(),
@@ -731,8 +730,31 @@ const useRigidBodyEvents = (rigidBodyRef, props, events) => {
 };
 
 const useRapier = () => {
-  return useContext(RapierContext);
+  return useContext(rapierContext);
+};
+const useBeforePhysicsStep = callback => {
+  const {
+    beforeStepCallbacks
+  } = useRapier();
+  useEffect(() => {
+    beforeStepCallbacks.add(callback);
+    return () => {
+      beforeStepCallbacks.delete(callback);
+    };
+  }, []);
 };
+const useAfterPhysicsStep = callback => {
+  const {
+    afterStepCallbacks
+  } = useRapier();
+  useEffect(() => {
+    afterStepCallbacks.add(callback);
+    return () => {
+      afterStepCallbacks.delete(callback);
+    };
+  }, []);
+}; // Internal hooks
+
 const useChildColliderProps = (ref, options, ignoreMeshColliders = true) => {
   const [colliderProps, setColliderProps] = useState([]);
   useEffect(() => {
@@ -796,103 +818,6 @@ const useRigidBody = (options = {}) => {
   useRigidBodyEvents(rigidBodyRef, mergedOptions, rigidBodyEvents);
   const api = useMemo(() => createRigidBodyApi(getRigidBodyRef), []);
   return [ref, api, childColliderProps];
-}; // Joints
-
-const useImpulseJoint = (body1, body2, params) => {
-  const {
-    world
-  } = useRapier();
-  const jointRef = useRef();
-  const getJointRef = 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;
-  });
-  useEffect(() => {
-    const joint = getJointRef.current();
-    return () => {
-      if (joint) {
-        world.removeImpulseJoint(joint);
-        jointRef.current = undefined;
-      }
-    };
-  }, []);
-  const api = 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);
 };
 
 const calcForceByType = {
@@ -980,7 +905,7 @@ const Attractor = /*#__PURE__*/memo(props => {
   });
 });
 
-const RapierContext = /*#__PURE__*/createContext(undefined);
+const rapierContext = /*#__PURE__*/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;
@@ -1035,7 +960,9 @@ const Physics = ({
   const rigidBodyEvents = useConst(() => new Map());
   const colliderEvents = useConst(() => new Map());
   const eventQueue = useConst(() => new 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
 
   useEffect(() => {
     const world = getWorldRef.current();
@@ -1054,6 +981,7 @@ const Physics = ({
       world.gravity = vectorArrayToVector3(_gravity);
     }
   }, [_gravity]);
+  const api = useMemo(() => createWorldApi(getWorldRef), []);
   const getSourceFromColliderHandle = useCallback(handle => {
     const world = worldRef.current;
 
@@ -1100,9 +1028,21 @@ const Physics = ({
 
     const clampedDelta = 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
@@ -1126,7 +1066,7 @@ const Physics = ({
             applyAttractorForceOnRigidBody(body, attractorState);
           });
         });
-        world.step(eventQueue);
+        stepWorld();
         steppingState.accumulator -= _timeStep;
       }
     }
@@ -1289,7 +1229,6 @@ const Physics = ({
   useFrame((_, dt) => {
     if (!_paused) step(dt);
   }, updatePriority);
-  const api = useMemo(() => createWorldApi(getWorldRef), []);
   const context = useMemo(() => ({
     rapier,
     world: api,
@@ -1302,10 +1241,12 @@ const Physics = ({
     rigidBodyEvents,
     colliderEvents,
     attractorStates,
+    beforeStepCallbacks,
+    afterStepCallbacks,
     isPaused: _paused,
     step
   }), [_paused, step]);
-  return /*#__PURE__*/React.createElement(RapierContext.Provider, {
+  return /*#__PURE__*/React.createElement(rapierContext.Provider, {
     value: context
   }, children);
 };
@@ -1533,7 +1474,7 @@ const RigidBody = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((props, ref) => {
 }));
 RigidBody.displayName = "RigidBody";
 
-const MeshCollider = props => {
+const MeshCollider = /*#__PURE__*/memo(props => {
   const {
     children,
     type
@@ -1561,7 +1502,7 @@ const MeshCollider = props => {
   }, children, childColliderProps.map((colliderProps, index) => /*#__PURE__*/React.createElement(AnyCollider, _extends({
     key: index
   }, colliderProps))));
-};
+});
 MeshCollider.displayName = "MeshCollider";
 
 function mapsEqual(map1, map2) {
@@ -1623,7 +1564,7 @@ const AttractorHelper = props => {
   }));
 };
 
-const Debug = () => {
+const Debug = /*#__PURE__*/memo(() => {
   const {
     world,
     attractorStates
@@ -1652,7 +1593,7 @@ const Debug = () => {
   }), /*#__PURE__*/React.createElement("bufferGeometry", null)), attractors.map((attractor, i) => /*#__PURE__*/React.createElement(AttractorHelper, _extends({
     key: attractor.object.uuid
   }, attractor))));
-};
+});
 
 const _excluded = ["positions", "rotations", "children"];
 const InstancedRigidBodies = /*#__PURE__*/forwardRef((props, ref) => {
@@ -1766,6 +1707,103 @@ const InstancedRigidBodies = /*#__PURE__*/forwardRef((props, ref) => {
 });
 InstancedRigidBodies.displayName = "InstancedRigidBodies";
 
+const useImpulseJoint = (body1, body2, params) => {
+  const {
+    world
+  } = useRapier();
+  const jointRef = useRef();
+  const getJointRef = 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;
+  });
+  useEffect(() => {
+    const joint = getJointRef.current();
+    return () => {
+      if (joint) {
+        world.removeImpulseJoint(joint);
+        jointRef.current = undefined;
+      }
+    };
+  }, []);
+  const api = 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
@@ -1802,4 +1840,4 @@ const interactionGroups = (memberships, filters) => (bitmask(memberships) << 16)
 
 const bitmask = groups => [groups].flat().reduce((acc, layer) => acc | 1 << layer, 0);
 
-export { AnyCollider, Attractor, BallCollider, CapsuleCollider, ConeCollider, ConvexHullCollider, CuboidCollider, CylinderCollider, Debug, HeightfieldCollider, InstancedRigidBodies, MeshCollider, Physics, RigidBody, RoundCuboidCollider, TrimeshCollider, interactionGroups, useChildColliderProps, useFixedJoint, useImpulseJoint, usePrismaticJoint, useRapier, useRevoluteJoint, useRigidBody, useSphericalJoint };
+export { AnyCollider, Attractor, BallCollider, CapsuleCollider, ConeCollider, ConvexHullCollider, CuboidCollider, CylinderCollider, Debug, HeightfieldCollider, InstancedRigidBodies, MeshCollider, Physics, RigidBody, RoundCuboidCollider, TrimeshCollider, interactionGroups, useAfterPhysicsStep, useBeforePhysicsStep, useFixedJoint, useImpulseJoint, usePrismaticJoint, useRapier, useRevoluteJoint, useSphericalJoint };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/rapier",
-  "version": "0.11.3",
+  "version": "0.12.1",
   "source": "src/index.ts",
   "main": "dist/react-three-rapier.cjs.js",
   "module": "dist/react-three-rapier.esm.js",