@threlte/rapier 1.0.0-next.0 → 1.0.0-next.1

package/dist/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @threlte/extras
 
+## 1.0.0-next.1
+
+### Major Changes
+
+- 4b67b473: Removed transform properties on rapier components Collider, AutoColliders and RigidBody
+
 ## 1.0.0-next.0
 
 ### Major Changes

package/dist/components/Colliders/AutoColliders.svelte

@@ -1,19 +1,15 @@
 <script>import { ActiveCollisionTypes, CoefficientCombineRule } from '@dimforge/rapier3d-compat';
-import { SceneGraphObject } from '@threlte/core';
-import { createEventDispatcher, onDestroy, onMount } from 'svelte';
-import { Object3D } from 'three';
+import { createRawEventDispatcher, 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 { applyColliderActiveEvents } from '../../lib/applyColliderActiveEvents';
-import { applyTransforms } from '../../lib/applyTransforms';
 import { createCollidersFromChildren } from '../../lib/createCollidersFromChildren';
 import { eulerToQuaternion } from '../../lib/eulerToQuaternion';
 export let shape = 'convexHull';
-export let position = undefined;
-export let rotation = undefined;
-export let scale = undefined;
 export let restitution = undefined;
 export let restitutionCombineRule = undefined;
 export let friction = undefined;
@@ -25,61 +21,61 @@ export let mass = undefined;
 export let centerOfMass = undefined;
 export let principalAngularInertia = undefined;
 export let angularInertiaLocalFrame = undefined;
-const object = new Object3D();
-/**
- * Immediately apply transforms
- */
-applyTransforms(object, position, rotation, scale);
-object.updateWorldMatrix(true, false);
+const group = new Group();
 const rigidBody = useRigidBody();
 const { world, addColliderToContext, removeColliderFromContext } = useRapier();
 export let colliders = [];
 const collisionGroups = useCollisionGroups();
-const dispatcher = createEventDispatcher();
+const dispatcher = createRawEventDispatcher();
 const { hasEventListeners: colliderHasEventListeners } = useHasEventListeners();
-onMount(() => {
-    colliders = createCollidersFromChildren(object, shape ?? 'convexHull', world, rigidBody);
-    colliders.forEach((c) => addColliderToContext(c, object, dispatcher));
-    collisionGroups.registerColliders(colliders);
-});
-$: {
-    if (colliders.length > 0) {
-        colliders.forEach((collider) => {
-            applyColliderActiveEvents(collider, colliderHasEventListeners, rigidBody?.userData?.hasEventListeners);
-            collider.setActiveCollisionTypes(ActiveCollisionTypes.ALL);
-            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 (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);
-            }
-        });
-    }
-}
-/**
- * Cleanup
- */
-onDestroy(() => {
+const cleanup = () => {
     collisionGroups.removeColliders(colliders);
     colliders.forEach((c) => {
         removeColliderFromContext(c);
         world.removeCollider(c, true);
     });
+    colliders.length = 0;
+};
+export const create = () => {
+    cleanup();
+    colliders = createCollidersFromChildren(group, shape ?? 'convexHull', world, rigidBody);
+    colliders.forEach((c) => addColliderToContext(c, group, dispatcher));
+    collisionGroups.registerColliders(colliders);
+    colliders.forEach((collider) => {
+        applyColliderActiveEvents(collider, colliderHasEventListeners, rigidBody?.userData?.hasEventListeners);
+        collider.setActiveCollisionTypes(ActiveCollisionTypes.ALL);
+        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 (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);
+        }
+    });
+};
+onMount(() => {
+    create();
 });
+export const refresh = () => {
+    create();
+};
+/**
+ * Cleanup
+ */
+onDestroy(cleanup);
 </script>
 
-<SceneGraphObject {object}>
-  <slot />
+<SceneGraphObject object={group}>
+  <slot {colliders} {refresh} />
 </SceneGraphObject>

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

@@ -1,16 +1,12 @@
 import type { CoefficientCombineRule, Collider } from '@dimforge/rapier3d-compat'
-import type { Position, Rotation } from '@threlte/core'
 import { SvelteComponentTyped } from 'svelte'
 import type { Euler, Vector3 } from 'three'
-import type { AutoCollidersShapes } from '../../types/types'
+import type { AutoCollidersShapes, ColliderEventMap } from '../../types/types'
 
 // ------------------ BASE ------------------
 
 type BaseProps = {
   shape?: AutoCollidersShapes
-  position?: Parameters<Vector3['set']>
-  rotation?: Parameters<Euler['set']>
-  scale?: Parameters<Vector3['set']>
   restitution?: number
   restitutionCombineRule?: CoefficientCombineRule
   friction?: number
@@ -18,6 +14,7 @@ type BaseProps = {
   sensor?: boolean
   colliders?: Collider[]
   contactForceEventThreshold?: number
+  refresh?: () => void
 }
 
 // ------------------ MASS ------------------
@@ -30,20 +27,20 @@ type Density = {
   principalAngularInertia?: never
   angularInertiaLocalFrame?: never
 }
+
 type Mass = {
   mass: number
-
   density?: never
   centerOfMass?: never
   principalAngularInertia?: never
   angularInertiaLocalFrame?: never
 }
+
 type MassProperties = {
   mass: number
   centerOfMass: Parameters<Vector3['set']>
   principalAngularInertia: Parameters<Vector3['set']>
   angularInertiaLocalFrame: Parameters<Euler['set']>
-
   density?: never
 }
 
@@ -69,6 +66,15 @@ type MassProps<TMassDef extends MassDef> = TMassDef extends Density
 
 export type AutoCollidersProps<TMassDef extends MassDef> = BaseProps & MassProps<TMassDef>
 
+type AutoCollidersSlots = {
+  default: {
+    colliders: Collider[]
+    refresh: () => void
+  }
+}
+
 export default class AutoColliders<TMassDef extends MassDef> extends SvelteComponentTyped<
-  AutoCollidersProps<TMassDef>
+  AutoCollidersProps<TMassDef>,
+  ColliderEventMap,
+  AutoCollidersSlots
 > {}

package/dist/components/Colliders/Collider.svelte

@@ -1,21 +1,18 @@
 <script>import { ActiveCollisionTypes, CoefficientCombineRule, Collider, ColliderDesc } from '@dimforge/rapier3d-compat';
-import { SceneGraphObject, useFrame } from '@threlte/core';
-import { createEventDispatcher, onDestroy, onMount, tick } from 'svelte';
+import { createRawEventDispatcher, SceneGraphObject, useFrame } 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 { applyColliderActiveEvents } from '../../lib/applyColliderActiveEvents';
-import { applyTransforms } from '../../lib/applyTransforms';
 import { eulerToQuaternion } from '../../lib/eulerToQuaternion';
 import { getWorldPosition, getWorldQuaternion } from '../../lib/getWorldTransforms';
 import { scaleColliderArgs } from '../../lib/scaleColliderArgs';
 export let shape;
 export let args;
-export let position = undefined;
-export let rotation = undefined;
-export let scale = undefined;
+export let type = undefined;
 export let restitution = undefined;
 export let restitutionCombineRule = undefined;
 export let friction = undefined;
@@ -28,18 +25,13 @@ export let centerOfMass = undefined;
 export let principalAngularInertia = undefined;
 export let angularInertiaLocalFrame = undefined;
 const object = new Object3D();
-/**
- * Immediately apply transforms
- */
-applyTransforms(object, position, rotation, scale);
-object.updateWorldMatrix(true, false);
 const rigidBody = useRigidBody();
-const isAttached = !!rigidBody;
+const hasRigidBodyParent = !!rigidBody;
 const rapierContext = useRapier();
 const { world } = rapierContext;
 export let collider = undefined;
 const collisionGroups = useCollisionGroups();
-const dispatcher = createEventDispatcher();
+const dispatcher = createRawEventDispatcher();
 /**
  * Actual collider setup happens onMount as only then
  * the transforms are finished.
@@ -59,7 +51,7 @@ onMount(async () => {
      * For use in conjunction with component <CollisionGroups>
      */
     collisionGroups.registerColliders([collider]);
-    if (isAttached) {
+    if (hasRigidBodyParent) {
         const rigidBodyWorldPos = new Vector3();
         const rigidBodyWorldQuatInversed = new Quaternion();
         object.traverseAncestors((child) => {
@@ -109,19 +101,27 @@ $: {
         }
     }
 }
-/**
- * If the Collider isAttached (i.e. NOT child of a RigidBody), update the
- * transforms on every frame.
- */
-useFrame(() => {
+export const refresh = () => {
     if (!collider)
         return;
-    applyTransforms(object, position, rotation, scale);
     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(() => {
+    refresh();
 }, {
-    autostart: !isAttached
+    autostart: !hasRigidBodyParent && type === 'dynamic'
 });
+$: {
+    if (!hasRigidBodyParent && type === 'dynamic')
+        start();
+    else
+        stop();
+}
 /**
  * Cleanup
  */
@@ -131,9 +131,10 @@ onDestroy(() => {
     rapierContext.removeColliderFromContext(collider);
     collisionGroups.removeColliders([collider]);
     world.removeCollider(collider, true);
+    collider = undefined;
 });
 </script>
 
 <SceneGraphObject {object}>
-  <slot />
+  <slot {collider} />
 </SceneGraphObject>

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

@@ -1,24 +1,26 @@
 import type {
   CoefficientCombineRule,
-  Collider as rapierCollider,
+  Collider as RapierCollider,
   ColliderDesc
 } from '@dimforge/rapier3d-compat'
 import { SvelteComponentTyped } from 'svelte'
 import type { Euler, Vector3 } from 'three'
+import type { ColliderEventMap } from '../../types/types'
 
 // ------------------ BASE ------------------
 
+type Type = 'static' | 'dynamic'
+
 type BaseProps = {
-  position?: Parameters<Vector3['set']>
-  rotation?: Parameters<Euler['set']>
-  scale?: Parameters<Vector3['set']>
+  type?: Type
   restitution?: number
   restitutionCombineRule?: CoefficientCombineRule
   friction?: number
   frictionCombineRule?: CoefficientCombineRule
   sensor?: boolean
-  collider?: rapierCollider
+  collider?: RapierCollider
   contactForceEventThreshold?: number
+  refresh?: () => void
 }
 
 // ------------------ SHAPE ------------------
@@ -54,7 +56,6 @@ type ShapeProps<TShape extends Shape> = {
 
 type Density = {
   density: number
-
   mass?: never
   centerOfMass?: never
   principalAngularInertia?: never
@@ -62,7 +63,6 @@ type Density = {
 }
 type Mass = {
   mass: number
-
   density?: never
   centerOfMass?: never
   principalAngularInertia?: never
@@ -73,7 +73,6 @@ type MassProperties = {
   centerOfMass: Parameters<Vector3['set']>
   principalAngularInertia: Parameters<Vector3['set']>
   angularInertiaLocalFrame: Parameters<Euler['set']>
-
   density?: never
 }
 
@@ -101,7 +100,13 @@ export type ColliderProps<TShape extends Shape, TMassDef extends MassDef> = Base
   ShapeProps<TShape> &
   MassProps<TMassDef>
 
+export type ColliderSlots = {
+  default: {
+    collider: RapierCollider
+  }
+}
+
 export default class Collider<
   TShape extends Shape,
   TMassDef extends MassDef
-> extends SvelteComponentTyped<ColliderProps<TShape, TMassDef>> {}
+> extends SvelteComponentTyped<ColliderProps<TShape, TMassDef>, ColliderEventMap, ColliderSlots> {}

package/dist/components/CollisionGroups/CollisionGroups.svelte

@@ -1,28 +1,9 @@
 <script>import { setContext } from 'svelte';
 import { writable } from 'svelte/store';
+import { computeBitMask } from '../../lib/computeBitMask';
 export let groups = undefined;
 export let filter = undefined;
 export let memberships = undefined;
-const computeBitMask = (groups, filter, memberships) => {
-    if (groups !== undefined) {
-        // groups is setting the filter and memberships at once
-        const g = groups;
-        const mask = g.reduce((acc, f) => {
-            return acc | (1 << f);
-        }, 0) |
-            g.reduce((acc, m) => {
-                return acc | (1 << (m + 16));
-            }, 0);
-        return mask;
-    }
-    const mask = memberships.reduce((acc, f) => {
-        return acc | (1 << f);
-    }, 0) |
-        filter.reduce((acc, m) => {
-            return acc | (1 << (m + 16));
-        }, 0);
-    return mask;
-};
 const store = writable(computeBitMask(groups, filter, memberships));
 $: store.set(computeBitMask(groups, filter, memberships));
 setContext('threlte-rapier-collision-group', store);

package/dist/components/RigidBody/RigidBody.svelte

@@ -1,15 +1,11 @@
-<script>import { SceneGraphObject } from '@threlte/core';
-import { createEventDispatcher, onDestroy, setContext, tick } from 'svelte';
+<script>import { createRawEventDispatcher, 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 { applyTransforms } from '../../lib/applyTransforms';
 import { getWorldPosition, getWorldQuaternion, getWorldScale } from '../../lib/getWorldTransforms';
 import { parseRigidBodyType } from '../../lib/parseRigidBodyType';
 const { world, rapier, addRigidBodyToContext, removeRigidBodyFromContext } = useRapier();
-export let position = undefined;
-export let rotation = undefined;
-export let scale = undefined;
 export let linearVelocity = undefined;
 export let angularVelocity = undefined;
 export let type = 'dynamic';
@@ -23,7 +19,8 @@ export let lockTranslations = false;
 export let enabledRotations = [true, true, true];
 export let enabledTranslations = [true, true, true];
 export let dominance = 0;
-const dispatcher = createEventDispatcher();
+export let enabled = true;
+const dispatcher = createRawEventDispatcher();
 const object = new Object3D();
 /**
  * Used to traverseAncestors to restore transform
@@ -33,18 +30,6 @@ object.userData.isRigidBody = true;
  * isSleeping used for events "sleep" and "wake" in `useFrameHandler`
  */
 object.userData.isSleeping = false;
-/**
- * Immediately apply transforms to get the objects
- * world position to apply to the RigidBody.
- * This is a one-off operation as RigidBodies should
- * not be moved around after initialization.
- */
-applyTransforms(object, position, rotation, scale);
-/**
- * Update the world matrix of the object before applying
- * the world position to the RigidBody
- */
-object.updateWorldMatrix(true, false);
 /**
  * RigidBody Description
  */
@@ -62,7 +47,6 @@ const rigidBodyTemp = world.createRigidBody(desc);
  */
 const initPosition = async () => {
     await tick();
-    applyTransforms(object, position, rotation, scale);
     object.updateMatrix();
     object.updateWorldMatrix(true, false);
     const parentWorldScale = object.parent ? getWorldScale(object.parent) : new Vector3(1, 1, 1);
@@ -80,22 +64,21 @@ object.userData.rigidBody = rigidBodyTemp;
 /**
  * Reactive RigidBody properties
  */
-$: {
-    rigidBodyTemp.setBodyType(parseRigidBodyType(type));
-    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.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);
 /**
  * Add userData to the rigidBody
  */

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

@@ -8,10 +8,6 @@ export type Boolean3Array = [x: boolean, y: boolean, z: boolean]
 export type RigidBodyProps = {
   rigidBody?: RapierRigidBody
 
-  position?: Parameters<Vector3['set']>
-  rotation?: Parameters<Euler['set']>
-  scale?: Parameters<Vector3['set']>
-
   /**
    * Specify the type of this rigid body
    */
@@ -89,6 +85,11 @@ export type RigidBodyProps = {
    * values are 0.0 (no damping at all).
    */
   angularDamping?: number
+
+  /**
+   * Set the rigidBody as enabled or disabled.
+   */
+  enabled?: boolean
 }
 
 export default class RigidBody extends SvelteComponentTyped<RigidBodyProps> {}

package/dist/components/World/InnerWorld.svelte

@@ -20,12 +20,13 @@ export let rawQueryPipeline = undefined;
 export let rawPhysicsPipeline = undefined;
 export let rawSerializationPipeline = undefined;
 export let rawDebugRenderPipeline = undefined;
+export let order = 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);
+useFrameHandler(rapierContext, order);
 onDestroy(async () => {
     await tick();
     rapierContext.world.free();

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

@@ -15,6 +15,7 @@ declare const __propDef: {
         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;
     };
     events: {
         [evt: string]: CustomEvent<any>;

package/dist/components/World/World.svelte

@@ -26,6 +26,12 @@ export let rawQueryPipeline = undefined;
 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;
 let error = false;
 const init = async () => {
     if ($initialized)
@@ -57,6 +63,7 @@ onMount(init);
     {rawPhysicsPipeline}
     {rawSerializationPipeline}
     {rawDebugRenderPipeline}
+		{order}
   >
     <slot />
   </InnerWorld>

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

@@ -31,6 +31,7 @@ export type WorldProps = {
   rawPhysicsPipeline?: RawPhysicsPipeline
   rawSerializationPipeline?: RawSerializationPipeline
   rawDebugRenderPipeline?: RawDebugRenderPipeline
+  order?: number
 }
 
 export default class World extends SvelteComponentTyped<WorldProps> {}

package/dist/hooks/useFrameHandler.d.ts

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

package/dist/hooks/useFrameHandler.js

@@ -1,5 +1,6 @@
 import { Collider, EventQueue } from '@dimforge/rapier3d-compat';
 import { useFrame } from '@threlte/core';
+import { derived } from 'svelte/store';
 import { Object3D, Quaternion, Vector3 } from 'three';
 const tempObject = new Object3D();
 const tempVector3 = new Vector3();
@@ -22,17 +23,14 @@ const getEventDispatchers = (ctx, collider1, collider2) => {
         rigidBodyDispatcher2
     };
 };
-export const useFrameHandler = (ctx) => {
+export const useFrameHandler = (ctx, order) => {
     const eventQueue = new EventQueue(false);
-    let time = performance.now();
-    useFrame(() => {
+    const { start, started, stop } = useFrame((_, delta) => {
         // if (!eventQueue) return
         const { world } = ctx;
         // Set timestep to current delta, to allow for variable frame rates
         // We cap the delta at 100, so that the physics simulation doesn't get wild
-        const now = performance.now();
-        const delta = Math.min(100, now - time);
-        world.timestep = delta / 1000;
+        world.timestep = Math.min(0.1, delta);
         world.step(eventQueue);
         // Update meshes
         ctx.rigidBodyObjects.forEach((mesh, handle) => {
@@ -227,6 +225,9 @@ export const useFrameHandler = (ctx) => {
                 });
             }
         });
-        time = now;
-    });
+    }, { order });
+    // replacing the original pause and resume functions as well as the paused property
+    ctx.pause = () => stop();
+    ctx.resume = () => start();
+    ctx.paused = derived(started, (started) => !started);
 };

package/dist/index.d.ts

@@ -13,6 +13,7 @@ export { default as Collider } from './components/Colliders/Collider.svelte';
 export { default as AutoColliders } from './components/Colliders/AutoColliders.svelte';
 export { default as CollisionGroups } from './components/CollisionGroups/CollisionGroups.svelte';
 export { default as Attractor } from './components/Attractor/Attractor.svelte';
+export { computeBitMask } from './lib/computeBitMask';
 export { default as BasicPlayerController } from './recipes/BasicPlayerController.svelte';
 export type { AutoCollidersProperties, AttractorProperties } from './types/components';
 export type { CollisionGroupsBitMask, AutoCollidersShapes, ColliderEventDispatcher, ColliderShapes, RapierContext, RigidBodyEventDispatcher, CollisionEnterEvent, CollisionExitEvent, SensorEnterEvent, SensorExitEvent, ContactEvent } from './types/types';

package/dist/index.js

@@ -16,5 +16,7 @@ export { default as Collider } from './components/Colliders/Collider.svelte';
 export { default as AutoColliders } from './components/Colliders/AutoColliders.svelte';
 export { default as CollisionGroups } from './components/CollisionGroups/CollisionGroups.svelte';
 export { default as Attractor } from './components/Attractor/Attractor.svelte';
+// lib
+export { computeBitMask } from './lib/computeBitMask';
 // recipes
 export { default as BasicPlayerController } from './recipes/BasicPlayerController.svelte';

package/dist/lib/computeBitMask.d.ts

@@ -0,0 +1,5 @@
+declare type N = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15;
+export declare type Groups = N[];
+export declare type MembershipsAndFilter = N[];
+export declare const computeBitMask: (groups: Groups, filter: MembershipsAndFilter, memberships: MembershipsAndFilter) => number;
+export {};

package/dist/lib/computeBitMask.js

@@ -0,0 +1,20 @@
+export const computeBitMask = (groups, filter, memberships) => {
+    if (groups !== undefined) {
+        // groups is setting the filter and memberships at once
+        const g = groups;
+        const mask = g.reduce((acc, f) => {
+            return acc | (1 << f);
+        }, 0) |
+            g.reduce((acc, m) => {
+                return acc | (1 << (m + 16));
+            }, 0);
+        return mask;
+    }
+    const mask = memberships.reduce((acc, f) => {
+        return acc | (1 << f);
+    }, 0) |
+        filter.reduce((acc, m) => {
+            return acc | (1 << (m + 16));
+        }, 0);
+    return mask;
+};

package/dist/lib/createRapierContext.d.ts

@@ -14,4 +14,7 @@ export declare const createRapierContext: (gravity: RAPIER.Vector, rawIntegratio
     addRigidBodyToContext: (rigidBody: RigidBody, object: Object3D, eventDispatcher: RigidBodyEventDispatcher) => void;
     removeRigidBodyFromContext: (rigidBody: RigidBody) => void;
     debug: import("svelte/store").Writable<boolean>;
+    pause: () => void;
+    resume: () => void;
+    paused: import("svelte/store").Readable<boolean>;
 };

package/dist/lib/createRapierContext.js

@@ -1,5 +1,6 @@
 import RAPIER from '@dimforge/rapier3d-compat';
-import { writable } from 'svelte/store';
+import { currentWritable } from '@threlte/core';
+import { readable, writable } from 'svelte/store';
 export const createRapierContext = (...args) => {
     const world = new RAPIER.World(...args);
     const colliderObjects = new Map();
@@ -42,6 +43,11 @@ export const createRapierContext = (...args) => {
         rigidBodyObjects.delete(rigidBody.handle);
         rigidBodyEventDispatchers.delete(rigidBody.handle);
     };
+    // Dummy functions, will be replaced by useFrameHandler fn
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    const pause = () => { };
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    const resume = () => { };
     return {
         rapier: RAPIER,
         world,
@@ -54,5 +60,8 @@ export const createRapierContext = (...args) => {
         addRigidBodyToContext,
         removeRigidBodyFromContext,
         debug: writable(false),
+        pause,
+        resume,
+        paused: readable(false)
     };
 };

package/dist/lib/scaleColliderArgs.js

@@ -21,5 +21,5 @@ export const scaleColliderArgs = (shape, args, scale) => {
         return newArgs;
     }
     const scaleArray = [scale.x, scale.y, scale.z];
-    return newArgs.map((arg, index) => scaleArray[index] * arg);
+    return newArgs.map((arg, index) => (scaleArray[index] ?? 1) * arg);
 };

package/dist/recipes/BasicPlayerController.svelte

@@ -1,5 +1,4 @@
-<script>import { T, useFrame, useThrelte } from '@threlte/core';
-import { createEventDispatcher } from 'svelte';
+<script>import { createRawEventDispatcher, T, useFrame, useThrelte } from '@threlte/core';
 import { Vector2, Vector3 } from 'three';
 import Collider from '../components/Colliders/Collider.svelte';
 import CollisionGroups from '../components/CollisionGroups/CollisionGroups.svelte';
@@ -23,7 +22,7 @@ const keys = {
 };
 const t = new Vector3();
 const t2 = new Vector2();
-const dispatch = createEventDispatcher();
+const dispatch = createRawEventDispatcher();
 let grounded = false;
 let groundsSensored = 0;
 $: {
@@ -99,37 +98,33 @@ const onKeyUp = (e) => {
 };
 </script>
 
-<svelte:window
-  on:keydown|preventDefault={onKeyDown}
-  on:keyup|preventDefault={onKeyUp}
-/>
+<svelte:window on:keydown|preventDefault={onKeyDown} on:keyup|preventDefault={onKeyUp} />
 
-<RigidBody
-  dominance={127}
-  enabledRotations={[false, false, false]}
-  bind:rigidBody
-  {position}
-  type={'dynamic'}
->
-  <CollisionGroups groups={playerCollisionGroups}>
-    <Collider
-      shape={'capsule'}
-      args={[height / 2 - radius, radius]}
-    />
-  </CollisionGroups>
+<T.Group {position}>
+  <RigidBody
+    dominance={127}
+    enabledRotations={[false, false, false]}
+    bind:rigidBody
+    type={'dynamic'}
+  >
+    <CollisionGroups groups={playerCollisionGroups}>
+      <Collider shape={'capsule'} args={[height / 2 - radius, radius]} />
+    </CollisionGroups>
 
-  <CollisionGroups groups={groundCollisionGroups}>
-    <Collider
-      sensor
-      on:sensorenter={() => (groundsSensored += 1)}
-      on:sensorexit={() => (groundsSensored -= 1)}
-      shape={'ball'}
-      args={[radius * 1.2]}
-      position={[0, -height / 2 + radius, 0]}
-    />
-  </CollisionGroups>
+    <CollisionGroups groups={groundCollisionGroups}>
+      <T.Group position={[0, -height / 2 + radius, 0]}>
+        <Collider
+          sensor
+          on:sensorenter={() => (groundsSensored += 1)}
+          on:sensorexit={() => (groundsSensored -= 1)}
+          shape={'ball'}
+          args={[radius * 1.2]}
+        />
+      </T.Group>
+    </CollisionGroups>
 
-  <T.Group position.y={-height / 2}>
-    <slot />
-  </T.Group>
-</RigidBody>
+    <T.Group position.y={-height / 2}>
+      <slot />
+    </T.Group>
+  </RigidBody>
+</T.Group>

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

@@ -12,9 +12,6 @@ declare const __propDef: {
         groundCollisionGroups?: CollisionGroupsBitMask | undefined;
     };
     events: {
-        groundenter: CustomEvent<void>;
-        groundexit: CustomEvent<void>;
-    } & {
         [evt: string]: CustomEvent<any>;
     };
     slots: {

package/dist/types/types.d.ts

@@ -1,8 +1,8 @@
-import type { createEventDispatcher } from 'svelte';
-import type { RigidBody, RigidBodyHandle, TempContactManifold, ColliderHandle, Collider, Vector } from '@dimforge/rapier3d-compat';
-import type { createRapierContext } from '../lib/createRapierContext';
+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 declare type ColliderShapes = 'ball' | 'capsule' | 'segment' | 'triangle' | 'roundTriangle' | 'polyline' | 'trimesh' | 'cuboid' | 'roundCuboid' | 'heightfield' | 'cylinder' | 'roundCylinder' | 'cone' | 'roundCone' | 'convexHull' | 'convexMesh' | 'roundConvexHull' | 'roundConvexMesh';
 export declare type AutoCollidersShapes = 'cuboid' | 'ball' | 'trimesh' | 'convexHull' | 'capsule';
 export declare type ColliderEventMap = {
@@ -42,8 +42,8 @@ export declare type RigidBodyEventMap = ColliderEventMap & {
     sleep: void;
     wake: void;
 };
-export declare type RigidBodyEventDispatcher = ReturnType<typeof createEventDispatcher<RigidBodyEventMap>>;
-export declare type ColliderEventDispatcher = ReturnType<typeof createEventDispatcher<ColliderEventMap>>;
+export declare type RigidBodyEventDispatcher = ReturnType<typeof createRawEventDispatcher<RigidBodyEventMap>>;
+export declare type ColliderEventDispatcher = ReturnType<typeof createRawEventDispatcher<ColliderEventMap>>;
 export declare type RigidBodyEventDispatchers = Map<RigidBodyHandle, RigidBodyEventDispatcher>;
 export declare type ColliderEventDispatchers = Map<ColliderHandle, ColliderEventDispatcher>;
 export declare type RapierContext = ReturnType<typeof createRapierContext>;

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@threlte/rapier",
-  "version": "1.0.0-next.0",
+  "version": "1.0.0-next.1",
   "author": "Grischa Erbe <hello@legrisch.com> (https://legrisch.com)",
   "license": "MIT",
   "devDependencies": {
-    "@dimforge/rapier3d-compat": "^0.9.0",
+    "@dimforge/rapier3d-compat": "^0.11.2",
     "@sveltejs/adapter-auto": "1.0.0-next.61",
     "@sveltejs/adapter-static": "1.0.0-next.35",
     "@sveltejs/kit": "1.0.0-next.377",
-    "@threlte/core": "6.0.0-next.0",
+    "@threlte/core": "6.0.0-next.2",
     "@types/node": "^18.0.3",
     "@types/three": "^0.144.0",
     "@typescript-eslint/eslint-plugin": "^4.31.1",
@@ -23,7 +23,7 @@
     "svelte-check": "^2.7.0",
     "svelte-preprocess": "^4.10.5",
     "svelte2tsx": "^0.5.9",
-    "three": "^0.145.0",
+    "three": "^0.151.3",
     "ts-node": "^10.8.2",
     "tsafe": "^0.9.0",
     "tslib": "^2.3.1",