@react-three/rapier 0.7.5 → 0.7.7

package/dist/declarations/src/RigidBody.d.ts

@@ -17,4 +17,4 @@ export declare const useRigidBodyContext: () => {
 export interface RigidBodyProps extends UseRigidBodyOptions {
     children?: ReactNode;
 }
-export declare const RigidBody: React.ForwardRefExoticComponent<RigidBodyProps & React.RefAttributes<import("./api").RigidBodyApi>>;
+export declare const RigidBody: React.MemoExoticComponent<React.ForwardRefExoticComponent<RigidBodyProps & React.RefAttributes<import("./api").RigidBodyApi>>>;

package/dist/declarations/src/api.d.ts

@@ -22,27 +22,27 @@ export interface RigidBodyApi {
     /**
      * Applies an impulse at the center-of-mass of this rigid-body.
      */
-    applyImpulse(impulseVector: Vector3Object, wakeUp: boolean): void;
+    applyImpulse(impulseVector: Vector3Object, wakeUp?: boolean): void;
     /**
      * Applies an impulsive torque at the center-of-mass of this rigid-body.
      */
-    applyTorqueImpulse(torqueVector: Vector3Object, wakeUp: boolean): void;
+    applyTorqueImpulse(torqueVector: Vector3Object, wakeUp?: boolean): void;
     /**
      * Applies an impulse at the given world-space point of this rigid-body.
      */
-    applyImpulseAtPoint(impulseVector: Vector3Object, impulsePoint: Vector3Object, wakeUp: boolean): void;
+    applyImpulseAtPoint(impulseVector: Vector3Object, impulsePoint: Vector3Object, wakeUp?: boolean): void;
     /**
      * Adds a force at the center-of-mass of this rigid-body.
      */
-    addForce(force: Vector3Object, wakeUp: boolean): void;
+    addForce(force: Vector3Object, wakeUp?: boolean): void;
     /**
      * Adds a force at the given world-space point of this rigid-body.
      */
-    addForceAtPoint(force: Vector3Object, point: Vector3Object, wakeUp: boolean): void;
+    addForceAtPoint(force: Vector3Object, point: Vector3Object, wakeUp?: boolean): void;
     /**
      * Adds a torque at the center-of-mass of this rigid-body.
      */
-    addTorque(torque: Vector3Object, wakeUp: boolean): void;
+    addTorque(torque: Vector3Object, wakeUp?: boolean): void;
     /**
      * The world-space translation of this rigid-body.
      */
@@ -50,7 +50,7 @@ export interface RigidBodyApi {
     /**
      * Sets the translation of this rigid-body.
      */
-    setTranslation(translation: Vector3Object, wakeUp: boolean): void;
+    setTranslation(translation: Vector3Object, wakeUp?: boolean): void;
     /**
      * The world-space orientation of this rigid-body.
      */
@@ -58,7 +58,7 @@ export interface RigidBodyApi {
     /**
      * Sets the rotation quaternion of this rigid-body.
      */
-    setRotation(rotation: Quaternion, wakeUp: boolean): void;
+    setRotation(rotation: Quaternion, wakeUp?: boolean): void;
     /**
      * The linear velocity of this rigid-body.
      */
@@ -66,7 +66,7 @@ export interface RigidBodyApi {
     /**
      * Sets the linear velocity of this rigid-body.
      */
-    setLinvel(velocity: Vector3Object, wakeUp: boolean): void;
+    setLinvel(velocity: Vector3Object, wakeUp?: boolean): void;
     /**
      * The angular velocity of this rigid-body.
      */
@@ -74,7 +74,7 @@ export interface RigidBodyApi {
     /**
      * Sets the angular velocity of this rigid-body.
      */
-    setAngvel(velocity: Vector3Object, wakeUp: boolean): void;
+    setAngvel(velocity: Vector3Object, wakeUp?: boolean): void;
     /**
      * The linear damping of this rigid-body.
      */
@@ -101,38 +101,38 @@ export interface RigidBodyApi {
      */
     setNextKinematicRotation(rotation: Quaternion): void;
     /**
-     * If this rigid body is kinematic, sets its future rotation after the next timestep integration.
+     * If this rigid body is kinematic, sets its future translation after the next timestep integration.
      *
-     * This should be used instead of rigidBody.setRotation to make the dynamic object interacting with
-     *  this kinematic body behave as expected. Internally, Rapier will compute an artificial velocity
-     *  for this rigid-body from its current position and its next kinematic position. This velocity
-     *  will be used to compute forces on dynamic bodies interacting with this body.
+     * This should be used instead of rigidBody.setTranslation to make the dynamic object interacting with
+     * this kinematic body behave as expected. Internally, Rapier will compute an artificial velocity
+     * for this rigid-body from its current position and its next kinematic position. This velocity
+     * will be used to compute forces on dynamic bodies interacting with this body.
      */
     setNextKinematicTranslation(translation: Vector3Object): void;
     /**
      * Resets to zero the user forces (but not torques) applied to this rigid-body.
      */
-    resetForces(wakeUp: boolean): void;
+    resetForces(wakeUp?: boolean): void;
     /**
      * Resets to zero the user torques applied to this rigid-body.
      */
-    resetTorques(wakeUp: boolean): void;
+    resetTorques(wakeUp?: boolean): void;
     /**
      * Locks or unlocks the ability of this rigid-body to rotate.
      */
-    lockRotations(locked: boolean, wakeUp: boolean): void;
+    lockRotations(locked: boolean, wakeUp?: boolean): void;
     /**
      * Locks or unlocks the ability of this rigid-body to translate.
      */
-    lockTranslations(locked: boolean, wakeUp: boolean): void;
+    lockTranslations(locked: boolean, wakeUp?: boolean): void;
     /**
      * Locks or unlocks the ability of this rigid-body to rotate along individual coordinate axes.
      */
-    setEnabledRotations(x: boolean, y: boolean, z: boolean, wakeUp: boolean): void;
+    setEnabledRotations(x: boolean, y: boolean, z: boolean, wakeUp?: boolean): void;
     /**
      * Locks or unlocks the ability of this rigid-body to translate along individual coordinate axes.
      */
-    setEnabledTranslations(x: boolean, y: boolean, z: boolean, wakeUp: boolean): void;
+    setEnabledTranslations(x: boolean, y: boolean, z: boolean, wakeUp?: boolean): void;
 }
 export declare const createRigidBodyApi: (ref: RefGetter<RigidBody>) => RigidBodyApi;
 export interface InstancedRigidBodyApi {
@@ -155,9 +155,9 @@ export interface WorldApi {
     createRigidBody(desc: RigidBodyDesc): RigidBody;
     createCollider(desc: ColliderDesc, parent?: RigidBody): Collider;
     removeRigidBody(rigidBody: RigidBody): void;
-    removeCollider(collider: Collider, wakeUp: boolean): void;
-    createImpulseJoint(params: JointData, rigidBodyA: RigidBody, rigidBodyB: RigidBody, wakeUp: boolean): ImpulseJoint;
-    removeImpulseJoint(joint: ImpulseJoint, wakeUp: boolean): void;
+    removeCollider(collider: Collider, wakeUp?: boolean): void;
+    createImpulseJoint(params: JointData, rigidBodyA: RigidBody, rigidBodyB: RigidBody, wakeUp?: boolean): ImpulseJoint;
+    removeImpulseJoint(joint: ImpulseJoint, wakeUp?: boolean): void;
     forEachCollider(callback: (collider: Collider) => void): void;
     setGravity(gravity: Vector3): void;
 }

package/dist/declarations/src/bitmasks.d.ts

@@ -31,4 +31,4 @@ import { InteractionGroups } from "@dimforge/rapier3d-compat";
  * @param filters Groups the interaction group should filter against. (Values can range from 0 to 15.)
  * @returns An InteractionGroup bitmask.
  */
-export declare const interactionGroups: (memberships: number | number[], filters?: number | number[] | undefined) => InteractionGroups;
+export declare const interactionGroups: (memberships: number | number[], filters?: number | number[]) => InteractionGroups;

package/dist/declarations/src/types.d.ts

@@ -19,7 +19,7 @@ export declare type CuboidArgs = [
     halfDepth: number
 ];
 export declare type BallArgs = [radius: number];
-export declare type CapsuleArgs = [radius: number, height: number];
+export declare type CapsuleArgs = [halfHeight: number, radius: number];
 export declare type ConvexHullArgs = [vertices: ArrayLike<number>];
 export declare type HeightfieldArgs = [
     width: number,
@@ -42,16 +42,16 @@ export declare type RoundCuboidArgs = [
     halfDepth: number,
     borderRadius: number
 ];
-export declare type CylinderArgs = [radius: number, height: number];
+export declare type CylinderArgs = [halfHeight: number, radius: number];
 export declare type RoundCylinderArgs = [
+    halfHeight: number,
     radius: number,
-    height: number,
     borderRadius: number
 ];
-export declare type ConeArgs = [radius: number, height: number];
+export declare type ConeArgs = [halfHeight: number, radius: number];
 export declare type RoundConeArgs = [
+    halfHeight: number,
     radius: number,
-    height: number,
     borderRadius: number
 ];
 export declare type ConvexMeshArgs = [

package/dist/declarations/src/utils-collider.d.ts

@@ -14,12 +14,12 @@ export declare const scaleColliderArgs: (shape: ColliderShape, args: (number | A
     y: number;
     z: number;
 })[];
-export declare const createColliderFromOptions: (options: ColliderProps, world: WorldApi, scale: Vector3, rigidBody?: RigidBody | undefined) => Collider;
+export declare const createColliderFromOptions: (options: ColliderProps, world: WorldApi, scale: Vector3, rigidBody?: RigidBody) => Collider;
 declare type ImmutableColliderOptions = (keyof ColliderProps)[];
 export declare const immutableColliderOptions: ImmutableColliderOptions;
 export declare const setColliderOptions: (collider: Collider, options: ColliderProps, states: ColliderStateMap) => void;
 export declare const useUpdateColliderOptions: (collidersRef: MutableRefObject<Collider[]>, props: ColliderProps, states: ColliderStateMap) => void;
-export declare const createColliderState: (collider: Collider, object: Object3D, rigidBodyObject?: Object3D<import("three").Event> | null | undefined) => ColliderState;
+export declare const createColliderState: (collider: Collider, object: Object3D, rigidBodyObject?: Object3D | null) => ColliderState;
 interface CreateColliderPropsFromChildren {
     (options: {
         object: Object3D;

package/dist/declarations/src/utils.d.ts

@@ -1,9 +1,10 @@
 import { Quaternion as RapierQuaternion, Vector3 as RapierVector3 } from "@dimforge/rapier3d-compat";
-import { Vector3 } from "three";
+import { Euler, Quaternion, Vector3 } from "three";
 import { RigidBodyTypeString, Vector3Array } from "./types";
 export declare const vectorArrayToVector3: (arr: Vector3Array) => Vector3;
-export declare const vector3ToQuaternion: (v: Vector3) => import("three").Quaternion;
+export declare const vector3ToQuaternion: (v: Vector3) => Quaternion;
 export declare const rapierVector3ToVector3: ({ x, y, z }: RapierVector3) => Vector3;
-export declare const rapierQuaternionToQuaternion: ({ x, y, z, w }: RapierQuaternion) => import("three").Quaternion;
+export declare const rapierQuaternionToQuaternion: ({ x, y, z, w }: RapierQuaternion) => Quaternion;
 export declare const rigidBodyTypeFromString: (type: RigidBodyTypeString) => number;
 export declare const scaleVertices: (vertices: ArrayLike<number>, scale: Vector3) => number[];
+export declare const vectorToTuple: (v: Vector3 | Quaternion | any[] | undefined | number | Euler) => any[];

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

@@ -73,6 +73,23 @@ const scaleVertices = (vertices, scale) => {
 
   return scaledVerts;
 };
+const vectorToTuple = v => {
+  if (!v) return [0];
+
+  if (v instanceof three.Quaternion) {
+    return [v.x, v.y, v.z, v.w];
+  }
+
+  if (v instanceof three.Vector3 || v instanceof three.Euler) {
+    return [v.x, v.y, v.z];
+  }
+
+  if (Array.isArray(v)) {
+    return v;
+  }
+
+  return [v];
+};
 
 const createRigidBodyApi = ref => {
   return {
@@ -181,10 +198,19 @@ const createWorldApi = ref => {
     getRigidBody: handle => ref.current().getRigidBody(handle),
     createRigidBody: desc => ref.current().createRigidBody(desc),
     createCollider: (desc, rigidBody) => ref.current().createCollider(desc, rigidBody),
-    removeRigidBody: rigidBody => ref.current().removeRigidBody(rigidBody),
-    removeCollider: (collider, wakeUp = true) => ref.current().removeCollider(collider, wakeUp),
+    removeRigidBody: rigidBody => {
+      if (!ref.current().bodies.contains(rigidBody.handle)) return;
+      ref.current().removeRigidBody(rigidBody);
+    },
+    removeCollider: (collider, wakeUp = true) => {
+      if (!ref.current().colliders.contains(collider.handle)) return;
+      ref.current().removeCollider(collider, wakeUp);
+    },
     createImpulseJoint: (params, rigidBodyA, rigidBodyB, wakeUp = true) => ref.current().createImpulseJoint(params, rigidBodyA, rigidBodyB, wakeUp),
-    removeImpulseJoint: (joint, wakeUp = true) => ref.current().removeImpulseJoint(joint, wakeUp),
+    removeImpulseJoint: (joint, wakeUp = true) => {
+      if (!ref.current().impulseJoints.contains(joint.handle)) return;
+      ref.current().removeImpulseJoint(joint, wakeUp);
+    },
     forEachCollider: callback => ref.current().forEachCollider(callback),
     setGravity: ({
       x,
@@ -228,10 +254,6 @@ const Physics = ({
   updatePriority
 }) => {
   const rapier = useAsset.useAsset(importRapier);
-  const [isPaused, setIsPaused] = React.useState(_paused);
-  React.useEffect(() => {
-    setIsPaused(_paused);
-  }, [_paused]);
   const worldRef = React.useRef();
   const getWorldRef = React.useRef(() => {
     if (!worldRef.current) {
@@ -252,6 +274,7 @@ const Physics = ({
     return () => {
       if (world) {
         world.free();
+        worldRef.current = undefined;
       }
     };
   }, []); // Update gravity
@@ -485,15 +508,15 @@ const Physics = ({
     colliderStates,
     rigidBodyEvents,
     colliderEvents,
-    isPaused
-  }), [isPaused]);
+    isPaused: _paused
+  }), [_paused]);
   return /*#__PURE__*/React__default["default"].createElement(RapierContext.Provider, {
     value: context
   }, children);
 };
 
 function _extends() {
-  _extends = Object.assign || function (target) {
+  _extends = Object.assign ? Object.assign.bind() : function (target) {
     for (var i = 1; i < arguments.length; i++) {
       var source = arguments[i];
 
@@ -506,7 +529,6 @@ function _extends() {
 
     return target;
   };
-
   return _extends.apply(this, arguments);
 }
 
@@ -643,7 +665,11 @@ const mutableRigidBodyOptions = {
   },
   ccd: (rb, value) => {
     rb.enableCcd(value);
-  }
+  },
+  position: () => {},
+  rotation: () => {},
+  quaternion: () => {},
+  scale: () => {}
 };
 const mutableRigidBodyOptionKeys = Object.keys(mutableRigidBodyOptions);
 const setRigidBodyOptions = (rigidBody, options, states, updateTranslations = true) => {
@@ -671,15 +697,19 @@ 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 => {
+    return vectorToTuple(props[key]);
+  }), [props]);
   React.useEffect(() => {
-    if ("length" in rigidBodyRef.current) {
-      rigidBodyRef.current.forEach(rigidBody => {
+    if (Array.isArray(rigidBodyRef.current)) {
+      for (const rigidBody of rigidBodyRef.current) {
         setRigidBodyOptions(rigidBody, props, states, updateTranslations);
-      });
-    } else {
+      }
+    } else if (rigidBodyRef.current) {
       setRigidBodyOptions(rigidBodyRef.current, props, states, updateTranslations);
     }
-  }, [props]);
+  }, mutablePropsAsFlatArray);
 };
 const useRigidBodyEvents = (rigidBodyRef, props, events) => {
   const {
@@ -699,24 +729,24 @@ const useRigidBodyEvents = (rigidBodyRef, props, events) => {
     onIntersectionExit
   };
   React.useEffect(() => {
-    if ("length" in rigidBodyRef.current) {
-      rigidBodyRef.current.forEach(rigidBody => {
+    if (Array.isArray(rigidBodyRef.current)) {
+      for (const rigidBody of rigidBodyRef.current) {
         events.set(rigidBody.handle, eventHandlers);
-      });
-    } else {
+      }
+    } else if (rigidBodyRef.current) {
       events.set(rigidBodyRef.current.handle, eventHandlers);
     }
 
     return () => {
-      if ("length" in rigidBodyRef.current) {
-        rigidBodyRef.current.forEach(rigidBody => {
+      if (Array.isArray(rigidBodyRef.current)) {
+        for (const rigidBody of rigidBodyRef.current) {
           events.delete(rigidBody.handle);
-        });
-      } else {
+        }
+      } else if (rigidBodyRef.current) {
         events.delete(rigidBodyRef.current.handle);
       }
     };
-  }, [onWake, onSleep, onCollisionEnter, onCollisionExit]);
+  }, [onWake, onSleep, onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit]);
 };
 
 const scaleColliderArgs = (shape, args, scale) => {
@@ -793,7 +823,12 @@ const mutableColliderOptions = {
   },
   restitutionCombineRule: (collider, value) => {
     collider.setRestitutionCombineRule(value);
-  }
+  },
+  // To make sure the options all mutalbe options are listed
+  quaternion: () => {},
+  position: () => {},
+  rotation: () => {},
+  scale: () => {}
 };
 const mutableColliderOptionKeys = Object.keys(mutableColliderOptions);
 const setColliderOptions = (collider, options, states) => {
@@ -835,11 +870,15 @@ 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 => {
+    return vectorToTuple(props[key]);
+  }), [props]);
   React.useEffect(() => {
     collidersRef.current.forEach(collider => {
       setColliderOptions(collider, props, states);
     });
-  }, [props]);
+  }, mutablePropsAsFlatArray);
 };
 
 const isChildOfMeshCollider = child => {
@@ -980,7 +1019,7 @@ 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]);
+  }, [onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit]);
 };
 
 const useRapier = () => {
@@ -1044,6 +1083,7 @@ const useRigidBody = (options = {}) => {
     return () => {
       world.removeRigidBody(rigidBody);
       rigidBodyStates.delete(rigidBody.handle);
+      rigidBodyRef.current = undefined;
     };
   }, []);
   useUpdateRigidBodyOptions(rigidBodyRef, mergedOptions, rigidBodyStates);
@@ -1267,7 +1307,7 @@ const ConvexHullCollider = /*#__PURE__*/React__default["default"].forwardRef((pr
 const _excluded$1 = ["children", "type", "position", "rotation", "scale", "quaternion"];
 const RigidBodyContext = /*#__PURE__*/React.createContext(undefined);
 const useRigidBodyContext = () => React.useContext(RigidBodyContext);
-const RigidBody = /*#__PURE__*/React.forwardRef((props, ref) => {
+const RigidBody = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef((props, ref) => {
   const {
     children,
     type,
@@ -1297,7 +1337,7 @@ const RigidBody = /*#__PURE__*/React.forwardRef((props, ref) => {
   }), children, childColliderProps.map((colliderProps, index) => /*#__PURE__*/React__default["default"].createElement(AnyCollider, _extends({
     key: index
   }, colliderProps)))));
-});
+}));
 
 const MeshCollider = props => {
   const {

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

@@ -73,6 +73,23 @@ const scaleVertices = (vertices, scale) => {
 
   return scaledVerts;
 };
+const vectorToTuple = v => {
+  if (!v) return [0];
+
+  if (v instanceof three.Quaternion) {
+    return [v.x, v.y, v.z, v.w];
+  }
+
+  if (v instanceof three.Vector3 || v instanceof three.Euler) {
+    return [v.x, v.y, v.z];
+  }
+
+  if (Array.isArray(v)) {
+    return v;
+  }
+
+  return [v];
+};
 
 const createRigidBodyApi = ref => {
   return {
@@ -181,10 +198,19 @@ const createWorldApi = ref => {
     getRigidBody: handle => ref.current().getRigidBody(handle),
     createRigidBody: desc => ref.current().createRigidBody(desc),
     createCollider: (desc, rigidBody) => ref.current().createCollider(desc, rigidBody),
-    removeRigidBody: rigidBody => ref.current().removeRigidBody(rigidBody),
-    removeCollider: (collider, wakeUp = true) => ref.current().removeCollider(collider, wakeUp),
+    removeRigidBody: rigidBody => {
+      if (!ref.current().bodies.contains(rigidBody.handle)) return;
+      ref.current().removeRigidBody(rigidBody);
+    },
+    removeCollider: (collider, wakeUp = true) => {
+      if (!ref.current().colliders.contains(collider.handle)) return;
+      ref.current().removeCollider(collider, wakeUp);
+    },
     createImpulseJoint: (params, rigidBodyA, rigidBodyB, wakeUp = true) => ref.current().createImpulseJoint(params, rigidBodyA, rigidBodyB, wakeUp),
-    removeImpulseJoint: (joint, wakeUp = true) => ref.current().removeImpulseJoint(joint, wakeUp),
+    removeImpulseJoint: (joint, wakeUp = true) => {
+      if (!ref.current().impulseJoints.contains(joint.handle)) return;
+      ref.current().removeImpulseJoint(joint, wakeUp);
+    },
     forEachCollider: callback => ref.current().forEachCollider(callback),
     setGravity: ({
       x,
@@ -228,10 +254,6 @@ const Physics = ({
   updatePriority
 }) => {
   const rapier = useAsset.useAsset(importRapier);
-  const [isPaused, setIsPaused] = React.useState(_paused);
-  React.useEffect(() => {
-    setIsPaused(_paused);
-  }, [_paused]);
   const worldRef = React.useRef();
   const getWorldRef = React.useRef(() => {
     if (!worldRef.current) {
@@ -252,6 +274,7 @@ const Physics = ({
     return () => {
       if (world) {
         world.free();
+        worldRef.current = undefined;
       }
     };
   }, []); // Update gravity
@@ -485,15 +508,15 @@ const Physics = ({
     colliderStates,
     rigidBodyEvents,
     colliderEvents,
-    isPaused
-  }), [isPaused]);
+    isPaused: _paused
+  }), [_paused]);
   return /*#__PURE__*/React__default["default"].createElement(RapierContext.Provider, {
     value: context
   }, children);
 };
 
 function _extends() {
-  _extends = Object.assign || function (target) {
+  _extends = Object.assign ? Object.assign.bind() : function (target) {
     for (var i = 1; i < arguments.length; i++) {
       var source = arguments[i];
 
@@ -506,7 +529,6 @@ function _extends() {
 
     return target;
   };
-
   return _extends.apply(this, arguments);
 }
 
@@ -643,7 +665,11 @@ const mutableRigidBodyOptions = {
   },
   ccd: (rb, value) => {
     rb.enableCcd(value);
-  }
+  },
+  position: () => {},
+  rotation: () => {},
+  quaternion: () => {},
+  scale: () => {}
 };
 const mutableRigidBodyOptionKeys = Object.keys(mutableRigidBodyOptions);
 const setRigidBodyOptions = (rigidBody, options, states, updateTranslations = true) => {
@@ -671,15 +697,19 @@ 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 => {
+    return vectorToTuple(props[key]);
+  }), [props]);
   React.useEffect(() => {
-    if ("length" in rigidBodyRef.current) {
-      rigidBodyRef.current.forEach(rigidBody => {
+    if (Array.isArray(rigidBodyRef.current)) {
+      for (const rigidBody of rigidBodyRef.current) {
         setRigidBodyOptions(rigidBody, props, states, updateTranslations);
-      });
-    } else {
+      }
+    } else if (rigidBodyRef.current) {
       setRigidBodyOptions(rigidBodyRef.current, props, states, updateTranslations);
     }
-  }, [props]);
+  }, mutablePropsAsFlatArray);
 };
 const useRigidBodyEvents = (rigidBodyRef, props, events) => {
   const {
@@ -699,24 +729,24 @@ const useRigidBodyEvents = (rigidBodyRef, props, events) => {
     onIntersectionExit
   };
   React.useEffect(() => {
-    if ("length" in rigidBodyRef.current) {
-      rigidBodyRef.current.forEach(rigidBody => {
+    if (Array.isArray(rigidBodyRef.current)) {
+      for (const rigidBody of rigidBodyRef.current) {
         events.set(rigidBody.handle, eventHandlers);
-      });
-    } else {
+      }
+    } else if (rigidBodyRef.current) {
       events.set(rigidBodyRef.current.handle, eventHandlers);
     }
 
     return () => {
-      if ("length" in rigidBodyRef.current) {
-        rigidBodyRef.current.forEach(rigidBody => {
+      if (Array.isArray(rigidBodyRef.current)) {
+        for (const rigidBody of rigidBodyRef.current) {
           events.delete(rigidBody.handle);
-        });
-      } else {
+        }
+      } else if (rigidBodyRef.current) {
         events.delete(rigidBodyRef.current.handle);
       }
     };
-  }, [onWake, onSleep, onCollisionEnter, onCollisionExit]);
+  }, [onWake, onSleep, onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit]);
 };
 
 const scaleColliderArgs = (shape, args, scale) => {
@@ -793,7 +823,12 @@ const mutableColliderOptions = {
   },
   restitutionCombineRule: (collider, value) => {
     collider.setRestitutionCombineRule(value);
-  }
+  },
+  // To make sure the options all mutalbe options are listed
+  quaternion: () => {},
+  position: () => {},
+  rotation: () => {},
+  scale: () => {}
 };
 const mutableColliderOptionKeys = Object.keys(mutableColliderOptions);
 const setColliderOptions = (collider, options, states) => {
@@ -835,11 +870,15 @@ 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 => {
+    return vectorToTuple(props[key]);
+  }), [props]);
   React.useEffect(() => {
     collidersRef.current.forEach(collider => {
       setColliderOptions(collider, props, states);
     });
-  }, [props]);
+  }, mutablePropsAsFlatArray);
 };
 
 const isChildOfMeshCollider = child => {
@@ -980,7 +1019,7 @@ 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]);
+  }, [onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit]);
 };
 
 const useRapier = () => {
@@ -1044,6 +1083,7 @@ const useRigidBody = (options = {}) => {
     return () => {
       world.removeRigidBody(rigidBody);
       rigidBodyStates.delete(rigidBody.handle);
+      rigidBodyRef.current = undefined;
     };
   }, []);
   useUpdateRigidBodyOptions(rigidBodyRef, mergedOptions, rigidBodyStates);
@@ -1267,7 +1307,7 @@ const ConvexHullCollider = /*#__PURE__*/React__default["default"].forwardRef((pr
 const _excluded$1 = ["children", "type", "position", "rotation", "scale", "quaternion"];
 const RigidBodyContext = /*#__PURE__*/React.createContext(undefined);
 const useRigidBodyContext = () => React.useContext(RigidBodyContext);
-const RigidBody = /*#__PURE__*/React.forwardRef((props, ref) => {
+const RigidBody = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef((props, ref) => {
   const {
     children,
     type,
@@ -1297,7 +1337,7 @@ const RigidBody = /*#__PURE__*/React.forwardRef((props, ref) => {
   }), children, childColliderProps.map((colliderProps, index) => /*#__PURE__*/React__default["default"].createElement(AnyCollider, _extends({
     key: index
   }, colliderProps)))));
-});
+}));
 
 const MeshCollider = props => {
   const {

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

@@ -1,6 +1,6 @@
 import { EventQueue, RigidBodyDesc, ColliderDesc, ActiveEvents, ShapeType } from '@dimforge/rapier3d-compat';
 export { CoefficientCombineRule, Collider as RapierCollider, RigidBody as RapierRigidBody } from '@dimforge/rapier3d-compat';
-import React, { useState, useEffect, useRef, useMemo, createContext, useContext, memo, forwardRef, useImperativeHandle, useLayoutEffect } from 'react';
+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 { Quaternion, Euler, Vector3, Object3D, Matrix4, MathUtils, InstancedMesh, MeshBasicMaterial, Color, PlaneGeometry, ConeGeometry, CapsuleGeometry, CylinderGeometry, BufferGeometry, BufferAttribute, SphereGeometry, BoxGeometry, DynamicDrawUsage } from 'three';
@@ -48,6 +48,23 @@ const scaleVertices = (vertices, scale) => {
 
   return scaledVerts;
 };
+const vectorToTuple = v => {
+  if (!v) return [0];
+
+  if (v instanceof Quaternion) {
+    return [v.x, v.y, v.z, v.w];
+  }
+
+  if (v instanceof Vector3 || v instanceof Euler) {
+    return [v.x, v.y, v.z];
+  }
+
+  if (Array.isArray(v)) {
+    return v;
+  }
+
+  return [v];
+};
 
 const createRigidBodyApi = ref => {
   return {
@@ -156,10 +173,19 @@ const createWorldApi = ref => {
     getRigidBody: handle => ref.current().getRigidBody(handle),
     createRigidBody: desc => ref.current().createRigidBody(desc),
     createCollider: (desc, rigidBody) => ref.current().createCollider(desc, rigidBody),
-    removeRigidBody: rigidBody => ref.current().removeRigidBody(rigidBody),
-    removeCollider: (collider, wakeUp = true) => ref.current().removeCollider(collider, wakeUp),
+    removeRigidBody: rigidBody => {
+      if (!ref.current().bodies.contains(rigidBody.handle)) return;
+      ref.current().removeRigidBody(rigidBody);
+    },
+    removeCollider: (collider, wakeUp = true) => {
+      if (!ref.current().colliders.contains(collider.handle)) return;
+      ref.current().removeCollider(collider, wakeUp);
+    },
     createImpulseJoint: (params, rigidBodyA, rigidBodyB, wakeUp = true) => ref.current().createImpulseJoint(params, rigidBodyA, rigidBodyB, wakeUp),
-    removeImpulseJoint: (joint, wakeUp = true) => ref.current().removeImpulseJoint(joint, wakeUp),
+    removeImpulseJoint: (joint, wakeUp = true) => {
+      if (!ref.current().impulseJoints.contains(joint.handle)) return;
+      ref.current().removeImpulseJoint(joint, wakeUp);
+    },
     forEachCollider: callback => ref.current().forEachCollider(callback),
     setGravity: ({
       x,
@@ -203,10 +229,6 @@ const Physics = ({
   updatePriority
 }) => {
   const rapier = useAsset(importRapier);
-  const [isPaused, setIsPaused] = useState(_paused);
-  useEffect(() => {
-    setIsPaused(_paused);
-  }, [_paused]);
   const worldRef = useRef();
   const getWorldRef = useRef(() => {
     if (!worldRef.current) {
@@ -227,6 +249,7 @@ const Physics = ({
     return () => {
       if (world) {
         world.free();
+        worldRef.current = undefined;
       }
     };
   }, []); // Update gravity
@@ -460,15 +483,15 @@ const Physics = ({
     colliderStates,
     rigidBodyEvents,
     colliderEvents,
-    isPaused
-  }), [isPaused]);
+    isPaused: _paused
+  }), [_paused]);
   return /*#__PURE__*/React.createElement(RapierContext.Provider, {
     value: context
   }, children);
 };
 
 function _extends() {
-  _extends = Object.assign || function (target) {
+  _extends = Object.assign ? Object.assign.bind() : function (target) {
     for (var i = 1; i < arguments.length; i++) {
       var source = arguments[i];
 
@@ -481,7 +504,6 @@ function _extends() {
 
     return target;
   };
-
   return _extends.apply(this, arguments);
 }
 
@@ -618,7 +640,11 @@ const mutableRigidBodyOptions = {
   },
   ccd: (rb, value) => {
     rb.enableCcd(value);
-  }
+  },
+  position: () => {},
+  rotation: () => {},
+  quaternion: () => {},
+  scale: () => {}
 };
 const mutableRigidBodyOptionKeys = Object.keys(mutableRigidBodyOptions);
 const setRigidBodyOptions = (rigidBody, options, states, updateTranslations = true) => {
@@ -646,15 +672,19 @@ 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 = useMemo(() => mutableRigidBodyOptionKeys.flatMap(key => {
+    return vectorToTuple(props[key]);
+  }), [props]);
   useEffect(() => {
-    if ("length" in rigidBodyRef.current) {
-      rigidBodyRef.current.forEach(rigidBody => {
+    if (Array.isArray(rigidBodyRef.current)) {
+      for (const rigidBody of rigidBodyRef.current) {
         setRigidBodyOptions(rigidBody, props, states, updateTranslations);
-      });
-    } else {
+      }
+    } else if (rigidBodyRef.current) {
       setRigidBodyOptions(rigidBodyRef.current, props, states, updateTranslations);
     }
-  }, [props]);
+  }, mutablePropsAsFlatArray);
 };
 const useRigidBodyEvents = (rigidBodyRef, props, events) => {
   const {
@@ -674,24 +704,24 @@ const useRigidBodyEvents = (rigidBodyRef, props, events) => {
     onIntersectionExit
   };
   useEffect(() => {
-    if ("length" in rigidBodyRef.current) {
-      rigidBodyRef.current.forEach(rigidBody => {
+    if (Array.isArray(rigidBodyRef.current)) {
+      for (const rigidBody of rigidBodyRef.current) {
         events.set(rigidBody.handle, eventHandlers);
-      });
-    } else {
+      }
+    } else if (rigidBodyRef.current) {
       events.set(rigidBodyRef.current.handle, eventHandlers);
     }
 
     return () => {
-      if ("length" in rigidBodyRef.current) {
-        rigidBodyRef.current.forEach(rigidBody => {
+      if (Array.isArray(rigidBodyRef.current)) {
+        for (const rigidBody of rigidBodyRef.current) {
           events.delete(rigidBody.handle);
-        });
-      } else {
+        }
+      } else if (rigidBodyRef.current) {
         events.delete(rigidBodyRef.current.handle);
       }
     };
-  }, [onWake, onSleep, onCollisionEnter, onCollisionExit]);
+  }, [onWake, onSleep, onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit]);
 };
 
 const scaleColliderArgs = (shape, args, scale) => {
@@ -768,7 +798,12 @@ const mutableColliderOptions = {
   },
   restitutionCombineRule: (collider, value) => {
     collider.setRestitutionCombineRule(value);
-  }
+  },
+  // To make sure the options all mutalbe options are listed
+  quaternion: () => {},
+  position: () => {},
+  rotation: () => {},
+  scale: () => {}
 };
 const mutableColliderOptionKeys = Object.keys(mutableColliderOptions);
 const setColliderOptions = (collider, options, states) => {
@@ -810,11 +845,15 @@ const setColliderOptions = (collider, options, states) => {
   }
 };
 const useUpdateColliderOptions = (collidersRef, props, states) => {
+  // TODO: Improve this, split each prop into its own effect
+  const mutablePropsAsFlatArray = useMemo(() => mutableColliderOptionKeys.flatMap(key => {
+    return vectorToTuple(props[key]);
+  }), [props]);
   useEffect(() => {
     collidersRef.current.forEach(collider => {
       setColliderOptions(collider, props, states);
     });
-  }, [props]);
+  }, mutablePropsAsFlatArray);
 };
 
 const isChildOfMeshCollider = child => {
@@ -955,7 +994,7 @@ 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]);
+  }, [onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit]);
 };
 
 const useRapier = () => {
@@ -1019,6 +1058,7 @@ const useRigidBody = (options = {}) => {
     return () => {
       world.removeRigidBody(rigidBody);
       rigidBodyStates.delete(rigidBody.handle);
+      rigidBodyRef.current = undefined;
     };
   }, []);
   useUpdateRigidBodyOptions(rigidBodyRef, mergedOptions, rigidBodyStates);
@@ -1242,7 +1282,7 @@ const ConvexHullCollider = /*#__PURE__*/React.forwardRef((props, ref) => {
 const _excluded$1 = ["children", "type", "position", "rotation", "scale", "quaternion"];
 const RigidBodyContext = /*#__PURE__*/createContext(undefined);
 const useRigidBodyContext = () => useContext(RigidBodyContext);
-const RigidBody = /*#__PURE__*/forwardRef((props, ref) => {
+const RigidBody = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((props, ref) => {
   const {
     children,
     type,
@@ -1272,7 +1312,7 @@ const RigidBody = /*#__PURE__*/forwardRef((props, ref) => {
   }), children, childColliderProps.map((colliderProps, index) => /*#__PURE__*/React.createElement(AnyCollider, _extends({
     key: index
   }, colliderProps)))));
-});
+}));
 
 const MeshCollider = props => {
   const {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/rapier",
-  "version": "0.7.5",
+  "version": "0.7.7",
   "source": "src/index.ts",
   "main": "dist/react-three-rapier.cjs.js",
   "module": "dist/react-three-rapier.esm.js",
@@ -9,18 +9,18 @@
     "dist"
   ],
   "devDependencies": {
-    "@react-three/drei": "^9.6.2",
-    "@react-three/fiber": "^8.0.12",
+    "@react-three/drei": "^9.34.1",
+    "@react-three/fiber": "^8.8.9",
     "@react-three/test-renderer": "^8.0.17",
     "@types/react-dom": "^18.0.2",
     "@types/three": "^0.139.0",
     "@vitejs/plugin-react": "^2.1.0",
-    "@vitest/ui": "^0.23.4",
-    "happy-dom": "^6.0.4",
+    "@vitest/ui": "^0.24.1",
+    "happy-dom": "^7.5.5",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "three": "^0.139.2",
-    "vitest": "^0.23.4"
+    "vitest": "^0.24.1"
   },
   "peerDependencies": {
     "@react-three/fiber": "^8.0.12",