@react-three/rapier 0.5.1 → 0.5.2

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

@@ -2,9 +2,9 @@ import { MutableRefObject } from "react";
 import { CoefficientCombineRule, RigidBody as RapierRigidBody, Collider as RapierCollider, TempContactManifold } from "@dimforge/rapier3d-compat";
 import { createColliderApi, createJointApi, createRigidBodyApi, createWorldApi } from "./api";
 export { RapierRigidBody, RapierCollider };
-export { CoefficientCombineRule as CoefficientCombineRule, } from "@dimforge/rapier3d-compat";
+export { CoefficientCombineRule as CoefficientCombineRule } from "@dimforge/rapier3d-compat";
 export declare type RefGetter<T> = MutableRefObject<() => T | undefined>;
-export declare type RigidBodyAutoCollider = 'ball' | 'cuboid' | 'hull' | 'trimesh' | false;
+export declare type RigidBodyAutoCollider = "ball" | "cuboid" | "hull" | "trimesh" | false;
 export interface UseRigidBodyAPI {
     rigidBody: RapierRigidBody;
     collider: RapierCollider;
@@ -65,7 +65,7 @@ export declare type RigidBodyTypeString = "fixed" | "dynamic" | "kinematicPositi
 export declare type RigidBodyShape = "cuboid" | "trimesh" | "ball" | "capsule" | "convexHull" | "heightfield" | "polyline" | "roundCuboid" | "cylinder" | "roundCylinder" | "cone" | "roundCone" | "convexMesh" | "roundConvexHull" | "roundConvexMesh";
 export declare type Vector3Array = [x: number, y: number, z: number];
 export declare type Boolean3Array = [x: boolean, y: boolean, z: boolean];
-export interface UseColliderOptions<A> {
+export interface UseColliderOptions<ColliderArgs> {
     /**
      * The shape of your collider
      */
@@ -73,7 +73,7 @@ export interface UseColliderOptions<A> {
     /**
      * Arguments to pass to the collider
      */
-    args?: A;
+    args?: ColliderArgs;
     /**
      * The mass of this rigid body.
      * The mass and density is automatically calculated based on the shape of the collider.

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

@@ -6,13 +6,23 @@ export declare const vectorArrayToObject: (arr: Vector3Array) => {
     y: number;
     z: number;
 };
+export declare const vector3ToQuaternion: (v: Vector3) => Quaternion;
 export declare const rigidBodyTypeFromString: (type: RigidBodyTypeString) => number;
 export declare const scaleColliderArgs: (shape: RigidBodyShape, args: (number | ArrayLike<number>)[], scale: Vector3) => (number | ArrayLike<number>)[];
-export declare const createColliderFromOptions: <A>(options: UseColliderOptions<A>, world: WorldApi, rigidBody?: RigidBody | undefined, scale?: {
-    x: number;
-    y: number;
-    z: number;
-}, hasCollisionEvents?: boolean) => Collider;
+interface CreateColliderFromOptions {
+    <ColliderArgs>(options: {
+        options: UseColliderOptions<ColliderArgs>;
+        world: WorldApi;
+        rigidBody?: RigidBody;
+        scale: {
+            x: number;
+            y: number;
+            z: number;
+        };
+        hasCollisionEvents: boolean;
+    }): Collider;
+}
+export declare const createColliderFromOptions: CreateColliderFromOptions;
 export declare const createCollidersFromChildren: (object: Object3D, rigidBody: RigidBodyApi, options: UseRigidBodyOptions, world: WorldApi, ignoreMeshColliders?: boolean) => Collider[];
 export declare const scaleVertices: (vertices: ArrayLike<number>, scale: Vector3) => number[];
-export declare const vector3ToQuaternion: (v: Vector3) => Quaternion;
+export {};

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

@@ -38,6 +38,11 @@ const vectorArrayToObject = arr => {
     z
   };
 };
+const quaternion = new three.Quaternion();
+const euler = new three.Euler();
+const vector3ToQuaternion = v => {
+  return quaternion.setFromEuler(euler.setFromVector3(v));
+};
 const rigidBodyTypeMap = {
   fixed: 1,
   dynamic: 0,
@@ -63,11 +68,13 @@ const scaleColliderArgs = (shape, args, scale) => {
   const scaleArray = [scale.x, scale.y, scale.z];
   return newArgs.map((arg, index) => scaleArray[index] * arg);
 };
-const createColliderFromOptions = (options, world, rigidBody, scale = {
-  x: 1,
-  y: 1,
-  z: 1
-}, hasCollisionEvents = false) => {
+const createColliderFromOptions = ({
+  options,
+  world,
+  rigidBody,
+  scale,
+  hasCollisionEvents
+}) => {
   var _options$shape, _options$args, _options$restitution, _options$restitutionC, _options$friction, _options$frictionComb;
 
   const mass = (options === null || options === void 0 ? void 0 : options.mass) || 1;
@@ -76,15 +83,16 @@ const createColliderFromOptions = (options, world, rigidBody, scale = {
   const [cmx, cmy, cmz] = (options === null || options === void 0 ? void 0 : options.centerOfMass) || [0, 0, 0];
   const [pix, piy, piz] = (options === null || options === void 0 ? void 0 : options.principalAngularInertia) || [mass * 0.2, mass * 0.2, mass * 0.2];
   const [x, y, z] = (options === null || options === void 0 ? void 0 : options.position) || [0, 0, 0];
-  const [rx, ry, rz] = (options === null || options === void 0 ? void 0 : options.rotation) || [0, 0, 0]; // @ts-ignore
+  const [rx, ry, rz] = (options === null || options === void 0 ? void 0 : options.rotation) || [0, 0, 0];
+  const qRotation = vector3ToQuaternion(new three.Vector3(rx, ry, rz)); // @ts-ignore
 
   const scaledArgs = scaleColliderArgs(options.shape, colliderArgs, scale);
   let colliderDesc = rapier3dCompat.ColliderDesc[colliderShape]( // @ts-ignore
   ...scaledArgs).setTranslation(x * scale.x, y * scale.y, z * scale.z).setRotation({
-    x: rx,
-    y: ry,
-    z: rz,
-    w: 1
+    x: qRotation.x,
+    y: qRotation.y,
+    z: qRotation.z,
+    w: qRotation.w
   }).setRestitution((_options$restitution = options === null || options === void 0 ? void 0 : options.restitution) !== null && _options$restitution !== void 0 ? _options$restitution : 0).setRestitutionCombineRule((_options$restitutionC = options === null || options === void 0 ? void 0 : options.restitutionCombineRule) !== null && _options$restitutionC !== void 0 ? _options$restitutionC : rapier3dCompat.CoefficientCombineRule.Average).setFriction((_options$friction = options === null || options === void 0 ? void 0 : options.friction) !== null && _options$friction !== void 0 ? _options$friction : 0.7).setFrictionCombineRule((_options$frictionComb = options === null || options === void 0 ? void 0 : options.frictionCombineRule) !== null && _options$frictionComb !== void 0 ? _options$frictionComb : rapier3dCompat.CoefficientCombineRule.Average);
 
   if (hasCollisionEvents) {
@@ -92,6 +100,8 @@ const createColliderFromOptions = (options, world, rigidBody, scale = {
   } // If any of the mass properties are specified, add mass properties
 
 
+  const qMassRot = vector3ToQuaternion(new three.Vector3(0, 0, 0));
+
   if (options !== null && options !== void 0 && options.mass || options !== null && options !== void 0 && options.centerOfMass || options !== null && options !== void 0 && options.principalAngularInertia) {
     colliderDesc.setDensity(0);
     colliderDesc.setMassProperties(mass, {
@@ -103,10 +113,10 @@ const createColliderFromOptions = (options, world, rigidBody, scale = {
       y: piy,
       z: piz
     }, {
-      x: 0,
-      y: 0,
-      z: 0,
-      w: 1
+      x: qMassRot.x,
+      y: qMassRot.y,
+      z: qMassRot.z,
+      w: qMassRot.w
     });
   }
 
@@ -218,11 +228,6 @@ const scaleVertices = (vertices, scale) => {
 
   return scaledVerts;
 };
-const quaternion = new three.Quaternion();
-const euler = new three.Euler();
-const vector3ToQuaternion = v => {
-  return quaternion.setFromEuler(euler.setFromVector3(v));
-};
 
 const createRigidBodyApi = ref => {
   return {
@@ -870,10 +875,15 @@ const RigidBody = /*#__PURE__*/React.forwardRef((_ref, ref) => {
   } = _ref,
       props = _objectWithoutProperties(_ref, _excluded);
 
-  const [object, rigidBody] = useRigidBody(props);
-  React.useImperativeHandle(ref, () => rigidBody);
+  const [object, api] = useRigidBody(props);
+  React.useImperativeHandle(ref, () => api);
   return /*#__PURE__*/React__default["default"].createElement(RigidBodyContext.Provider, {
-    value: [object, rigidBody, !!(props.onCollisionEnter || props.onCollisionExit), props]
+    value: {
+      ref: object,
+      api,
+      hasCollisionEvents: !!(props.onCollisionEnter || props.onCollisionExit),
+      options: props
+    }
   }, /*#__PURE__*/React__default["default"].createElement("object3D", {
     ref: object
   }, children));
@@ -887,7 +897,10 @@ const MeshCollider = ({
     world
   } = useRapier();
   const object = React.useRef(null);
-  const [, rigidBody, hasCollisionEvents, rigidBodyOptions] = useRigidBodyContext();
+  const {
+    api,
+    options
+  } = useRigidBodyContext();
   React.useEffect(() => {
     let autoColliders = [];
 
@@ -895,7 +908,7 @@ const MeshCollider = ({
       var _ref2;
 
       const colliderSetting = (_ref2 = type !== null && type !== void 0 ? type : physicsOptions.colliders) !== null && _ref2 !== void 0 ? _ref2 : false;
-      autoColliders = colliderSetting !== false ? createCollidersFromChildren(object.current, rigidBody, _objectSpread2(_objectSpread2({}, rigidBodyOptions), {}, {
+      autoColliders = colliderSetting !== false ? createCollidersFromChildren(object.current, api, _objectSpread2(_objectSpread2({}, options), {}, {
         colliders: colliderSetting
       }), world, false) : [];
     }
@@ -909,7 +922,7 @@ const MeshCollider = ({
   return /*#__PURE__*/React__default["default"].createElement("object3D", {
     ref: object,
     userData: {
-      r3RapierType: 'MeshCollider'
+      r3RapierType: "MeshCollider"
     }
   }, children);
 }; // Colliders
@@ -923,11 +936,19 @@ const AnyCollider = _ref3 => {
   const {
     world
   } = useRapier();
-  const [, rigidBody, hasCollisionEvents] = useRigidBodyContext();
+  const rigidBodyContext = useRigidBodyContext();
   const ref = React.useRef(null);
   React.useEffect(() => {
+    var _rigidBodyContext$api;
+
     const scale = ref.current.getWorldScale(new three.Vector3());
-    const collider = createColliderFromOptions(props, world, rigidBody.raw(), scale, hasCollisionEvents);
+    const collider = createColliderFromOptions({
+      options: props,
+      world,
+      rigidBody: rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : (_rigidBodyContext$api = rigidBodyContext.api) === null || _rigidBodyContext$api === void 0 ? void 0 : _rigidBodyContext$api.raw(),
+      scale,
+      hasCollisionEvents: rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.hasCollisionEvents
+    });
     return () => {
       world.removeCollider(collider);
     };

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

@@ -38,6 +38,11 @@ const vectorArrayToObject = arr => {
     z
   };
 };
+const quaternion = new three.Quaternion();
+const euler = new three.Euler();
+const vector3ToQuaternion = v => {
+  return quaternion.setFromEuler(euler.setFromVector3(v));
+};
 const rigidBodyTypeMap = {
   fixed: 1,
   dynamic: 0,
@@ -63,11 +68,13 @@ const scaleColliderArgs = (shape, args, scale) => {
   const scaleArray = [scale.x, scale.y, scale.z];
   return newArgs.map((arg, index) => scaleArray[index] * arg);
 };
-const createColliderFromOptions = (options, world, rigidBody, scale = {
-  x: 1,
-  y: 1,
-  z: 1
-}, hasCollisionEvents = false) => {
+const createColliderFromOptions = ({
+  options,
+  world,
+  rigidBody,
+  scale,
+  hasCollisionEvents
+}) => {
   var _options$shape, _options$args, _options$restitution, _options$restitutionC, _options$friction, _options$frictionComb;
 
   const mass = (options === null || options === void 0 ? void 0 : options.mass) || 1;
@@ -76,15 +83,16 @@ const createColliderFromOptions = (options, world, rigidBody, scale = {
   const [cmx, cmy, cmz] = (options === null || options === void 0 ? void 0 : options.centerOfMass) || [0, 0, 0];
   const [pix, piy, piz] = (options === null || options === void 0 ? void 0 : options.principalAngularInertia) || [mass * 0.2, mass * 0.2, mass * 0.2];
   const [x, y, z] = (options === null || options === void 0 ? void 0 : options.position) || [0, 0, 0];
-  const [rx, ry, rz] = (options === null || options === void 0 ? void 0 : options.rotation) || [0, 0, 0]; // @ts-ignore
+  const [rx, ry, rz] = (options === null || options === void 0 ? void 0 : options.rotation) || [0, 0, 0];
+  const qRotation = vector3ToQuaternion(new three.Vector3(rx, ry, rz)); // @ts-ignore
 
   const scaledArgs = scaleColliderArgs(options.shape, colliderArgs, scale);
   let colliderDesc = rapier3dCompat.ColliderDesc[colliderShape]( // @ts-ignore
   ...scaledArgs).setTranslation(x * scale.x, y * scale.y, z * scale.z).setRotation({
-    x: rx,
-    y: ry,
-    z: rz,
-    w: 1
+    x: qRotation.x,
+    y: qRotation.y,
+    z: qRotation.z,
+    w: qRotation.w
   }).setRestitution((_options$restitution = options === null || options === void 0 ? void 0 : options.restitution) !== null && _options$restitution !== void 0 ? _options$restitution : 0).setRestitutionCombineRule((_options$restitutionC = options === null || options === void 0 ? void 0 : options.restitutionCombineRule) !== null && _options$restitutionC !== void 0 ? _options$restitutionC : rapier3dCompat.CoefficientCombineRule.Average).setFriction((_options$friction = options === null || options === void 0 ? void 0 : options.friction) !== null && _options$friction !== void 0 ? _options$friction : 0.7).setFrictionCombineRule((_options$frictionComb = options === null || options === void 0 ? void 0 : options.frictionCombineRule) !== null && _options$frictionComb !== void 0 ? _options$frictionComb : rapier3dCompat.CoefficientCombineRule.Average);
 
   if (hasCollisionEvents) {
@@ -92,6 +100,8 @@ const createColliderFromOptions = (options, world, rigidBody, scale = {
   } // If any of the mass properties are specified, add mass properties
 
 
+  const qMassRot = vector3ToQuaternion(new three.Vector3(0, 0, 0));
+
   if (options !== null && options !== void 0 && options.mass || options !== null && options !== void 0 && options.centerOfMass || options !== null && options !== void 0 && options.principalAngularInertia) {
     colliderDesc.setDensity(0);
     colliderDesc.setMassProperties(mass, {
@@ -103,10 +113,10 @@ const createColliderFromOptions = (options, world, rigidBody, scale = {
       y: piy,
       z: piz
     }, {
-      x: 0,
-      y: 0,
-      z: 0,
-      w: 1
+      x: qMassRot.x,
+      y: qMassRot.y,
+      z: qMassRot.z,
+      w: qMassRot.w
     });
   }
 
@@ -218,11 +228,6 @@ const scaleVertices = (vertices, scale) => {
 
   return scaledVerts;
 };
-const quaternion = new three.Quaternion();
-const euler = new three.Euler();
-const vector3ToQuaternion = v => {
-  return quaternion.setFromEuler(euler.setFromVector3(v));
-};
 
 const createRigidBodyApi = ref => {
   return {
@@ -870,10 +875,15 @@ const RigidBody = /*#__PURE__*/React.forwardRef((_ref, ref) => {
   } = _ref,
       props = _objectWithoutProperties(_ref, _excluded);
 
-  const [object, rigidBody] = useRigidBody(props);
-  React.useImperativeHandle(ref, () => rigidBody);
+  const [object, api] = useRigidBody(props);
+  React.useImperativeHandle(ref, () => api);
   return /*#__PURE__*/React__default["default"].createElement(RigidBodyContext.Provider, {
-    value: [object, rigidBody, !!(props.onCollisionEnter || props.onCollisionExit), props]
+    value: {
+      ref: object,
+      api,
+      hasCollisionEvents: !!(props.onCollisionEnter || props.onCollisionExit),
+      options: props
+    }
   }, /*#__PURE__*/React__default["default"].createElement("object3D", {
     ref: object
   }, children));
@@ -887,7 +897,10 @@ const MeshCollider = ({
     world
   } = useRapier();
   const object = React.useRef(null);
-  const [, rigidBody, hasCollisionEvents, rigidBodyOptions] = useRigidBodyContext();
+  const {
+    api,
+    options
+  } = useRigidBodyContext();
   React.useEffect(() => {
     let autoColliders = [];
 
@@ -895,7 +908,7 @@ const MeshCollider = ({
       var _ref2;
 
       const colliderSetting = (_ref2 = type !== null && type !== void 0 ? type : physicsOptions.colliders) !== null && _ref2 !== void 0 ? _ref2 : false;
-      autoColliders = colliderSetting !== false ? createCollidersFromChildren(object.current, rigidBody, _objectSpread2(_objectSpread2({}, rigidBodyOptions), {}, {
+      autoColliders = colliderSetting !== false ? createCollidersFromChildren(object.current, api, _objectSpread2(_objectSpread2({}, options), {}, {
         colliders: colliderSetting
       }), world, false) : [];
     }
@@ -909,7 +922,7 @@ const MeshCollider = ({
   return /*#__PURE__*/React__default["default"].createElement("object3D", {
     ref: object,
     userData: {
-      r3RapierType: 'MeshCollider'
+      r3RapierType: "MeshCollider"
     }
   }, children);
 }; // Colliders
@@ -923,11 +936,19 @@ const AnyCollider = _ref3 => {
   const {
     world
   } = useRapier();
-  const [, rigidBody, hasCollisionEvents] = useRigidBodyContext();
+  const rigidBodyContext = useRigidBodyContext();
   const ref = React.useRef(null);
   React.useEffect(() => {
+    var _rigidBodyContext$api;
+
     const scale = ref.current.getWorldScale(new three.Vector3());
-    const collider = createColliderFromOptions(props, world, rigidBody.raw(), scale, hasCollisionEvents);
+    const collider = createColliderFromOptions({
+      options: props,
+      world,
+      rigidBody: rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : (_rigidBodyContext$api = rigidBodyContext.api) === null || _rigidBodyContext$api === void 0 ? void 0 : _rigidBodyContext$api.raw(),
+      scale,
+      hasCollisionEvents: rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.hasCollisionEvents
+    });
     return () => {
       world.removeCollider(collider);
     };

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

@@ -13,6 +13,11 @@ const vectorArrayToObject = arr => {
     z
   };
 };
+const quaternion = new Quaternion();
+const euler = new Euler();
+const vector3ToQuaternion = v => {
+  return quaternion.setFromEuler(euler.setFromVector3(v));
+};
 const rigidBodyTypeMap = {
   fixed: 1,
   dynamic: 0,
@@ -38,11 +43,13 @@ const scaleColliderArgs = (shape, args, scale) => {
   const scaleArray = [scale.x, scale.y, scale.z];
   return newArgs.map((arg, index) => scaleArray[index] * arg);
 };
-const createColliderFromOptions = (options, world, rigidBody, scale = {
-  x: 1,
-  y: 1,
-  z: 1
-}, hasCollisionEvents = false) => {
+const createColliderFromOptions = ({
+  options,
+  world,
+  rigidBody,
+  scale,
+  hasCollisionEvents
+}) => {
   var _options$shape, _options$args, _options$restitution, _options$restitutionC, _options$friction, _options$frictionComb;
 
   const mass = (options === null || options === void 0 ? void 0 : options.mass) || 1;
@@ -51,15 +58,16 @@ const createColliderFromOptions = (options, world, rigidBody, scale = {
   const [cmx, cmy, cmz] = (options === null || options === void 0 ? void 0 : options.centerOfMass) || [0, 0, 0];
   const [pix, piy, piz] = (options === null || options === void 0 ? void 0 : options.principalAngularInertia) || [mass * 0.2, mass * 0.2, mass * 0.2];
   const [x, y, z] = (options === null || options === void 0 ? void 0 : options.position) || [0, 0, 0];
-  const [rx, ry, rz] = (options === null || options === void 0 ? void 0 : options.rotation) || [0, 0, 0]; // @ts-ignore
+  const [rx, ry, rz] = (options === null || options === void 0 ? void 0 : options.rotation) || [0, 0, 0];
+  const qRotation = vector3ToQuaternion(new Vector3(rx, ry, rz)); // @ts-ignore
 
   const scaledArgs = scaleColliderArgs(options.shape, colliderArgs, scale);
   let colliderDesc = ColliderDesc[colliderShape]( // @ts-ignore
   ...scaledArgs).setTranslation(x * scale.x, y * scale.y, z * scale.z).setRotation({
-    x: rx,
-    y: ry,
-    z: rz,
-    w: 1
+    x: qRotation.x,
+    y: qRotation.y,
+    z: qRotation.z,
+    w: qRotation.w
   }).setRestitution((_options$restitution = options === null || options === void 0 ? void 0 : options.restitution) !== null && _options$restitution !== void 0 ? _options$restitution : 0).setRestitutionCombineRule((_options$restitutionC = options === null || options === void 0 ? void 0 : options.restitutionCombineRule) !== null && _options$restitutionC !== void 0 ? _options$restitutionC : CoefficientCombineRule.Average).setFriction((_options$friction = options === null || options === void 0 ? void 0 : options.friction) !== null && _options$friction !== void 0 ? _options$friction : 0.7).setFrictionCombineRule((_options$frictionComb = options === null || options === void 0 ? void 0 : options.frictionCombineRule) !== null && _options$frictionComb !== void 0 ? _options$frictionComb : CoefficientCombineRule.Average);
 
   if (hasCollisionEvents) {
@@ -67,6 +75,8 @@ const createColliderFromOptions = (options, world, rigidBody, scale = {
   } // If any of the mass properties are specified, add mass properties
 
 
+  const qMassRot = vector3ToQuaternion(new Vector3(0, 0, 0));
+
   if (options !== null && options !== void 0 && options.mass || options !== null && options !== void 0 && options.centerOfMass || options !== null && options !== void 0 && options.principalAngularInertia) {
     colliderDesc.setDensity(0);
     colliderDesc.setMassProperties(mass, {
@@ -78,10 +88,10 @@ const createColliderFromOptions = (options, world, rigidBody, scale = {
       y: piy,
       z: piz
     }, {
-      x: 0,
-      y: 0,
-      z: 0,
-      w: 1
+      x: qMassRot.x,
+      y: qMassRot.y,
+      z: qMassRot.z,
+      w: qMassRot.w
     });
   }
 
@@ -193,11 +203,6 @@ const scaleVertices = (vertices, scale) => {
 
   return scaledVerts;
 };
-const quaternion = new Quaternion();
-const euler = new Euler();
-const vector3ToQuaternion = v => {
-  return quaternion.setFromEuler(euler.setFromVector3(v));
-};
 
 const createRigidBodyApi = ref => {
   return {
@@ -845,10 +850,15 @@ const RigidBody = /*#__PURE__*/forwardRef((_ref, ref) => {
   } = _ref,
       props = _objectWithoutProperties(_ref, _excluded);
 
-  const [object, rigidBody] = useRigidBody(props);
-  useImperativeHandle(ref, () => rigidBody);
+  const [object, api] = useRigidBody(props);
+  useImperativeHandle(ref, () => api);
   return /*#__PURE__*/React.createElement(RigidBodyContext.Provider, {
-    value: [object, rigidBody, !!(props.onCollisionEnter || props.onCollisionExit), props]
+    value: {
+      ref: object,
+      api,
+      hasCollisionEvents: !!(props.onCollisionEnter || props.onCollisionExit),
+      options: props
+    }
   }, /*#__PURE__*/React.createElement("object3D", {
     ref: object
   }, children));
@@ -862,7 +872,10 @@ const MeshCollider = ({
     world
   } = useRapier();
   const object = useRef(null);
-  const [, rigidBody, hasCollisionEvents, rigidBodyOptions] = useRigidBodyContext();
+  const {
+    api,
+    options
+  } = useRigidBodyContext();
   useEffect(() => {
     let autoColliders = [];
 
@@ -870,7 +883,7 @@ const MeshCollider = ({
       var _ref2;
 
       const colliderSetting = (_ref2 = type !== null && type !== void 0 ? type : physicsOptions.colliders) !== null && _ref2 !== void 0 ? _ref2 : false;
-      autoColliders = colliderSetting !== false ? createCollidersFromChildren(object.current, rigidBody, _objectSpread2(_objectSpread2({}, rigidBodyOptions), {}, {
+      autoColliders = colliderSetting !== false ? createCollidersFromChildren(object.current, api, _objectSpread2(_objectSpread2({}, options), {}, {
         colliders: colliderSetting
       }), world, false) : [];
     }
@@ -884,7 +897,7 @@ const MeshCollider = ({
   return /*#__PURE__*/React.createElement("object3D", {
     ref: object,
     userData: {
-      r3RapierType: 'MeshCollider'
+      r3RapierType: "MeshCollider"
     }
   }, children);
 }; // Colliders
@@ -898,11 +911,19 @@ const AnyCollider = _ref3 => {
   const {
     world
   } = useRapier();
-  const [, rigidBody, hasCollisionEvents] = useRigidBodyContext();
+  const rigidBodyContext = useRigidBodyContext();
   const ref = useRef(null);
   useEffect(() => {
+    var _rigidBodyContext$api;
+
     const scale = ref.current.getWorldScale(new Vector3());
-    const collider = createColliderFromOptions(props, world, rigidBody.raw(), scale, hasCollisionEvents);
+    const collider = createColliderFromOptions({
+      options: props,
+      world,
+      rigidBody: rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : (_rigidBodyContext$api = rigidBodyContext.api) === null || _rigidBodyContext$api === void 0 ? void 0 : _rigidBodyContext$api.raw(),
+      scale,
+      hasCollisionEvents: rigidBodyContext === null || rigidBodyContext === void 0 ? void 0 : rigidBodyContext.hasCollisionEvents
+    });
     return () => {
       world.removeCollider(collider);
     };

package/package.json

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

package/CHANGELOG.md

@@ -1,93 +0,0 @@
-# @react-three/rapier
-
-## 0.5.1
-
-### Patch Changes
-
-- c36be39: Add MeshCollider, allowing more fine control over automatic collider creation
-
-## 0.5.0
-
-### Minor Changes
-
-- a3be5f6: Remove hooks api in favor of better fleshed out components
-
-### Patch Changes
-
-- a3be5f6: Update types for Joints -- now only allow RefObjects of RigidBodyApi
-- a3be5f6: Fix setKinematicRotation (convert Vector3 to Quaternion)
-- a3be5f6: Update to @dimforge/rapier3d-compat@0.9.0
-- a3be5f6: Allow setting the physics timeStep
-- a3be5f6: Add rotational and transitional constraits to RigidBody
-- a3be5f6: Allow updating the gravity at runtime
-
-## 0.4.3
-
-### Patch Changes
-
-- f7a8a2d: Rigid body creation hooks should not use auto colliders
-- 663eeb5: Fix default collider setting
-
-## 0.4.2
-
-### Patch Changes
-
-- 387b32c: Add restitution and friction as props for auto-generated colliders on RigidBody
-
-## 0.4.1
-
-### Patch Changes
-
-- bb7a269: Add useful proxied api methods to rigidbody
-
-## 0.4.0
-
-### Minor Changes
-
-- dd535aa: Update to @dimforge/rapier3d-compat@0.8.1, pinned version
-
-### Patch Changes
-
-- dd535aa: Better <Physics /> lifecycle making reinitialization more stable
-
-## 0.3.1
-
-### Patch Changes
-
-- 37d2621: Pin rapier3d version to 0.8.0-alpha.2
-
-## 0.3.0
-
-### Minor Changes
-
-- 7e36172: Add collision and sleep/awake events
-
-## 0.2.0
-
-### Minor Changes
-
-- 584ce08: Expose joint api, however no joint is returned when created (rapier bug?)
-
-### Patch Changes
-
-- 584ce08: All parts now uses a more rigid initiation process
-- 584ce08: Apply bounding box offset for auto colliders
-- 584ce08: Use single update loop instead of individual rigid body callbacks
-
-## 0.1.2
-
-### Patch Changes
-
-- 4f7440c: fix: make global colliders setting progate to children
-
-## 0.1.1
-
-### Patch Changes
-
-- 260e6d1: Fix Physics "colliders" value not being applied in children by default
-
-## 0.1.0
-
-### Minor Changes
-
-- First release with base functionality of RigidBodies in Rapier