@threlte/rapier 0.0.1 → 0.1.0

package/dist/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @threlte/extras
 
+## 0.1.0
+
+### Minor Changes
+
+- c272617: Hooks added to add Joints, Collider and AutoColliders now accepts density, mass or massProperties, documentation for joints hooks added, "Basic Vehicle Controller" Recipe added.
+
+## 0.0.3
+
+### Patch Changes
+
+- cd6dac6: cleaned up dead code in RigidBody component
+
+## 0.0.2
+
+### Patch Changes
+
+- 62d2c5c: fixed `<RigidBody>` initial transforms
+
 ## 0.0.1
 
 ### Patch Changes

package/dist/components/Colliders/AutoColliders.svelte

@@ -1,26 +1,27 @@
 <script>import { ActiveCollisionTypes, ActiveEvents, CoefficientCombineRule } from '@dimforge/rapier3d-compat';
 import { SceneGraphObject } from '@threlte/core';
 import { createEventDispatcher, onDestroy, onMount } from 'svelte';
-import { Object3D, Vector3 } from 'three';
+import { Object3D } from 'three';
 import { useCollisionGroups } from '../../hooks/useCollisionGroups';
 import { useRapier } from '../../hooks/useRapier';
 import { useRigidBody } from '../../hooks/useRigidBody';
 import { applyTransforms } from '../../lib/applyTransforms';
 import { createCollidersFromChildren } from '../../lib/createCollidersFromChildren';
 import { positionToVector3 } from '../../lib/positionToVector3';
+import { rotationToQuaternion } from '../../lib/rotationToQuaternion';
 export let shape = 'convexHull';
 export let position = undefined;
 export let rotation = undefined;
 export let scale = undefined;
 export let lookAt = undefined;
-export let mass = undefined;
-export let centerOfMass = undefined;
-export let principalAngularInertia = undefined;
 export let restitution = undefined;
 export let restitutionCombineRule = undefined;
 export let friction = undefined;
 export let frictionCombineRule = undefined;
 export let sensor = undefined;
+export let density = undefined;
+export let mass = undefined;
+export let massProperties = undefined;
 const object = new Object3D();
 /**
  * Immediately apply transforms
@@ -33,7 +34,7 @@ export let colliders = [];
 const collisionGroups = useCollisionGroups();
 const dispatcher = createEventDispatcher();
 onMount(() => {
-    colliders = createCollidersFromChildren(object, shape, world, rigidBody);
+    colliders = createCollidersFromChildren(object, shape ?? 'convexHull', world, rigidBody);
     colliders.forEach((c) => addColliderToContext(c, object, dispatcher));
     collisionGroups.registerColliders(colliders);
 });
@@ -47,13 +48,12 @@ $: {
             collider.setFriction(friction ?? 0.7);
             collider.setFrictionCombineRule(frictionCombineRule ?? CoefficientCombineRule.Average);
             collider.setSensor(sensor ?? false);
-            const { x: cmx, y: cmy, z: cmz } = positionToVector3(centerOfMass) || new Vector3();
-            const { x: pix, y: piy, z: piz } = positionToVector3(principalAngularInertia) ||
-                new Vector3(mass ?? 1 * 0.2, mass ?? 1 * 0.2, mass ?? 1 * 0.2);
-            if (mass || centerOfMass || principalAngularInertia) {
-                collider.setDensity(0);
-                collider.setMassProperties(mass ?? 1, { x: cmx, y: cmy, z: cmz }, { x: pix, y: piy, z: piz }, { x: 0, y: 0, z: 0, w: 1 });
-            }
+            if (density)
+                collider.setDensity(density);
+            if (mass)
+                collider.setMass(mass);
+            if (massProperties)
+                collider.setMassProperties(massProperties.mass, positionToVector3(massProperties.centerOfMass), positionToVector3(massProperties.principalAngularInertia), rotationToQuaternion(massProperties.angularInertiaLocalFrame));
         });
     }
 }

package/dist/components/Colliders/Collider.svelte

@@ -1,6 +1,6 @@
 <script>import { ActiveCollisionTypes, ActiveEvents, CoefficientCombineRule, Collider, ColliderDesc } from '@dimforge/rapier3d-compat';
 import { SceneGraphObject, TransformableObject, useFrame } from '@threlte/core';
-import { createEventDispatcher, onDestroy, onMount } from 'svelte';
+import { createEventDispatcher, onDestroy, onMount, tick } from 'svelte';
 import { Object3D, Quaternion, Vector3 } from 'three';
 import { useCollisionGroups } from '../../hooks/useCollisionGroups';
 import { useRapier } from '../../hooks/useRapier';
@@ -8,6 +8,7 @@ import { useRigidBody } from '../../hooks/useRigidBody';
 import { applyTransforms } from '../../lib/applyTransforms';
 import { getWorldPosition, getWorldQuaternion } from '../../lib/getWorldTransforms';
 import { positionToVector3 } from '../../lib/positionToVector3';
+import { rotationToQuaternion } from '../../lib/rotationToQuaternion';
 import { scaleColliderArgs } from '../../lib/scaleColliderArgs';
 export let shape;
 export let args;
@@ -15,14 +16,14 @@ export let position = undefined;
 export let rotation = undefined;
 export let scale = undefined;
 export let lookAt = undefined;
-export let mass = undefined;
-export let centerOfMass = undefined;
-export let principalAngularInertia = undefined;
 export let restitution = undefined;
 export let restitutionCombineRule = undefined;
 export let friction = undefined;
 export let frictionCombineRule = undefined;
 export let sensor = undefined;
+export let density = undefined;
+export let mass = undefined;
+export let massProperties = undefined;
 const object = new Object3D();
 /**
  * Immediately apply transforms
@@ -40,7 +41,8 @@ const dispatcher = createEventDispatcher();
  * Actual collider setup happens onMount as only then
  * the transforms are finished.
  */
-onMount(() => {
+onMount(async () => {
+    await tick();
     const scale = object.getWorldScale(new Vector3());
     const scaledArgs = scaleColliderArgs(shape, args, scale);
     // @ts-ignore
@@ -64,8 +66,12 @@ onMount(() => {
                 rigidBodyWorldQuatInversed.invert();
             }
         });
-        collider.setTranslationWrtParent(object.getWorldPosition(new Vector3()).sub(rigidBodyWorldPos));
-        collider.setRotationWrtParent(object.getWorldQuaternion(new Quaternion()).premultiply(rigidBodyWorldQuatInversed));
+        const worldPosition = object.getWorldPosition(new Vector3()).sub(rigidBodyWorldPos);
+        const worldRotation = object
+            .getWorldQuaternion(new Quaternion())
+            .premultiply(rigidBodyWorldQuatInversed);
+        collider.setTranslationWrtParent(worldPosition);
+        collider.setRotationWrtParent(worldRotation);
     }
     else {
         collider.setTranslation(object.getWorldPosition(new Vector3()));
@@ -81,13 +87,12 @@ $: {
         collider.setFriction(friction ?? 0.7);
         collider.setFrictionCombineRule(frictionCombineRule ?? CoefficientCombineRule.Average);
         collider.setSensor(sensor ?? false);
-        const { x: cmx, y: cmy, z: cmz } = positionToVector3(centerOfMass) || new Vector3();
-        const { x: pix, y: piy, z: piz } = positionToVector3(principalAngularInertia) ||
-            new Vector3(mass ?? 1 * 0.2, mass ?? 1 * 0.2, mass ?? 1 * 0.2);
-        if (mass || centerOfMass || principalAngularInertia) {
-            collider.setDensity(0);
-            collider.setMassProperties(mass ?? 1, { x: cmx, y: cmy, z: cmz }, { x: pix, y: piy, z: piz }, { x: 0, y: 0, z: 0, w: 1 });
-        }
+        if (density)
+            collider.setDensity(density);
+        if (mass)
+            collider.setMass(mass);
+        if (massProperties)
+            collider.setMassProperties(massProperties.mass, positionToVector3(massProperties.centerOfMass), positionToVector3(massProperties.principalAngularInertia), rotationToQuaternion(massProperties.angularInertiaLocalFrame));
     }
 }
 useFrame(() => {

package/dist/components/Colliders/Collider.svelte.d.ts

@@ -1,32 +1,85 @@
 import { SvelteComponentTyped } from "svelte";
 import { CoefficientCombineRule, Collider, ColliderDesc } from '@dimforge/rapier3d-compat';
+import { type Position, type Rotation } from '@threlte/core';
 import type { ColliderEventMap } from '../../types/types';
-declare class __sveltets_Render<Shape extends 'ball' | 'capsule' | 'segment' | 'triangle' | 'roundTriangle' | 'polyline' | 'trimesh' | 'cuboid' | 'roundCuboid' | 'heightfield' | 'cylinder' | 'roundCylinder' | 'cone' | 'roundCone' | 'convexHull' | 'convexMesh' | 'roundConvexHull' | 'roundConvexMesh', Args extends Parameters<typeof ColliderDesc[Shape]>> {
+declare class __sveltets_Render<Shape extends 'ball' | 'capsule' | 'segment' | 'triangle' | 'roundTriangle' | 'polyline' | 'trimesh' | 'cuboid' | 'roundCuboid' | 'heightfield' | 'cylinder' | 'roundCylinder' | 'cone' | 'roundCone' | 'convexHull' | 'convexMesh' | 'roundConvexHull' | 'roundConvexMesh', Args extends Parameters<typeof ColliderDesc[Shape]>, Density extends number | undefined, Mass extends Density extends undefined ? number | undefined : undefined, MassProperties extends Density extends undefined ? Mass extends undefined ? {
+    mass: number;
+    centerOfMass: Position;
+    principalAngularInertia: Position;
+    angularInertiaLocalFrame: Rotation;
+} : undefined : undefined> {
     props(): {
         shape: Shape;
         args: Args;
-        position?: import("@threlte/core").Position | undefined;
-        rotation?: import("@threlte/core").Rotation | undefined;
+        position?: Position | undefined;
+        rotation?: Rotation | undefined;
         scale?: import("@threlte/core").Scale | undefined;
         lookAt?: import("@threlte/core").LookAt | undefined;
-        mass?: number | undefined;
-        centerOfMass?: import("@threlte/core").Position | undefined;
-        principalAngularInertia?: import("@threlte/core").Position | undefined;
         restitution?: number | undefined;
         restitutionCombineRule?: CoefficientCombineRule | undefined;
         friction?: number | undefined;
         frictionCombineRule?: CoefficientCombineRule | undefined;
         sensor?: boolean | undefined;
         collider?: Collider | undefined;
+        density?: Density | undefined;
+    } | {
+        shape: Shape;
+        args: Args;
+        position?: Position | undefined;
+        rotation?: Rotation | undefined;
+        scale?: import("@threlte/core").Scale | undefined;
+        lookAt?: import("@threlte/core").LookAt | undefined;
+        restitution?: number | undefined;
+        restitutionCombineRule?: CoefficientCombineRule | undefined;
+        friction?: number | undefined;
+        frictionCombineRule?: CoefficientCombineRule | undefined;
+        sensor?: boolean | undefined;
+        collider?: Collider | undefined;
+        mass?: Mass | undefined;
+    } | {
+        shape: Shape;
+        args: Args;
+        position?: Position | undefined;
+        rotation?: Rotation | undefined;
+        scale?: import("@threlte/core").Scale | undefined;
+        lookAt?: import("@threlte/core").LookAt | undefined;
+        restitution?: number | undefined;
+        restitutionCombineRule?: CoefficientCombineRule | undefined;
+        friction?: number | undefined;
+        frictionCombineRule?: CoefficientCombineRule | undefined;
+        sensor?: boolean | undefined;
+        collider?: Collider | undefined;
+        mass?: Mass | undefined;
+        massProperties?: MassProperties | undefined;
     };
     events(): ColliderEventMap;
     slots(): {
         default: {};
     };
 }
-export declare type ColliderProps<Shape extends 'ball' | 'capsule' | 'segment' | 'triangle' | 'roundTriangle' | 'polyline' | 'trimesh' | 'cuboid' | 'roundCuboid' | 'heightfield' | 'cylinder' | 'roundCylinder' | 'cone' | 'roundCone' | 'convexHull' | 'convexMesh' | 'roundConvexHull' | 'roundConvexMesh', Args extends Parameters<typeof ColliderDesc[Shape]>> = ReturnType<__sveltets_Render<Shape, Args>['props']>;
-export declare type ColliderEvents<Shape extends 'ball' | 'capsule' | 'segment' | 'triangle' | 'roundTriangle' | 'polyline' | 'trimesh' | 'cuboid' | 'roundCuboid' | 'heightfield' | 'cylinder' | 'roundCylinder' | 'cone' | 'roundCone' | 'convexHull' | 'convexMesh' | 'roundConvexHull' | 'roundConvexMesh', Args extends Parameters<typeof ColliderDesc[Shape]>> = ReturnType<__sveltets_Render<Shape, Args>['events']>;
-export declare type ColliderSlots<Shape extends 'ball' | 'capsule' | 'segment' | 'triangle' | 'roundTriangle' | 'polyline' | 'trimesh' | 'cuboid' | 'roundCuboid' | 'heightfield' | 'cylinder' | 'roundCylinder' | 'cone' | 'roundCone' | 'convexHull' | 'convexMesh' | 'roundConvexHull' | 'roundConvexMesh', Args extends Parameters<typeof ColliderDesc[Shape]>> = ReturnType<__sveltets_Render<Shape, Args>['slots']>;
-export default class Collider<Shape extends 'ball' | 'capsule' | 'segment' | 'triangle' | 'roundTriangle' | 'polyline' | 'trimesh' | 'cuboid' | 'roundCuboid' | 'heightfield' | 'cylinder' | 'roundCylinder' | 'cone' | 'roundCone' | 'convexHull' | 'convexMesh' | 'roundConvexHull' | 'roundConvexMesh', Args extends Parameters<typeof ColliderDesc[Shape]>> extends SvelteComponentTyped<ColliderProps<Shape, Args>, ColliderEvents<Shape, Args>, ColliderSlots<Shape, Args>> {
+export declare type ColliderProps<Shape extends 'ball' | 'capsule' | 'segment' | 'triangle' | 'roundTriangle' | 'polyline' | 'trimesh' | 'cuboid' | 'roundCuboid' | 'heightfield' | 'cylinder' | 'roundCylinder' | 'cone' | 'roundCone' | 'convexHull' | 'convexMesh' | 'roundConvexHull' | 'roundConvexMesh', Args extends Parameters<typeof ColliderDesc[Shape]>, Density extends number | undefined, Mass extends Density extends undefined ? number | undefined : undefined, MassProperties extends Density extends undefined ? Mass extends undefined ? {
+    mass: number;
+    centerOfMass: Position;
+    principalAngularInertia: Position;
+    angularInertiaLocalFrame: Rotation;
+} : undefined : undefined> = ReturnType<__sveltets_Render<Shape, Args, Density, Mass, MassProperties>['props']>;
+export declare type ColliderEvents<Shape extends 'ball' | 'capsule' | 'segment' | 'triangle' | 'roundTriangle' | 'polyline' | 'trimesh' | 'cuboid' | 'roundCuboid' | 'heightfield' | 'cylinder' | 'roundCylinder' | 'cone' | 'roundCone' | 'convexHull' | 'convexMesh' | 'roundConvexHull' | 'roundConvexMesh', Args extends Parameters<typeof ColliderDesc[Shape]>, Density extends number | undefined, Mass extends Density extends undefined ? number | undefined : undefined, MassProperties extends Density extends undefined ? Mass extends undefined ? {
+    mass: number;
+    centerOfMass: Position;
+    principalAngularInertia: Position;
+    angularInertiaLocalFrame: Rotation;
+} : undefined : undefined> = ReturnType<__sveltets_Render<Shape, Args, Density, Mass, MassProperties>['events']>;
+export declare type ColliderSlots<Shape extends 'ball' | 'capsule' | 'segment' | 'triangle' | 'roundTriangle' | 'polyline' | 'trimesh' | 'cuboid' | 'roundCuboid' | 'heightfield' | 'cylinder' | 'roundCylinder' | 'cone' | 'roundCone' | 'convexHull' | 'convexMesh' | 'roundConvexHull' | 'roundConvexMesh', Args extends Parameters<typeof ColliderDesc[Shape]>, Density extends number | undefined, Mass extends Density extends undefined ? number | undefined : undefined, MassProperties extends Density extends undefined ? Mass extends undefined ? {
+    mass: number;
+    centerOfMass: Position;
+    principalAngularInertia: Position;
+    angularInertiaLocalFrame: Rotation;
+} : undefined : undefined> = ReturnType<__sveltets_Render<Shape, Args, Density, Mass, MassProperties>['slots']>;
+export default class Collider<Shape extends 'ball' | 'capsule' | 'segment' | 'triangle' | 'roundTriangle' | 'polyline' | 'trimesh' | 'cuboid' | 'roundCuboid' | 'heightfield' | 'cylinder' | 'roundCylinder' | 'cone' | 'roundCone' | 'convexHull' | 'convexMesh' | 'roundConvexHull' | 'roundConvexMesh', Args extends Parameters<typeof ColliderDesc[Shape]>, Density extends number | undefined, Mass extends Density extends undefined ? number | undefined : undefined, MassProperties extends Density extends undefined ? Mass extends undefined ? {
+    mass: number;
+    centerOfMass: Position;
+    principalAngularInertia: Position;
+    angularInertiaLocalFrame: Rotation;
+} : undefined : undefined> extends SvelteComponentTyped<ColliderProps<Shape, Args, Density, Mass, MassProperties>, ColliderEvents<Shape, Args, Density, Mass, MassProperties>, ColliderSlots<Shape, Args, Density, Mass, MassProperties>> {
 }
 export {};

package/dist/components/Joints/RevoluteJoint.svelte

@@ -0,0 +1,5 @@
+<script>import { useRevoluteJoint } from '../../hooks/useRevoluteJoint';
+export const { joint, rigidBodyA, rigidBodyB } = useRevoluteJoint();
+</script>
+
+<slot {rigidBodyA} {rigidBodyB} />

package/dist/components/Joints/RevoluteJoint.svelte.d.ts

@@ -0,0 +1,23 @@
+import { SvelteComponentTyped } from "svelte";
+declare const __propDef: {
+    props: {
+        joint?: import("svelte/store").Writable<import("@dimforge/rapier3d-compat").RevoluteImpulseJoint> | undefined;
+        rigidBodyA?: import("svelte/store").Writable<import("@dimforge/rapier3d-compat").RigidBody | undefined> | undefined;
+        rigidBodyB?: import("svelte/store").Writable<import("@dimforge/rapier3d-compat").RigidBody | undefined> | undefined;
+    };
+    events: {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {
+        default: {
+            rigidBodyA: import("svelte/store").Writable<import("@dimforge/rapier3d-compat").RigidBody | undefined>;
+            rigidBodyB: import("svelte/store").Writable<import("@dimforge/rapier3d-compat").RigidBody | undefined>;
+        };
+    };
+};
+export declare type RevoluteJointProps = typeof __propDef.props;
+export declare type RevoluteJointEvents = typeof __propDef.events;
+export declare type RevoluteJointSlots = typeof __propDef.slots;
+export default class RevoluteJoint extends SvelteComponentTyped<RevoluteJointProps, RevoluteJointEvents, RevoluteJointSlots> {
+}
+export {};

package/dist/components/RigidBody/RigidBody.svelte

@@ -1,13 +1,14 @@
 <script>import { LayerableObject, SceneGraphObject } from '@threlte/core';
-import { createEventDispatcher, onDestroy, setContext } from 'svelte';
+import { createEventDispatcher, onDestroy, setContext, tick } from 'svelte';
 import { Object3D, Vector3 } from 'three';
 import { useRapier } from '../../hooks/useRapier';
 import { applyTransforms } from '../../lib/applyTransforms';
-import { getWorldPosition, getWorldQuaternion } from '../../lib/getWorldTransforms';
+import { getWorldPosition, getWorldQuaternion, getWorldScale } from '../../lib/getWorldTransforms';
 import { parseRigidBodyType } from '../../lib/parseRigidBodyType';
 import { positionToVector3 } from '../../lib/positionToVector3';
 import { rotationToEuler } from '../../lib/rotationToEuler';
 const { world, rapier, addRigidBodyToContext, removeRigidBodyFromContext } = useRapier();
+export let debug = false;
 export let type = 'dynamic';
 export let canSleep = true;
 export let linearVelocity = {};
@@ -53,54 +54,71 @@ applyTransforms(object, position, rotation, scale, lookAt);
  * the world position to the RigidBody
  */
 object.updateWorldMatrix(true, false);
-const worldPosition = getWorldPosition(object);
-const worldRotation = getWorldQuaternion(object);
-const parentWorldScale = object.parent?.getWorldScale(new Vector3()) || new Vector3(1, 1, 1);
 /**
  * RigidBody Description
  */
-const desc = new rapier.RigidBodyDesc(parseRigidBodyType(type))
-    .setCanSleep(canSleep)
-    .setTranslation(worldPosition.x * parentWorldScale.x, worldPosition.y * parentWorldScale.y, worldPosition.z * parentWorldScale.z)
-    .setRotation({ x: worldRotation.x, y: worldRotation.y, z: worldRotation.z, w: worldRotation.w });
+const desc = new rapier.RigidBodyDesc(parseRigidBodyType(type)).setCanSleep(canSleep);
+export let rigidBody = undefined;
 /**
  * RigidBody init
  */
-export const rigidBody = world.createRigidBody(desc);
+export const rigidBodyTemp = world.createRigidBody(desc);
+/**
+ * Apply transforms after the parent component added "object" to itself
+ */
+const initPosition = async () => {
+    await tick();
+    applyTransforms(object, position, rotation, scale, lookAt);
+    object.updateMatrix();
+    object.updateWorldMatrix(true, false);
+    const parentWorldScale = object.parent ? getWorldScale(object.parent) : new Vector3(1, 1, 1);
+    const worldPosition = getWorldPosition(object).multiply(parentWorldScale);
+    const worldQuaternion = getWorldQuaternion(object);
+    rigidBodyTemp.setTranslation(worldPosition, true);
+    rigidBodyTemp.setRotation(worldQuaternion, true);
+    if (debug) {
+        console.log('worldPosition', worldPosition);
+        console.log('worldQuaternion', worldQuaternion);
+    }
+    if (debug)
+        console.log(JSON.stringify(desc, null, 2));
+    rigidBody = rigidBodyTemp;
+};
+initPosition();
 /**
  * Will come in handy in the future for joints
  */
-object.userData.rigidBody = rigidBody;
+object.userData.rigidBody = rigidBodyTemp;
 /**
  * Reactive RigidBody properties
  */
 $: {
-    rigidBody.setBodyType(parseRigidBodyType(type));
-    rigidBody.setLinvel(positionToVector3(linearVelocity), true);
-    rigidBody.setAngvel(rotationToEuler(angularVelocity), true);
-    rigidBody.setGravityScale(gravityScale, true);
-    rigidBody.enableCcd(ccd);
-    rigidBody.setDominanceGroup(dominance);
-    rigidBody.lockRotations(lockRotations, true);
-    rigidBody.lockTranslations(lockTranslations, true);
-    rigidBody.setEnabledRotations(...enabledRotations, true);
-    rigidBody.setEnabledTranslations(...enabledTranslations, true);
+    rigidBodyTemp.setBodyType(parseRigidBodyType(type));
+    rigidBodyTemp.setLinvel(positionToVector3(linearVelocity), true);
+    rigidBodyTemp.setAngvel(rotationToEuler(angularVelocity), true);
+    rigidBodyTemp.setGravityScale(gravityScale, true);
+    rigidBodyTemp.enableCcd(ccd);
+    rigidBodyTemp.setDominanceGroup(dominance);
+    rigidBodyTemp.lockRotations(lockRotations, true);
+    rigidBodyTemp.lockTranslations(lockTranslations, true);
+    rigidBodyTemp.setEnabledRotations(...enabledRotations, true);
+    rigidBodyTemp.setEnabledTranslations(...enabledTranslations, true);
 }
 /**
  * Setting the RigidBody context so that colliders can
  * hook onto.
  */
-setContext('threlte-rapier-rigidbody', rigidBody);
+setContext('threlte-rapier-rigidbody', rigidBodyTemp);
 /**
  * Add the mesh to the context
  */
-addRigidBodyToContext(rigidBody, object, dispatcher);
+addRigidBodyToContext(rigidBodyTemp, object, dispatcher);
 /**
  * cleanup
  */
 onDestroy(() => {
-    removeRigidBodyFromContext(rigidBody);
-    world.removeRigidBody(rigidBody);
+    removeRigidBodyFromContext(rigidBodyTemp);
+    world.removeRigidBody(rigidBodyTemp);
 });
 </script>
 

package/dist/components/RigidBody/RigidBody.svelte.d.ts

@@ -1,8 +1,10 @@
 import { SvelteComponentTyped } from "svelte";
+import type { RigidBody } from '@dimforge/rapier3d-compat';
 import type { RigidBodyProperties } from '../../types/components';
 import type { RigidBodyEventMap } from '../../types/types';
 declare const __propDef: {
     props: {
+        debug?: boolean | undefined;
         type?: import("../../lib/parseRigidBodyType").RigidBodyTypeString | undefined;
         canSleep?: boolean | undefined;
         linearVelocity?: import("@threlte/core").Position | undefined;
@@ -18,15 +20,16 @@ declare const __propDef: {
         enabledRotations?: import("../../types/components").Boolean3Array | undefined;
         enabledTranslations?: import("../../types/components").Boolean3Array | undefined;
         dominance?: number | undefined;
+        rigidBody?: RigidBody | undefined;
         /**
            * RigidBody init
-           */ rigidBody?: import("@dimforge/rapier3d-compat").RigidBody | undefined;
+           */ rigidBodyTemp?: RigidBody | undefined;
     };
     slots: {
         default: {};
     };
     getters: {
-        rigidBody: import("@dimforge/rapier3d-compat").RigidBody;
+        rigidBodyTemp: RigidBody;
     };
     events: RigidBodyEventMap;
 };
@@ -34,6 +37,6 @@ export declare type RigidBodyProps = typeof __propDef.props;
 export declare type RigidBodyEvents = typeof __propDef.events;
 export declare type RigidBodySlots = typeof __propDef.slots;
 export default class RigidBody extends SvelteComponentTyped<RigidBodyProps, RigidBodyEvents, RigidBodySlots> {
-    get rigidBody(): import("@dimforge/rapier3d-compat").RigidBody;
+    get rigidBodyTemp(): RigidBody;
 }
 export {};

package/dist/hooks/useFixedJoint.d.ts

@@ -0,0 +1,7 @@
+import type { FixedImpulseJoint } from '@dimforge/rapier3d-compat';
+import type { Position, Rotation } from '@threlte/core';
+export declare const useFixedJoint: (anchorA: Position, frameA: Rotation, anchorB: Position, frameB: Rotation) => {
+    joint: import("svelte/store").Writable<FixedImpulseJoint>;
+    rigidBodyA: import("svelte/store").Writable<import("@dimforge/rapier3d-compat").RigidBody | undefined>;
+    rigidBodyB: import("svelte/store").Writable<import("@dimforge/rapier3d-compat").RigidBody | undefined>;
+};

package/dist/hooks/useFixedJoint.js

@@ -0,0 +1,10 @@
+import { positionToVector3 } from '../lib/positionToVector3';
+import { rotationToQuaternion } from '../lib/rotationToQuaternion';
+import { useJoint } from './useJoint';
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+export const useFixedJoint = (anchorA, frameA, anchorB, frameB) => {
+    return useJoint((rbA, rbB, { world, rapier }) => {
+        const params = rapier.JointData.fixed(positionToVector3(anchorA), rotationToQuaternion(frameA), positionToVector3(anchorB), rotationToQuaternion(frameB));
+        return world.createImpulseJoint(params, rbA, rbB, true);
+    });
+};

package/dist/hooks/useJoint.d.ts

@@ -0,0 +1,7 @@
+import type { ImpulseJoint, RigidBody } from '@dimforge/rapier3d-compat';
+import type { RapierContext } from '../types/types';
+export declare const useJoint: <T extends ImpulseJoint>(initializeJoint: (rigidBodyA: RigidBody, rigidBodyB: RigidBody, ctx: RapierContext) => T) => {
+    joint: import("svelte/store").Writable<T>;
+    rigidBodyA: import("svelte/store").Writable<RigidBody | undefined>;
+    rigidBodyB: import("svelte/store").Writable<RigidBody | undefined>;
+};

package/dist/hooks/useJoint.js

@@ -0,0 +1,31 @@
+import { onDestroy } from 'svelte';
+import { derived, get, writable } from 'svelte/store';
+import { useRapier } from './useRapier';
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+export const useJoint = (initializeJoint) => {
+    const rigidBodyA = writable(undefined);
+    const rigidBodyB = writable(undefined);
+    const ctx = useRapier();
+    const bodies = derived([rigidBodyA, rigidBodyB], ([rbA, rbB]) => {
+        if (!!rbA && !!rbB) {
+            return [rbA, rbB];
+        }
+    });
+    const joint = writable(undefined);
+    const unsubscribeBodies = bodies.subscribe((bodies) => {
+        if (bodies)
+            joint.set(initializeJoint(...bodies, ctx));
+    });
+    onDestroy(() => {
+        unsubscribeBodies();
+        const j = get(joint);
+        if (!j)
+            return;
+        ctx.world.removeImpulseJoint(j, true);
+    });
+    return {
+        joint,
+        rigidBodyA,
+        rigidBodyB
+    };
+};

package/dist/hooks/usePrismaticJoint.d.ts

@@ -0,0 +1,7 @@
+import type { PrismaticImpulseJoint } from '@dimforge/rapier3d-compat';
+import type { Position } from '@threlte/core';
+export declare const usePrismaticJoint: (anchorA: Position, anchorB: Position, axis: Position, limits?: [min: number, max: number]) => {
+    joint: import("svelte/store").Writable<PrismaticImpulseJoint>;
+    rigidBodyA: import("svelte/store").Writable<import("@dimforge/rapier3d-compat").RigidBody | undefined>;
+    rigidBodyB: import("svelte/store").Writable<import("@dimforge/rapier3d-compat").RigidBody | undefined>;
+};

package/dist/hooks/usePrismaticJoint.js

@@ -0,0 +1,13 @@
+import { positionToVector3 } from '../lib/positionToVector3';
+import { useJoint } from './useJoint';
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+export const usePrismaticJoint = (anchorA, anchorB, axis, limits) => {
+    return useJoint((rbA, rbB, { world, rapier }) => {
+        const params = rapier.JointData.prismatic(positionToVector3(anchorA), positionToVector3(anchorB), positionToVector3(axis).normalize());
+        if (limits) {
+            params.limitsEnabled = true;
+            params.limits = limits;
+        }
+        return world.createImpulseJoint(params, rbA, rbB, true);
+    });
+};

package/dist/hooks/useRevoluteJoint.d.ts

@@ -0,0 +1,7 @@
+import type { RevoluteImpulseJoint } from '@dimforge/rapier3d-compat';
+import type { Position } from '@threlte/core';
+export declare const useRevoluteJoint: (anchorA: Position, anchorB: Position, axis: Position, limits?: [min: number, max: number]) => {
+    joint: import("svelte/store").Writable<RevoluteImpulseJoint>;
+    rigidBodyA: import("svelte/store").Writable<import("@dimforge/rapier3d-compat").RigidBody | undefined>;
+    rigidBodyB: import("svelte/store").Writable<import("@dimforge/rapier3d-compat").RigidBody | undefined>;
+};

package/dist/hooks/useRevoluteJoint.js

@@ -0,0 +1,13 @@
+import { positionToVector3 } from '../lib/positionToVector3';
+import { useJoint } from './useJoint';
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+export const useRevoluteJoint = (anchorA, anchorB, axis, limits) => {
+    return useJoint((rbA, rbB, { world, rapier }) => {
+        const params = rapier.JointData.revolute(positionToVector3(anchorA), positionToVector3(anchorB), positionToVector3(axis).normalize());
+        if (limits) {
+            params.limitsEnabled = true;
+            params.limits = limits;
+        }
+        return world.createImpulseJoint(params, rbA, rbB, true);
+    });
+};

package/dist/hooks/useSphericalJoint.d.ts

@@ -0,0 +1,7 @@
+import type { SphericalImpulseJoint } from '@dimforge/rapier3d-compat';
+import type { Position } from '@threlte/core';
+export declare const useSphericalJoint: (anchorA: Position, anchorB: Position) => {
+    joint: import("svelte/store").Writable<SphericalImpulseJoint>;
+    rigidBodyA: import("svelte/store").Writable<import("@dimforge/rapier3d-compat").RigidBody | undefined>;
+    rigidBodyB: import("svelte/store").Writable<import("@dimforge/rapier3d-compat").RigidBody | undefined>;
+};

package/dist/hooks/useSphericalJoint.js

@@ -0,0 +1,11 @@
+import { navigating } from '$app/stores';
+import { positionToVector3 } from '../lib/positionToVector3';
+import { useJoint } from './useJoint';
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+export const useSphericalJoint = (anchorA, anchorB) => {
+    return useJoint((rbA, rbB, { world, rapier }) => {
+        const params = rapier.JointData.spherical(positionToVector3(anchorA), positionToVector3(anchorB));
+        return world.createImpulseJoint(params, rbA, rbB, true);
+    });
+};
+navigating;

package/dist/index.d.ts

@@ -1,6 +1,10 @@
 export { useRapier } from './hooks/useRapier';
 export { useCollisionGroups } from './hooks/useCollisionGroups';
 export { useRigidBody } from './hooks/useRigidBody';
+export { useRevoluteJoint } from './hooks/useRevoluteJoint';
+export { usePrismaticJoint } from './hooks/usePrismaticJoint';
+export { useFixedJoint } from './hooks/useFixedJoint';
+export { useSphericalJoint } from './hooks/useSphericalJoint';
 export { default as World } from './components/World/World.svelte';
 export { default as RigidBody } from './components/RigidBody/RigidBody.svelte';
 export { default as Debug } from './components/Debug/Debug.svelte';
@@ -8,5 +12,5 @@ export { default as Collider } from './components/Colliders/Collider.svelte';
 export { default as AutoColliders } from './components/Colliders/AutoColliders.svelte';
 export { default as CollisionGroups } from './components/CollisionGroups/CollisionGroups.svelte';
 export { default as BasicPlayerController } from './recipes/BasicPlayerController.svelte';
-export type { AutoCollidersProperties, ColliderProperties, Boolean3Array, RigidBodyProperties, WorldProperties } from './types/components';
+export type { AutoCollidersProperties, Boolean3Array, RigidBodyProperties, WorldProperties } from './types/components';
 export type { CollisionGroupsBitMask, AutoCollidersShapes, ColliderEventDispatcher, ColliderShapes, RapierContext, RigidBodyEventDispatcher } from './types/types';

package/dist/index.js

@@ -2,6 +2,11 @@
 export { useRapier } from './hooks/useRapier';
 export { useCollisionGroups } from './hooks/useCollisionGroups';
 export { useRigidBody } from './hooks/useRigidBody';
+// Joints
+export { useRevoluteJoint } from './hooks/useRevoluteJoint';
+export { usePrismaticJoint } from './hooks/usePrismaticJoint';
+export { useFixedJoint } from './hooks/useFixedJoint';
+export { useSphericalJoint } from './hooks/useSphericalJoint';
 // components
 export { default as World } from './components/World/World.svelte';
 export { default as RigidBody } from './components/RigidBody/RigidBody.svelte';

package/dist/lib/getWorldTransforms.js

@@ -1,7 +1,8 @@
 import { Euler, Object3D, Quaternion, Vector3 } from 'three';
-const tempVector3 = new Vector3();
+const tempPosition = new Vector3();
 const tempQuaternion = new Quaternion();
-const tempEuler = new Euler();
+const tempRotation = new Euler();
+const tempScale = new Vector3();
 /**
  * Get the world position of an object.
  * If no target is provided, a globally used
@@ -12,7 +13,7 @@ const tempEuler = new Euler();
  * @returns
  */
 export const getWorldPosition = (object, target) => {
-    return object.getWorldPosition(target ?? tempVector3);
+    return object.getWorldPosition(target ?? tempPosition);
 };
 /**
  * Get the world quaternion of an object.
@@ -39,7 +40,7 @@ export const getWorldRotation = (object, target) => {
     object.getWorldQuaternion(tempQuaternion);
     return target
         ? target.setFromQuaternion(tempQuaternion)
-        : tempEuler.setFromQuaternion(tempQuaternion);
+        : tempRotation.setFromQuaternion(tempQuaternion);
 };
 /**
  * Get the world scale of an object.
@@ -51,5 +52,5 @@ export const getWorldRotation = (object, target) => {
  * @returns
  */
 export const getWorldScale = (object, target) => {
-    return object.getWorldScale(target ?? tempVector3);
+    return object.getWorldScale(target ?? tempScale);
 };

package/dist/types/components.d.ts

@@ -72,6 +72,7 @@ export declare type ColliderProperties<Shape extends ColliderShapes> = Omit<Tran
      * More info https://rapier.rs/docs/user_guides/javascript/colliders#mass-properties
      */
     mass?: number;
+    density?: number;
     /**
      * The center of mass of this rigid body
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@threlte/rapier",
-  "version": "0.0.1",
+  "version": "0.1.0",
   "author": "Grischa Erbe <hello@legrisch.com> (https://legrisch.com)",
   "license": "MIT",
   "devDependencies": {
@@ -8,7 +8,7 @@
     "@sveltejs/adapter-auto": "next",
     "@sveltejs/adapter-static": "^1.0.0-next.29",
     "@sveltejs/kit": "next",
-    "@threlte/core": "4.1.2",
+    "@threlte/core": "4.3.1",
     "@types/node": "^18.0.3",
     "@types/three": "^0.140.0",
     "@typescript-eslint/eslint-plugin": "^4.31.1",

package/dist/components/Colliders/AutoColliders.svelte.d.ts

@@ -1,33 +0,0 @@
-import { SvelteComponentTyped } from "svelte";
-import { type Collider } from '@dimforge/rapier3d-compat';
-import type { AutoCollidersProperties } from '../../types/components';
-import type { ColliderEventMap } from '../../types/types';
-declare const __propDef: {
-    props: {
-        shape?: import("../../types/types").AutoCollidersShapes | undefined;
-        position?: AutoCollidersProperties['position'];
-        rotation?: AutoCollidersProperties['rotation'];
-        scale?: AutoCollidersProperties['scale'];
-        lookAt?: AutoCollidersProperties['lookAt'];
-        mass?: AutoCollidersProperties['mass'];
-        centerOfMass?: AutoCollidersProperties['centerOfMass'];
-        principalAngularInertia?: AutoCollidersProperties['principalAngularInertia'];
-        restitution?: AutoCollidersProperties['restitution'];
-        restitutionCombineRule?: AutoCollidersProperties['restitutionCombineRule'];
-        friction?: AutoCollidersProperties['friction'];
-        frictionCombineRule?: AutoCollidersProperties['frictionCombineRule'];
-        sensor?: AutoCollidersProperties['sensor'];
-        colliders?: Collider[] | undefined;
-    };
-    slots: {
-        default: {};
-    };
-    getters: {};
-    events: ColliderEventMap;
-};
-export declare type AutoCollidersProps = typeof __propDef.props;
-export declare type AutoCollidersEvents = typeof __propDef.events;
-export declare type AutoCollidersSlots = typeof __propDef.slots;
-export default class AutoColliders extends SvelteComponentTyped<AutoCollidersProps, AutoCollidersEvents, AutoCollidersSlots> {
-}
-export {};