@react-three/rapier 0.4.3 → 0.5.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @react-three/rapier
 
+## 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

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

@@ -27,9 +27,31 @@ declare type EventMap = Map<ColliderHandle | RigidBodyHandle, {
     }): void;
 }>;
 interface RapierWorldProps {
+    children: ReactNode;
+    /**
+     * Set the gravity of the physics world
+     * @defaultValue [0, -9.81, 0]
+     */
     gravity?: Vector3Array;
+    /**
+     * Set the base automatic colliders for this physics world
+     * All Meshes inside RigidBodies will generate a collider
+     * based on this value, if not overridden.
+     */
     colliders?: RigidBodyAutoCollider;
-    children: ReactNode;
+    /**
+     * Set the timestep for the simulation.
+     * Setting this to a number (eg. 1/60) will run the
+     * simulation at that framerate.
+     *
+     * "vary" will run the simulation at a delta-value based
+     * on the users current framerate. This ensures simulations
+     * run at the same percieved speed at all framerates, but
+     * can also lead to instability.
+     *
+     * @defaultValue "vary"
+     */
+    timeStep?: number | 'vary';
 }
 export declare const Physics: FC<RapierWorldProps>;
 export {};

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

@@ -101,6 +101,22 @@ export interface RigidBodyApi {
      * Resets to zero the user torques applied to this rigid-body.
      */
     resetTorques(): void;
+    /**
+     * Locks or unlocks the ability of this rigid-body to rotate.
+     */
+    lockRotations(locked: boolean): void;
+    /**
+     * Locks or unlocks the ability of this rigid-body to translate.
+     */
+    lockTranslations(locked: boolean): void;
+    /**
+     * Locks or unlocks the ability of this rigid-body to rotate along individual coordinate axes.
+     */
+    setEnabledRotations(x: boolean, y: boolean, z: boolean): void;
+    /**
+     * Locks or unlocks the ability of this rigid-body to translate along individual coordinate axes.
+     */
+    setEnabledTranslations(x: boolean, y: boolean, z: boolean): void;
 }
 export declare const createRigidBodyApi: (ref: RefGetter<RigidBody>) => RigidBodyApi;
 export declare const createColliderApi: (ref: RefGetter<Collider>) => {
@@ -118,6 +134,7 @@ export interface WorldApi {
     createImpulseJoint(params: JointData, rigidBodyA: RigidBody, rigidBodyB: RigidBody): ImpulseJoint;
     removeImpulseJoint(joint: ImpulseJoint): void;
     forEachCollider(callback: (collider: Collider) => void): void;
+    setGravity(gravity: Vector3): void;
 }
 export declare const createWorldApi: (ref: RefGetter<World>) => WorldApi;
 export declare const createJointApi: (ref: RefGetter<ImpulseJoint>) => {

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

@@ -1,47 +1,15 @@
 import React, { MutableRefObject } from "react";
 import { RapierContext } from "./Physics";
-import { Mesh, Object3D } from "three";
+import { Object3D } from "three";
 import type Rapier from "@dimforge/rapier3d-compat";
 export declare const useRapier: () => RapierContext;
-import { BallArgs, CapsuleArgs, ConeArgs, ConvexHullArgs, CuboidArgs, CylinderArgs, HeightfieldArgs, PolylineArgs, RoundConvexHullArgs, RoundCuboidArgs, RoundCylinderArgs, TrimeshArgs, UseBodyOptions, UseRigidBodyOptions, UseImpulseJoint, SphericalJointParams, FixedJointParams, PrismaticJointParams, RevoluteJointParams, UseColliderOptions, RapierRigidBody, ConvexMeshArgs, RoundConvexMeshArgs, RigidBodyApi } from "./types";
-import { RoundCone } from "@dimforge/rapier3d-compat";
+import { UseRigidBodyOptions, UseImpulseJoint, SphericalJointParams, FixedJointParams, PrismaticJointParams, RevoluteJointParams, UseColliderOptions, RigidBodyApi, RigidBodyApiRef } from "./types";
 export declare const useRigidBody: <O extends Object3D<import("three").Event>>(options?: UseRigidBodyOptions) => [React.MutableRefObject<O>, import("./api").RigidBodyApi];
 export declare const useCollider: <A>(body: RigidBodyApi, options?: UseColliderOptions<A>) => (React.MutableRefObject<Object3D<import("three").Event> | undefined> | {
     raw: () => Rapier.Collider | undefined;
     readonly handle: number;
 })[];
-export declare const useRigidBodyWithCollider: <A, O extends Object3D<import("three").Event> = Object3D<import("three").Event>>(rigidBodyOptions?: UseRigidBodyOptions | undefined, colliderOptions?: UseColliderOptions<A> | undefined) => [ref: React.MutableRefObject<O>, rigidBody: import("./api").RigidBodyApi];
-export declare const useCuboid: <T extends Object3D<import("three").Event>>(rigidBodyOptions?: UseBodyOptions, colliderOptions?: UseColliderOptions<CuboidArgs>) => [ref: React.MutableRefObject<T>, rigidBody: import("./api").RigidBodyApi];
-export declare const useBall: <T extends Object3D<import("three").Event>>(rigidBodyOptions?: UseBodyOptions, colliderOptions?: UseColliderOptions<BallArgs>) => [ref: React.MutableRefObject<T>, rigidBody: import("./api").RigidBodyApi];
-export declare const useCapsule: <T extends Object3D<import("three").Event>>(rigidBodyOptions?: UseBodyOptions, colliderOptions?: UseColliderOptions<CapsuleArgs>) => [ref: React.MutableRefObject<T>, rigidBody: import("./api").RigidBodyApi];
-export declare const useHeightfield: <T extends Object3D<import("three").Event>>(rigidBodyOptions?: UseBodyOptions, colliderOptions?: UseColliderOptions<HeightfieldArgs>) => [ref: React.MutableRefObject<T>, rigidBody: import("./api").RigidBodyApi];
-/**
- * Create a trimesh collider and rigid body.
- * Note that Trimeshes don't have mass unless provided.
- * See https://rapier.rs/docs/user_guides/javascript/rigid_bodies#mass-properties
- * for available properties.
- */
-export declare const useTrimesh: {
-    <T extends Object3D<import("three").Event>>(rigidBodyOptions?: UseBodyOptions, colliderOptions?: UseColliderOptions<TrimeshArgs>): [ref: React.MutableRefObject<T>, rigidBody: import("./api").RigidBodyApi];
-    fromMesh<T_1 extends Object3D<import("three").Event>>(mesh: Mesh, rigidBodyOptions?: UseBodyOptions, colliderOptions?: UseColliderOptions<TrimeshArgs>): [ref: React.MutableRefObject<T_1>, rigidBody: import("./api").RigidBodyApi];
-};
-export declare const usePolyline: <T extends Object3D<import("three").Event>>(rigidBodyOptions?: UseBodyOptions, colliderOptions?: UseColliderOptions<PolylineArgs>) => [ref: React.MutableRefObject<T>, rigidBody: import("./api").RigidBodyApi];
-export declare const useRoundCuboid: <T extends Object3D<import("three").Event>>(rigidBodyOptions?: UseBodyOptions, colliderOptions?: UseColliderOptions<RoundCuboidArgs>) => [ref: React.MutableRefObject<T>, rigidBody: import("./api").RigidBodyApi];
-export declare const useCylinder: <T extends Object3D<import("three").Event>>(rigidBodyOptions?: UseBodyOptions, colliderOptions?: UseColliderOptions<CylinderArgs>) => [ref: React.MutableRefObject<T>, rigidBody: import("./api").RigidBodyApi];
-export declare const useRoundCylinder: <T extends Object3D<import("three").Event>>(rigidBodyOptions?: UseBodyOptions, colliderOptions?: UseColliderOptions<RoundCylinderArgs>) => [ref: React.MutableRefObject<T>, rigidBody: import("./api").RigidBodyApi];
-export declare const useCone: <T extends Object3D<import("three").Event>>(rigidBodyOptions?: UseBodyOptions, colliderOptions?: UseColliderOptions<ConeArgs>) => [ref: React.MutableRefObject<T>, rigidBody: import("./api").RigidBodyApi];
-export declare const useRoundCone: <T extends Object3D<import("three").Event>>(rigidBodyOptions?: UseBodyOptions, colliderOptions?: UseColliderOptions<RoundCone>) => [ref: React.MutableRefObject<T>, rigidBody: import("./api").RigidBodyApi];
-export declare const useConvexHull: {
-    <T extends Object3D<import("three").Event>>(rigidBodyOptions?: UseBodyOptions, colliderOptions?: UseColliderOptions<ConvexHullArgs>): [ref: React.MutableRefObject<T>, rigidBody: import("./api").RigidBodyApi];
-    fromMesh<T_1 extends Object3D<import("three").Event>>(mesh: Mesh, rigidBodyOptions?: UseBodyOptions, colliderOptions?: Omit<UseColliderOptions<ConvexHullArgs>, "colliderArgs">): [ref: React.MutableRefObject<T_1>, rigidBody: import("./api").RigidBodyApi];
-};
-export declare const useRoundConvexHull: <T extends Object3D<import("three").Event>>(rigidBodyOptions?: UseBodyOptions, colliderOptions?: UseColliderOptions<RoundConvexHullArgs>) => [ref: React.MutableRefObject<T>, rigidBody: import("./api").RigidBodyApi];
-export declare const useConvexMesh: {
-    <T extends Object3D<import("three").Event>>(rigidBodyOptions?: UseBodyOptions, colliderOptions?: UseColliderOptions<ConvexMeshArgs>): [ref: React.MutableRefObject<Object3D<import("three").Event>>, rigidBody: import("./api").RigidBodyApi];
-    fromMesh<T_1 extends Object3D<import("three").Event>>(mesh: Mesh, rigidBodyOptions?: UseBodyOptions, colliderOptions?: Omit<UseColliderOptions<ConvexMeshArgs>, "colliderArgs">): [ref: React.MutableRefObject<Object3D<import("three").Event>>, rigidBody: import("./api").RigidBodyApi];
-};
-export declare const useRoundConvexMesh: <T extends Object3D<import("three").Event>>(rigidBodyOptions?: UseBodyOptions, colliderOptions?: UseColliderOptions<RoundConvexMeshArgs>) => [ref: React.MutableRefObject<Object3D<import("three").Event>>, rigidBody: import("./api").RigidBodyApi];
-export declare const useImpulseJoint: <T extends Rapier.ImpulseJoint>(body1: MutableRefObject<RapierRigidBody | undefined | null> | RigidBodyApi, body2: MutableRefObject<RapierRigidBody | undefined | null> | RigidBodyApi, params: Rapier.JointData) => {
+export declare const useImpulseJoint: <T extends Rapier.ImpulseJoint>(body1: RigidBodyApiRef, body2: RigidBodyApiRef, params: Rapier.JointData) => {
     raw: () => Rapier.ImpulseJoint | undefined;
     readonly handle: number;
     configureMotorPosition: (targetPos: number, stiffness: number, damping: number) => void;

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

@@ -64,6 +64,7 @@ export declare type UseBodyOptions = Omit<UseRigidBodyOptions, "shape">;
 export declare type RigidBodyTypeString = "fixed" | "dynamic" | "kinematicPosition" | "kinematicVelocity";
 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> {
     /**
      * The shape of your collider
@@ -188,6 +189,22 @@ export interface UseRigidBodyOptions {
     }): void;
     onSleep?(): void;
     onWake?(): void;
+    /**
+     * Locks all rotations that would have resulted from forces on the created rigid-body.
+     */
+    lockRotations?: boolean;
+    /**
+     * Locks all translations that would have resulted from forces on the created rigid-body.
+     */
+    lockTranslations?: boolean;
+    /**
+     * Allow rotation of this rigid-body only along specific axes.
+     */
+    enabledRotations?: Boolean3Array;
+    /**
+     * Allow rotation of this rigid-body only along specific axes.
+     */
+    enabledTranslations?: Boolean3Array;
 }
 export declare type SphericalJointParams = [
     body1Anchor: Vector3Array,
@@ -207,12 +224,12 @@ export declare type PrismaticJointParams = [
 ];
 export declare type RevoluteJointParams = [
     body1Anchor: Vector3Array,
-    body1LocalFrame: Vector3Array,
     body2Anchor: Vector3Array,
-    body2LocalFrame: Vector3Array
+    axis: Vector3Array
 ];
+export declare type RigidBodyApiRef = MutableRefObject<undefined | null | RigidBodyApi>;
 export interface UseImpulseJoint<P> {
-    (body1: MutableRefObject<RapierRigidBody | undefined | null>, body2: MutableRefObject<RapierRigidBody | undefined | null>, params: P): JointApi;
+    (body1: RigidBodyApiRef, body2: RigidBodyApiRef, params: P): JointApi;
 }
 export declare type RigidBodyApi = ReturnType<typeof createRigidBodyApi>;
 export declare type ColliderApi = ReturnType<typeof createColliderApi>;

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

@@ -1,5 +1,5 @@
 import { Collider, RigidBody } from "@dimforge/rapier3d-compat";
-import { Object3D, Vector3 } from "three";
+import { Object3D, Quaternion, Vector3 } from "three";
 import { RigidBodyShape, RigidBodyTypeString, UseColliderOptions, UseRigidBodyOptions, Vector3Array, WorldApi } from "./types";
 export declare const vectorArrayToObject: (arr: Vector3Array) => {
     x: number;
@@ -15,3 +15,4 @@ export declare const createColliderFromOptions: <A>(options: UseColliderOptions<
 }, 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[];
+export declare const vector3ToQuaternion: (v: Vector3) => Quaternion;

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

@@ -207,6 +207,11 @@ 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));
+};
 
 function _defineProperty(obj, key, value) {
   if (key in obj) {
@@ -318,12 +323,26 @@ const createRigidBodyApi = ref => {
     },
 
     setAngvel: velocity => ref.current().setAngvel(velocity, true),
-    setNextKinematicRotation: rotation => ref.current().setNextKinematicRotation(_objectSpread2(_objectSpread2({}, rotation), {}, {
-      w: 1
-    })),
+    setNextKinematicRotation: ({
+      x,
+      y,
+      z
+    }) => {
+      const q = vector3ToQuaternion(new three.Vector3(x, y, z));
+      ref.current().setNextKinematicRotation({
+        x: q.x,
+        y: q.y,
+        z: q.z,
+        w: q.w
+      });
+    },
     setNextKinematicTranslation: translation => ref.current().setNextKinematicTranslation(translation),
     resetForces: () => ref.current().resetForces(true),
-    resetTorques: () => ref.current().resetTorques(true)
+    resetTorques: () => ref.current().resetTorques(true),
+    lockRotations: locked => ref.current().lockRotations(locked, true),
+    lockTranslations: locked => ref.current().lockTranslations(locked, true),
+    setEnabledRotations: (x, y, z) => ref.current().setEnabledRotations(x, y, z, true),
+    setEnabledTranslations: (x, y, z) => ref.current().setEnabledTranslations(x, y, z, true)
   };
 }; // TODO: Flesh this out
 
@@ -348,7 +367,16 @@ const createWorldApi = ref => {
     removeCollider: collider => ref.current().removeCollider(collider, true),
     createImpulseJoint: (params, rigidBodyA, rigidBodyB) => ref.current().createImpulseJoint(params, rigidBodyA, rigidBodyB, true),
     removeImpulseJoint: joint => ref.current().removeImpulseJoint(joint, true),
-    forEachCollider: callback => ref.current().forEachCollider(callback)
+    forEachCollider: callback => ref.current().forEachCollider(callback),
+    setGravity: ({
+      x,
+      y,
+      z
+    }) => ref.current().gravity = {
+      x,
+      y,
+      z
+    }
   };
 }; // TODO: Broken currently, waiting for Rapier3D to fix
 
@@ -376,7 +404,8 @@ const importRapier = async () => {
 const Physics = ({
   colliders: _colliders = 'cuboid',
   gravity: _gravity = [0, -9.81, 0],
-  children
+  children,
+  timeStep: _timeStep = 'vary'
 }) => {
   const rapier = useAsset.useAsset(importRapier);
   const worldRef = React.useRef();
@@ -401,7 +430,15 @@ const Physics = ({
         worldRef.current = undefined;
       }
     };
-  }, []);
+  }, []); // Update gravity
+
+  React.useEffect(() => {
+    const world = worldRef.current;
+
+    if (world) {
+      world.gravity = vectorArrayToObject(_gravity);
+    }
+  }, [_gravity]);
   const time = React.useRef(performance.now());
   fiber.useFrame(context => {
     const world = worldRef.current;
@@ -410,7 +447,13 @@ const Physics = ({
 
     const now = performance.now();
     const delta = Math.min(100, now - time.current);
-    world.timestep = delta / 1000;
+
+    if (_timeStep === 'vary') {
+      world.timestep = delta / 1000;
+    } else {
+      world.timestep = _timeStep;
+    }
+
     world.step(eventQueue); // Update meshes
 
     rigidBodyMeshes.forEach((mesh, handle) => {
@@ -539,7 +582,7 @@ const useRigidBody = (options = {}) => {
   const rigidBodyRef = React.useRef();
   const getRigidBodyRef = React.useRef(() => {
     if (!rigidBodyRef.current) {
-      var _options$linearVeloci, _options$angularVeloc, _options$gravityScale, _options$canSleep, _options$ccd;
+      var _options$linearVeloci, _options$angularVeloc, _options$gravityScale, _options$canSleep, _options$ccd, _options$enabledRotat, _options$enabledTrans;
 
       const type = rigidBodyTypeFromString((options === null || options === void 0 ? void 0 : options.type) || "dynamic");
       const [lvx, lvy, lvz] = (_options$linearVeloci = options === null || options === void 0 ? void 0 : options.linearVelocity) !== null && _options$linearVeloci !== void 0 ? _options$linearVeloci : [0, 0, 0];
@@ -547,11 +590,15 @@ const useRigidBody = (options = {}) => {
       const gravityScale = (_options$gravityScale = options === null || options === void 0 ? void 0 : options.gravityScale) !== null && _options$gravityScale !== void 0 ? _options$gravityScale : 1;
       const canSleep = (_options$canSleep = options === null || options === void 0 ? void 0 : options.canSleep) !== null && _options$canSleep !== void 0 ? _options$canSleep : true;
       const ccdEnabled = (_options$ccd = options === null || options === void 0 ? void 0 : options.ccd) !== null && _options$ccd !== void 0 ? _options$ccd : false;
+      const [erx, ery, erz] = (_options$enabledRotat = options === null || options === void 0 ? void 0 : options.enabledRotations) !== null && _options$enabledRotat !== void 0 ? _options$enabledRotat : [true, true, true];
+      const [etx, ety, etz] = (_options$enabledTrans = options === null || options === void 0 ? void 0 : options.enabledTranslations) !== null && _options$enabledTrans !== void 0 ? _options$enabledTrans : [true, true, true];
       const desc = new rapier.RigidBodyDesc(type).setLinvel(lvx, lvy, lvz).setAngvel({
         x: avx,
         y: avy,
         z: avz
-      }).setGravityScale(gravityScale).setCanSleep(canSleep).setCcdEnabled(ccdEnabled);
+      }).setGravityScale(gravityScale).setCanSleep(canSleep).setCcdEnabled(ccdEnabled).enabledRotations(erx, ery, erz).enabledTranslations(etx, ety, etz);
+      if (options.lockRotations) desc.lockRotations();
+      if (options.lockTranslations) desc.lockTranslations();
       const rigidBody = world.createRigidBody(desc);
       rigidBodyRef.current = world.getRigidBody(rigidBody.handle);
     }
@@ -648,144 +695,6 @@ const useCollider = (body, options = {}) => {
   }, []);
   const api = React.useMemo(() => createColliderApi(getColliderRef), []);
   return [objectRef, api];
-};
-const useRigidBodyWithCollider = (rigidBodyOptions, colliderOptions) => {
-  const {
-    world
-  } = useRapier();
-  const [ref, rigidBody] = useRigidBody(_objectSpread2(_objectSpread2({}, rigidBodyOptions), {}, {
-    colliders: false
-  }));
-  React.useEffect(() => {
-    if (!colliderOptions) {
-      return;
-    }
-
-    const scale = ref.current.getWorldScale(new three.Vector3());
-    const collider = createColliderFromOptions(colliderOptions, world, world.getRigidBody(rigidBody.handle), scale);
-    return () => {
-      world.removeCollider(collider);
-    };
-  }, []);
-  return [ref, rigidBody];
-};
-const useCuboid = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _colliderOptions$args;
-
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "cuboid",
-    args: (_colliderOptions$args = colliderOptions.args) !== null && _colliderOptions$args !== void 0 ? _colliderOptions$args : [0.5, 0.5, 0.5]
-  }, colliderOptions));
-};
-const useBall = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _colliderOptions$args2;
-
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "ball",
-    args: (_colliderOptions$args2 = colliderOptions.args) !== null && _colliderOptions$args2 !== void 0 ? _colliderOptions$args2 : [0.5]
-  }, colliderOptions));
-};
-const useCapsule = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _colliderOptions$args3;
-
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "capsule",
-    args: (_colliderOptions$args3 = colliderOptions.args) !== null && _colliderOptions$args3 !== void 0 ? _colliderOptions$args3 : [0.5, 0.5]
-  }, colliderOptions));
-};
-const useHeightfield = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "heightfield"
-  }, colliderOptions));
-};
-/**
- * Create a trimesh collider and rigid body.
- * Note that Trimeshes don't have mass unless provided.
- * See https://rapier.rs/docs/user_guides/javascript/rigid_bodies#mass-properties
- * for available properties.
- */
-
-const useTrimesh = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "trimesh"
-  }, colliderOptions));
-};
-
-useTrimesh.fromMesh = (mesh, rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _mesh$geometry, _mesh$geometry$index;
-
-  return useTrimesh(rigidBodyOptions, _objectSpread2({
-    args: [mesh.geometry.attributes.position.array, ((_mesh$geometry = mesh.geometry) === null || _mesh$geometry === void 0 ? void 0 : (_mesh$geometry$index = _mesh$geometry.index) === null || _mesh$geometry$index === void 0 ? void 0 : _mesh$geometry$index.array) || []]
-  }, colliderOptions));
-};
-
-const usePolyline = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "polyline"
-  }, colliderOptions));
-};
-const useRoundCuboid = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "roundCuboid"
-  }, colliderOptions));
-};
-const useCylinder = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "cylinder"
-  }, colliderOptions));
-};
-const useRoundCylinder = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "roundCylinder"
-  }, colliderOptions));
-};
-const useCone = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "cone"
-  }, colliderOptions));
-};
-const useRoundCone = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "roundCone"
-  }, colliderOptions));
-};
-const useConvexHull = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "convexHull"
-  }, colliderOptions));
-};
-
-useConvexHull.fromMesh = (mesh, rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _mesh$geometry2, _mesh$geometry2$attri, _mesh$geometry2$attri2;
-
-  return useConvexHull(rigidBodyOptions, _objectSpread2({
-    args: [(mesh === null || mesh === void 0 ? void 0 : (_mesh$geometry2 = mesh.geometry) === null || _mesh$geometry2 === void 0 ? void 0 : (_mesh$geometry2$attri = _mesh$geometry2.attributes) === null || _mesh$geometry2$attri === void 0 ? void 0 : (_mesh$geometry2$attri2 = _mesh$geometry2$attri.position) === null || _mesh$geometry2$attri2 === void 0 ? void 0 : _mesh$geometry2$attri2.array) || []]
-  }, colliderOptions));
-};
-
-const useRoundConvexHull = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "roundConvexHull"
-  }, colliderOptions));
-};
-const useConvexMesh = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "convexMesh"
-  }, colliderOptions));
-};
-
-useConvexMesh.fromMesh = (mesh, rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _mesh$geometry3, _mesh$geometry3$attri, _mesh$geometry3$attri2, _mesh$geometry4, _mesh$geometry4$index;
-
-  return useConvexMesh(rigidBodyOptions, _objectSpread2({
-    args: [mesh === null || mesh === void 0 ? void 0 : (_mesh$geometry3 = mesh.geometry) === null || _mesh$geometry3 === void 0 ? void 0 : (_mesh$geometry3$attri = _mesh$geometry3.attributes) === null || _mesh$geometry3$attri === void 0 ? void 0 : (_mesh$geometry3$attri2 = _mesh$geometry3$attri.position) === null || _mesh$geometry3$attri2 === void 0 ? void 0 : _mesh$geometry3$attri2.array, ((_mesh$geometry4 = mesh.geometry) === null || _mesh$geometry4 === void 0 ? void 0 : (_mesh$geometry4$index = _mesh$geometry4.index) === null || _mesh$geometry4$index === void 0 ? void 0 : _mesh$geometry4$index.array) || []]
-  }, colliderOptions));
-};
-
-const useRoundConvexMesh = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "convexMesh"
-  }, colliderOptions));
 }; // Joints
 
 const useImpulseJoint = (body1, body2, params) => {
@@ -798,12 +707,6 @@ const useImpulseJoint = (body1, body2, params) => {
       let rb1;
       let rb2;
 
-      if ('handle' in body1 && 'handle' in body2) {
-        rb1 = world.getRigidBody(body1.handle);
-        rb2 = world.getRigidBody(body2.handle);
-        jointRef.current = world.createImpulseJoint(params, rb1, rb2);
-      }
-
       if ('current' in body1 && body1.current && 'current' in body2 && body2.current) {
         rb1 = world.getRigidBody(body1.current.handle);
         rb2 = world.getRigidBody(body2.current.handle);
@@ -1163,27 +1066,11 @@ exports.Physics = Physics;
 exports.RigidBody = RigidBody;
 exports.RoundCuboidCollider = RoundCuboidCollider;
 exports.TrimeshCollider = TrimeshCollider;
-exports.useBall = useBall;
-exports.useCapsule = useCapsule;
 exports.useCollider = useCollider;
-exports.useCone = useCone;
-exports.useConvexHull = useConvexHull;
-exports.useConvexMesh = useConvexMesh;
-exports.useCuboid = useCuboid;
-exports.useCylinder = useCylinder;
 exports.useFixedJoint = useFixedJoint;
-exports.useHeightfield = useHeightfield;
 exports.useImpulseJoint = useImpulseJoint;
-exports.usePolyline = usePolyline;
 exports.usePrismaticJoint = usePrismaticJoint;
 exports.useRapier = useRapier;
 exports.useRevoluteJoint = useRevoluteJoint;
 exports.useRigidBody = useRigidBody;
-exports.useRigidBodyWithCollider = useRigidBodyWithCollider;
-exports.useRoundCone = useRoundCone;
-exports.useRoundConvexHull = useRoundConvexHull;
-exports.useRoundConvexMesh = useRoundConvexMesh;
-exports.useRoundCuboid = useRoundCuboid;
-exports.useRoundCylinder = useRoundCylinder;
 exports.useSphericalJoint = useSphericalJoint;
-exports.useTrimesh = useTrimesh;

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

@@ -207,6 +207,11 @@ 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));
+};
 
 function _defineProperty(obj, key, value) {
   if (key in obj) {
@@ -318,12 +323,26 @@ const createRigidBodyApi = ref => {
     },
 
     setAngvel: velocity => ref.current().setAngvel(velocity, true),
-    setNextKinematicRotation: rotation => ref.current().setNextKinematicRotation(_objectSpread2(_objectSpread2({}, rotation), {}, {
-      w: 1
-    })),
+    setNextKinematicRotation: ({
+      x,
+      y,
+      z
+    }) => {
+      const q = vector3ToQuaternion(new three.Vector3(x, y, z));
+      ref.current().setNextKinematicRotation({
+        x: q.x,
+        y: q.y,
+        z: q.z,
+        w: q.w
+      });
+    },
     setNextKinematicTranslation: translation => ref.current().setNextKinematicTranslation(translation),
     resetForces: () => ref.current().resetForces(true),
-    resetTorques: () => ref.current().resetTorques(true)
+    resetTorques: () => ref.current().resetTorques(true),
+    lockRotations: locked => ref.current().lockRotations(locked, true),
+    lockTranslations: locked => ref.current().lockTranslations(locked, true),
+    setEnabledRotations: (x, y, z) => ref.current().setEnabledRotations(x, y, z, true),
+    setEnabledTranslations: (x, y, z) => ref.current().setEnabledTranslations(x, y, z, true)
   };
 }; // TODO: Flesh this out
 
@@ -348,7 +367,16 @@ const createWorldApi = ref => {
     removeCollider: collider => ref.current().removeCollider(collider, true),
     createImpulseJoint: (params, rigidBodyA, rigidBodyB) => ref.current().createImpulseJoint(params, rigidBodyA, rigidBodyB, true),
     removeImpulseJoint: joint => ref.current().removeImpulseJoint(joint, true),
-    forEachCollider: callback => ref.current().forEachCollider(callback)
+    forEachCollider: callback => ref.current().forEachCollider(callback),
+    setGravity: ({
+      x,
+      y,
+      z
+    }) => ref.current().gravity = {
+      x,
+      y,
+      z
+    }
   };
 }; // TODO: Broken currently, waiting for Rapier3D to fix
 
@@ -376,7 +404,8 @@ const importRapier = async () => {
 const Physics = ({
   colliders: _colliders = 'cuboid',
   gravity: _gravity = [0, -9.81, 0],
-  children
+  children,
+  timeStep: _timeStep = 'vary'
 }) => {
   const rapier = useAsset.useAsset(importRapier);
   const worldRef = React.useRef();
@@ -401,7 +430,15 @@ const Physics = ({
         worldRef.current = undefined;
       }
     };
-  }, []);
+  }, []); // Update gravity
+
+  React.useEffect(() => {
+    const world = worldRef.current;
+
+    if (world) {
+      world.gravity = vectorArrayToObject(_gravity);
+    }
+  }, [_gravity]);
   const time = React.useRef(performance.now());
   fiber.useFrame(context => {
     const world = worldRef.current;
@@ -410,7 +447,13 @@ const Physics = ({
 
     const now = performance.now();
     const delta = Math.min(100, now - time.current);
-    world.timestep = delta / 1000;
+
+    if (_timeStep === 'vary') {
+      world.timestep = delta / 1000;
+    } else {
+      world.timestep = _timeStep;
+    }
+
     world.step(eventQueue); // Update meshes
 
     rigidBodyMeshes.forEach((mesh, handle) => {
@@ -539,7 +582,7 @@ const useRigidBody = (options = {}) => {
   const rigidBodyRef = React.useRef();
   const getRigidBodyRef = React.useRef(() => {
     if (!rigidBodyRef.current) {
-      var _options$linearVeloci, _options$angularVeloc, _options$gravityScale, _options$canSleep, _options$ccd;
+      var _options$linearVeloci, _options$angularVeloc, _options$gravityScale, _options$canSleep, _options$ccd, _options$enabledRotat, _options$enabledTrans;
 
       const type = rigidBodyTypeFromString((options === null || options === void 0 ? void 0 : options.type) || "dynamic");
       const [lvx, lvy, lvz] = (_options$linearVeloci = options === null || options === void 0 ? void 0 : options.linearVelocity) !== null && _options$linearVeloci !== void 0 ? _options$linearVeloci : [0, 0, 0];
@@ -547,11 +590,15 @@ const useRigidBody = (options = {}) => {
       const gravityScale = (_options$gravityScale = options === null || options === void 0 ? void 0 : options.gravityScale) !== null && _options$gravityScale !== void 0 ? _options$gravityScale : 1;
       const canSleep = (_options$canSleep = options === null || options === void 0 ? void 0 : options.canSleep) !== null && _options$canSleep !== void 0 ? _options$canSleep : true;
       const ccdEnabled = (_options$ccd = options === null || options === void 0 ? void 0 : options.ccd) !== null && _options$ccd !== void 0 ? _options$ccd : false;
+      const [erx, ery, erz] = (_options$enabledRotat = options === null || options === void 0 ? void 0 : options.enabledRotations) !== null && _options$enabledRotat !== void 0 ? _options$enabledRotat : [true, true, true];
+      const [etx, ety, etz] = (_options$enabledTrans = options === null || options === void 0 ? void 0 : options.enabledTranslations) !== null && _options$enabledTrans !== void 0 ? _options$enabledTrans : [true, true, true];
       const desc = new rapier.RigidBodyDesc(type).setLinvel(lvx, lvy, lvz).setAngvel({
         x: avx,
         y: avy,
         z: avz
-      }).setGravityScale(gravityScale).setCanSleep(canSleep).setCcdEnabled(ccdEnabled);
+      }).setGravityScale(gravityScale).setCanSleep(canSleep).setCcdEnabled(ccdEnabled).enabledRotations(erx, ery, erz).enabledTranslations(etx, ety, etz);
+      if (options.lockRotations) desc.lockRotations();
+      if (options.lockTranslations) desc.lockTranslations();
       const rigidBody = world.createRigidBody(desc);
       rigidBodyRef.current = world.getRigidBody(rigidBody.handle);
     }
@@ -648,144 +695,6 @@ const useCollider = (body, options = {}) => {
   }, []);
   const api = React.useMemo(() => createColliderApi(getColliderRef), []);
   return [objectRef, api];
-};
-const useRigidBodyWithCollider = (rigidBodyOptions, colliderOptions) => {
-  const {
-    world
-  } = useRapier();
-  const [ref, rigidBody] = useRigidBody(_objectSpread2(_objectSpread2({}, rigidBodyOptions), {}, {
-    colliders: false
-  }));
-  React.useEffect(() => {
-    if (!colliderOptions) {
-      return;
-    }
-
-    const scale = ref.current.getWorldScale(new three.Vector3());
-    const collider = createColliderFromOptions(colliderOptions, world, world.getRigidBody(rigidBody.handle), scale);
-    return () => {
-      world.removeCollider(collider);
-    };
-  }, []);
-  return [ref, rigidBody];
-};
-const useCuboid = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _colliderOptions$args;
-
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "cuboid",
-    args: (_colliderOptions$args = colliderOptions.args) !== null && _colliderOptions$args !== void 0 ? _colliderOptions$args : [0.5, 0.5, 0.5]
-  }, colliderOptions));
-};
-const useBall = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _colliderOptions$args2;
-
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "ball",
-    args: (_colliderOptions$args2 = colliderOptions.args) !== null && _colliderOptions$args2 !== void 0 ? _colliderOptions$args2 : [0.5]
-  }, colliderOptions));
-};
-const useCapsule = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _colliderOptions$args3;
-
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "capsule",
-    args: (_colliderOptions$args3 = colliderOptions.args) !== null && _colliderOptions$args3 !== void 0 ? _colliderOptions$args3 : [0.5, 0.5]
-  }, colliderOptions));
-};
-const useHeightfield = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "heightfield"
-  }, colliderOptions));
-};
-/**
- * Create a trimesh collider and rigid body.
- * Note that Trimeshes don't have mass unless provided.
- * See https://rapier.rs/docs/user_guides/javascript/rigid_bodies#mass-properties
- * for available properties.
- */
-
-const useTrimesh = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "trimesh"
-  }, colliderOptions));
-};
-
-useTrimesh.fromMesh = (mesh, rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _mesh$geometry, _mesh$geometry$index;
-
-  return useTrimesh(rigidBodyOptions, _objectSpread2({
-    args: [mesh.geometry.attributes.position.array, ((_mesh$geometry = mesh.geometry) === null || _mesh$geometry === void 0 ? void 0 : (_mesh$geometry$index = _mesh$geometry.index) === null || _mesh$geometry$index === void 0 ? void 0 : _mesh$geometry$index.array) || []]
-  }, colliderOptions));
-};
-
-const usePolyline = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "polyline"
-  }, colliderOptions));
-};
-const useRoundCuboid = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "roundCuboid"
-  }, colliderOptions));
-};
-const useCylinder = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "cylinder"
-  }, colliderOptions));
-};
-const useRoundCylinder = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "roundCylinder"
-  }, colliderOptions));
-};
-const useCone = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "cone"
-  }, colliderOptions));
-};
-const useRoundCone = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "roundCone"
-  }, colliderOptions));
-};
-const useConvexHull = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "convexHull"
-  }, colliderOptions));
-};
-
-useConvexHull.fromMesh = (mesh, rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _mesh$geometry2, _mesh$geometry2$attri, _mesh$geometry2$attri2;
-
-  return useConvexHull(rigidBodyOptions, _objectSpread2({
-    args: [(mesh === null || mesh === void 0 ? void 0 : (_mesh$geometry2 = mesh.geometry) === null || _mesh$geometry2 === void 0 ? void 0 : (_mesh$geometry2$attri = _mesh$geometry2.attributes) === null || _mesh$geometry2$attri === void 0 ? void 0 : (_mesh$geometry2$attri2 = _mesh$geometry2$attri.position) === null || _mesh$geometry2$attri2 === void 0 ? void 0 : _mesh$geometry2$attri2.array) || []]
-  }, colliderOptions));
-};
-
-const useRoundConvexHull = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "roundConvexHull"
-  }, colliderOptions));
-};
-const useConvexMesh = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "convexMesh"
-  }, colliderOptions));
-};
-
-useConvexMesh.fromMesh = (mesh, rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _mesh$geometry3, _mesh$geometry3$attri, _mesh$geometry3$attri2, _mesh$geometry4, _mesh$geometry4$index;
-
-  return useConvexMesh(rigidBodyOptions, _objectSpread2({
-    args: [mesh === null || mesh === void 0 ? void 0 : (_mesh$geometry3 = mesh.geometry) === null || _mesh$geometry3 === void 0 ? void 0 : (_mesh$geometry3$attri = _mesh$geometry3.attributes) === null || _mesh$geometry3$attri === void 0 ? void 0 : (_mesh$geometry3$attri2 = _mesh$geometry3$attri.position) === null || _mesh$geometry3$attri2 === void 0 ? void 0 : _mesh$geometry3$attri2.array, ((_mesh$geometry4 = mesh.geometry) === null || _mesh$geometry4 === void 0 ? void 0 : (_mesh$geometry4$index = _mesh$geometry4.index) === null || _mesh$geometry4$index === void 0 ? void 0 : _mesh$geometry4$index.array) || []]
-  }, colliderOptions));
-};
-
-const useRoundConvexMesh = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "convexMesh"
-  }, colliderOptions));
 }; // Joints
 
 const useImpulseJoint = (body1, body2, params) => {
@@ -798,12 +707,6 @@ const useImpulseJoint = (body1, body2, params) => {
       let rb1;
       let rb2;
 
-      if ('handle' in body1 && 'handle' in body2) {
-        rb1 = world.getRigidBody(body1.handle);
-        rb2 = world.getRigidBody(body2.handle);
-        jointRef.current = world.createImpulseJoint(params, rb1, rb2);
-      }
-
       if ('current' in body1 && body1.current && 'current' in body2 && body2.current) {
         rb1 = world.getRigidBody(body1.current.handle);
         rb2 = world.getRigidBody(body2.current.handle);
@@ -1163,27 +1066,11 @@ exports.Physics = Physics;
 exports.RigidBody = RigidBody;
 exports.RoundCuboidCollider = RoundCuboidCollider;
 exports.TrimeshCollider = TrimeshCollider;
-exports.useBall = useBall;
-exports.useCapsule = useCapsule;
 exports.useCollider = useCollider;
-exports.useCone = useCone;
-exports.useConvexHull = useConvexHull;
-exports.useConvexMesh = useConvexMesh;
-exports.useCuboid = useCuboid;
-exports.useCylinder = useCylinder;
 exports.useFixedJoint = useFixedJoint;
-exports.useHeightfield = useHeightfield;
 exports.useImpulseJoint = useImpulseJoint;
-exports.usePolyline = usePolyline;
 exports.usePrismaticJoint = usePrismaticJoint;
 exports.useRapier = useRapier;
 exports.useRevoluteJoint = useRevoluteJoint;
 exports.useRigidBody = useRigidBody;
-exports.useRigidBodyWithCollider = useRigidBodyWithCollider;
-exports.useRoundCone = useRoundCone;
-exports.useRoundConvexHull = useRoundConvexHull;
-exports.useRoundConvexMesh = useRoundConvexMesh;
-exports.useRoundCuboid = useRoundCuboid;
-exports.useRoundCylinder = useRoundCylinder;
 exports.useSphericalJoint = useSphericalJoint;
-exports.useTrimesh = useTrimesh;

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

@@ -3,7 +3,7 @@ import { useAsset } from 'use-asset';
 import { useFrame } from '@react-three/fiber';
 import { ColliderDesc, CoefficientCombineRule, ActiveEvents, EventQueue, ShapeType } from '@dimforge/rapier3d-compat';
 export { CoefficientCombineRule, Collider as RapierCollider, RigidBody as RapierRigidBody } from '@dimforge/rapier3d-compat';
-import { Vector3, Quaternion, Object3D, Euler, CylinderBufferGeometry, BufferGeometry, BufferAttribute, SphereBufferGeometry, BoxBufferGeometry } from 'three';
+import { Quaternion, Euler, Vector3, Object3D, CylinderBufferGeometry, BufferGeometry, BufferAttribute, SphereBufferGeometry, BoxBufferGeometry } from 'three';
 
 const vectorArrayToObject = arr => {
   const [x, y, z] = arr;
@@ -182,6 +182,11 @@ const scaleVertices = (vertices, scale) => {
 
   return scaledVerts;
 };
+const quaternion = new Quaternion();
+const euler = new Euler();
+const vector3ToQuaternion = v => {
+  return quaternion.setFromEuler(euler.setFromVector3(v));
+};
 
 function _defineProperty(obj, key, value) {
   if (key in obj) {
@@ -293,12 +298,26 @@ const createRigidBodyApi = ref => {
     },
 
     setAngvel: velocity => ref.current().setAngvel(velocity, true),
-    setNextKinematicRotation: rotation => ref.current().setNextKinematicRotation(_objectSpread2(_objectSpread2({}, rotation), {}, {
-      w: 1
-    })),
+    setNextKinematicRotation: ({
+      x,
+      y,
+      z
+    }) => {
+      const q = vector3ToQuaternion(new Vector3(x, y, z));
+      ref.current().setNextKinematicRotation({
+        x: q.x,
+        y: q.y,
+        z: q.z,
+        w: q.w
+      });
+    },
     setNextKinematicTranslation: translation => ref.current().setNextKinematicTranslation(translation),
     resetForces: () => ref.current().resetForces(true),
-    resetTorques: () => ref.current().resetTorques(true)
+    resetTorques: () => ref.current().resetTorques(true),
+    lockRotations: locked => ref.current().lockRotations(locked, true),
+    lockTranslations: locked => ref.current().lockTranslations(locked, true),
+    setEnabledRotations: (x, y, z) => ref.current().setEnabledRotations(x, y, z, true),
+    setEnabledTranslations: (x, y, z) => ref.current().setEnabledTranslations(x, y, z, true)
   };
 }; // TODO: Flesh this out
 
@@ -323,7 +342,16 @@ const createWorldApi = ref => {
     removeCollider: collider => ref.current().removeCollider(collider, true),
     createImpulseJoint: (params, rigidBodyA, rigidBodyB) => ref.current().createImpulseJoint(params, rigidBodyA, rigidBodyB, true),
     removeImpulseJoint: joint => ref.current().removeImpulseJoint(joint, true),
-    forEachCollider: callback => ref.current().forEachCollider(callback)
+    forEachCollider: callback => ref.current().forEachCollider(callback),
+    setGravity: ({
+      x,
+      y,
+      z
+    }) => ref.current().gravity = {
+      x,
+      y,
+      z
+    }
   };
 }; // TODO: Broken currently, waiting for Rapier3D to fix
 
@@ -351,7 +379,8 @@ const importRapier = async () => {
 const Physics = ({
   colliders: _colliders = 'cuboid',
   gravity: _gravity = [0, -9.81, 0],
-  children
+  children,
+  timeStep: _timeStep = 'vary'
 }) => {
   const rapier = useAsset(importRapier);
   const worldRef = useRef();
@@ -376,7 +405,15 @@ const Physics = ({
         worldRef.current = undefined;
       }
     };
-  }, []);
+  }, []); // Update gravity
+
+  useEffect(() => {
+    const world = worldRef.current;
+
+    if (world) {
+      world.gravity = vectorArrayToObject(_gravity);
+    }
+  }, [_gravity]);
   const time = useRef(performance.now());
   useFrame(context => {
     const world = worldRef.current;
@@ -385,7 +422,13 @@ const Physics = ({
 
     const now = performance.now();
     const delta = Math.min(100, now - time.current);
-    world.timestep = delta / 1000;
+
+    if (_timeStep === 'vary') {
+      world.timestep = delta / 1000;
+    } else {
+      world.timestep = _timeStep;
+    }
+
     world.step(eventQueue); // Update meshes
 
     rigidBodyMeshes.forEach((mesh, handle) => {
@@ -514,7 +557,7 @@ const useRigidBody = (options = {}) => {
   const rigidBodyRef = useRef();
   const getRigidBodyRef = useRef(() => {
     if (!rigidBodyRef.current) {
-      var _options$linearVeloci, _options$angularVeloc, _options$gravityScale, _options$canSleep, _options$ccd;
+      var _options$linearVeloci, _options$angularVeloc, _options$gravityScale, _options$canSleep, _options$ccd, _options$enabledRotat, _options$enabledTrans;
 
       const type = rigidBodyTypeFromString((options === null || options === void 0 ? void 0 : options.type) || "dynamic");
       const [lvx, lvy, lvz] = (_options$linearVeloci = options === null || options === void 0 ? void 0 : options.linearVelocity) !== null && _options$linearVeloci !== void 0 ? _options$linearVeloci : [0, 0, 0];
@@ -522,11 +565,15 @@ const useRigidBody = (options = {}) => {
       const gravityScale = (_options$gravityScale = options === null || options === void 0 ? void 0 : options.gravityScale) !== null && _options$gravityScale !== void 0 ? _options$gravityScale : 1;
       const canSleep = (_options$canSleep = options === null || options === void 0 ? void 0 : options.canSleep) !== null && _options$canSleep !== void 0 ? _options$canSleep : true;
       const ccdEnabled = (_options$ccd = options === null || options === void 0 ? void 0 : options.ccd) !== null && _options$ccd !== void 0 ? _options$ccd : false;
+      const [erx, ery, erz] = (_options$enabledRotat = options === null || options === void 0 ? void 0 : options.enabledRotations) !== null && _options$enabledRotat !== void 0 ? _options$enabledRotat : [true, true, true];
+      const [etx, ety, etz] = (_options$enabledTrans = options === null || options === void 0 ? void 0 : options.enabledTranslations) !== null && _options$enabledTrans !== void 0 ? _options$enabledTrans : [true, true, true];
       const desc = new rapier.RigidBodyDesc(type).setLinvel(lvx, lvy, lvz).setAngvel({
         x: avx,
         y: avy,
         z: avz
-      }).setGravityScale(gravityScale).setCanSleep(canSleep).setCcdEnabled(ccdEnabled);
+      }).setGravityScale(gravityScale).setCanSleep(canSleep).setCcdEnabled(ccdEnabled).enabledRotations(erx, ery, erz).enabledTranslations(etx, ety, etz);
+      if (options.lockRotations) desc.lockRotations();
+      if (options.lockTranslations) desc.lockTranslations();
       const rigidBody = world.createRigidBody(desc);
       rigidBodyRef.current = world.getRigidBody(rigidBody.handle);
     }
@@ -623,144 +670,6 @@ const useCollider = (body, options = {}) => {
   }, []);
   const api = useMemo(() => createColliderApi(getColliderRef), []);
   return [objectRef, api];
-};
-const useRigidBodyWithCollider = (rigidBodyOptions, colliderOptions) => {
-  const {
-    world
-  } = useRapier();
-  const [ref, rigidBody] = useRigidBody(_objectSpread2(_objectSpread2({}, rigidBodyOptions), {}, {
-    colliders: false
-  }));
-  useEffect(() => {
-    if (!colliderOptions) {
-      return;
-    }
-
-    const scale = ref.current.getWorldScale(new Vector3());
-    const collider = createColliderFromOptions(colliderOptions, world, world.getRigidBody(rigidBody.handle), scale);
-    return () => {
-      world.removeCollider(collider);
-    };
-  }, []);
-  return [ref, rigidBody];
-};
-const useCuboid = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _colliderOptions$args;
-
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "cuboid",
-    args: (_colliderOptions$args = colliderOptions.args) !== null && _colliderOptions$args !== void 0 ? _colliderOptions$args : [0.5, 0.5, 0.5]
-  }, colliderOptions));
-};
-const useBall = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _colliderOptions$args2;
-
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "ball",
-    args: (_colliderOptions$args2 = colliderOptions.args) !== null && _colliderOptions$args2 !== void 0 ? _colliderOptions$args2 : [0.5]
-  }, colliderOptions));
-};
-const useCapsule = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _colliderOptions$args3;
-
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "capsule",
-    args: (_colliderOptions$args3 = colliderOptions.args) !== null && _colliderOptions$args3 !== void 0 ? _colliderOptions$args3 : [0.5, 0.5]
-  }, colliderOptions));
-};
-const useHeightfield = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "heightfield"
-  }, colliderOptions));
-};
-/**
- * Create a trimesh collider and rigid body.
- * Note that Trimeshes don't have mass unless provided.
- * See https://rapier.rs/docs/user_guides/javascript/rigid_bodies#mass-properties
- * for available properties.
- */
-
-const useTrimesh = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "trimesh"
-  }, colliderOptions));
-};
-
-useTrimesh.fromMesh = (mesh, rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _mesh$geometry, _mesh$geometry$index;
-
-  return useTrimesh(rigidBodyOptions, _objectSpread2({
-    args: [mesh.geometry.attributes.position.array, ((_mesh$geometry = mesh.geometry) === null || _mesh$geometry === void 0 ? void 0 : (_mesh$geometry$index = _mesh$geometry.index) === null || _mesh$geometry$index === void 0 ? void 0 : _mesh$geometry$index.array) || []]
-  }, colliderOptions));
-};
-
-const usePolyline = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "polyline"
-  }, colliderOptions));
-};
-const useRoundCuboid = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "roundCuboid"
-  }, colliderOptions));
-};
-const useCylinder = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "cylinder"
-  }, colliderOptions));
-};
-const useRoundCylinder = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "roundCylinder"
-  }, colliderOptions));
-};
-const useCone = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "cone"
-  }, colliderOptions));
-};
-const useRoundCone = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "roundCone"
-  }, colliderOptions));
-};
-const useConvexHull = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "convexHull"
-  }, colliderOptions));
-};
-
-useConvexHull.fromMesh = (mesh, rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _mesh$geometry2, _mesh$geometry2$attri, _mesh$geometry2$attri2;
-
-  return useConvexHull(rigidBodyOptions, _objectSpread2({
-    args: [(mesh === null || mesh === void 0 ? void 0 : (_mesh$geometry2 = mesh.geometry) === null || _mesh$geometry2 === void 0 ? void 0 : (_mesh$geometry2$attri = _mesh$geometry2.attributes) === null || _mesh$geometry2$attri === void 0 ? void 0 : (_mesh$geometry2$attri2 = _mesh$geometry2$attri.position) === null || _mesh$geometry2$attri2 === void 0 ? void 0 : _mesh$geometry2$attri2.array) || []]
-  }, colliderOptions));
-};
-
-const useRoundConvexHull = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "roundConvexHull"
-  }, colliderOptions));
-};
-const useConvexMesh = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "convexMesh"
-  }, colliderOptions));
-};
-
-useConvexMesh.fromMesh = (mesh, rigidBodyOptions = {}, colliderOptions = {}) => {
-  var _mesh$geometry3, _mesh$geometry3$attri, _mesh$geometry3$attri2, _mesh$geometry4, _mesh$geometry4$index;
-
-  return useConvexMesh(rigidBodyOptions, _objectSpread2({
-    args: [mesh === null || mesh === void 0 ? void 0 : (_mesh$geometry3 = mesh.geometry) === null || _mesh$geometry3 === void 0 ? void 0 : (_mesh$geometry3$attri = _mesh$geometry3.attributes) === null || _mesh$geometry3$attri === void 0 ? void 0 : (_mesh$geometry3$attri2 = _mesh$geometry3$attri.position) === null || _mesh$geometry3$attri2 === void 0 ? void 0 : _mesh$geometry3$attri2.array, ((_mesh$geometry4 = mesh.geometry) === null || _mesh$geometry4 === void 0 ? void 0 : (_mesh$geometry4$index = _mesh$geometry4.index) === null || _mesh$geometry4$index === void 0 ? void 0 : _mesh$geometry4$index.array) || []]
-  }, colliderOptions));
-};
-
-const useRoundConvexMesh = (rigidBodyOptions = {}, colliderOptions = {}) => {
-  return useRigidBodyWithCollider(rigidBodyOptions, _objectSpread2({
-    shape: "convexMesh"
-  }, colliderOptions));
 }; // Joints
 
 const useImpulseJoint = (body1, body2, params) => {
@@ -773,12 +682,6 @@ const useImpulseJoint = (body1, body2, params) => {
       let rb1;
       let rb2;
 
-      if ('handle' in body1 && 'handle' in body2) {
-        rb1 = world.getRigidBody(body1.handle);
-        rb2 = world.getRigidBody(body2.handle);
-        jointRef.current = world.createImpulseJoint(params, rb1, rb2);
-      }
-
       if ('current' in body1 && body1.current && 'current' in body2 && body2.current) {
         rb1 = world.getRigidBody(body1.current.handle);
         rb2 = world.getRigidBody(body2.current.handle);
@@ -1114,4 +1017,4 @@ const Debug = () => {
   })));
 };
 
-export { BallCollider, CapsuleCollider, ConeCollider, ConvexHullCollider, CuboidCollider, CylinderCollider, Debug, HeightfieldCollider, Physics, RigidBody, RoundCuboidCollider, TrimeshCollider, useBall, useCapsule, useCollider, useCone, useConvexHull, useConvexMesh, useCuboid, useCylinder, useFixedJoint, useHeightfield, useImpulseJoint, usePolyline, usePrismaticJoint, useRapier, useRevoluteJoint, useRigidBody, useRigidBodyWithCollider, useRoundCone, useRoundConvexHull, useRoundConvexMesh, useRoundCuboid, useRoundCylinder, useSphericalJoint, useTrimesh };
+export { BallCollider, CapsuleCollider, ConeCollider, ConvexHullCollider, CuboidCollider, CylinderCollider, Debug, HeightfieldCollider, 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.4.3",
+  "version": "0.5.0",
   "source": "src/index.ts",
   "main": "dist/react-three-rapier.cjs.js",
   "module": "dist/react-three-rapier.esm.js",
@@ -23,7 +23,7 @@
     "three": "^0.139.2"
   },
   "dependencies": {
-    "@dimforge/rapier3d-compat": "0.8.1",
+    "@dimforge/rapier3d-compat": "0.9.0",
     "use-asset": "^1.0.4"
   },
   "repository": "https://github.com/pmndrs/react-three-rapier/tree/master/packages/react-three-rapier"

package/readme.md

@@ -134,7 +134,7 @@ return (
       colliders="hull"
       onSleep={() => setIsAsleep(true)}
       onWake={() => setIsAsleep(false)}
-      onCollision={({manifold}) => {
+      onCollisionEnter={({manifold}) => {
         console.log('Collision at world position ', manifold.solverContactPoint(0))
       }}
     >
@@ -146,24 +146,9 @@ return (
 }
 ```
 
-## Hooks
+## Joints
 
-You can also use hooks to generate rigid bodies and colliders, but it's not encouraged.
-
-```tsx
-import { Box } from "@react-three/drei";
-import { useCuboid } from "@react-three/rapier";
-
-const RigidBox = () => {
-  // Generates a RigidBody and attaches a BoxCollider to it, returns a ref
-  const [box, rigidBody, collider] = useCuboid(
-    { position: [1, 1, 1] },
-    { args: [0.5, 0.5, 0.5] }
-  );
-
-  return <Box ref={box} />;
-};
-```
+WIP
 
 ## Roadmap?
 
@@ -174,8 +159,9 @@ In order, but also not necessarily:
 - [x] Nested objects retain world transforms
 - [x] Nested objects retain correct collider scale
 - [x] Automatic colliders based on rigidbody children
-- [ ] Translation and rotational constraints
+- [x] Translation and rotational constraints
 - [x] Collision events
+- [ ] Colliders outside RigidBodies
 - [ ] InstancedMesh support
 - [ ] Docs
 - [ ] CodeSandbox examples