@react-three/rapier 0.7.6 → 0.7.7

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

@@ -101,12 +101,12 @@ 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;
     /**

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/react-three-rapier.cjs.dev.js

@@ -198,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,
@@ -245,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) {
@@ -269,6 +274,7 @@ const Physics = ({
     return () => {
       if (world) {
         world.free();
+        worldRef.current = undefined;
       }
     };
   }, []); // Update gravity
@@ -502,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];
 
@@ -523,7 +529,6 @@ function _extends() {
 
     return target;
   };
-
   return _extends.apply(this, arguments);
 }
 
@@ -697,11 +702,11 @@ const useUpdateRigidBodyOptions = (rigidBodyRef, props, states, updateTranslatio
     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);
     }
   }, mutablePropsAsFlatArray);
@@ -724,20 +729,20 @@ 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);
       }
     };
@@ -1078,6 +1083,7 @@ const useRigidBody = (options = {}) => {
     return () => {
       world.removeRigidBody(rigidBody);
       rigidBodyStates.delete(rigidBody.handle);
+      rigidBodyRef.current = undefined;
     };
   }, []);
   useUpdateRigidBodyOptions(rigidBodyRef, mergedOptions, rigidBodyStates);

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

@@ -198,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,
@@ -245,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) {
@@ -269,6 +274,7 @@ const Physics = ({
     return () => {
       if (world) {
         world.free();
+        worldRef.current = undefined;
       }
     };
   }, []); // Update gravity
@@ -502,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];
 
@@ -523,7 +529,6 @@ function _extends() {
 
     return target;
   };
-
   return _extends.apply(this, arguments);
 }
 
@@ -697,11 +702,11 @@ const useUpdateRigidBodyOptions = (rigidBodyRef, props, states, updateTranslatio
     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);
     }
   }, mutablePropsAsFlatArray);
@@ -724,20 +729,20 @@ 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);
       }
     };
@@ -1078,6 +1083,7 @@ const useRigidBody = (options = {}) => {
     return () => {
       world.removeRigidBody(rigidBody);
       rigidBodyStates.delete(rigidBody.handle);
+      rigidBodyRef.current = undefined;
     };
   }, []);
   useUpdateRigidBodyOptions(rigidBodyRef, mergedOptions, rigidBodyStates);

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';
@@ -173,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,
@@ -220,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) {
@@ -244,6 +249,7 @@ const Physics = ({
     return () => {
       if (world) {
         world.free();
+        worldRef.current = undefined;
       }
     };
   }, []); // Update gravity
@@ -477,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];
 
@@ -498,7 +504,6 @@ function _extends() {
 
     return target;
   };
-
   return _extends.apply(this, arguments);
 }
 
@@ -672,11 +677,11 @@ const useUpdateRigidBodyOptions = (rigidBodyRef, props, states, updateTranslatio
     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);
     }
   }, mutablePropsAsFlatArray);
@@ -699,20 +704,20 @@ 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);
       }
     };
@@ -1053,6 +1058,7 @@ const useRigidBody = (options = {}) => {
     return () => {
       world.removeRigidBody(rigidBody);
       rigidBodyStates.delete(rigidBody.handle);
+      rigidBodyRef.current = undefined;
     };
   }, []);
   useUpdateRigidBodyOptions(rigidBodyRef, mergedOptions, rigidBodyStates);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/rapier",
-  "version": "0.7.6",
+  "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",