@react-three/rapier 0.5.0 → 0.5.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @react-three/rapier
 
+## 0.5.1
+
+### Patch Changes
+
+- c36be39: Add MeshCollider, allowing more fine control over automatic collider creation
+
 ## 0.5.0
 
 ### Minor Changes

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

@@ -128,7 +128,7 @@ export interface WorldApi {
     getCollider(handle: number): Collider | undefined;
     getRigidBody(handle: number): RigidBody | undefined;
     createRigidBody(desc: RigidBodyDesc): RigidBody;
-    createCollider(desc: ColliderDesc, rigidBody: RigidBody): Collider;
+    createCollider(desc: ColliderDesc, parent?: RigidBody): Collider;
     removeRigidBody(rigidBody: RigidBody): void;
     removeCollider(collider: Collider): void;
     createImpulseJoint(params: JointData, rigidBodyA: RigidBody, rigidBodyB: RigidBody): ImpulseJoint;

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

@@ -1,10 +1,15 @@
 import React from "react";
 import { ReactNode } from "react";
-import { BallArgs, CapsuleArgs, ConeArgs, ConvexHullArgs, CuboidArgs, CylinderArgs, HeightfieldArgs, RoundCuboidArgs, TrimeshArgs, UseColliderOptions, UseRigidBodyOptions } from "./types";
+import { BallArgs, CapsuleArgs, ConeArgs, ConvexHullArgs, CuboidArgs, CylinderArgs, HeightfieldArgs, RigidBodyAutoCollider, RoundCuboidArgs, TrimeshArgs, UseColliderOptions, UseRigidBodyOptions } from "./types";
 interface RigidBodyProps extends UseRigidBodyOptions {
     children?: ReactNode;
 }
 export declare const RigidBody: React.ForwardRefExoticComponent<RigidBodyProps & React.RefAttributes<import("./api").RigidBodyApi>>;
+interface MeshColliderProps {
+    children: ReactNode;
+    type: RigidBodyAutoCollider;
+}
+export declare const MeshCollider: ({ children, type }: MeshColliderProps) => JSX.Element;
 declare type UseColliderOptionsRequiredArgs<T> = Omit<UseColliderOptions<T>, "args"> & {
     args: T;
     children?: ReactNode;

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

@@ -1,6 +1,6 @@
 import { Collider, RigidBody } from "@dimforge/rapier3d-compat";
 import { Object3D, Quaternion, Vector3 } from "three";
-import { RigidBodyShape, RigidBodyTypeString, UseColliderOptions, UseRigidBodyOptions, Vector3Array, WorldApi } from "./types";
+import { RigidBodyApi, RigidBodyShape, RigidBodyTypeString, UseColliderOptions, UseRigidBodyOptions, Vector3Array, WorldApi } from "./types";
 export declare const vectorArrayToObject: (arr: Vector3Array) => {
     x: number;
     y: number;
@@ -8,11 +8,11 @@ export declare const vectorArrayToObject: (arr: Vector3Array) => {
 };
 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, scale?: {
+export declare const createColliderFromOptions: <A>(options: UseColliderOptions<A>, world: WorldApi, rigidBody?: RigidBody | undefined, scale?: {
     x: number;
     y: number;
     z: number;
 }, hasCollisionEvents?: boolean) => Collider;
-export declare const createCollidersFromChildren: (object: Object3D, rigidBody: RigidBody, options: UseRigidBodyOptions, world: WorldApi) => Collider[];
+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;

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

@@ -113,13 +113,23 @@ const createColliderFromOptions = (options, world, rigidBody, scale = {
   const collider = world.createCollider(colliderDesc, rigidBody);
   return collider;
 };
-const createCollidersFromChildren = (object, rigidBody, options, world) => {
+
+const isChildOfMeshCollider = child => {
+  let flag = false;
+  child.traverseAncestors(a => {
+    if (a.userData.r3RapierType === "MeshCollider") flag = true;
+  });
+  return flag;
+};
+
+const createCollidersFromChildren = (object, rigidBody, options, world, ignoreMeshColliders = true) => {
   const hasCollisionEvents = !!(options.onCollisionEnter || options.onCollisionExit);
   const colliders = [];
   let desc;
   let offset = new three.Vector3();
   object.traverse(child => {
     if ("isMesh" in child) {
+      if (ignoreMeshColliders && isChildOfMeshCollider(child)) return;
       const {
         geometry
       } = child;
@@ -190,7 +200,8 @@ const createCollidersFromChildren = (object, rigidBody, options, world) => {
       if (hasCollisionEvents) desc.setActiveEvents(rapier3dCompat.ActiveEvents.COLLISION_EVENTS);
       if (Number.isFinite(options.friction)) desc.setFriction(options.friction);
       if (Number.isFinite(options.restitution)) desc.setRestitution(options.restitution);
-      const collider = world.createCollider(desc, rigidBody);
+      const actualRigidBody = world.getRigidBody(rigidBody === null || rigidBody === void 0 ? void 0 : rigidBody.handle);
+      const collider = world.createCollider(desc, actualRigidBody);
       colliders.push(collider);
     }
   });
@@ -213,47 +224,6 @@ const vector3ToQuaternion = v => {
   return quaternion.setFromEuler(euler.setFromVector3(v));
 };
 
-function _defineProperty(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-
-  return obj;
-}
-
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
-
-  if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-    enumerableOnly && (symbols = symbols.filter(function (sym) {
-      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    })), keys.push.apply(keys, symbols);
-  }
-
-  return keys;
-}
-
-function _objectSpread2(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = null != arguments[i] ? arguments[i] : {};
-    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
-      _defineProperty(target, key, source[key]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
-      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-    });
-  }
-
-  return target;
-}
-
 const createRigidBodyApi = ref => {
   return {
     raw: () => ref.current(),
@@ -298,9 +268,19 @@ const createRigidBodyApi = ref => {
       return new three.Quaternion(x, y, z, w);
     },
 
-    setRotation: rotation => ref.current().setRotation(_objectSpread2(_objectSpread2({}, rotation), {}, {
-      w: 1
-    }), true),
+    setRotation: ({
+      x,
+      y,
+      z
+    }) => {
+      const q = vector3ToQuaternion(new three.Vector3(x, y, z));
+      ref.current().setRotation({
+        x: q.x,
+        y: q.y,
+        z: q.z,
+        w: q.w
+      }, true);
+    },
 
     linvel() {
       const {
@@ -566,6 +546,47 @@ const Physics = ({
   }, children);
 };
 
+function _defineProperty(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+
+  return obj;
+}
+
+function ownKeys(object, enumerableOnly) {
+  var keys = Object.keys(object);
+
+  if (Object.getOwnPropertySymbols) {
+    var symbols = Object.getOwnPropertySymbols(object);
+    enumerableOnly && (symbols = symbols.filter(function (sym) {
+      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+    })), keys.push.apply(keys, symbols);
+  }
+
+  return keys;
+}
+
+function _objectSpread2(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = null != arguments[i] ? arguments[i] : {};
+    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
+      _defineProperty(target, key, source[key]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
+  }
+
+  return target;
+}
+
 const useRapier = () => {
   return React.useContext(RapierContext);
 };
@@ -852,17 +873,52 @@ const RigidBody = /*#__PURE__*/React.forwardRef((_ref, ref) => {
   const [object, rigidBody] = useRigidBody(props);
   React.useImperativeHandle(ref, () => rigidBody);
   return /*#__PURE__*/React__default["default"].createElement(RigidBodyContext.Provider, {
-    value: [object, rigidBody, !!(props.onCollisionEnter || props.onCollisionExit)]
+    value: [object, rigidBody, !!(props.onCollisionEnter || props.onCollisionExit), props]
   }, /*#__PURE__*/React__default["default"].createElement("object3D", {
     ref: object
   }, children));
-}); // Colliders
+});
+const MeshCollider = ({
+  children,
+  type
+}) => {
+  const {
+    physicsOptions,
+    world
+  } = useRapier();
+  const object = React.useRef(null);
+  const [, rigidBody, hasCollisionEvents, rigidBodyOptions] = useRigidBodyContext();
+  React.useEffect(() => {
+    let autoColliders = [];
+
+    if (object.current) {
+      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), {}, {
+        colliders: colliderSetting
+      }), world, false) : [];
+    }
+
+    return () => {
+      autoColliders.forEach(collider => {
+        world.removeCollider(collider);
+      });
+    };
+  }, []);
+  return /*#__PURE__*/React__default["default"].createElement("object3D", {
+    ref: object,
+    userData: {
+      r3RapierType: 'MeshCollider'
+    }
+  }, children);
+}; // Colliders
 
-const AnyCollider = _ref2 => {
+const AnyCollider = _ref3 => {
   let {
     children
-  } = _ref2,
-      props = _objectWithoutProperties(_ref2, _excluded2);
+  } = _ref3,
+      props = _objectWithoutProperties(_ref3, _excluded2);
 
   const {
     world
@@ -1062,6 +1118,7 @@ exports.CuboidCollider = CuboidCollider;
 exports.CylinderCollider = CylinderCollider;
 exports.Debug = Debug;
 exports.HeightfieldCollider = HeightfieldCollider;
+exports.MeshCollider = MeshCollider;
 exports.Physics = Physics;
 exports.RigidBody = RigidBody;
 exports.RoundCuboidCollider = RoundCuboidCollider;

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

@@ -113,13 +113,23 @@ const createColliderFromOptions = (options, world, rigidBody, scale = {
   const collider = world.createCollider(colliderDesc, rigidBody);
   return collider;
 };
-const createCollidersFromChildren = (object, rigidBody, options, world) => {
+
+const isChildOfMeshCollider = child => {
+  let flag = false;
+  child.traverseAncestors(a => {
+    if (a.userData.r3RapierType === "MeshCollider") flag = true;
+  });
+  return flag;
+};
+
+const createCollidersFromChildren = (object, rigidBody, options, world, ignoreMeshColliders = true) => {
   const hasCollisionEvents = !!(options.onCollisionEnter || options.onCollisionExit);
   const colliders = [];
   let desc;
   let offset = new three.Vector3();
   object.traverse(child => {
     if ("isMesh" in child) {
+      if (ignoreMeshColliders && isChildOfMeshCollider(child)) return;
       const {
         geometry
       } = child;
@@ -190,7 +200,8 @@ const createCollidersFromChildren = (object, rigidBody, options, world) => {
       if (hasCollisionEvents) desc.setActiveEvents(rapier3dCompat.ActiveEvents.COLLISION_EVENTS);
       if (Number.isFinite(options.friction)) desc.setFriction(options.friction);
       if (Number.isFinite(options.restitution)) desc.setRestitution(options.restitution);
-      const collider = world.createCollider(desc, rigidBody);
+      const actualRigidBody = world.getRigidBody(rigidBody === null || rigidBody === void 0 ? void 0 : rigidBody.handle);
+      const collider = world.createCollider(desc, actualRigidBody);
       colliders.push(collider);
     }
   });
@@ -213,47 +224,6 @@ const vector3ToQuaternion = v => {
   return quaternion.setFromEuler(euler.setFromVector3(v));
 };
 
-function _defineProperty(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-
-  return obj;
-}
-
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
-
-  if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-    enumerableOnly && (symbols = symbols.filter(function (sym) {
-      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    })), keys.push.apply(keys, symbols);
-  }
-
-  return keys;
-}
-
-function _objectSpread2(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = null != arguments[i] ? arguments[i] : {};
-    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
-      _defineProperty(target, key, source[key]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
-      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-    });
-  }
-
-  return target;
-}
-
 const createRigidBodyApi = ref => {
   return {
     raw: () => ref.current(),
@@ -298,9 +268,19 @@ const createRigidBodyApi = ref => {
       return new three.Quaternion(x, y, z, w);
     },
 
-    setRotation: rotation => ref.current().setRotation(_objectSpread2(_objectSpread2({}, rotation), {}, {
-      w: 1
-    }), true),
+    setRotation: ({
+      x,
+      y,
+      z
+    }) => {
+      const q = vector3ToQuaternion(new three.Vector3(x, y, z));
+      ref.current().setRotation({
+        x: q.x,
+        y: q.y,
+        z: q.z,
+        w: q.w
+      }, true);
+    },
 
     linvel() {
       const {
@@ -566,6 +546,47 @@ const Physics = ({
   }, children);
 };
 
+function _defineProperty(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+
+  return obj;
+}
+
+function ownKeys(object, enumerableOnly) {
+  var keys = Object.keys(object);
+
+  if (Object.getOwnPropertySymbols) {
+    var symbols = Object.getOwnPropertySymbols(object);
+    enumerableOnly && (symbols = symbols.filter(function (sym) {
+      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+    })), keys.push.apply(keys, symbols);
+  }
+
+  return keys;
+}
+
+function _objectSpread2(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = null != arguments[i] ? arguments[i] : {};
+    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
+      _defineProperty(target, key, source[key]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
+  }
+
+  return target;
+}
+
 const useRapier = () => {
   return React.useContext(RapierContext);
 };
@@ -852,17 +873,52 @@ const RigidBody = /*#__PURE__*/React.forwardRef((_ref, ref) => {
   const [object, rigidBody] = useRigidBody(props);
   React.useImperativeHandle(ref, () => rigidBody);
   return /*#__PURE__*/React__default["default"].createElement(RigidBodyContext.Provider, {
-    value: [object, rigidBody, !!(props.onCollisionEnter || props.onCollisionExit)]
+    value: [object, rigidBody, !!(props.onCollisionEnter || props.onCollisionExit), props]
   }, /*#__PURE__*/React__default["default"].createElement("object3D", {
     ref: object
   }, children));
-}); // Colliders
+});
+const MeshCollider = ({
+  children,
+  type
+}) => {
+  const {
+    physicsOptions,
+    world
+  } = useRapier();
+  const object = React.useRef(null);
+  const [, rigidBody, hasCollisionEvents, rigidBodyOptions] = useRigidBodyContext();
+  React.useEffect(() => {
+    let autoColliders = [];
+
+    if (object.current) {
+      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), {}, {
+        colliders: colliderSetting
+      }), world, false) : [];
+    }
+
+    return () => {
+      autoColliders.forEach(collider => {
+        world.removeCollider(collider);
+      });
+    };
+  }, []);
+  return /*#__PURE__*/React__default["default"].createElement("object3D", {
+    ref: object,
+    userData: {
+      r3RapierType: 'MeshCollider'
+    }
+  }, children);
+}; // Colliders
 
-const AnyCollider = _ref2 => {
+const AnyCollider = _ref3 => {
   let {
     children
-  } = _ref2,
-      props = _objectWithoutProperties(_ref2, _excluded2);
+  } = _ref3,
+      props = _objectWithoutProperties(_ref3, _excluded2);
 
   const {
     world
@@ -1062,6 +1118,7 @@ exports.CuboidCollider = CuboidCollider;
 exports.CylinderCollider = CylinderCollider;
 exports.Debug = Debug;
 exports.HeightfieldCollider = HeightfieldCollider;
+exports.MeshCollider = MeshCollider;
 exports.Physics = Physics;
 exports.RigidBody = RigidBody;
 exports.RoundCuboidCollider = RoundCuboidCollider;

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

@@ -88,13 +88,23 @@ const createColliderFromOptions = (options, world, rigidBody, scale = {
   const collider = world.createCollider(colliderDesc, rigidBody);
   return collider;
 };
-const createCollidersFromChildren = (object, rigidBody, options, world) => {
+
+const isChildOfMeshCollider = child => {
+  let flag = false;
+  child.traverseAncestors(a => {
+    if (a.userData.r3RapierType === "MeshCollider") flag = true;
+  });
+  return flag;
+};
+
+const createCollidersFromChildren = (object, rigidBody, options, world, ignoreMeshColliders = true) => {
   const hasCollisionEvents = !!(options.onCollisionEnter || options.onCollisionExit);
   const colliders = [];
   let desc;
   let offset = new Vector3();
   object.traverse(child => {
     if ("isMesh" in child) {
+      if (ignoreMeshColliders && isChildOfMeshCollider(child)) return;
       const {
         geometry
       } = child;
@@ -165,7 +175,8 @@ const createCollidersFromChildren = (object, rigidBody, options, world) => {
       if (hasCollisionEvents) desc.setActiveEvents(ActiveEvents.COLLISION_EVENTS);
       if (Number.isFinite(options.friction)) desc.setFriction(options.friction);
       if (Number.isFinite(options.restitution)) desc.setRestitution(options.restitution);
-      const collider = world.createCollider(desc, rigidBody);
+      const actualRigidBody = world.getRigidBody(rigidBody === null || rigidBody === void 0 ? void 0 : rigidBody.handle);
+      const collider = world.createCollider(desc, actualRigidBody);
       colliders.push(collider);
     }
   });
@@ -188,47 +199,6 @@ const vector3ToQuaternion = v => {
   return quaternion.setFromEuler(euler.setFromVector3(v));
 };
 
-function _defineProperty(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-
-  return obj;
-}
-
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
-
-  if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-    enumerableOnly && (symbols = symbols.filter(function (sym) {
-      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    })), keys.push.apply(keys, symbols);
-  }
-
-  return keys;
-}
-
-function _objectSpread2(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = null != arguments[i] ? arguments[i] : {};
-    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
-      _defineProperty(target, key, source[key]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
-      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-    });
-  }
-
-  return target;
-}
-
 const createRigidBodyApi = ref => {
   return {
     raw: () => ref.current(),
@@ -273,9 +243,19 @@ const createRigidBodyApi = ref => {
       return new Quaternion(x, y, z, w);
     },
 
-    setRotation: rotation => ref.current().setRotation(_objectSpread2(_objectSpread2({}, rotation), {}, {
-      w: 1
-    }), true),
+    setRotation: ({
+      x,
+      y,
+      z
+    }) => {
+      const q = vector3ToQuaternion(new Vector3(x, y, z));
+      ref.current().setRotation({
+        x: q.x,
+        y: q.y,
+        z: q.z,
+        w: q.w
+      }, true);
+    },
 
     linvel() {
       const {
@@ -541,6 +521,47 @@ const Physics = ({
   }, children);
 };
 
+function _defineProperty(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+
+  return obj;
+}
+
+function ownKeys(object, enumerableOnly) {
+  var keys = Object.keys(object);
+
+  if (Object.getOwnPropertySymbols) {
+    var symbols = Object.getOwnPropertySymbols(object);
+    enumerableOnly && (symbols = symbols.filter(function (sym) {
+      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+    })), keys.push.apply(keys, symbols);
+  }
+
+  return keys;
+}
+
+function _objectSpread2(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = null != arguments[i] ? arguments[i] : {};
+    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
+      _defineProperty(target, key, source[key]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
+  }
+
+  return target;
+}
+
 const useRapier = () => {
   return useContext(RapierContext);
 };
@@ -827,17 +848,52 @@ const RigidBody = /*#__PURE__*/forwardRef((_ref, ref) => {
   const [object, rigidBody] = useRigidBody(props);
   useImperativeHandle(ref, () => rigidBody);
   return /*#__PURE__*/React.createElement(RigidBodyContext.Provider, {
-    value: [object, rigidBody, !!(props.onCollisionEnter || props.onCollisionExit)]
+    value: [object, rigidBody, !!(props.onCollisionEnter || props.onCollisionExit), props]
   }, /*#__PURE__*/React.createElement("object3D", {
     ref: object
   }, children));
-}); // Colliders
+});
+const MeshCollider = ({
+  children,
+  type
+}) => {
+  const {
+    physicsOptions,
+    world
+  } = useRapier();
+  const object = useRef(null);
+  const [, rigidBody, hasCollisionEvents, rigidBodyOptions] = useRigidBodyContext();
+  useEffect(() => {
+    let autoColliders = [];
+
+    if (object.current) {
+      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), {}, {
+        colliders: colliderSetting
+      }), world, false) : [];
+    }
+
+    return () => {
+      autoColliders.forEach(collider => {
+        world.removeCollider(collider);
+      });
+    };
+  }, []);
+  return /*#__PURE__*/React.createElement("object3D", {
+    ref: object,
+    userData: {
+      r3RapierType: 'MeshCollider'
+    }
+  }, children);
+}; // Colliders
 
-const AnyCollider = _ref2 => {
+const AnyCollider = _ref3 => {
   let {
     children
-  } = _ref2,
-      props = _objectWithoutProperties(_ref2, _excluded2);
+  } = _ref3,
+      props = _objectWithoutProperties(_ref3, _excluded2);
 
   const {
     world
@@ -1017,4 +1073,4 @@ const Debug = () => {
   })));
 };
 
-export { BallCollider, CapsuleCollider, ConeCollider, ConvexHullCollider, CuboidCollider, CylinderCollider, Debug, HeightfieldCollider, Physics, RigidBody, RoundCuboidCollider, TrimeshCollider, useCollider, useFixedJoint, useImpulseJoint, usePrismaticJoint, useRapier, useRevoluteJoint, useRigidBody, useSphericalJoint };
+export { BallCollider, CapsuleCollider, ConeCollider, ConvexHullCollider, CuboidCollider, CylinderCollider, Debug, HeightfieldCollider, MeshCollider, Physics, RigidBody, RoundCuboidCollider, TrimeshCollider, useCollider, useFixedJoint, useImpulseJoint, usePrismaticJoint, useRapier, useRevoluteJoint, useRigidBody, useSphericalJoint };

package/package.json

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

package/readme.md

@@ -60,19 +60,39 @@ Turn off automatic collider generation globally, but apply auto generation local
 ```tsx
 const Scene = () => (
   <Physics colliders={false}>
+    {/* Use an automatic CuboidCollider for all meshes inside this RigidBody */}
     <RigidBody colliders="cuboid">
       <Box />
     </RigidBody>
 
+    {/* Use an automatic BallCollider for all meshes inside this RigidBody */}
     <RigidBody position={[0, 10, 0]} colliders="ball">
       <Sphere />
     </RigidBody>
 
+    {/* Make a compound shape with two custom BallColliders */}
     <RigidBody position={[0, 10, 0]}>
       <Sphere />
       <BallCollider args={0.5} />
       <BallCollider args={0.5} position={[1, 0, 0]} />
     </RigidBody>
+
+    {/* Make a compound shape with two custom BallColliders, an automatic BallCollider,
+        Two automatic MeshColliders, based on two different shape strategies */}
+    <RigidBody position={[0, 10, 0]} colliders='ball'>
+      <MeshCollider type="trimesh">
+        <mesh ... />
+      </MeshCollider>
+
+      <MeshCollider type="hull">
+        <mesh ... />
+      </MeshCollider>
+
+      <Sphere />
+
+      <BallCollider args={0.5} />
+      <BallCollider args={0.5} position={[1, 0, 0]} />
+    </RigidBody>
   </Physics>
 );
 ```