@threlte/rapier 3.0.0-next.1 → 3.0.0-next.3

package/dist/components/Attractor/Attractor.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">import { T, useTask } from '@threlte/core';
 import { Group, Vector3 } from 'three';
 import { useRapier } from '../../hooks/useRapier';
-let { strength = 1, range = 50, gravityType = 'static', gravitationalConstant = 6.673e-11, ref = $bindable(), ...props } = $props();
+let { strength = 1, range = 50, gravityType = 'static', gravitationalConstant = 6.673e-11, ref = $bindable(), children, ...props } = $props();
 const { world, debug } = useRapier();
 const gravitySource = new Vector3();
 const group = new Group();
@@ -37,7 +37,7 @@ useTask(() => {
   bind:ref
   {...props}
 >
-  <slot ref={group} />
+  {@render children?.({ ref: group })}
 
   {#if $debug}
     <T.Mesh>

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

@@ -1,4 +1,4 @@
-import { Props, type Events, type Slots } from '@threlte/core'
+import { Props } from '@threlte/core'
 import { SvelteComponent } from 'svelte'
 import type { Group } from 'three'
 import type { GravityType } from '../../types/types'
@@ -31,12 +31,4 @@ type AttractorProps = Props<Group> & {
   gravitationalConstant?: number
 }
 
-type AttractorEvents = Events<Group>
-
-type AttractorSlots = Slots<Group>
-
-export default class Attractor extends SvelteComponent<
-  AttractorProps,
-  AttractorEvents,
-  AttractorSlots
-> {}
+export default class Attractor extends SvelteComponent<AttractorProps> {}

package/dist/components/Colliders/AutoColliders.svelte

@@ -10,9 +10,9 @@ import { useParentRigidbodyObject } from '../../lib/rigidBodyObjectContext';
 import { applyColliderActiveEvents } from '../../lib/applyColliderActiveEvents';
 import { createCollidersFromChildren } from '../../lib/createCollidersFromChildren';
 import { eulerToQuaternion } from '../../lib/eulerToQuaternion';
-let { shape = 'convexHull', restitution, restitutionCombineRule, friction, frictionCombineRule, sensor, contactForceEventThreshold, density, mass, centerOfMass, principalAngularInertia, angularInertiaLocalFrame, refresh = $bindable(() => create()), colliders = $bindable(), ...props } = $props();
+let { shape = 'convexHull', restitution, restitutionCombineRule, friction, frictionCombineRule, sensor, contactForceEventThreshold, density, mass, centerOfMass, principalAngularInertia, angularInertiaLocalFrame, refresh = $bindable(() => create()), colliders = $bindable(), oncreate, oncollisionenter, oncollisionexit, oncontact, onsensorenter, onsensorexit, children, } = $props();
 const group = new Group();
-const { updateRef } = useCreateEvent(props.$$events);
+const { updateRef } = useCreateEvent(oncreate);
 const rigidBody = useRigidBody();
 const rigidBodyParentObject = useParentRigidbodyObject();
 const { world, addColliderToContext, removeColliderFromContext } = useRapier();
@@ -27,13 +27,20 @@ const cleanup = () => {
     });
     colliders.length = 0;
 };
+const events = {
+    oncollisionenter,
+    oncollisionexit,
+    oncontact,
+    onsensorenter,
+    onsensorexit
+};
 const create = () => {
     cleanup();
     colliders = createCollidersFromChildren(group, shape ?? 'convexHull', world, rigidBody, rigidBodyParentObject);
-    colliders.forEach((c) => addColliderToContext(c, group, props.$$events));
+    colliders.forEach((c) => addColliderToContext(c, group, events));
     collisionGroups.registerColliders(colliders);
     colliders.forEach((collider) => {
-        applyColliderActiveEvents(collider, props.$$events, rigidBody?.userData?.events);
+        applyColliderActiveEvents(collider, events, rigidBody?.userData?.events);
         collider.setActiveCollisionTypes(ActiveCollisionTypes.ALL);
         collider.setRestitution(restitution ?? 0);
         collider.setRestitutionCombineRule(restitutionCombineRule ?? CoefficientCombineRule.Average);
@@ -66,8 +73,5 @@ onDestroy(cleanup);
 </script>
 
 <SceneGraphObject object={group}>
-  <slot
-    {colliders}
-    {refresh}
-  />
+  {@render children?.({ colliders: colliders ?? [], refresh })}
 </SceneGraphObject>

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

@@ -1,7 +1,7 @@
 import type { CoefficientCombineRule, Collider } from '@dimforge/rapier3d-compat'
-import { SvelteComponent } from 'svelte'
+import { SvelteComponent, type Snippet } from 'svelte'
 import type { Euler, Vector3 } from 'three'
-import type { AutoCollidersShapes, ColliderEventMap } from '../../types/types'
+import type { AutoCollidersShapes, ColliderEvents } from '../../types/types'
 
 // ------------------ BASE ------------------
 
@@ -14,7 +14,10 @@ type BaseProps = {
   sensor?: boolean
   colliders?: Collider[]
   contactForceEventThreshold?: number
+
   refresh?: () => void
+
+  oncreate?: () => void
 }
 
 // ------------------ MASS ------------------
@@ -64,17 +67,18 @@ type MassProps<TMassDef extends MassDef> = TMassDef extends Density
 
 // ------------------ COLLIDER ------------------
 
-export type AutoCollidersProps<TMassDef extends MassDef> = BaseProps & MassProps<TMassDef>
-
-type AutoCollidersSlots = {
-  default: {
-    colliders: Collider[]
-    refresh: () => void
+export type AutoCollidersProps<TMassDef extends MassDef> = BaseProps &
+  MassProps<TMassDef> & {
+    children?: Snippet<
+      [
+        {
+          colliders: Collider[]
+          refresh: () => void
+        }
+      ]
+    >
   }
-}
 
 export default class AutoColliders<TMassDef extends MassDef> extends SvelteComponent<
-  AutoCollidersProps<TMassDef>,
-  ColliderEventMap,
-  AutoCollidersSlots
+  AutoCollidersProps<TMassDef>
 > {}

package/dist/components/Colliders/Collider.svelte

@@ -16,15 +16,22 @@ let { shape, args, type, restitution, restitutionCombineRule, friction, friction
         return;
     collider.setTranslation(getWorldPosition(object));
     collider.setRotation(getWorldQuaternion(object));
-}), ...props } = $props();
+}), oncreate, oncollisionenter, oncollisionexit, oncontact, onsensorenter, onsensorexit, children, } = $props();
 const object = new Object3D();
-const { updateRef } = useCreateEvent(props.$$events);
+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.
@@ -41,7 +48,7 @@ onMount(async () => {
     /**
      * Add collider to context
      */
-    rapierContext.addColliderToContext(collider, object, props.$$events);
+    rapierContext.addColliderToContext(collider, object, events);
     /**
      * For use in conjunction with component <CollisionGroups>
      */
@@ -98,7 +105,7 @@ $effect.pre(() => {
 });
 $effect.pre(() => {
     if (collider) {
-        applyColliderActiveEvents(collider, props.$$events, rigidBody?.userData?.events);
+        applyColliderActiveEvents(collider, events, rigidBody?.userData?.events);
     }
 });
 /**
@@ -130,5 +137,5 @@ onDestroy(() => {
 </script>
 
 <SceneGraphObject {object}>
-  <slot {collider} />
+  {@render children?.({ collider })}
 </SceneGraphObject>

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

@@ -1,11 +1,11 @@
+import type { ColliderEvents } from '../../types/types'
 import type {
   CoefficientCombineRule,
   Collider as RapierCollider,
   ColliderDesc
 } from '@dimforge/rapier3d-compat'
-import { SvelteComponent } from 'svelte'
+import { SvelteComponent, type Snippet } from 'svelte'
 import type { Euler, Vector3 } from 'three'
-import type { ColliderEventMap } from '../../types/types'
 
 // ------------------ BASE ------------------
 
@@ -97,16 +97,13 @@ type MassProps<TMassDef extends MassDef> = TMassDef extends Density
 // ------------------ COLLIDER ------------------
 
 export type ColliderProps<TShape extends Shape, TMassDef extends MassDef> = BaseProps &
+  ColliderEvents &
   ShapeProps<TShape> &
-  MassProps<TMassDef>
-
-export type ColliderSlots = {
-  default: {
-    collider: RapierCollider
+  MassProps<TMassDef> & {
+    children?: Snippet<[{ collider?: RapierCollider }]>
   }
-}
 
 export default class Collider<
   TShape extends Shape,
   TMassDef extends MassDef
-> extends SvelteComponent<ColliderProps<TShape, TMassDef>, ColliderEventMap, ColliderSlots> {}
+> extends SvelteComponent<ColliderProps<TShape, TMassDef>> {}

package/dist/components/CollisionGroups/CollisionGroups.svelte

@@ -1,10 +1,10 @@
 <script lang="ts">import { setContext } from 'svelte';
 import { writable } from 'svelte/store';
 import { computeBitMask } from '../../lib/computeBitMask';
-let { groups, filter, memberships } = $props();
+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);
 </script>
 
-<slot />
+{@render children?.()}

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

@@ -1,4 +1,4 @@
-import { SvelteComponent } from 'svelte'
+import { SvelteComponent, type Snippet } from 'svelte'
 
 type N = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15
 
@@ -11,6 +11,8 @@ type GroupsProps = {
 
   filter?: never
   memberships?: never
+
+  children?: Snippet
 }
 
 type MembershipsAndFilterProps = {
@@ -18,6 +20,8 @@ type MembershipsAndFilterProps = {
   memberships: N[]
 
   groups?: never
+
+  children?: Snippet
 }
 
 type GroupsDef = GroupsProps | MembershipsAndFilterProps

package/dist/components/RigidBody/RigidBody.svelte

@@ -7,8 +7,11 @@ import { parseRigidBodyType } from '../../lib/parseRigidBodyType';
 import { setParentRigidbodyObject } from '../../lib/rigidBodyObjectContext';
 import { useCreateEvent } from '../../lib/useCreateEvent';
 const { world, rapier, addRigidBodyToContext, removeRigidBodyFromContext } = useRapier();
-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);
+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(), oncreate, oncollisionenter, oncollisionexit, oncontact, onsensorenter, onsensorexit, onsleep, onwake } = $props();
+/**
+ * Every RigidBody receives and forwards collision-related events
+ */
+const { updateRef } = useCreateEvent(oncreate);
 const object = new Object3D();
 /**
  * isSleeping used for events "sleep" and "wake" in `useFrameHandler`
@@ -68,7 +71,15 @@ $effect.pre(() => rigidBodyInternal.setEnabled(enabled));
  */
 $effect.pre(() => {
     rigidBodyInternal.userData = {
-        events: props.$$events,
+        events: {
+            oncollisionenter,
+            oncollisionexit,
+            oncontact,
+            onsensorenter,
+            onsensorexit,
+            onsleep,
+            onwake
+        },
         ...userData
     };
 });
@@ -84,7 +95,15 @@ setParentRigidbodyObject(object);
 /**
  * Add the mesh to the context
  */
-addRigidBodyToContext(rigidBodyInternal, object, props.$$events);
+addRigidBodyToContext(rigidBodyInternal, object, {
+    oncollisionenter,
+    oncollisionexit,
+    oncontact,
+    onsensorenter,
+    onsensorexit,
+    onsleep,
+    onwake
+});
 /**
  * cleanup
  */

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

@@ -1,13 +1,13 @@
 import { RigidBody as RapierRigidBody } from '@dimforge/rapier3d-compat'
-import { SvelteComponent } from 'svelte'
+import { SvelteComponent, type Snippet } from 'svelte'
 import type { Euler, Vector3 } from 'three'
 import type { RigidBodyTypeString } from '../../lib/parseRigidBodyType'
-import type { RigidBodyEventMap } from '../../types/types'
+import type { RigidBodyEvents } 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
@@ -95,18 +95,8 @@ export type RigidBodyProps = {
    * An arbitrary user-defined object associated with this rigid-body.
    */
   userData?: Record<string, any>
-}
-
-type RigidBodyEvents = RigidBodyEventMap
 
-type RigidBodySlots = {
-  default: {
-    rigidBody: RapierRigidBody
-  }
+  children?: Snippet<[{ rigidBody: RapierRigidBody }]>
 }
 
-export default class RigidBody extends SvelteComponent<
-  RigidBodyProps,
-  RigidBodyEvents,
-  RigidBodySlots
-> {}
+export default class RigidBody extends SvelteComponent<RigidBodyProps & RigidBodyEvents> {}

package/dist/components/World/World.svelte

@@ -17,7 +17,7 @@ let { gravity, rawIntegrationParameters, rawIslands, rawBroadPhase, rawNarrowPha
  * Use this to control when the rapier physics engine is updating the scene.
  * @default undefined
  */
-stage } = $props();
+stage, fallback, children } = $props();
 let error = $state(false);
 const init = async () => {
     if ($initialized)
@@ -51,10 +51,10 @@ onMount(init);
     {rawDebugRenderPipeline}
     {stage}
   >
-    <slot />
+    {@render children?.()}
   </InnerWorld>
 {/if}
 
 {#if error}
-  <slot name="fallback" />
+  {@render fallback?.()}
 {/if}

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

@@ -13,7 +13,7 @@ import type {
   RawRigidBodySet,
   RawSerializationPipeline
 } from '@dimforge/rapier3d-compat/raw'
-import { SvelteComponent } from 'svelte'
+import { SvelteComponent, type Snippet } from 'svelte'
 import type { Vector3 } from 'three'
 import type { Key, Stage } from '@threlte/core'
 
@@ -33,6 +33,9 @@ export type WorldProps = {
   rawSerializationPipeline?: RawSerializationPipeline
   rawDebugRenderPipeline?: RawDebugRenderPipeline
   stage?: Key | Stage
+
+  children?: Snippet
+  fallback?: Snippet
 }
 
 export default class World extends SvelteComponent<WorldProps> {}

package/dist/hooks/useFrameHandler.js

@@ -35,21 +35,19 @@ export const useFrameHandler = (ctx, stage) => {
         // Update meshes
         ctx.rigidBodyObjects.forEach((mesh, handle) => {
             const rigidBody = world.getRigidBody(handle);
-            if (!rigidBody)
-                return;
-            const events = ctx.rigidBodyEventDispatchers.get(handle);
             if (!rigidBody || !rigidBody.isValid())
                 return;
+            const events = ctx.rigidBodyEventDispatchers.get(handle);
             if (events) {
                 if (rigidBody.isSleeping() && !mesh.userData.isSleeping) {
-                    events.sleep?.();
+                    events.onsleep?.();
                 }
                 if (!rigidBody.isSleeping() && mesh.userData.isSleeping) {
-                    events.wake?.();
+                    events.onwake?.();
                 }
                 mesh.userData.isSleeping = rigidBody.isSleeping();
             }
-            if (!rigidBody || rigidBody.isSleeping() || rigidBody.isFixed() || !mesh.parent) {
+            if (rigidBody.isSleeping() || rigidBody.isFixed() || !mesh.parent) {
                 return;
             }
             // Position
@@ -79,7 +77,7 @@ export const useFrameHandler = (ctx, stage) => {
             const rigidBody1 = collider1.parent();
             const rigidBody2 = collider2.parent();
             // Collider events
-            collider1Events?.contact?.({
+            collider1Events?.oncontact?.({
                 targetCollider: collider2,
                 targetRigidBody: rigidBody2,
                 maxForceDirection: e.maxForceDirection(),
@@ -87,7 +85,7 @@ export const useFrameHandler = (ctx, stage) => {
                 totalForce: e.totalForce(),
                 totalForceMagnitude: e.totalForceMagnitude()
             });
-            collider2Events?.contact?.({
+            collider2Events?.oncontact?.({
                 targetCollider: collider1,
                 targetRigidBody: rigidBody1,
                 maxForceDirection: e.maxForceDirection(),
@@ -96,7 +94,7 @@ export const useFrameHandler = (ctx, stage) => {
                 totalForceMagnitude: e.totalForceMagnitude()
             });
             // RigidBody Events
-            rigidBody1Events?.contact?.({
+            rigidBody1Events?.oncontact?.({
                 targetCollider: collider2,
                 targetRigidBody: rigidBody2,
                 maxForceDirection: e.maxForceDirection(),
@@ -104,7 +102,7 @@ export const useFrameHandler = (ctx, stage) => {
                 totalForce: e.totalForce(),
                 totalForceMagnitude: e.totalForceMagnitude()
             });
-            rigidBody2Events?.contact?.({
+            rigidBody2Events?.oncontact?.({
                 targetCollider: collider1,
                 targetRigidBody: rigidBody1,
                 maxForceDirection: e.maxForceDirection(),
@@ -132,20 +130,20 @@ export const useFrameHandler = (ctx, stage) => {
                 const isIntersection = world.intersectionPair(collider1, collider2);
                 if (isIntersection) {
                     // Collider Events
-                    collider1Events?.sensorenter?.({
+                    collider1Events?.onsensorenter?.({
                         targetCollider: collider2,
                         targetRigidBody: rigidBody2
                     });
-                    collider2Events?.sensorenter?.({
+                    collider2Events?.onsensorenter?.({
                         targetCollider: collider1,
                         targetRigidBody: rigidBody1
                     });
                     // RigidBody Events
-                    rigidBody1Events?.sensorenter?.({
+                    rigidBody1Events?.onsensorenter?.({
                         targetCollider: collider2,
                         targetRigidBody: rigidBody2
                     });
-                    rigidBody2Events?.sensorenter?.({
+                    rigidBody2Events?.onsensorenter?.({
                         targetCollider: collider1,
                         targetRigidBody: rigidBody1
                     });
@@ -154,26 +152,26 @@ export const useFrameHandler = (ctx, stage) => {
                 }
                 world.contactPair(collider1, collider2, (manifold, flipped) => {
                     // Collider events
-                    collider1Events?.collisionenter?.({
+                    collider1Events?.oncollisionenter?.({
                         flipped,
                         manifold,
                         targetCollider: collider2,
                         targetRigidBody: rigidBody2
                     });
-                    collider2Events?.collisionenter?.({
+                    collider2Events?.oncollisionenter?.({
                         flipped,
                         manifold,
                         targetCollider: collider1,
                         targetRigidBody: rigidBody1
                     });
                     // RigidBody Events
-                    rigidBody1Events?.collisionenter?.({
+                    rigidBody1Events?.oncollisionenter?.({
                         flipped,
                         manifold,
                         targetCollider: collider2,
                         targetRigidBody: rigidBody2
                     });
-                    rigidBody2Events?.collisionenter?.({
+                    rigidBody2Events?.oncollisionenter?.({
                         flipped,
                         manifold,
                         targetCollider: collider1,
@@ -188,20 +186,20 @@ export const useFrameHandler = (ctx, stage) => {
                     collider1.isSensor() ||
                     collider2.isSensor();
                 if (isIntersection) {
-                    collider1Events?.sensorexit?.({
+                    collider1Events?.onsensorexit?.({
                         targetCollider: collider2,
                         targetRigidBody: rigidBody2
                     });
-                    collider2Events?.sensorexit?.({
+                    collider2Events?.onsensorexit?.({
                         targetCollider: collider1,
                         targetRigidBody: rigidBody1
                     });
                     // RigidBody Events
-                    rigidBody1Events?.sensorexit?.({
+                    rigidBody1Events?.onsensorexit?.({
                         targetCollider: collider2,
                         targetRigidBody: rigidBody2
                     });
-                    rigidBody2Events?.sensorexit?.({
+                    rigidBody2Events?.onsensorexit?.({
                         targetCollider: collider1,
                         targetRigidBody: rigidBody1
                     });
@@ -209,20 +207,20 @@ export const useFrameHandler = (ctx, stage) => {
                     return;
                 }
                 // Collider events
-                collider1Events?.collisionexit?.({
+                collider1Events?.oncollisionexit?.({
                     targetCollider: collider2,
                     targetRigidBody: rigidBody2
                 });
-                collider2Events?.collisionexit?.({
+                collider2Events?.oncollisionexit?.({
                     targetCollider: collider1,
                     targetRigidBody: rigidBody1
                 });
                 // RigidBody Events
-                rigidBody1Events?.collisionexit?.({
+                rigidBody1Events?.oncollisionexit?.({
                     targetCollider: collider2,
                     targetRigidBody: rigidBody2
                 });
-                rigidBody2Events?.collisionexit?.({
+                rigidBody2Events?.oncollisionexit?.({
                     targetCollider: collider1,
                     targetRigidBody: rigidBody1
                 });

package/dist/lib/applyColliderActiveEvents.d.ts

@@ -1,2 +1,3 @@
+import type { ColliderEvents, RigidBodyEvents } from '../types/types';
 import { type Collider } from '@dimforge/rapier3d-compat';
-export declare const applyColliderActiveEvents: (collider: Collider, colliderEvents?: Record<string, (arg: unknown) => void>, rigidBodyEvents?: Record<string, (arg: unknown) => void>) => void;
+export declare const applyColliderActiveEvents: (collider: Collider, colliderEvents?: ColliderEvents, rigidBodyEvents?: RigidBodyEvents) => void;

package/dist/lib/applyColliderActiveEvents.js

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

package/dist/lib/createRapierContext.d.ts

@@ -2,17 +2,17 @@
 import type { Collider, RigidBody } from '@dimforge/rapier3d-compat';
 import RAPIER from '@dimforge/rapier3d-compat';
 import type { Object3D } from 'three';
-import type { ColliderEventDispatchers, RigidBodyEventDispatchers } from '../types/types';
+import type { ColliderEvents, RigidBodyEvents } 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;
     colliderObjects: Map<number, Object3D<import("three").Object3DEventMap>>;
     rigidBodyObjects: Map<number, Object3D<import("three").Object3DEventMap>>;
-    rigidBodyEventDispatchers: RigidBodyEventDispatchers;
-    colliderEventDispatchers: ColliderEventDispatchers;
-    addColliderToContext: (collider: Collider, object: Object3D, events: Record<string, (arg: unknown) => void>) => void;
+    rigidBodyEventDispatchers: Map<number, RigidBodyEvents>;
+    colliderEventDispatchers: Map<number, ColliderEvents>;
+    addColliderToContext: (collider: Collider, object: Object3D, props: ColliderEvents) => void;
     removeColliderFromContext: (collider: Collider) => void;
-    addRigidBodyToContext: (rigidBody: RigidBody, object: Object3D, events: Record<string, (arg: unknown) => void>) => void;
+    addRigidBodyToContext: (rigidBody: RigidBody, object: Object3D, events: RigidBodyEvents) => 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, events) => {
+    const addColliderToContext = (collider, object, props) => {
         colliderObjects.set(collider.handle, object);
-        colliderEventDispatchers.set(collider.handle, events);
+        colliderEventDispatchers.set(collider.handle, props);
     };
     /**
      * Removes the collider from the context

package/dist/lib/rigidBodyObjectContext.d.ts

@@ -1,2 +1,3 @@
-export declare const useParentRigidbodyObject: () => THREE.Object3D | undefined;
-export declare const setParentRigidbodyObject: (object3d: THREE.Object3D) => void;
+import type { Object3D } from 'three';
+export declare const useParentRigidbodyObject: () => Object3D | undefined;
+export declare const setParentRigidbodyObject: (object3d: Object3D) => void;

package/dist/lib/useCreateEvent.d.ts

@@ -1,3 +1,4 @@
-export declare const useCreateEvent: <T>(events: Record<string, (arg: unknown) => void>) => {
+import type { ColliderEvents } from '../types/types';
+export declare const useCreateEvent: <T>(oncreate?: ColliderEvents['oncreate']) => {
     updateRef: (newRef: T) => void;
 };

package/dist/lib/useCreateEvent.js

@@ -1,7 +1,7 @@
 import { onDestroy } from 'svelte';
-export const useCreateEvent = (events) => {
+export const useCreateEvent = (oncreate) => {
     const cleanupFunctions = [];
-    let ref = undefined;
+    let ref;
     const dispatchCreateEvent = () => {
         // call every cleanup function
         cleanupFunctions.forEach((cleanup) => cleanup());
@@ -13,7 +13,7 @@ export const useCreateEvent = (events) => {
         };
         if (ref === undefined)
             return;
-        events?.create?.({ ref, cleanup });
+        oncreate?.({ ref, cleanup });
     };
     const updateRef = (newRef) => {
         ref = newRef;

package/dist/recipes/BasicPlayerController.svelte

@@ -1,4 +1,4 @@
-<script lang="ts">import { createRawEventDispatcher, T, useTask } from '@threlte/core';
+<script lang="ts">import { T, useTask } from '@threlte/core';
 import { Vector2, Vector3 } from 'three';
 import Collider from '../components/Colliders/Collider.svelte';
 import CollisionGroups from '../components/CollisionGroups/CollisionGroups.svelte';
@@ -10,6 +10,8 @@ export let speed = 1;
 export let jumpStrength = 3;
 export let playerCollisionGroups = [0];
 export let groundCollisionGroups = [15];
+export let ongroundenter = undefined;
+export let ongroundexit = undefined;
 let rigidBody;
 const keys = {
     up: false,
@@ -19,7 +21,6 @@ const keys = {
 };
 const t = new Vector3();
 const t2 = new Vector2();
-const dispatch = createRawEventDispatcher();
 let grounded = false;
 let groundsSensored = 0;
 $: {
@@ -28,7 +29,7 @@ $: {
     else
         grounded = true;
 }
-$: grounded ? dispatch('groundenter') : dispatch('groundexit');
+$: grounded ? ongroundenter?.() : ongroundexit?.();
 const { start } = useTask(() => {
     t.set(0, 0, 0);
     if (keys.down)
@@ -126,8 +127,8 @@ const onKeyUp = (e) => {
       <T.Group position={[0, -height / 2 + radius, 0]}>
         <Collider
           sensor
-          on:sensorenter={() => (groundsSensored += 1)}
-          on:sensorexit={() => (groundsSensored -= 1)}
+          onsensorenter={() => (groundsSensored += 1)}
+          onsensorexit={() => (groundsSensored -= 1)}
           shape={'ball'}
           args={[radius * 1.2]}
         />

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

@@ -10,6 +10,8 @@ declare const __propDef: {
         jumpStrength?: number | undefined;
         playerCollisionGroups?: CollisionGroupsBitMask | undefined;
         groundCollisionGroups?: CollisionGroupsBitMask | undefined;
+        ongroundenter?: (() => void) | undefined;
+        ongroundexit?: (() => void) | undefined;
         children?: ((this: void) => typeof import("svelte").SnippetReturn & {
             _: "functions passed to {@render ...} tags must use the `Snippet` type imported from \"svelte\"";
         }) | undefined;

package/dist/types/types.d.ts

@@ -1,56 +1,54 @@
 /// <reference types="svelte" />
-import type { Collider, ColliderHandle, RigidBody, RigidBodyHandle, TempContactManifold, Vector } from '@dimforge/rapier3d-compat';
+import type { Collider, RigidBody, TempContactManifold, Vector } from '@dimforge/rapier3d-compat';
 import type { Writable } from 'svelte/store';
 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';
-export type ColliderEventMap = {
-    create: {
+export type ColliderEvents = {
+    oncreate?: (event: {
         ref: Collider;
         cleanup: (callback: () => void) => void;
-    };
-    collisionenter: {
+    }) => void;
+    oncollisionenter?: (event: {
         targetCollider: Collider;
         targetRigidBody: RigidBody | null;
         manifold: TempContactManifold;
         flipped: boolean;
-    };
-    collisionexit: {
+    }) => void;
+    oncollisionexit?: (event: {
         targetCollider: Collider;
         targetRigidBody: RigidBody | null;
-    };
-    sensorenter: {
+    }) => void;
+    onsensorenter?: (event: {
         targetCollider: Collider;
         targetRigidBody: RigidBody | null;
-    };
-    sensorexit: {
+    }) => void;
+    onsensorexit?: (event: {
         targetCollider: Collider;
         targetRigidBody: RigidBody | null;
-    };
-    contact: {
+    }) => void;
+    oncontact?: (event: {
         targetCollider: Collider;
         targetRigidBody: RigidBody | null;
         maxForceDirection: Vector;
         maxForceMagnitude: number;
         totalForce: Vector;
         totalForceMagnitude: number;
-    };
+    }) => void;
 };
-export type CollisionEnterEvent = ColliderEventMap['collisionenter'];
-export type CollisionExitEvent = ColliderEventMap['collisionexit'];
-export type SensorEnterEvent = ColliderEventMap['sensorenter'];
-export type SensorExitEvent = ColliderEventMap['sensorexit'];
-export type ContactEvent = ColliderEventMap['contact'];
-export type RigidBodyEventMap = ColliderEventMap & {
-    sleep: void;
-    wake: void;
+export type CollisionEnterEvent = ColliderEvents['oncollisionenter'];
+export type CollisionExitEvent = ColliderEvents['oncollisionexit'];
+export type SensorEnterEvent = ColliderEvents['onsensorenter'];
+export type SensorExitEvent = ColliderEvents['onsensorexit'];
+export type ContactEvent = ColliderEvents['oncontact'];
+export type RigidBodyEvents = ColliderEvents & {
+    onsleep?: () => void;
+    onwake?: () => void;
 };
-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 = {
-    events?: Record<string, (arg: unknown) => void>;
+    events?: RigidBodyEvents;
 };
 export type ThrelteRigidBody = RigidBody & {
     userData?: RigidBodyUserData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@threlte/rapier",
-  "version": "3.0.0-next.1",
+  "version": "3.0.0-next.3",
   "author": "Grischa Erbe <hello@legrisch.com> (https://legrisch.com)",
   "license": "MIT",
   "devDependencies": {
@@ -10,7 +10,7 @@
     "@sveltejs/package": "^2.3.1",
     "@sveltejs/vite-plugin-svelte": "^3.1.0",
     "@types/node": "^20.12.7",
-    "@types/three": "^0.163.0",
+    "@types/three": "^0.165.0",
     "@typescript-eslint/eslint-plugin": "^7.6.0",
     "@typescript-eslint/parser": "^7.6.0",
     "@yushijinhun/three-minifier-rollup": "^0.4.0",
@@ -21,16 +21,16 @@
     "prettier-plugin-svelte": "^3.2.2",
     "publint": "^0.2.7",
     "rimraf": "^5.0.5",
-    "svelte": "5.0.0-next.97",
+    "svelte": "5.0.0-next.107",
     "svelte-check": "^3.6.9",
     "svelte-preprocess": "^5.1.3",
     "svelte2tsx": "^0.7.6",
-    "three": "^0.163.0",
+    "three": "^0.165.0",
     "tslib": "^2.6.2",
     "type-fest": "^4.15.0",
     "typescript": "^5.4.5",
     "vite": "^5.2.8",
-    "@threlte/core": "8.0.0-next.2"
+    "@threlte/core": "8.0.0-next.7"
   },
   "peerDependencies": {
     "@dimforge/rapier3d-compat": ">=0.12",