@threlte/rapier 3.1.5 → 3.3.0

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

@@ -1,151 +1,201 @@
 <script
   lang="ts"
   generics="TShape extends Shape, TMassDef extends MassDef"
->import { ActiveCollisionTypes, CoefficientCombineRule, ColliderDesc } from '@dimforge/rapier3d-compat';
-import { createParentObject3DContext, useParentObject3D, useTask, watch } from '@threlte/core';
-import { onDestroy, onMount, tick } from 'svelte';
-import { Object3D, Quaternion, Vector3 } from 'three';
-import { useCollisionGroups } from '../../../hooks/useCollisionGroups';
-import { useRapier } from '../../../hooks/useRapier';
-import { useRigidBody } from '../../../hooks/useRigidBody';
-import { applyColliderActiveEvents } from '../../../lib/applyColliderActiveEvents';
-import { eulerToQuaternion } from '../../../lib/eulerToQuaternion';
-import { getWorldPosition, getWorldQuaternion } from '../../../lib/getWorldTransforms';
-import { useParentRigidbodyObject } from '../../../lib/rigidBodyObjectContext';
-import { scaleColliderArgs } from '../../../lib/scaleColliderArgs';
-import { useCreateEvent } from '../../../lib/useCreateEvent';
-let { shape, args, type, restitution, restitutionCombineRule, friction, frictionCombineRule, sensor, contactForceEventThreshold, density, mass, centerOfMass, principalAngularInertia, angularInertiaLocalFrame, collider = $bindable(), oncreate, oncollisionenter, oncollisionexit, oncontact, onsensorenter, onsensorexit, children } = $props();
-const object = new Object3D();
-const { updateRef } = useCreateEvent(oncreate);
-const rigidBody = useRigidBody();
-const parentRigidBodyObject = useParentRigidbodyObject();
-const hasRigidBodyParent = !!rigidBody;
-const rapierContext = useRapier();
-const { world } = rapierContext;
-const collisionGroups = useCollisionGroups();
-const events = {
+>
+  import {
+    ActiveCollisionTypes,
+    CoefficientCombineRule,
+    ColliderDesc
+  } from '@dimforge/rapier3d-compat'
+  import { createParentObject3DContext, useParentObject3D, useTask, watch } from '@threlte/core'
+  import { onDestroy, onMount, tick } from 'svelte'
+  import { Object3D, Quaternion, Vector3 } from 'three'
+  import { useCollisionGroups } from '../../../hooks/useCollisionGroups.js'
+  import { useRapier } from '../../../hooks/useRapier.js'
+  import { useRigidBody } from '../../../hooks/useRigidBody.js'
+  import { applyColliderActiveEvents } from '../../../lib/applyColliderActiveEvents.js'
+  import { eulerToQuaternion } from '../../../lib/eulerToQuaternion.js'
+  import { getWorldPosition, getWorldQuaternion } from '../../../lib/getWorldTransforms.js'
+  import { useParentRigidbodyObject } from '../../../lib/rigidBodyObjectContext.js'
+  import { scaleColliderArgs } from '../../../lib/scaleColliderArgs.js'
+  import { useCreateEvent } from '../../../lib/useCreateEvent.js'
+  import type { ColliderProps, MassDef, Shape } from './types.js'
+
+  let {
+    shape,
+    args,
+    type,
+    restitution,
+    restitutionCombineRule,
+    friction,
+    frictionCombineRule,
+    sensor,
+    contactForceEventThreshold,
+    density,
+    mass,
+    centerOfMass,
+    principalAngularInertia,
+    angularInertiaLocalFrame,
+    collider = $bindable(),
+    oncreate,
+    oncollisionenter,
+    oncollisionexit,
+    oncontact,
+    onsensorenter,
+    onsensorexit,
+    children
+  }: ColliderProps<TShape, TMassDef> = $props()
+
+  const object = new Object3D()
+
+  const { updateRef } = useCreateEvent(oncreate)
+  const rigidBody = useRigidBody()
+  const parentRigidBodyObject = useParentRigidbodyObject()
+  const hasRigidBodyParent = !!rigidBody
+
+  const rapierContext = useRapier()
+  const { world } = rapierContext
+
+  const collisionGroups = useCollisionGroups()
+
+  const events = {
     oncollisionenter,
     oncollisionexit,
     oncontact,
     onsensorenter,
     onsensorexit
-};
-/**
- * Actual collider setup happens onMount as only then
- * the transforms are finished.
- */
-onMount(async () => {
-    await tick();
-    const scale = object.getWorldScale(new Vector3());
-    const scaledArgs = scaleColliderArgs(shape, args, scale);
+  }
+
+  /**
+   * Actual collider setup happens onMount as only then
+   * the transforms are finished.
+   */
+  onMount(async () => {
+    await tick()
+
+    const scale = object.getWorldScale(new Vector3())
+
+    const scaledArgs = scaleColliderArgs(shape, args, scale)
+
     // @ts-expect-error
-    const colliderDesc = ColliderDesc[shape](...scaledArgs);
-    collider = world.createCollider(colliderDesc, rigidBody);
-    collider.setActiveCollisionTypes(ActiveCollisionTypes.ALL);
-    updateRef(collider);
+    const colliderDesc = ColliderDesc[shape](...scaledArgs) as ColliderDesc
+
+    collider = world.createCollider(colliderDesc, rigidBody)
+    collider.setActiveCollisionTypes(ActiveCollisionTypes.ALL)
+    updateRef(collider)
+
     /**
      * Add collider to context
      */
-    rapierContext.addColliderToContext(collider, object, events);
+    rapierContext.addColliderToContext(collider, object, events)
+
     /**
      * For use in conjunction with component <CollisionGroups>
      */
-    collisionGroups.registerColliders([collider]);
+    collisionGroups.registerColliders([collider])
+
     if (hasRigidBodyParent) {
-        const rigidBodyWorldPos = new Vector3();
-        const rigidBodyWorldQuatInversed = new Quaternion();
-        parentRigidBodyObject?.getWorldPosition(rigidBodyWorldPos);
-        parentRigidBodyObject?.getWorldQuaternion(rigidBodyWorldQuatInversed);
-        rigidBodyWorldQuatInversed.invert();
-        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()));
-        collider.setRotation(object.getWorldQuaternion(new Quaternion()));
+      const rigidBodyWorldPos = new Vector3()
+      const rigidBodyWorldQuatInversed = new Quaternion()
+
+      parentRigidBodyObject?.getWorldPosition(rigidBodyWorldPos)
+      parentRigidBodyObject?.getWorldQuaternion(rigidBodyWorldQuatInversed)
+      rigidBodyWorldQuatInversed.invert()
+
+      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()))
+      collider.setRotation(object.getWorldQuaternion(new Quaternion()))
     }
-});
-$effect.pre(() => {
-    collider?.setRestitution(restitution ?? 0);
-});
-$effect.pre(() => {
-    collider?.setRestitutionCombineRule(restitutionCombineRule ?? CoefficientCombineRule.Average);
-});
-$effect.pre(() => {
-    collider?.setFriction(friction ?? 0.7);
-});
-$effect.pre(() => {
-    collider?.setFrictionCombineRule(frictionCombineRule ?? CoefficientCombineRule.Average);
-});
-$effect.pre(() => collider?.setSensor(sensor ?? false));
-$effect.pre(() => collider?.setContactForceEventThreshold(contactForceEventThreshold ?? 0));
-$effect.pre(() => {
-    if (density !== undefined)
-        collider?.setDensity(density);
-});
-$effect.pre(() => {
+  })
+
+  $effect.pre(() => {
+    collider?.setRestitution(restitution ?? 0)
+  })
+  $effect.pre(() => {
+    collider?.setRestitutionCombineRule(restitutionCombineRule ?? CoefficientCombineRule.Average)
+  })
+  $effect.pre(() => {
+    collider?.setFriction(friction ?? 0.7)
+  })
+  $effect.pre(() => {
+    collider?.setFrictionCombineRule(frictionCombineRule ?? CoefficientCombineRule.Average)
+  })
+  $effect.pre(() => collider?.setSensor(sensor ?? false))
+  $effect.pre(() => collider?.setContactForceEventThreshold(contactForceEventThreshold ?? 0))
+  $effect.pre(() => {
+    if (density !== undefined) collider?.setDensity(density)
+  })
+
+  $effect.pre(() => {
     if (collider && mass) {
-        if (centerOfMass && principalAngularInertia && angularInertiaLocalFrame) {
-            collider.setMassProperties(mass, { x: centerOfMass[0], y: centerOfMass[1], z: centerOfMass[2] }, {
-                x: principalAngularInertia[0],
-                y: principalAngularInertia[1],
-                z: principalAngularInertia[2]
-            }, eulerToQuaternion(angularInertiaLocalFrame));
-        }
-        else {
-            collider.setMass(mass);
-        }
+      if (centerOfMass && principalAngularInertia && angularInertiaLocalFrame) {
+        collider.setMassProperties(
+          mass,
+          { x: centerOfMass[0], y: centerOfMass[1], z: centerOfMass[2] },
+          {
+            x: principalAngularInertia[0],
+            y: principalAngularInertia[1],
+            z: principalAngularInertia[2]
+          },
+          eulerToQuaternion(angularInertiaLocalFrame)
+        )
+      } else {
+        collider.setMass(mass)
+      }
     }
-});
-$effect.pre(() => {
+  })
+
+  $effect.pre(() => {
     if (collider) {
-        applyColliderActiveEvents(collider, events, rigidBody?.userData?.events);
+      applyColliderActiveEvents(collider, events, rigidBody?.userData?.events)
+    }
+  })
+
+  export const refresh = () => {
+    if (!collider) return
+    collider.setTranslation(getWorldPosition(object))
+    collider.setRotation(getWorldQuaternion(object))
+  }
+
+  /**
+   * If the Collider isAttached (i.e. NOT child of a RigidBody), update the
+   * transforms on every frame.
+   */
+  useTask(
+    () => {
+      refresh()
+    },
+    {
+      running: () => !hasRigidBodyParent && type === 'dynamic'
     }
-});
-export const refresh = () => {
-    if (!collider)
-        return;
-    collider.setTranslation(getWorldPosition(object));
-    collider.setRotation(getWorldQuaternion(object));
-};
-/**
- * If the Collider isAttached (i.e. NOT child of a RigidBody), update the
- * transforms on every frame.
- */
-const { start, stop } = useTask(() => {
-    refresh();
-}, {
-    autoStart: !hasRigidBodyParent && type === 'dynamic'
-});
-$effect.pre(() => {
-    if (!hasRigidBodyParent && type === 'dynamic')
-        start();
-    else
-        stop();
-});
-/**
- * Cleanup
- */
-onDestroy(() => {
-    if (!collider)
-        return;
-    rapierContext.removeColliderFromContext(collider);
-    collisionGroups.removeColliders([collider]);
-    world.removeCollider(collider, true);
-    collider = undefined;
-});
-const parent3DObject = useParentObject3D();
-createParentObject3DContext(object);
-watch(parent3DObject, (parent) => {
-    parent?.add(object);
+  )
+
+  /**
+   * Cleanup
+   */
+  onDestroy(() => {
+    if (!collider) return
+    rapierContext.removeColliderFromContext(collider)
+    collisionGroups.removeColliders([collider])
+    world.removeCollider(collider, true)
+    collider = undefined
+  })
+
+  const parent3DObject = useParentObject3D()
+  createParentObject3DContext(object)
+  watch(parent3DObject, (parent) => {
+    parent?.add(object)
     return () => {
-        parent?.remove(object);
-    };
-});
+      parent?.remove(object)
+    }
+  })
 </script>
 
 {@render children?.({ collider })}

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

@@ -1,8 +1,17 @@
-import type { ColliderProps, MassDef, Shape } from './types';
+import type { ColliderProps, MassDef, Shape } from './types.js';
+declare function $$render<TShape extends Shape, TMassDef extends MassDef>(): {
+    props: ColliderProps<TShape, TMassDef>;
+    exports: {
+        refresh: () => void;
+    };
+    bindings: "collider";
+    slots: {};
+    events: {};
+};
 declare class __sveltets_Render<TShape extends Shape, TMassDef extends MassDef> {
-    props(): ColliderProps<TShape, TMassDef>;
-    events(): {};
-    slots(): {};
+    props(): ReturnType<typeof $$render<TShape, TMassDef>>['props'];
+    events(): ReturnType<typeof $$render<TShape, TMassDef>>['events'];
+    slots(): ReturnType<typeof $$render<TShape, TMassDef>>['slots'];
     bindings(): "collider";
     exports(): {
         refresh: () => void;

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

@@ -1,7 +1,7 @@
 import type { CoefficientCombineRule, Collider, ColliderDesc, Collider as RapierCollider } from '@dimforge/rapier3d-compat';
 import type { Snippet } from 'svelte';
 import type { Euler, Vector3 } from 'three';
-import type { ColliderEvents, CreateEvent } from '../../../types/types';
+import type { ColliderEvents, CreateEvent } from '../../../types/types.js';
 type Type = 'static' | 'dynamic';
 type BaseProps = {
     /**

package/dist/components/CollisionGroups/CollisionGroups.svelte

@@ -1,13 +1,33 @@
 <script
   lang="ts"
   generics="TGroupsDef extends GroupsDef"
->import { setContext } from 'svelte';
-import { writable } from 'svelte/store';
-import { computeBitMask } from '../../lib/computeBitMask';
-let { groups, filter, memberships, children } = $props();
-const store = writable(computeBitMask(groups, filter, memberships));
-$effect.pre(() => store.set(computeBitMask(groups, filter, memberships)));
-setContext('threlte-rapier-collision-group', store);
+>
+  import { setContext } from 'svelte'
+  import { writable } from 'svelte/store'
+  import { computeBitMask } from '../../lib/computeBitMask.js'
+  import type { CollisionGroupsContext } from '../../types/types.js'
+  import type { CollisionGroupsProps, Groups, GroupsDef, MembershipsAndFilter } from './types.js'
+
+  let { groups, filter, memberships, children }: CollisionGroupsProps<TGroupsDef> = $props()
+
+  const store = writable<number>(
+    computeBitMask(
+      groups as Groups,
+      filter as MembershipsAndFilter,
+      memberships as MembershipsAndFilter
+    )
+  )
+  $effect.pre(() =>
+    store.set(
+      computeBitMask(
+        groups as Groups,
+        filter as MembershipsAndFilter,
+        memberships as MembershipsAndFilter
+      )
+    )
+  )
+
+  setContext<NonNullable<CollisionGroupsContext>>('threlte-rapier-collision-group', store)
 </script>
 
 {@render children?.()}

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

@@ -1,8 +1,15 @@
-import type { CollisionGroupsProps, GroupsDef } from './types';
+import type { CollisionGroupsProps, GroupsDef } from './types.js';
+declare function $$render<TGroupsDef extends GroupsDef>(): {
+    props: CollisionGroupsProps<TGroupsDef>;
+    exports: {};
+    bindings: "";
+    slots: {};
+    events: {};
+};
 declare class __sveltets_Render<TGroupsDef extends GroupsDef> {
-    props(): CollisionGroupsProps<TGroupsDef>;
-    events(): {};
-    slots(): {};
+    props(): ReturnType<typeof $$render<TGroupsDef>>['props'];
+    events(): ReturnType<typeof $$render<TGroupsDef>>['events'];
+    slots(): ReturnType<typeof $$render<TGroupsDef>>['slots'];
     bindings(): "";
     exports(): {};
 }

package/dist/components/Debug/Debug.svelte

@@ -1,21 +1,31 @@
-<script lang="ts">import { T, useTask } from '@threlte/core';
-import { onDestroy } from 'svelte';
-import { BufferAttribute, BufferGeometry, LineSegments } from 'three';
-import { useRapier } from '../../hooks/useRapier';
-let { ref = $bindable(new LineSegments()), ...props } = $props();
-const { world, debug } = useRapier();
-const geometry = new BufferGeometry();
-debug.set(true);
-useTask(() => {
-    const buffers = world.debugRender();
-    const vertices = new BufferAttribute(buffers.vertices, 3);
-    const colors = new BufferAttribute(buffers.colors, 4);
-    geometry.setAttribute('position', vertices);
-    geometry.setAttribute('color', colors);
-});
-onDestroy(() => {
-    debug.set(false);
-});
+<script lang="ts">
+  import { T, useTask } from '@threlte/core'
+  import { onDestroy } from 'svelte'
+  import { BufferAttribute, BufferGeometry, LineSegments } from 'three'
+  import { useRapier } from '../../hooks/useRapier.js'
+  import type { DebugProps } from './types.js'
+
+  let { ref = $bindable(new LineSegments()), ...props }: DebugProps = $props()
+
+  const { world, debug } = useRapier()
+
+  const geometry = new BufferGeometry()
+
+  debug.set(true)
+
+  useTask(() => {
+    const buffers = world.debugRender()
+
+    const vertices = new BufferAttribute(buffers.vertices, 3)
+    const colors = new BufferAttribute(buffers.colors, 4)
+
+    geometry.setAttribute('position', vertices)
+    geometry.setAttribute('color', colors)
+  })
+
+  onDestroy(() => {
+    debug.set(false)
+  })
 </script>
 
 <T

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

@@ -1,3 +1,4 @@
-import type { DebugProps } from './types';
+import type { DebugProps } from './types.js';
 declare const Debug: import("svelte").Component<DebugProps, {}, "ref">;
+type Debug = ReturnType<typeof Debug>;
 export default Debug;