@react-three/rapier 0.4.1 → 0.4.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @react-three/rapier
 
+## 0.4.2
+
+### Patch Changes
+
+- 387b32c: Add restitution and friction as props for auto-generated colliders on RigidBody
+
 ## 0.4.1
 
 ### Patch Changes

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

@@ -162,6 +162,16 @@ export interface UseRigidBodyOptions {
      * Setting this to false will disable automatic colliders.
      */
     colliders?: RigidBodyAutoCollider | false;
+    /**
+     * Set the friction of auto-generated colliders.
+     * This does not affect any non-automatic child collider-components.
+     */
+    friction?: number;
+    /**
+     * Set the restitution (bounciness) of auto-generated colliders.
+     * This does not affect any non-automatic child collider-components.
+     */
+    restitution?: number;
     /**
      * Callback when this rigidbody collides with another rigidbody
      */

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

@@ -1,6 +1,6 @@
 import { Collider, RigidBody } from "@dimforge/rapier3d-compat";
 import { Object3D, Vector3 } from "three";
-import { RigidBodyAutoCollider, RigidBodyShape, RigidBodyTypeString, UseColliderOptions, Vector3Array, WorldApi } from "./types";
+import { RigidBodyShape, RigidBodyTypeString, UseColliderOptions, UseRigidBodyOptions, Vector3Array, WorldApi } from "./types";
 export declare const vectorArrayToObject: (arr: Vector3Array) => {
     x: number;
     y: number;
@@ -13,5 +13,5 @@ export declare const createColliderFromOptions: <A>(options: UseColliderOptions<
     y: number;
     z: number;
 }, hasCollisionEvents?: boolean) => Collider;
-export declare const createCollidersFromChildren: (object: Object3D, rigidBody: RigidBody, type: RigidBodyAutoCollider, world: WorldApi, hasCollisionEvents?: boolean) => Collider[];
+export declare const createCollidersFromChildren: (object: Object3D, rigidBody: RigidBody, options: UseRigidBodyOptions, world: WorldApi) => Collider[];
 export declare const scaleVertices: (vertices: ArrayLike<number>, scale: Vector3) => number[];

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

@@ -113,7 +113,8 @@ const createColliderFromOptions = (options, world, rigidBody, scale = {
   const collider = world.createCollider(colliderDesc, rigidBody);
   return collider;
 };
-const createCollidersFromChildren = (object, rigidBody, type, world, hasCollisionEvents = false) => {
+const createCollidersFromChildren = (object, rigidBody, options, world) => {
+  const hasCollisionEvents = !!(options.onCollisionEnter || options.onCollisionExit);
   const colliders = [];
   let desc;
   let offset = new three.Vector3();
@@ -135,7 +136,7 @@ const createCollidersFromChildren = (object, rigidBody, type, world, hasCollisio
       } = new three.Quaternion().setFromEuler(child.rotation);
       const scale = child.getWorldScale(new three.Vector3());
 
-      switch (type) {
+      switch (options.colliders) {
         case "cuboid":
           {
             geometry.computeBoundingBox();
@@ -186,11 +187,9 @@ const createCollidersFromChildren = (object, rigidBody, type, world, hasCollisio
         z: rz,
         w: rw
       });
-
-      if (hasCollisionEvents) {
-        desc.setActiveEvents(rapier3dCompat.ActiveEvents.COLLISION_EVENTS);
-      }
-
+      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);
       colliders.push(collider);
     }
@@ -600,9 +599,7 @@ const useRigidBody = (options = {}) => {
     rigidBody.resetForces(false);
     rigidBody.resetTorques(false);
     const colliderSetting = (_ref = (_options$colliders = options === null || options === void 0 ? void 0 : options.colliders) !== null && _options$colliders !== void 0 ? _options$colliders : physicsOptions.colliders) !== null && _ref !== void 0 ? _ref : false;
-    const hasCollisionEvents = !!(options.onCollisionEnter || options.onCollisionExit);
-    const autoColliders = colliderSetting !== false ? createCollidersFromChildren(ref.current, rigidBody, colliderSetting, world, hasCollisionEvents) : [];
-    rigidBody.wakeUp();
+    const autoColliders = colliderSetting !== false ? createCollidersFromChildren(ref.current, rigidBody, options, world) : [];
     rigidBodyMeshes.set(rigidBody.handle, ref.current);
     return () => {
       world.removeRigidBody(rigidBody);

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

@@ -113,7 +113,8 @@ const createColliderFromOptions = (options, world, rigidBody, scale = {
   const collider = world.createCollider(colliderDesc, rigidBody);
   return collider;
 };
-const createCollidersFromChildren = (object, rigidBody, type, world, hasCollisionEvents = false) => {
+const createCollidersFromChildren = (object, rigidBody, options, world) => {
+  const hasCollisionEvents = !!(options.onCollisionEnter || options.onCollisionExit);
   const colliders = [];
   let desc;
   let offset = new three.Vector3();
@@ -135,7 +136,7 @@ const createCollidersFromChildren = (object, rigidBody, type, world, hasCollisio
       } = new three.Quaternion().setFromEuler(child.rotation);
       const scale = child.getWorldScale(new three.Vector3());
 
-      switch (type) {
+      switch (options.colliders) {
         case "cuboid":
           {
             geometry.computeBoundingBox();
@@ -186,11 +187,9 @@ const createCollidersFromChildren = (object, rigidBody, type, world, hasCollisio
         z: rz,
         w: rw
       });
-
-      if (hasCollisionEvents) {
-        desc.setActiveEvents(rapier3dCompat.ActiveEvents.COLLISION_EVENTS);
-      }
-
+      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);
       colliders.push(collider);
     }
@@ -600,9 +599,7 @@ const useRigidBody = (options = {}) => {
     rigidBody.resetForces(false);
     rigidBody.resetTorques(false);
     const colliderSetting = (_ref = (_options$colliders = options === null || options === void 0 ? void 0 : options.colliders) !== null && _options$colliders !== void 0 ? _options$colliders : physicsOptions.colliders) !== null && _ref !== void 0 ? _ref : false;
-    const hasCollisionEvents = !!(options.onCollisionEnter || options.onCollisionExit);
-    const autoColliders = colliderSetting !== false ? createCollidersFromChildren(ref.current, rigidBody, colliderSetting, world, hasCollisionEvents) : [];
-    rigidBody.wakeUp();
+    const autoColliders = colliderSetting !== false ? createCollidersFromChildren(ref.current, rigidBody, options, world) : [];
     rigidBodyMeshes.set(rigidBody.handle, ref.current);
     return () => {
       world.removeRigidBody(rigidBody);

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

@@ -88,7 +88,8 @@ const createColliderFromOptions = (options, world, rigidBody, scale = {
   const collider = world.createCollider(colliderDesc, rigidBody);
   return collider;
 };
-const createCollidersFromChildren = (object, rigidBody, type, world, hasCollisionEvents = false) => {
+const createCollidersFromChildren = (object, rigidBody, options, world) => {
+  const hasCollisionEvents = !!(options.onCollisionEnter || options.onCollisionExit);
   const colliders = [];
   let desc;
   let offset = new Vector3();
@@ -110,7 +111,7 @@ const createCollidersFromChildren = (object, rigidBody, type, world, hasCollisio
       } = new Quaternion().setFromEuler(child.rotation);
       const scale = child.getWorldScale(new Vector3());
 
-      switch (type) {
+      switch (options.colliders) {
         case "cuboid":
           {
             geometry.computeBoundingBox();
@@ -161,11 +162,9 @@ const createCollidersFromChildren = (object, rigidBody, type, world, hasCollisio
         z: rz,
         w: rw
       });
-
-      if (hasCollisionEvents) {
-        desc.setActiveEvents(ActiveEvents.COLLISION_EVENTS);
-      }
-
+      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);
       colliders.push(collider);
     }
@@ -575,9 +574,7 @@ const useRigidBody = (options = {}) => {
     rigidBody.resetForces(false);
     rigidBody.resetTorques(false);
     const colliderSetting = (_ref = (_options$colliders = options === null || options === void 0 ? void 0 : options.colliders) !== null && _options$colliders !== void 0 ? _options$colliders : physicsOptions.colliders) !== null && _ref !== void 0 ? _ref : false;
-    const hasCollisionEvents = !!(options.onCollisionEnter || options.onCollisionExit);
-    const autoColliders = colliderSetting !== false ? createCollidersFromChildren(ref.current, rigidBody, colliderSetting, world, hasCollisionEvents) : [];
-    rigidBody.wakeUp();
+    const autoColliders = colliderSetting !== false ? createCollidersFromChildren(ref.current, rigidBody, options, world) : [];
     rigidBodyMeshes.set(rigidBody.handle, ref.current);
     return () => {
       world.removeRigidBody(rigidBody);

package/package.json

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

package/readme.md

@@ -5,18 +5,24 @@
 ## Usage
 
 ```tsx
-import { Box } from "@react-three/drei";
+import { Box, Torus } from "@react-three/drei";
 import { Canvas } from "@react-three/fiber";
 import { Physics, RigidBody } from "@react-three/rapier";
 
 const App = () => {
   return (
     <Canvas>
-      <Physics>
-        <RigidBody>
-          <Box />
-        </RigidBody>
-      </Physics>
+      <Suspense>
+        <Physics>
+          <RigidBody colliders={"hull"} restitution={2}>
+            <Torus />
+          </RigidBody>
+
+          <RigidBody position={[0, -2, 0]} type="kinematicPosition">
+            <Box args={[20, 0.5, 20]} />
+          </RigidBody>
+        </Physics>
+      </Suspense>
     </Canvas>
   );
 };