@threlte/rapier 1.1.4 → 3.0.0-next.0

package/dist/components/Attractor/Attractor.svelte

@@ -1,4 +1,4 @@
-<script>import { T, useFrame } from '@threlte/core';
+<script lang="ts">import { T, useTask } from '@threlte/core';
 import { Group, Vector3 } from 'three';
 import { useRapier } from '../../hooks/useRapier';
 export let strength = 1;
@@ -13,14 +13,15 @@ const calcForceByType = {
     linear: (s, m2, r, d, G) => s * (d / r),
     newtonian: (s, m2, r, d, G) => (G * s * m2) / Math.pow(d, 2)
 };
+const impulseVector = new Vector3();
+const bodyV3 = new Vector3();
 function applyImpulseToBodiesInRange() {
-    const impulseVector = new Vector3();
     obj.getWorldPosition(gravitySource);
     world.forEachRigidBody((body) => {
         const { x, y, z } = body.translation();
-        const bodyV3 = new Vector3(x, y, z);
-        const distance = gravitySource.distanceTo(bodyV3);
-        if (distance < range) {
+        bodyV3.set(x, y, z);
+        const distance = gravitySource.distanceToSquared(bodyV3);
+        if (distance < range ** 2) {
             let force = calcForceByType[gravityType](strength, body.mass(), range, distance, gravitationalConstant);
             // Prevent wild forces when Attractors collide
             force = force === Infinity ? strength : force;
@@ -29,7 +30,7 @@ function applyImpulseToBodiesInRange() {
         }
     });
 }
-useFrame(() => {
+useTask(() => {
     applyImpulseToBodiesInRange();
 });
 </script>

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

@@ -1,5 +1,5 @@
 import { Props, type Events, type Slots } from '@threlte/core'
-import { SvelteComponentTyped } from 'svelte'
+import { SvelteComponent } from 'svelte'
 import type { Group } from 'three'
 import type { GravityType } from '../../types/types'
 
@@ -35,7 +35,7 @@ type AttractorEvents = Events<Group>
 
 type AttractorSlots = Slots<Group>
 
-export default class Attractor extends SvelteComponentTyped<
+export default class Attractor extends SvelteComponent<
   AttractorProps,
   AttractorEvents,
   AttractorSlots

package/dist/components/Colliders/AutoColliders.svelte

@@ -1,9 +1,8 @@
-<script>import { ActiveCollisionTypes, CoefficientCombineRule } from '@dimforge/rapier3d-compat';
-import { createRawEventDispatcher, SceneGraphObject } from '@threlte/core';
+<script lang="ts">import { ActiveCollisionTypes, CoefficientCombineRule } from '@dimforge/rapier3d-compat';
+import { SceneGraphObject } from '@threlte/core';
 import { onDestroy, onMount } from 'svelte';
 import { Group } from 'three';
 import { useCollisionGroups } from '../../hooks/useCollisionGroups';
-import { useHasEventListeners } from '../../hooks/useHasEventListener';
 import { useRapier } from '../../hooks/useRapier';
 import { useRigidBody } from '../../hooks/useRigidBody';
 import { useCreateEvent } from '../../lib/useCreateEvent';
@@ -11,28 +10,16 @@ import { useParentRigidbodyObject } from '../../lib/rigidBodyObjectContext';
 import { applyColliderActiveEvents } from '../../lib/applyColliderActiveEvents';
 import { createCollidersFromChildren } from '../../lib/createCollidersFromChildren';
 import { eulerToQuaternion } from '../../lib/eulerToQuaternion';
-export let shape = 'convexHull';
-export let restitution = undefined;
-export let restitutionCombineRule = undefined;
-export let friction = undefined;
-export let frictionCombineRule = undefined;
-export let sensor = undefined;
-export let contactForceEventThreshold = undefined;
-export let density = undefined;
-export let mass = undefined;
-export let centerOfMass = undefined;
-export let principalAngularInertia = undefined;
-export let angularInertiaLocalFrame = undefined;
+let { shape = 'convexHull', restitution, restitutionCombineRule, friction, frictionCombineRule, sensor, contactForceEventThreshold, density, mass, centerOfMass, principalAngularInertia, angularInertiaLocalFrame, refresh = $bindable(() => create()), colliders = $bindable(), ...props } = $props();
 const group = new Group();
-const { updateRef } = useCreateEvent();
+const { updateRef } = useCreateEvent(props.$$events);
 const rigidBody = useRigidBody();
 const rigidBodyParentObject = useParentRigidbodyObject();
 const { world, addColliderToContext, removeColliderFromContext } = useRapier();
-export let colliders = [];
 const collisionGroups = useCollisionGroups();
-const dispatcher = createRawEventDispatcher();
-const { hasEventListeners: colliderHasEventListeners } = useHasEventListeners();
 const cleanup = () => {
+    if (colliders === undefined)
+        return;
     collisionGroups.removeColliders(colliders);
     colliders.forEach((c) => {
         removeColliderFromContext(c);
@@ -40,13 +27,13 @@ const cleanup = () => {
     });
     colliders.length = 0;
 };
-export const create = () => {
+const create = () => {
     cleanup();
     colliders = createCollidersFromChildren(group, shape ?? 'convexHull', world, rigidBody, rigidBodyParentObject);
-    colliders.forEach((c) => addColliderToContext(c, group, dispatcher));
+    colliders.forEach((c) => addColliderToContext(c, group, props.$$events));
     collisionGroups.registerColliders(colliders);
     colliders.forEach((collider) => {
-        applyColliderActiveEvents(collider, colliderHasEventListeners, rigidBody?.userData?.hasEventListeners);
+        applyColliderActiveEvents(collider, props.$$events, rigidBody?.userData?.events);
         collider.setActiveCollisionTypes(ActiveCollisionTypes.ALL);
         collider.setRestitution(restitution ?? 0);
         collider.setRestitutionCombineRule(restitutionCombineRule ?? CoefficientCombineRule.Average);
@@ -72,9 +59,6 @@ export const create = () => {
 onMount(() => {
     create();
 });
-export const refresh = () => {
-    create();
-};
 /**
  * Cleanup
  */

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

@@ -57,10 +57,10 @@ export type MassDef = Density | Mass | MassProperties | NoMassProperties
 type MassProps<TMassDef extends MassDef> = TMassDef extends Density
   ? Density
   : TMassDef extends MassProperties
-  ? MassProperties
-  : TMassDef extends Mass
-  ? Mass
-  : NoMassProperties
+    ? MassProperties
+    : TMassDef extends Mass
+      ? Mass
+      : NoMassProperties
 
 // ------------------ COLLIDER ------------------
 

package/dist/components/Colliders/Collider.svelte

@@ -1,9 +1,8 @@
-<script>import { ActiveCollisionTypes, CoefficientCombineRule, Collider, ColliderDesc } from '@dimforge/rapier3d-compat';
-import { createRawEventDispatcher, SceneGraphObject, useFrame } from '@threlte/core';
+<script lang="ts">import { ActiveCollisionTypes, CoefficientCombineRule, Collider, ColliderDesc } from '@dimforge/rapier3d-compat';
+import { SceneGraphObject, useTask } from '@threlte/core';
 import { onDestroy, onMount, tick } from 'svelte';
 import { Object3D, Quaternion, Vector3 } from 'three';
 import { useCollisionGroups } from '../../hooks/useCollisionGroups';
-import { useHasEventListeners } from '../../hooks/useHasEventListener';
 import { useRapier } from '../../hooks/useRapier';
 import { useRigidBody } from '../../hooks/useRigidBody';
 import { useParentRigidbodyObject } from '../../lib/rigidBodyObjectContext';
@@ -12,30 +11,20 @@ import { applyColliderActiveEvents } from '../../lib/applyColliderActiveEvents';
 import { eulerToQuaternion } from '../../lib/eulerToQuaternion';
 import { getWorldPosition, getWorldQuaternion } from '../../lib/getWorldTransforms';
 import { scaleColliderArgs } from '../../lib/scaleColliderArgs';
-export let shape;
-export let args;
-export let type = undefined;
-export let restitution = undefined;
-export let restitutionCombineRule = undefined;
-export let friction = undefined;
-export let frictionCombineRule = undefined;
-export let sensor = undefined;
-export let contactForceEventThreshold = undefined;
-export let density = undefined;
-export let mass = undefined;
-export let centerOfMass = undefined;
-export let principalAngularInertia = undefined;
-export let angularInertiaLocalFrame = undefined;
+let { shape, args, type, restitution, restitutionCombineRule, friction, frictionCombineRule, sensor, contactForceEventThreshold, density, mass, centerOfMass, principalAngularInertia, angularInertiaLocalFrame, collider = $bindable(), refresh = $bindable(() => {
+    if (!collider)
+        return;
+    collider.setTranslation(getWorldPosition(object));
+    collider.setRotation(getWorldQuaternion(object));
+}), ...props } = $props();
 const object = new Object3D();
-const { updateRef } = useCreateEvent();
+const { updateRef } = useCreateEvent(props.$$events);
 const rigidBody = useRigidBody();
 const parentRigidBodyObject = useParentRigidbodyObject();
 const hasRigidBodyParent = !!rigidBody;
 const rapierContext = useRapier();
 const { world } = rapierContext;
-export let collider = undefined;
 const collisionGroups = useCollisionGroups();
-const dispatcher = createRawEventDispatcher();
 /**
  * Actual collider setup happens onMount as only then
  * the transforms are finished.
@@ -52,7 +41,7 @@ onMount(async () => {
     /**
      * Add collider to context
      */
-    rapierContext.addColliderToContext(collider, object, dispatcher);
+    rapierContext.addColliderToContext(collider, object, props.$$events);
     /**
      * For use in conjunction with component <CollisionGroups>
      */
@@ -75,51 +64,58 @@ onMount(async () => {
         collider.setRotation(object.getWorldQuaternion(new Quaternion()));
     }
 });
-const { hasEventListeners: colliderHasEventListeners } = useHasEventListeners();
-$: collider?.setRestitution(restitution ?? 0);
-$: collider?.setRestitutionCombineRule(restitutionCombineRule ?? CoefficientCombineRule.Average);
-$: collider?.setFriction(friction ?? 0.7);
-$: collider?.setFrictionCombineRule(frictionCombineRule ?? CoefficientCombineRule.Average);
-$: collider?.setSensor(sensor ?? false);
-$: collider?.setContactForceEventThreshold(contactForceEventThreshold ?? 0);
-$: if (density)
-    collider?.setDensity(density);
-$: 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));
+$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);
+        }
     }
-    else {
-        collider.setMass(mass);
+});
+$effect.pre(() => {
+    if (collider) {
+        applyColliderActiveEvents(collider, props.$$events, rigidBody?.userData?.events);
     }
-}
-$: if (collider) {
-    applyColliderActiveEvents(collider, colliderHasEventListeners, rigidBody?.userData?.hasEventListeners);
-}
-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 } = useFrame(() => {
+const { start, stop } = useTask(() => {
     refresh();
 }, {
-    autostart: !hasRigidBodyParent && type === 'dynamic'
+    autoStart: !hasRigidBodyParent && type === 'dynamic'
 });
-$: {
+$effect.pre(() => {
     if (!hasRigidBodyParent && type === 'dynamic')
         start();
     else
         stop();
-}
+});
 /**
  * Cleanup
  */

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

@@ -89,10 +89,10 @@ export type MassDef = Density | Mass | MassProperties | NoMassProperties
 type MassProps<TMassDef extends MassDef> = TMassDef extends Density
   ? Density
   : TMassDef extends MassProperties
-  ? MassProperties
-  : TMassDef extends Mass
-  ? Mass
-  : NoMassProperties
+    ? MassProperties
+    : TMassDef extends Mass
+      ? Mass
+      : NoMassProperties
 
 // ------------------ COLLIDER ------------------
 

package/dist/components/CollisionGroups/CollisionGroups.svelte

@@ -1,4 +1,4 @@
-<script>import { setContext } from 'svelte';
+<script lang="ts">import { setContext } from 'svelte';
 import { writable } from 'svelte/store';
 import { computeBitMask } from '../../lib/computeBitMask';
 export let groups = undefined;

package/dist/components/Debug/Debug.svelte

@@ -1,11 +1,11 @@
-<script>import { T, useFrame } from '@threlte/core';
+<script lang="ts">import { T, useTask } from '@threlte/core';
 import { onDestroy } from 'svelte';
 import { BufferAttribute, BufferGeometry } from 'three';
 import { useRapier } from '../../hooks/useRapier';
 const { world, debug } = useRapier();
 const geometry = new BufferGeometry();
 debug.set(true);
-useFrame(() => {
+useTask(() => {
     const buffers = world.debugRender();
     const vertices = new BufferAttribute(buffers.vertices, 3);
     const colors = new BufferAttribute(buffers.colors, 4);

package/dist/components/RigidBody/RigidBody.svelte

@@ -1,30 +1,14 @@
-<script>import { createRawEventDispatcher, SceneGraphObject } from '@threlte/core';
+<script lang="ts">import { SceneGraphObject } from '@threlte/core';
 import { onDestroy, setContext, tick } from 'svelte';
 import { Object3D, Vector3 } from 'three';
-import { useHasEventListeners } from '../../hooks/useHasEventListener';
 import { useRapier } from '../../hooks/useRapier';
 import { getWorldPosition, getWorldQuaternion, getWorldScale } from '../../lib/getWorldTransforms';
 import { parseRigidBodyType } from '../../lib/parseRigidBodyType';
 import { setParentRigidbodyObject } from '../../lib/rigidBodyObjectContext';
 import { useCreateEvent } from '../../lib/useCreateEvent';
 const { world, rapier, addRigidBodyToContext, removeRigidBodyFromContext } = useRapier();
-export let linearVelocity = undefined;
-export let angularVelocity = undefined;
-export let type = 'dynamic';
-export let canSleep = true;
-export let gravityScale = 1;
-export let ccd = false;
-export let angularDamping = 0;
-export let linearDamping = 0;
-export let lockRotations = false;
-export let lockTranslations = false;
-export let enabledRotations = [true, true, true];
-export let enabledTranslations = [true, true, true];
-export let dominance = 0;
-export let enabled = true;
-export let userData = {};
-const dispatcher = createRawEventDispatcher();
-const { updateRef } = useCreateEvent();
+let { linearVelocity, angularVelocity, type = 'dynamic', canSleep = true, gravityScale = 1, ccd = false, angularDamping = 0, linearDamping = 0, lockRotations = false, lockTranslations = false, enabledRotations = [true, true, true], enabledTranslations = [true, true, true], dominance = 0, enabled = true, userData = {}, rigidBody = $bindable(), ...props } = $props();
+const { updateRef } = useCreateEvent(props.$$events);
 const object = new Object3D();
 /**
  * isSleeping used for events "sleep" and "wake" in `useFrameHandler`
@@ -34,14 +18,11 @@ object.userData.isSleeping = false;
  * RigidBody Description
  */
 const desc = new rapier.RigidBodyDesc(parseRigidBodyType(type)).setCanSleep(canSleep);
-/**
- * Export the rigidBody only after positional initialization
- */
-export let rigidBody = undefined;
 /**
  * Temporary RigidBody init
  */
-const rigidBodyTemp = world.createRigidBody(desc);
+let rigidBodyInternal = world.createRigidBody(desc);
+rigidBody = rigidBodyInternal;
 /**
  * Apply transforms after the parent component added "object" to itself
  */
@@ -52,47 +33,50 @@ const initPosition = async () => {
     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);
-    rigidBody = rigidBodyTemp;
-    updateRef(rigidBody);
+    rigidBodyInternal.setTranslation(worldPosition, true);
+    rigidBodyInternal.setRotation(worldQuaternion, true);
+    updateRef(rigidBodyInternal);
 };
 initPosition();
 /**
  * Will come in handy in the future for joints
  */
-object.userData.rigidBody = rigidBodyTemp;
-/**
- * Reactive RigidBody properties
- */
-$: rigidBodyTemp.setBodyType(parseRigidBodyType(type), true);
-$: if (linearVelocity)
-    rigidBodyTemp.setLinvel({ x: linearVelocity[0], y: linearVelocity[1], z: linearVelocity[2] }, true);
-$: if (angularVelocity)
-    rigidBodyTemp.setAngvel({ x: angularVelocity[0], y: angularVelocity[1], z: angularVelocity[2] }, 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);
-$: rigidBodyTemp.setAngularDamping(angularDamping);
-$: rigidBodyTemp.setLinearDamping(linearDamping);
-$: rigidBodyTemp.setEnabled(enabled);
+object.userData.rigidBody = rigidBodyInternal;
+$effect.pre(() => rigidBodyInternal.setBodyType(parseRigidBodyType(type), true));
+$effect.pre(() => {
+    if (linearVelocity) {
+        rigidBodyInternal.setLinvel({ x: linearVelocity[0], y: linearVelocity[1], z: linearVelocity[2] }, true);
+    }
+});
+$effect.pre(() => {
+    if (angularVelocity) {
+        rigidBodyInternal.setAngvel({ x: angularVelocity[0], y: angularVelocity[1], z: angularVelocity[2] }, true);
+    }
+});
+$effect.pre(() => rigidBodyInternal.setGravityScale(gravityScale, true));
+$effect.pre(() => rigidBodyInternal.enableCcd(ccd));
+$effect.pre(() => rigidBodyInternal.setDominanceGroup(dominance));
+$effect.pre(() => rigidBodyInternal.lockRotations(lockRotations, true));
+$effect.pre(() => rigidBodyInternal.lockTranslations(lockTranslations, true));
+$effect.pre(() => rigidBodyInternal.setEnabledRotations(...enabledRotations, true));
+$effect.pre(() => rigidBodyInternal.setEnabledTranslations(...enabledTranslations, true));
+$effect.pre(() => rigidBodyInternal.setAngularDamping(angularDamping));
+$effect.pre(() => rigidBodyInternal.setLinearDamping(linearDamping));
+$effect.pre(() => rigidBodyInternal.setEnabled(enabled));
 /**
  * Add userData to the rigidBody
  */
-const { hasEventListeners } = useHasEventListeners();
-$: rigidBodyTemp.userData = {
-    hasEventListeners,
-    ...userData
-};
+$effect.pre(() => {
+    rigidBodyInternal.userData = {
+        events: props.$$events,
+        ...userData
+    };
+});
 /**
  * Setting the RigidBody context so that colliders can
  * hook onto.
  */
-setContext('threlte-rapier-rigidbody', rigidBodyTemp);
+setContext('threlte-rapier-rigidbody', rigidBodyInternal);
 /**
  * Used by child colliders to restore transform
  */
@@ -100,16 +84,16 @@ setParentRigidbodyObject(object);
 /**
  * Add the mesh to the context
  */
-addRigidBodyToContext(rigidBodyTemp, object, dispatcher);
+addRigidBodyToContext(rigidBodyInternal, object, props.$$events);
 /**
  * cleanup
  */
 onDestroy(() => {
-    removeRigidBodyFromContext(rigidBodyTemp);
-    world.removeRigidBody(rigidBodyTemp);
+    removeRigidBodyFromContext(rigidBodyInternal);
+    world.removeRigidBody(rigidBodyInternal);
 });
 </script>
 
 <SceneGraphObject {object}>
-  <slot {rigidBody} />
+  <slot rigidBody={rigidBodyInternal} />
 </SceneGraphObject>

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

@@ -7,7 +7,7 @@ import type { RigidBodyEventMap } from '../../types/types'
 export type Boolean3Array = [x: boolean, y: boolean, z: boolean]
 
 export type RigidBodyProps = {
-  rigidBody?: RapierRigidBody
+  rigidBody: RapierRigidBody
 
   /**
    * Specify the type of this rigid body
@@ -58,7 +58,7 @@ export type RigidBodyProps = {
   enabledRotations?: Boolean3Array
 
   /**
-   * Allow rotation of this rigid-body only along specific axes.
+   * Allow translations of this rigid-body only along specific axes.
    */
   enabledTranslations?: Boolean3Array
 

package/dist/components/World/InnerWorld.svelte

@@ -1,12 +1,12 @@
 <script
   context="module"
- 
+  lang="ts"
 >import { onDestroy, setContext, tick } from 'svelte';
 import { useFrameHandler } from '../../hooks/useFrameHandler';
 import { createRapierContext } from '../../lib/createRapierContext';
 </script>
 
-<script>export let gravity = [0, -9.81, 0];
+<script lang="ts">export let gravity = [0, -9.81, 0];
 export let rawIntegrationParameters = undefined;
 export let rawIslands = undefined;
 export let rawBroadPhase = undefined;
@@ -20,13 +20,13 @@ export let rawQueryPipeline = undefined;
 export let rawPhysicsPipeline = undefined;
 export let rawSerializationPipeline = undefined;
 export let rawDebugRenderPipeline = undefined;
-export let order = undefined;
+export let stage = undefined;
 const rapierContext = createRapierContext({ x: gravity[0], y: gravity[1], z: gravity[2] }, rawIntegrationParameters, rawIslands, rawBroadPhase, rawNarrowPhase, rawBodies, rawColliders, rawImpulseJoints, rawMultibodyJoints, rawCCDSolver, rawQueryPipeline, rawPhysicsPipeline, rawSerializationPipeline, rawDebugRenderPipeline);
 setContext('threlte-rapier-context', rapierContext);
 $: if (gravity !== undefined) {
     rapierContext.world.gravity = { x: gravity[0], y: gravity[1], z: gravity[2] };
 }
-useFrameHandler(rapierContext, order);
+useFrameHandler(rapierContext, stage);
 onDestroy(async () => {
     await tick();
     rapierContext.world.free();

package/dist/components/World/InnerWorld.svelte.d.ts

@@ -1,22 +1,7 @@
-import { SvelteComponentTyped } from "svelte";
+import { SvelteComponent } from "svelte";
+import type { WorldProps } from './World.svelte';
 declare const __propDef: {
-    props: {
-        gravity?: [x: number, y: number, z: number] | undefined;
-        rawIntegrationParameters?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawIntegrationParameters | undefined;
-        rawIslands?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawIslandManager | undefined;
-        rawBroadPhase?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawBroadPhase | undefined;
-        rawNarrowPhase?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawNarrowPhase | undefined;
-        rawBodies?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawRigidBodySet | undefined;
-        rawColliders?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawColliderSet | undefined;
-        rawImpulseJoints?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawImpulseJointSet | undefined;
-        rawMultibodyJoints?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawMultibodyJointSet | undefined;
-        rawCCDSolver?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawCCDSolver | undefined;
-        rawQueryPipeline?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawQueryPipeline | undefined;
-        rawPhysicsPipeline?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawPhysicsPipeline | undefined;
-        rawSerializationPipeline?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawSerializationPipeline | undefined;
-        rawDebugRenderPipeline?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawDebugRenderPipeline | undefined;
-        order?: number | undefined;
-    };
+    props: WorldProps;
     events: {
         [evt: string]: CustomEvent<any>;
     };
@@ -27,6 +12,6 @@ declare const __propDef: {
 export type InnerWorldProps = typeof __propDef.props;
 export type InnerWorldEvents = typeof __propDef.events;
 export type InnerWorldSlots = typeof __propDef.slots;
-export default class InnerWorld extends SvelteComponentTyped<InnerWorldProps, InnerWorldEvents, InnerWorldSlots> {
+export default class InnerWorld extends SvelteComponent<InnerWorldProps, InnerWorldEvents, InnerWorldSlots> {
 }
 export {};

package/dist/components/World/World.svelte

@@ -1,6 +1,6 @@
 <script
   context="module"
- 
+  lang="ts"
 >import RAPIER from '@dimforge/rapier3d-compat';
 import { onMount } from 'svelte';
 import { writable } from 'svelte/store';
@@ -10,7 +10,7 @@ import { writable } from 'svelte/store';
 const initialized = writable(false);
 </script>
 
-<script>import InnerWorld from './InnerWorld.svelte';
+<script lang="ts">import InnerWorld from './InnerWorld.svelte';
 // self
 export let gravity = undefined;
 export let rawIntegrationParameters = undefined;
@@ -27,11 +27,11 @@ export let rawPhysicsPipeline = undefined;
 export let rawSerializationPipeline = undefined;
 export let rawDebugRenderPipeline = undefined;
 /**
-* The property order is passed to the useFrame handler.
-* Use this to control when the rapier physics engine is updating the scene.
-* @default undefined
-*/
-export let order = undefined;
+ * This is passed to the useTask handler.
+ * Use this to control when the rapier physics engine is updating the scene.
+ * @default undefined
+ */
+export let stage = undefined;
 let error = false;
 const init = async () => {
     if ($initialized)
@@ -63,7 +63,7 @@ onMount(init);
     {rawPhysicsPipeline}
     {rawSerializationPipeline}
     {rawDebugRenderPipeline}
-		{order}
+    {stage}
   >
     <slot />
   </InnerWorld>

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

@@ -13,8 +13,9 @@ import type {
   RawRigidBodySet,
   RawSerializationPipeline
 } from '@dimforge/rapier3d-compat/raw'
-import { SvelteComponentTyped } from 'svelte'
+import { SvelteComponent } from 'svelte'
 import type { Vector3 } from 'three'
+import type { Key, Stage } from '@threlte/core'
 
 export type WorldProps = {
   gravity?: Parameters<Vector3['set']>
@@ -31,7 +32,7 @@ export type WorldProps = {
   rawPhysicsPipeline?: RawPhysicsPipeline
   rawSerializationPipeline?: RawSerializationPipeline
   rawDebugRenderPipeline?: RawDebugRenderPipeline
-  order?: number
+  stage?: Key | Stage
 }
 
-export default class World extends SvelteComponentTyped<WorldProps> {}
+export default class World extends SvelteComponent<WorldProps> {}

package/dist/hooks/useFrameHandler.d.ts

@@ -1,2 +1,3 @@
+import { type Stage, type Key } from '@threlte/core';
 import type { RapierContext } from '../types/types';
-export declare const useFrameHandler: (ctx: RapierContext, order?: number) => void;
+export declare const useFrameHandler: (ctx: RapierContext, stage?: Stage | Key) => void;

package/dist/hooks/useFrameHandler.js

@@ -1,31 +1,31 @@
-import { Collider, EventQueue } from '@dimforge/rapier3d-compat';
-import { useFrame } from '@threlte/core';
+import { EventQueue } from '@dimforge/rapier3d-compat';
+import { useTask } from '@threlte/core';
 import { derived } from 'svelte/store';
 import { Object3D, Quaternion, Vector3 } from 'three';
 const tempObject = new Object3D();
 const tempVector3 = new Vector3();
 const tempQuaternion = new Quaternion();
 const getEventDispatchers = (ctx, collider1, collider2) => {
-    const colliderDispatcher1 = ctx.colliderEventDispatchers.get(collider1.handle);
-    const colliderDispatcher2 = ctx.colliderEventDispatchers.get(collider2.handle);
+    const collider1Events = ctx.colliderEventDispatchers.get(collider1.handle);
+    const collider2Events = ctx.colliderEventDispatchers.get(collider2.handle);
     const rigidBody1 = collider1.parent();
     const rigidBody2 = collider2.parent();
-    const rigidBodyDispatcher1 = rigidBody1
+    const rigidBody1Events = rigidBody1
         ? ctx.rigidBodyEventDispatchers.get(rigidBody1.handle)
         : undefined;
-    const rigidBodyDispatcher2 = rigidBody2
+    const rigidBody2Events = rigidBody2
         ? ctx.rigidBodyEventDispatchers.get(rigidBody2.handle)
         : undefined;
     return {
-        colliderDispatcher1,
-        colliderDispatcher2,
-        rigidBodyDispatcher1,
-        rigidBodyDispatcher2
+        collider1Events,
+        collider2Events,
+        rigidBody1Events,
+        rigidBody2Events
     };
 };
-export const useFrameHandler = (ctx, order) => {
+export const useFrameHandler = (ctx, stage) => {
     const eventQueue = new EventQueue(false);
-    const { start, started, stop } = useFrame((_, delta) => {
+    const { start, started, stop } = useTask((delta) => {
         // if (!eventQueue) return
         const { world } = ctx;
         // Set timestep to current delta, to allow for variable frame rates
@@ -37,15 +37,15 @@ export const useFrameHandler = (ctx, order) => {
             const rigidBody = world.getRigidBody(handle);
             if (!rigidBody)
                 return;
-            const dispatcher = ctx.rigidBodyEventDispatchers.get(handle);
+            const events = ctx.rigidBodyEventDispatchers.get(handle);
             if (!rigidBody || !rigidBody.isValid())
                 return;
-            if (dispatcher) {
+            if (events) {
                 if (rigidBody.isSleeping() && !mesh.userData.isSleeping) {
-                    dispatcher('sleep');
+                    events.sleep?.();
                 }
                 if (!rigidBody.isSleeping() && mesh.userData.isSleeping) {
-                    dispatcher('wake');
+                    events.wake?.();
                 }
                 mesh.userData.isSleeping = rigidBody.isSleeping();
             }
@@ -75,11 +75,11 @@ export const useFrameHandler = (ctx, order) => {
             if (!collider1 || !collider2) {
                 return;
             }
-            const { colliderDispatcher1, colliderDispatcher2, rigidBodyDispatcher1, rigidBodyDispatcher2 } = getEventDispatchers(ctx, collider1, collider2);
+            const { collider1Events, collider2Events, rigidBody1Events, rigidBody2Events } = getEventDispatchers(ctx, collider1, collider2);
             const rigidBody1 = collider1.parent();
             const rigidBody2 = collider2.parent();
             // Collider events
-            colliderDispatcher1?.('contact', {
+            collider1Events?.contact?.({
                 targetCollider: collider2,
                 targetRigidBody: rigidBody2,
                 maxForceDirection: e.maxForceDirection(),
@@ -87,7 +87,7 @@ export const useFrameHandler = (ctx, order) => {
                 totalForce: e.totalForce(),
                 totalForceMagnitude: e.totalForceMagnitude()
             });
-            colliderDispatcher2?.('contact', {
+            collider2Events?.contact?.({
                 targetCollider: collider1,
                 targetRigidBody: rigidBody1,
                 maxForceDirection: e.maxForceDirection(),
@@ -96,7 +96,7 @@ export const useFrameHandler = (ctx, order) => {
                 totalForceMagnitude: e.totalForceMagnitude()
             });
             // RigidBody Events
-            rigidBodyDispatcher1?.('contact', {
+            rigidBody1Events?.contact?.({
                 targetCollider: collider2,
                 targetRigidBody: rigidBody2,
                 maxForceDirection: e.maxForceDirection(),
@@ -104,7 +104,7 @@ export const useFrameHandler = (ctx, order) => {
                 totalForce: e.totalForce(),
                 totalForceMagnitude: e.totalForceMagnitude()
             });
-            rigidBodyDispatcher2?.('contact', {
+            rigidBody2Events?.contact?.({
                 targetCollider: collider1,
                 targetRigidBody: rigidBody1,
                 maxForceDirection: e.maxForceDirection(),
@@ -121,7 +121,10 @@ export const useFrameHandler = (ctx, order) => {
             if (!collider1 || !collider2) {
                 return;
             }
-            const { colliderDispatcher1, colliderDispatcher2, rigidBodyDispatcher1, rigidBodyDispatcher2 } = getEventDispatchers(ctx, collider1, collider2);
+            const { collider1Events, collider2Events, rigidBody1Events, rigidBody2Events } = getEventDispatchers(ctx, collider1, collider2);
+            if (!collider1Events && !collider2Events && !rigidBody1Events && !rigidBody2Events) {
+                return;
+            }
             const rigidBody1 = collider1.parent();
             const rigidBody2 = collider2.parent();
             if (started) {
@@ -129,20 +132,20 @@ export const useFrameHandler = (ctx, order) => {
                 const isIntersection = world.intersectionPair(collider1, collider2);
                 if (isIntersection) {
                     // Collider Events
-                    colliderDispatcher1?.('sensorenter', {
+                    collider1Events?.sensorenter?.({
                         targetCollider: collider2,
                         targetRigidBody: rigidBody2
                     });
-                    colliderDispatcher2?.('sensorenter', {
+                    collider2Events?.sensorenter?.({
                         targetCollider: collider1,
                         targetRigidBody: rigidBody1
                     });
                     // RigidBody Events
-                    rigidBodyDispatcher1?.('sensorenter', {
+                    rigidBody1Events?.sensorenter?.({
                         targetCollider: collider2,
                         targetRigidBody: rigidBody2
                     });
-                    rigidBodyDispatcher2?.('sensorenter', {
+                    rigidBody2Events?.sensorenter?.({
                         targetCollider: collider1,
                         targetRigidBody: rigidBody1
                     });
@@ -151,26 +154,26 @@ export const useFrameHandler = (ctx, order) => {
                 }
                 world.contactPair(collider1, collider2, (manifold, flipped) => {
                     // Collider events
-                    colliderDispatcher1?.('collisionenter', {
+                    collider1Events?.collisionenter?.({
                         flipped,
                         manifold,
                         targetCollider: collider2,
                         targetRigidBody: rigidBody2
                     });
-                    colliderDispatcher2?.('collisionenter', {
+                    collider2Events?.collisionenter?.({
                         flipped,
                         manifold,
                         targetCollider: collider1,
                         targetRigidBody: rigidBody1
                     });
                     // RigidBody Events
-                    rigidBodyDispatcher1?.('collisionenter', {
+                    rigidBody1Events?.collisionenter?.({
                         flipped,
                         manifold,
                         targetCollider: collider2,
                         targetRigidBody: rigidBody2
                     });
-                    rigidBodyDispatcher2?.('collisionenter', {
+                    rigidBody2Events?.collisionenter?.({
                         flipped,
                         manifold,
                         targetCollider: collider1,
@@ -185,20 +188,20 @@ export const useFrameHandler = (ctx, order) => {
                     collider1.isSensor() ||
                     collider2.isSensor();
                 if (isIntersection) {
-                    colliderDispatcher1?.('sensorexit', {
+                    collider1Events?.sensorexit?.({
                         targetCollider: collider2,
                         targetRigidBody: rigidBody2
                     });
-                    colliderDispatcher2?.('sensorexit', {
+                    collider2Events?.sensorexit?.({
                         targetCollider: collider1,
                         targetRigidBody: rigidBody1
                     });
                     // RigidBody Events
-                    rigidBodyDispatcher1?.('sensorexit', {
+                    rigidBody1Events?.sensorexit?.({
                         targetCollider: collider2,
                         targetRigidBody: rigidBody2
                     });
-                    rigidBodyDispatcher2?.('sensorexit', {
+                    rigidBody2Events?.sensorexit?.({
                         targetCollider: collider1,
                         targetRigidBody: rigidBody1
                     });
@@ -206,26 +209,26 @@ export const useFrameHandler = (ctx, order) => {
                     return;
                 }
                 // Collider events
-                colliderDispatcher1?.('collisionexit', {
+                collider1Events?.collisionexit?.({
                     targetCollider: collider2,
                     targetRigidBody: rigidBody2
                 });
-                colliderDispatcher2?.('collisionexit', {
+                collider2Events?.collisionexit?.({
                     targetCollider: collider1,
                     targetRigidBody: rigidBody1
                 });
                 // RigidBody Events
-                rigidBodyDispatcher1?.('collisionexit', {
+                rigidBody1Events?.collisionexit?.({
                     targetCollider: collider2,
                     targetRigidBody: rigidBody2
                 });
-                rigidBodyDispatcher2?.('collisionexit', {
+                rigidBody2Events?.collisionexit?.({
                     targetCollider: collider1,
                     targetRigidBody: rigidBody1
                 });
             }
         });
-    }, { order });
+    }, { stage });
     // replacing the original pause and resume functions as well as the paused property
     ctx.pause = () => stop();
     ctx.resume = () => start();

package/dist/hooks/useHasEventListener.js

@@ -1,9 +1,9 @@
-import { get_current_component } from 'svelte/internal';
 export const useHasEventListeners = () => {
-    const component = get_current_component();
+    // const component = get_current_component()
     const hasEventListeners = (type) => {
-        const callbacks = component.$$.callbacks;
-        return type in callbacks && callbacks[type].length > 0;
+        // const callbacks = component.$$.callbacks
+        return true;
+        // return type in callbacks && (callbacks[type] as any[]).length > 0
     };
     return {
         hasEventListeners

package/dist/lib/applyColliderActiveEvents.d.ts

@@ -1,4 +1,2 @@
 import { type Collider } from '@dimforge/rapier3d-compat';
-import type { useHasEventListeners } from '../hooks/useHasEventListener';
-import type { ColliderEventDispatcher, RigidBodyEventDispatcher } from '../types/types';
-export declare const applyColliderActiveEvents: (collider: Collider, colliderHasEventListeners: ReturnType<typeof useHasEventListeners<ColliderEventDispatcher>>['hasEventListeners'], rigidBodyHasEventListeners?: ReturnType<typeof useHasEventListeners<RigidBodyEventDispatcher>>['hasEventListeners']) => void;
+export declare const applyColliderActiveEvents: (collider: Collider, colliderEvents?: Record<string, (arg: unknown) => void>, rigidBodyEvents?: Record<string, (arg: unknown) => void>) => void;

package/dist/lib/applyColliderActiveEvents.js

@@ -1,17 +1,17 @@
 import { ActiveEvents } from '@dimforge/rapier3d-compat';
-export const applyColliderActiveEvents = (collider, colliderHasEventListeners, rigidBodyHasEventListeners) => {
+export const applyColliderActiveEvents = (collider, colliderEvents = {}, rigidBodyEvents = {}) => {
     let events = 0;
-    if (colliderHasEventListeners('collisionenter') ||
-        colliderHasEventListeners('collisionexit') ||
-        rigidBodyHasEventListeners?.('collisionenter') ||
-        rigidBodyHasEventListeners?.('collisionexit') ||
-        colliderHasEventListeners('sensorenter') ||
-        colliderHasEventListeners('sensorexit') ||
-        rigidBodyHasEventListeners?.('sensorenter') ||
-        rigidBodyHasEventListeners?.('sensorexit')) {
+    if (colliderEvents.collisionenter ||
+        colliderEvents.collisionexit ||
+        rigidBodyEvents.collisionenter ||
+        rigidBodyEvents.collisionexit ||
+        colliderEvents.sensorenter ||
+        colliderEvents.sensorexit ||
+        rigidBodyEvents.sensorenter ||
+        rigidBodyEvents.sensorexit) {
         events = events | ActiveEvents.COLLISION_EVENTS;
     }
-    if (colliderHasEventListeners('contact') || rigidBodyHasEventListeners?.('contact')) {
+    if (colliderEvents.contact || rigidBodyEvents.contact) {
         events = events | ActiveEvents.CONTACT_FORCE_EVENTS;
     }
     if (events > 0) {

package/dist/lib/createCollidersFromChildren.js

@@ -1,5 +1,5 @@
-import { ActiveEvents, Collider, ColliderDesc, World, RigidBody } from '@dimforge/rapier3d-compat';
-import { Mesh, Quaternion, Vector3 } from 'three';
+import { ActiveEvents, ColliderDesc } from '@dimforge/rapier3d-compat';
+import { Quaternion, Vector3 } from 'three';
 const offset = new Vector3();
 const worldPosition = new Vector3();
 const worldQuaternion = new Quaternion();

package/dist/lib/createRapierContext.d.ts

@@ -2,7 +2,7 @@
 import type { Collider, RigidBody } from '@dimforge/rapier3d-compat';
 import RAPIER from '@dimforge/rapier3d-compat';
 import type { Object3D } from 'three';
-import type { ColliderEventDispatcher, ColliderEventDispatchers, RigidBodyEventDispatcher, RigidBodyEventDispatchers } from '../types/types';
+import type { ColliderEventDispatchers, RigidBodyEventDispatchers } from '../types/types';
 export declare const createRapierContext: (gravity: RAPIER.Vector, rawIntegrationParameters?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawIntegrationParameters | undefined, rawIslands?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawIslandManager | undefined, rawBroadPhase?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawBroadPhase | undefined, rawNarrowPhase?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawNarrowPhase | undefined, rawBodies?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawRigidBodySet | undefined, rawColliders?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawColliderSet | undefined, rawImpulseJoints?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawImpulseJointSet | undefined, rawMultibodyJoints?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawMultibodyJointSet | undefined, rawCCDSolver?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawCCDSolver | undefined, rawQueryPipeline?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawQueryPipeline | undefined, rawPhysicsPipeline?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawPhysicsPipeline | undefined, rawSerializationPipeline?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawSerializationPipeline | undefined, rawDebugRenderPipeline?: import("@dimforge/rapier3d-compat/rapier_wasm3d").RawDebugRenderPipeline | undefined) => {
     rapier: typeof RAPIER;
     world: RAPIER.World;
@@ -10,9 +10,9 @@ export declare const createRapierContext: (gravity: RAPIER.Vector, rawIntegratio
     rigidBodyObjects: Map<number, Object3D<import("three").Object3DEventMap>>;
     rigidBodyEventDispatchers: RigidBodyEventDispatchers;
     colliderEventDispatchers: ColliderEventDispatchers;
-    addColliderToContext: (collider: Collider, object: Object3D, eventDispatcher: ColliderEventDispatcher) => void;
+    addColliderToContext: (collider: Collider, object: Object3D, events: Record<string, (arg: unknown) => void>) => void;
     removeColliderFromContext: (collider: Collider) => void;
-    addRigidBodyToContext: (rigidBody: RigidBody, object: Object3D, eventDispatcher: RigidBodyEventDispatcher) => void;
+    addRigidBodyToContext: (rigidBody: RigidBody, object: Object3D, events: Record<string, (arg: unknown) => void>) => void;
     removeRigidBodyFromContext: (rigidBody: RigidBody) => void;
     debug: import("svelte/store").Writable<boolean>;
     pause: () => void;

package/dist/lib/createRapierContext.js

@@ -12,9 +12,9 @@ export const createRapierContext = (...args) => {
      * @param object
      * @param eventDispatcher
      */
-    const addColliderToContext = (collider, object, eventDispatcher) => {
+    const addColliderToContext = (collider, object, events) => {
         colliderObjects.set(collider.handle, object);
-        colliderEventDispatchers.set(collider.handle, eventDispatcher);
+        colliderEventDispatchers.set(collider.handle, events);
     };
     /**
      * Removes the collider from the context
@@ -30,9 +30,9 @@ export const createRapierContext = (...args) => {
      * @param object
      * @param eventDispatcher
      */
-    const addRigidBodyToContext = (rigidBody, object, eventDispatcher) => {
+    const addRigidBodyToContext = (rigidBody, object, events) => {
         rigidBodyObjects.set(rigidBody.handle, object);
-        rigidBodyEventDispatchers.set(rigidBody.handle, eventDispatcher);
+        rigidBodyEventDispatchers.set(rigidBody.handle, events);
     };
     /**
      * Removes the RigidBody from the context

package/dist/lib/getWorldTransforms.js

@@ -1,4 +1,4 @@
-import { Euler, Object3D, Quaternion, Vector3 } from 'three';
+import { Euler, Quaternion, Vector3 } from 'three';
 const tempPosition = new Vector3();
 const tempQuaternion = new Quaternion();
 const tempRotation = new Euler();

package/dist/lib/useCreateEvent.d.ts

@@ -1,3 +1,3 @@
-export declare const useCreateEvent: <T>() => {
+export declare const useCreateEvent: <T>(events: Record<string, (arg: unknown) => void>) => {
     updateRef: (newRef: T) => void;
 };

package/dist/lib/useCreateEvent.js

@@ -1,7 +1,5 @@
 import { onDestroy } from 'svelte';
-import { createRawEventDispatcher } from '@threlte/core';
-export const useCreateEvent = () => {
-    const dispatchRaw = createRawEventDispatcher();
+export const useCreateEvent = (events) => {
     const cleanupFunctions = [];
     let ref = undefined;
     const dispatchCreateEvent = () => {
@@ -15,7 +13,7 @@ export const useCreateEvent = () => {
         };
         if (ref === undefined)
             return;
-        dispatchRaw('create', { ref, cleanup });
+        events?.create?.({ ref, cleanup });
     };
     const updateRef = (newRef) => {
         ref = newRef;

package/dist/recipes/BasicPlayerController.svelte

@@ -1,4 +1,4 @@
-<script>import { createRawEventDispatcher, T, useFrame } from '@threlte/core';
+<script lang="ts">import { createRawEventDispatcher, T, useTask } from '@threlte/core';
 import { Vector2, Vector3 } from 'three';
 import Collider from '../components/Colliders/Collider.svelte';
 import CollisionGroups from '../components/CollisionGroups/CollisionGroups.svelte';
@@ -29,10 +29,8 @@ $: {
         grounded = true;
 }
 $: grounded ? dispatch('groundenter') : dispatch('groundexit');
-useFrame(() => {
-    if (!rigidBody)
-        return;
-    t.fromArray([0, 0, 0]);
+const { start } = useTask(() => {
+    t.set(0, 0, 0);
     if (keys.down)
         t.x += 1;
     if (keys.up)
@@ -53,18 +51,24 @@ useFrame(() => {
     t.y = linVel.y;
     rigidBody.setLinvel(t, true);
 });
+$: if (rigidBody)
+    start();
 const onKeyDown = (e) => {
-    switch (e.key) {
-        case 'ArrowDown':
+    switch (e.key.toLowerCase()) {
+        case 's':
+        case 'arrowdown':
             keys.down = true;
             break;
-        case 'ArrowUp':
+        case 'w':
+        case 'arrowup':
             keys.up = true;
             break;
-        case 'ArrowLeft':
+        case 'a':
+        case 'arrowleft':
             keys.left = true;
             break;
-        case 'ArrowRight':
+        case 'd':
+        case 'arrowright':
             keys.right = true;
             break;
         case ' ':
@@ -76,17 +80,21 @@ const onKeyDown = (e) => {
     }
 };
 const onKeyUp = (e) => {
-    switch (e.key) {
-        case 'ArrowDown':
+    switch (e.key.toLowerCase()) {
+        case 's':
+        case 'arrowdown':
             keys.down = false;
             break;
-        case 'ArrowUp':
+        case 'w':
+        case 'arrowup':
             keys.up = false;
             break;
-        case 'ArrowLeft':
+        case 'a':
+        case 'arrowleft':
             keys.left = false;
             break;
-        case 'ArrowRight':
+        case 'd':
+        case 'arrowright':
             keys.right = false;
             break;
         default:
@@ -95,7 +103,10 @@ const onKeyUp = (e) => {
 };
 </script>
 
-<svelte:window on:keydown|preventDefault={onKeyDown} on:keyup|preventDefault={onKeyUp} />
+<svelte:window
+  on:keydown|preventDefault={onKeyDown}
+  on:keyup|preventDefault={onKeyUp}
+/>
 
 <T.Group {position}>
   <RigidBody
@@ -105,7 +116,10 @@ const onKeyUp = (e) => {
     type={'dynamic'}
   >
     <CollisionGroups groups={playerCollisionGroups}>
-      <Collider shape={'capsule'} args={[height / 2 - radius, radius]} />
+      <Collider
+        shape={'capsule'}
+        args={[height / 2 - radius, radius]}
+      />
     </CollisionGroups>
 
     <CollisionGroups groups={groundCollisionGroups}>

package/dist/recipes/BasicPlayerController.svelte.d.ts

@@ -1,4 +1,4 @@
-import { SvelteComponentTyped } from "svelte";
+import { SvelteComponent } from "svelte";
 import { Vector3 } from 'three';
 import type { CollisionGroupsBitMask } from '../types/types';
 declare const __propDef: {
@@ -10,6 +10,9 @@ declare const __propDef: {
         jumpStrength?: number | undefined;
         playerCollisionGroups?: CollisionGroupsBitMask | undefined;
         groundCollisionGroups?: CollisionGroupsBitMask | undefined;
+        children?: ((this: void) => typeof import("svelte").SnippetReturn & {
+            _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\"";
+        }) | undefined;
     };
     events: {
         [evt: string]: CustomEvent<any>;
@@ -21,6 +24,6 @@ declare const __propDef: {
 export type BasicPlayerControllerProps = typeof __propDef.props;
 export type BasicPlayerControllerEvents = typeof __propDef.events;
 export type BasicPlayerControllerSlots = typeof __propDef.slots;
-export default class BasicPlayerController extends SvelteComponentTyped<BasicPlayerControllerProps, BasicPlayerControllerEvents, BasicPlayerControllerSlots> {
+export default class BasicPlayerController extends SvelteComponent<BasicPlayerControllerProps, BasicPlayerControllerEvents, BasicPlayerControllerSlots> {
 }
 export {};

package/dist/types/types.d.ts

@@ -1,7 +1,6 @@
+/// <reference types="svelte" />
 import type { Collider, ColliderHandle, RigidBody, RigidBodyHandle, TempContactManifold, Vector } from '@dimforge/rapier3d-compat';
-import type { createRawEventDispatcher } from '@threlte/core';
 import type { Writable } from 'svelte/store';
-import type { useHasEventListeners } from '../hooks/useHasEventListener';
 import type { createRapierContext } from '../lib/createRapierContext';
 export type ColliderShapes = 'ball' | 'capsule' | 'segment' | 'triangle' | 'roundTriangle' | 'polyline' | 'trimesh' | 'cuboid' | 'roundCuboid' | 'heightfield' | 'cylinder' | 'roundCylinder' | 'cone' | 'roundCone' | 'convexHull' | 'convexMesh' | 'roundConvexHull' | 'roundConvexMesh';
 export type AutoCollidersShapes = 'cuboid' | 'ball' | 'trimesh' | 'convexHull' | 'capsule';
@@ -46,14 +45,12 @@ export type RigidBodyEventMap = ColliderEventMap & {
     sleep: void;
     wake: void;
 };
-export type RigidBodyEventDispatcher = ReturnType<typeof createRawEventDispatcher<RigidBodyEventMap>>;
-export type ColliderEventDispatcher = ReturnType<typeof createRawEventDispatcher<ColliderEventMap>>;
-export type RigidBodyEventDispatchers = Map<RigidBodyHandle, RigidBodyEventDispatcher>;
-export type ColliderEventDispatchers = Map<ColliderHandle, ColliderEventDispatcher>;
+export type RigidBodyEventDispatchers = Map<RigidBodyHandle, Record<string, (arg: unknown) => void>>;
+export type ColliderEventDispatchers = Map<ColliderHandle, Record<string, (arg: unknown) => void>>;
 export type RapierContext = ReturnType<typeof createRapierContext>;
 export type CollisionGroupsContext = Writable<number> | undefined;
 export type RigidBodyUserData = {
-    hasEventListeners?: ReturnType<typeof useHasEventListeners<RigidBodyEventDispatcher>>['hasEventListeners'];
+    events?: Record<string, (arg: unknown) => void>;
 };
 export type ThrelteRigidBody = RigidBody & {
     userData?: RigidBodyUserData;

package/package.json

@@ -1,38 +1,41 @@
 {
   "name": "@threlte/rapier",
-  "version": "1.1.4",
+  "version": "3.0.0-next.0",
   "author": "Grischa Erbe <hello@legrisch.com> (https://legrisch.com)",
   "license": "MIT",
   "devDependencies": {
-    "@dimforge/rapier3d-compat": "^0.11.2",
-    "@sveltejs/adapter-auto": "^2.0.0",
-    "@sveltejs/kit": "^1.20.4",
-    "@sveltejs/package": "^2.1.0",
-    "@types/node": "^18.0.3",
-    "@types/three": "^0.158.3",
-    "@typescript-eslint/eslint-plugin": "^5.45.0",
-    "@typescript-eslint/parser": "^5.45.0",
-    "@yushijinhun/three-minifier-rollup": "^0.3.1",
-    "eslint": "^8.28.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-svelte": "^2.30.0",
-    "prettier": "^2.8.8",
-    "prettier-plugin-svelte": "^2.10.1",
-    "publint": "^0.1.12",
-    "rimraf": "^5.0.1",
-    "svelte-check": "^3.4.3",
-    "svelte-preprocess": "^5.0.4",
-    "svelte2tsx": "^0.6.19",
-    "tslib": "^2.4.1",
-    "type-fest": "^2.13.0",
-    "typescript": "^5.0.0",
-    "vite": "^4.3.6",
-    "@threlte/core": "7.0.4"
+    "@dimforge/rapier3d-compat": "^0.12.0",
+    "@sveltejs/adapter-auto": "^3.2.0",
+    "@sveltejs/kit": "^2.5.5",
+    "@sveltejs/package": "^2.3.1",
+    "@sveltejs/vite-plugin-svelte": "^3.0.2",
+    "@types/node": "^20.12.4",
+    "@types/three": "^0.163.0",
+    "@typescript-eslint/eslint-plugin": "^7.5.0",
+    "@typescript-eslint/parser": "^7.5.0",
+    "@yushijinhun/three-minifier-rollup": "^0.4.0",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-svelte": "^2.35.1",
+    "prettier": "^3.2.5",
+    "prettier-plugin-svelte": "^3.2.2",
+    "publint": "^0.2.7",
+    "rimraf": "^5.0.5",
+    "svelte": "5.0.0-next.94",
+    "svelte-check": "^3.6.9",
+    "svelte-preprocess": "^5.1.3",
+    "svelte2tsx": "^0.7.6",
+    "three": "^0.163.0",
+    "tslib": "^2.6.2",
+    "type-fest": "^4.15.0",
+    "typescript": "^5.4.4",
+    "vite": "^5.2.8",
+    "@threlte/core": "8.0.0-next.0"
   },
   "peerDependencies": {
+    "@dimforge/rapier3d-compat": ">=0.11",
     "svelte": ">=4",
-    "three": ">=0.133",
-    "@dimforge/rapier3d-compat": ">=0.11"
+    "three": ">=0.152"
   },
   "type": "module",
   "exports": {
@@ -47,6 +50,7 @@
     "dist"
   ],
   "scripts": {
+    "dev": "vite dev",
     "package": "svelte-kit sync && svelte-package && node ./scripts/cleanupPackage.js && publint",
     "check": "svelte-check --tsconfig ./tsconfig.json",
     "check:watch": "svelte-check --tsconfig ./tsconfig.json --watch",