@react-three/rapier 0.7.0 → 0.7.1

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

@@ -14,7 +14,7 @@ interface CreateRigidBodyStateOptions {
 export declare const createRigidBodyState: ({ rigidBody, object, setMatrix, getMatrix, worldScale }: CreateRigidBodyStateOptions) => RigidBodyState;
 declare type ImmutableRigidBodyOptions = (keyof RigidBodyProps)[];
 export declare const immutableRigidBodyOptions: ImmutableRigidBodyOptions;
-export declare const setRigidBodyOptions: (rigidBody: RigidBody, options: RigidBodyProps, states: RigidBodyStateMap) => void;
-export declare const useUpdateRigidBodyOptions: (rigidBodyRef: MutableRefObject<RigidBody | undefined>, props: RigidBodyProps, states: RigidBodyStateMap) => void;
-export declare const useRigidBodyEvents: (rigidBodyRef: MutableRefObject<RigidBody | undefined>, props: RigidBodyProps, events: EventMap) => void;
+export declare const setRigidBodyOptions: (rigidBody: RigidBody, options: RigidBodyProps, states: RigidBodyStateMap, updateTranslations?: boolean) => void;
+export declare const useUpdateRigidBodyOptions: (rigidBodyRef: MutableRefObject<RigidBody | RigidBody[] | undefined>, props: RigidBodyProps, states: RigidBodyStateMap, updateTranslations?: boolean) => void;
+export declare const useRigidBodyEvents: (rigidBodyRef: MutableRefObject<RigidBody | RigidBody[] | undefined>, props: RigidBodyProps, events: EventMap) => void;
 export {};

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

@@ -636,7 +636,7 @@ const mutableRigidBodyOptions = {
   }
 };
 const mutableRigidBodyOptionKeys = Object.keys(mutableRigidBodyOptions);
-const setRigidBodyOptions = (rigidBody, options, states) => {
+const setRigidBodyOptions = (rigidBody, options, states, updateTranslations = true) => {
   if (!rigidBody) {
     return;
   }
@@ -644,12 +644,15 @@ const setRigidBodyOptions = (rigidBody, options, states) => {
   const state = states.get(rigidBody.handle);
 
   if (state) {
-    state.object.updateWorldMatrix(true, false);
+    if (updateTranslations) {
+      state.object.updateWorldMatrix(true, false);
+
+      _matrix4.copy(state.object.matrixWorld).decompose(_position, _rotation, _scale);
 
-    _matrix4.copy(state.object.matrixWorld).decompose(_position, _rotation, _scale);
+      rigidBody.setTranslation(_position, false);
+      rigidBody.setRotation(_rotation, false);
+    }
 
-    rigidBody.setTranslation(_position, false);
-    rigidBody.setRotation(_rotation, false);
     mutableRigidBodyOptionKeys.forEach(key => {
       if (key in options) {
         mutableRigidBodyOptions[key](rigidBody, options[key]);
@@ -657,9 +660,15 @@ const setRigidBodyOptions = (rigidBody, options, states) => {
     });
   }
 };
-const useUpdateRigidBodyOptions = (rigidBodyRef, props, states) => {
+const useUpdateRigidBodyOptions = (rigidBodyRef, props, states, updateTranslations = true) => {
   React.useEffect(() => {
-    setRigidBodyOptions(rigidBodyRef.current, props, states);
+    if ("length" in rigidBodyRef.current) {
+      rigidBodyRef.current.forEach(rigidBody => {
+        setRigidBodyOptions(rigidBody, props, states, updateTranslations);
+      });
+    } else {
+      setRigidBodyOptions(rigidBodyRef.current, props, states, updateTranslations);
+    }
   }, [props]);
 };
 const useRigidBodyEvents = (rigidBodyRef, props, events) => {
@@ -671,17 +680,31 @@ const useRigidBodyEvents = (rigidBodyRef, props, events) => {
     onIntersectionEnter,
     onIntersectionExit
   } = props;
+  const eventHandlers = {
+    onWake,
+    onSleep,
+    onCollisionEnter,
+    onCollisionExit,
+    onIntersectionEnter,
+    onIntersectionExit
+  };
   React.useEffect(() => {
-    events.set(rigidBodyRef.current.handle, {
-      onWake,
-      onSleep,
-      onCollisionEnter,
-      onCollisionExit,
-      onIntersectionEnter,
-      onIntersectionExit
-    });
+    if ("length" in rigidBodyRef.current) {
+      rigidBodyRef.current.forEach(rigidBody => {
+        events.set(rigidBody.handle, eventHandlers);
+      });
+    } else {
+      events.set(rigidBodyRef.current.handle, eventHandlers);
+    }
+
     return () => {
-      events.delete(rigidBodyRef.current.handle);
+      if ("length" in rigidBodyRef.current) {
+        rigidBodyRef.current.forEach(rigidBody => {
+          events.delete(rigidBody.handle);
+        });
+      } else {
+        events.delete(rigidBodyRef.current.handle);
+      }
     };
   }, [onWake, onSleep, onCollisionEnter, onCollisionExit]);
 };
@@ -1413,7 +1436,8 @@ const InstancedRigidBodies = /*#__PURE__*/React.forwardRef((props, ref) => {
   const {
     world,
     rigidBodyStates,
-    physicsOptions
+    physicsOptions,
+    rigidBodyEvents
   } = useRapier();
   const object = React.useRef(null);
 
@@ -1424,7 +1448,7 @@ const InstancedRigidBodies = /*#__PURE__*/React.forwardRef((props, ref) => {
   } = props,
         options = _objectWithoutProperties(props, _excluded);
 
-  const instancesRef = React.useRef();
+  const instancesRef = React.useRef([]);
   const instancesRefGetter = React.useRef(() => {
     if (!instancesRef.current) {
       instancesRef.current = [];
@@ -1469,10 +1493,9 @@ const InstancedRigidBodies = /*#__PURE__*/React.forwardRef((props, ref) => {
 
           _object3d.rotation.set(rx, ry, rz);
 
-          _object3d.applyMatrix4(invertedWorld); // Set initial transforms based on world transforms
-          // will be replaced by the setRigidBodyOption below
-
+          _object3d.applyMatrix4(invertedWorld);
 
+          mesh.setMatrixAt(index, _object3d.matrix);
           rigidBody.setTranslation(_object3d.position, false);
           rigidBody.setRotation(_object3d.quaternion, false);
           const api = createRigidBodyApi({
@@ -1493,11 +1516,21 @@ const InstancedRigidBodies = /*#__PURE__*/React.forwardRef((props, ref) => {
         world.removeRigidBody(rb.rigidBody);
         rigidBodyStates.delete(rb.rigidBody.handle);
       });
-      instancesRef.current = undefined;
+      instancesRef.current = [];
     };
   }, []);
   const api = React.useMemo(() => createInstancedRigidBodiesApi(instancesRefGetter), []);
   React.useImperativeHandle(ref, () => api);
+  useUpdateRigidBodyOptions({
+    current: instancesRef.current.map(({
+      rigidBody
+    }) => rigidBody)
+  }, mergedOptions, rigidBodyStates, false);
+  useRigidBodyEvents({
+    current: instancesRef.current.map(({
+      rigidBody
+    }) => rigidBody)
+  }, mergedOptions, rigidBodyEvents);
   return /*#__PURE__*/React__default["default"].createElement(RigidBodyContext.Provider, {
     value: {
       ref: object,

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

@@ -636,7 +636,7 @@ const mutableRigidBodyOptions = {
   }
 };
 const mutableRigidBodyOptionKeys = Object.keys(mutableRigidBodyOptions);
-const setRigidBodyOptions = (rigidBody, options, states) => {
+const setRigidBodyOptions = (rigidBody, options, states, updateTranslations = true) => {
   if (!rigidBody) {
     return;
   }
@@ -644,12 +644,15 @@ const setRigidBodyOptions = (rigidBody, options, states) => {
   const state = states.get(rigidBody.handle);
 
   if (state) {
-    state.object.updateWorldMatrix(true, false);
+    if (updateTranslations) {
+      state.object.updateWorldMatrix(true, false);
+
+      _matrix4.copy(state.object.matrixWorld).decompose(_position, _rotation, _scale);
 
-    _matrix4.copy(state.object.matrixWorld).decompose(_position, _rotation, _scale);
+      rigidBody.setTranslation(_position, false);
+      rigidBody.setRotation(_rotation, false);
+    }
 
-    rigidBody.setTranslation(_position, false);
-    rigidBody.setRotation(_rotation, false);
     mutableRigidBodyOptionKeys.forEach(key => {
       if (key in options) {
         mutableRigidBodyOptions[key](rigidBody, options[key]);
@@ -657,9 +660,15 @@ const setRigidBodyOptions = (rigidBody, options, states) => {
     });
   }
 };
-const useUpdateRigidBodyOptions = (rigidBodyRef, props, states) => {
+const useUpdateRigidBodyOptions = (rigidBodyRef, props, states, updateTranslations = true) => {
   React.useEffect(() => {
-    setRigidBodyOptions(rigidBodyRef.current, props, states);
+    if ("length" in rigidBodyRef.current) {
+      rigidBodyRef.current.forEach(rigidBody => {
+        setRigidBodyOptions(rigidBody, props, states, updateTranslations);
+      });
+    } else {
+      setRigidBodyOptions(rigidBodyRef.current, props, states, updateTranslations);
+    }
   }, [props]);
 };
 const useRigidBodyEvents = (rigidBodyRef, props, events) => {
@@ -671,17 +680,31 @@ const useRigidBodyEvents = (rigidBodyRef, props, events) => {
     onIntersectionEnter,
     onIntersectionExit
   } = props;
+  const eventHandlers = {
+    onWake,
+    onSleep,
+    onCollisionEnter,
+    onCollisionExit,
+    onIntersectionEnter,
+    onIntersectionExit
+  };
   React.useEffect(() => {
-    events.set(rigidBodyRef.current.handle, {
-      onWake,
-      onSleep,
-      onCollisionEnter,
-      onCollisionExit,
-      onIntersectionEnter,
-      onIntersectionExit
-    });
+    if ("length" in rigidBodyRef.current) {
+      rigidBodyRef.current.forEach(rigidBody => {
+        events.set(rigidBody.handle, eventHandlers);
+      });
+    } else {
+      events.set(rigidBodyRef.current.handle, eventHandlers);
+    }
+
     return () => {
-      events.delete(rigidBodyRef.current.handle);
+      if ("length" in rigidBodyRef.current) {
+        rigidBodyRef.current.forEach(rigidBody => {
+          events.delete(rigidBody.handle);
+        });
+      } else {
+        events.delete(rigidBodyRef.current.handle);
+      }
     };
   }, [onWake, onSleep, onCollisionEnter, onCollisionExit]);
 };
@@ -1413,7 +1436,8 @@ const InstancedRigidBodies = /*#__PURE__*/React.forwardRef((props, ref) => {
   const {
     world,
     rigidBodyStates,
-    physicsOptions
+    physicsOptions,
+    rigidBodyEvents
   } = useRapier();
   const object = React.useRef(null);
 
@@ -1424,7 +1448,7 @@ const InstancedRigidBodies = /*#__PURE__*/React.forwardRef((props, ref) => {
   } = props,
         options = _objectWithoutProperties(props, _excluded);
 
-  const instancesRef = React.useRef();
+  const instancesRef = React.useRef([]);
   const instancesRefGetter = React.useRef(() => {
     if (!instancesRef.current) {
       instancesRef.current = [];
@@ -1469,10 +1493,9 @@ const InstancedRigidBodies = /*#__PURE__*/React.forwardRef((props, ref) => {
 
           _object3d.rotation.set(rx, ry, rz);
 
-          _object3d.applyMatrix4(invertedWorld); // Set initial transforms based on world transforms
-          // will be replaced by the setRigidBodyOption below
-
+          _object3d.applyMatrix4(invertedWorld);
 
+          mesh.setMatrixAt(index, _object3d.matrix);
           rigidBody.setTranslation(_object3d.position, false);
           rigidBody.setRotation(_object3d.quaternion, false);
           const api = createRigidBodyApi({
@@ -1493,11 +1516,21 @@ const InstancedRigidBodies = /*#__PURE__*/React.forwardRef((props, ref) => {
         world.removeRigidBody(rb.rigidBody);
         rigidBodyStates.delete(rb.rigidBody.handle);
       });
-      instancesRef.current = undefined;
+      instancesRef.current = [];
     };
   }, []);
   const api = React.useMemo(() => createInstancedRigidBodiesApi(instancesRefGetter), []);
   React.useImperativeHandle(ref, () => api);
+  useUpdateRigidBodyOptions({
+    current: instancesRef.current.map(({
+      rigidBody
+    }) => rigidBody)
+  }, mergedOptions, rigidBodyStates, false);
+  useRigidBodyEvents({
+    current: instancesRef.current.map(({
+      rigidBody
+    }) => rigidBody)
+  }, mergedOptions, rigidBodyEvents);
   return /*#__PURE__*/React__default["default"].createElement(RigidBodyContext.Provider, {
     value: {
       ref: object,

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

@@ -611,7 +611,7 @@ const mutableRigidBodyOptions = {
   }
 };
 const mutableRigidBodyOptionKeys = Object.keys(mutableRigidBodyOptions);
-const setRigidBodyOptions = (rigidBody, options, states) => {
+const setRigidBodyOptions = (rigidBody, options, states, updateTranslations = true) => {
   if (!rigidBody) {
     return;
   }
@@ -619,12 +619,15 @@ const setRigidBodyOptions = (rigidBody, options, states) => {
   const state = states.get(rigidBody.handle);
 
   if (state) {
-    state.object.updateWorldMatrix(true, false);
+    if (updateTranslations) {
+      state.object.updateWorldMatrix(true, false);
+
+      _matrix4.copy(state.object.matrixWorld).decompose(_position, _rotation, _scale);
 
-    _matrix4.copy(state.object.matrixWorld).decompose(_position, _rotation, _scale);
+      rigidBody.setTranslation(_position, false);
+      rigidBody.setRotation(_rotation, false);
+    }
 
-    rigidBody.setTranslation(_position, false);
-    rigidBody.setRotation(_rotation, false);
     mutableRigidBodyOptionKeys.forEach(key => {
       if (key in options) {
         mutableRigidBodyOptions[key](rigidBody, options[key]);
@@ -632,9 +635,15 @@ const setRigidBodyOptions = (rigidBody, options, states) => {
     });
   }
 };
-const useUpdateRigidBodyOptions = (rigidBodyRef, props, states) => {
+const useUpdateRigidBodyOptions = (rigidBodyRef, props, states, updateTranslations = true) => {
   useEffect(() => {
-    setRigidBodyOptions(rigidBodyRef.current, props, states);
+    if ("length" in rigidBodyRef.current) {
+      rigidBodyRef.current.forEach(rigidBody => {
+        setRigidBodyOptions(rigidBody, props, states, updateTranslations);
+      });
+    } else {
+      setRigidBodyOptions(rigidBodyRef.current, props, states, updateTranslations);
+    }
   }, [props]);
 };
 const useRigidBodyEvents = (rigidBodyRef, props, events) => {
@@ -646,17 +655,31 @@ const useRigidBodyEvents = (rigidBodyRef, props, events) => {
     onIntersectionEnter,
     onIntersectionExit
   } = props;
+  const eventHandlers = {
+    onWake,
+    onSleep,
+    onCollisionEnter,
+    onCollisionExit,
+    onIntersectionEnter,
+    onIntersectionExit
+  };
   useEffect(() => {
-    events.set(rigidBodyRef.current.handle, {
-      onWake,
-      onSleep,
-      onCollisionEnter,
-      onCollisionExit,
-      onIntersectionEnter,
-      onIntersectionExit
-    });
+    if ("length" in rigidBodyRef.current) {
+      rigidBodyRef.current.forEach(rigidBody => {
+        events.set(rigidBody.handle, eventHandlers);
+      });
+    } else {
+      events.set(rigidBodyRef.current.handle, eventHandlers);
+    }
+
     return () => {
-      events.delete(rigidBodyRef.current.handle);
+      if ("length" in rigidBodyRef.current) {
+        rigidBodyRef.current.forEach(rigidBody => {
+          events.delete(rigidBody.handle);
+        });
+      } else {
+        events.delete(rigidBodyRef.current.handle);
+      }
     };
   }, [onWake, onSleep, onCollisionEnter, onCollisionExit]);
 };
@@ -1388,7 +1411,8 @@ const InstancedRigidBodies = /*#__PURE__*/forwardRef((props, ref) => {
   const {
     world,
     rigidBodyStates,
-    physicsOptions
+    physicsOptions,
+    rigidBodyEvents
   } = useRapier();
   const object = useRef(null);
 
@@ -1399,7 +1423,7 @@ const InstancedRigidBodies = /*#__PURE__*/forwardRef((props, ref) => {
   } = props,
         options = _objectWithoutProperties(props, _excluded);
 
-  const instancesRef = useRef();
+  const instancesRef = useRef([]);
   const instancesRefGetter = useRef(() => {
     if (!instancesRef.current) {
       instancesRef.current = [];
@@ -1444,10 +1468,9 @@ const InstancedRigidBodies = /*#__PURE__*/forwardRef((props, ref) => {
 
           _object3d.rotation.set(rx, ry, rz);
 
-          _object3d.applyMatrix4(invertedWorld); // Set initial transforms based on world transforms
-          // will be replaced by the setRigidBodyOption below
-
+          _object3d.applyMatrix4(invertedWorld);
 
+          mesh.setMatrixAt(index, _object3d.matrix);
           rigidBody.setTranslation(_object3d.position, false);
           rigidBody.setRotation(_object3d.quaternion, false);
           const api = createRigidBodyApi({
@@ -1468,11 +1491,21 @@ const InstancedRigidBodies = /*#__PURE__*/forwardRef((props, ref) => {
         world.removeRigidBody(rb.rigidBody);
         rigidBodyStates.delete(rb.rigidBody.handle);
       });
-      instancesRef.current = undefined;
+      instancesRef.current = [];
     };
   }, []);
   const api = useMemo(() => createInstancedRigidBodiesApi(instancesRefGetter), []);
   useImperativeHandle(ref, () => api);
+  useUpdateRigidBodyOptions({
+    current: instancesRef.current.map(({
+      rigidBody
+    }) => rigidBody)
+  }, mergedOptions, rigidBodyStates, false);
+  useRigidBodyEvents({
+    current: instancesRef.current.map(({
+      rigidBody
+    }) => rigidBody)
+  }, mergedOptions, rigidBodyEvents);
   return /*#__PURE__*/React.createElement(RigidBodyContext.Provider, {
     value: {
       ref: object,

package/package.json

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