@react-three/rapier 0.7.5 → 0.7.6

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.
      */
@@ -112,27 +112,27 @@ export interface RigidBodyApi {
     /**
      * 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/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 {
@@ -643,7 +660,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,6 +692,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 => {
+    return vectorToTuple(props[key]);
+  }), [props]);
   React.useEffect(() => {
     if ("length" in rigidBodyRef.current) {
       rigidBodyRef.current.forEach(rigidBody => {
@@ -679,7 +704,7 @@ const useUpdateRigidBodyOptions = (rigidBodyRef, props, states, updateTranslatio
     } else {
       setRigidBodyOptions(rigidBodyRef.current, props, states, updateTranslations);
     }
-  }, [props]);
+  }, mutablePropsAsFlatArray);
 };
 const useRigidBodyEvents = (rigidBodyRef, props, events) => {
   const {
@@ -716,7 +741,7 @@ const useRigidBodyEvents = (rigidBodyRef, props, events) => {
         events.delete(rigidBodyRef.current.handle);
       }
     };
-  }, [onWake, onSleep, onCollisionEnter, onCollisionExit]);
+  }, [onWake, onSleep, onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit]);
 };
 
 const scaleColliderArgs = (shape, args, scale) => {
@@ -793,7 +818,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 +865,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 +1014,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 = () => {
@@ -1267,7 +1301,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 +1331,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 {
@@ -643,7 +660,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,6 +692,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 => {
+    return vectorToTuple(props[key]);
+  }), [props]);
   React.useEffect(() => {
     if ("length" in rigidBodyRef.current) {
       rigidBodyRef.current.forEach(rigidBody => {
@@ -679,7 +704,7 @@ const useUpdateRigidBodyOptions = (rigidBodyRef, props, states, updateTranslatio
     } else {
       setRigidBodyOptions(rigidBodyRef.current, props, states, updateTranslations);
     }
-  }, [props]);
+  }, mutablePropsAsFlatArray);
 };
 const useRigidBodyEvents = (rigidBodyRef, props, events) => {
   const {
@@ -716,7 +741,7 @@ const useRigidBodyEvents = (rigidBodyRef, props, events) => {
         events.delete(rigidBodyRef.current.handle);
       }
     };
-  }, [onWake, onSleep, onCollisionEnter, onCollisionExit]);
+  }, [onWake, onSleep, onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit]);
 };
 
 const scaleColliderArgs = (shape, args, scale) => {
@@ -793,7 +818,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 +865,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 +1014,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 = () => {
@@ -1267,7 +1301,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 +1331,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

@@ -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 {
@@ -618,7 +635,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,6 +667,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 = useMemo(() => mutableRigidBodyOptionKeys.flatMap(key => {
+    return vectorToTuple(props[key]);
+  }), [props]);
   useEffect(() => {
     if ("length" in rigidBodyRef.current) {
       rigidBodyRef.current.forEach(rigidBody => {
@@ -654,7 +679,7 @@ const useUpdateRigidBodyOptions = (rigidBodyRef, props, states, updateTranslatio
     } else {
       setRigidBodyOptions(rigidBodyRef.current, props, states, updateTranslations);
     }
-  }, [props]);
+  }, mutablePropsAsFlatArray);
 };
 const useRigidBodyEvents = (rigidBodyRef, props, events) => {
   const {
@@ -691,7 +716,7 @@ const useRigidBodyEvents = (rigidBodyRef, props, events) => {
         events.delete(rigidBodyRef.current.handle);
       }
     };
-  }, [onWake, onSleep, onCollisionEnter, onCollisionExit]);
+  }, [onWake, onSleep, onCollisionEnter, onCollisionExit, onIntersectionEnter, onIntersectionExit]);
 };
 
 const scaleColliderArgs = (shape, args, scale) => {
@@ -768,7 +793,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 +840,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 +989,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 = () => {
@@ -1242,7 +1276,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 +1306,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.6",
   "source": "src/index.ts",
   "main": "dist/react-three-rapier.cjs.js",
   "module": "dist/react-three-rapier.esm.js",