@threlte/rapier 1.1.4 → 2.0.0

package/dist/components/Attractor/Attractor.svelte

@@ -1,4 +1,4 @@
-<script>import { T, useFrame } from '@threlte/core';
+<script>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/Colliders/Collider.svelte

@@ -1,5 +1,5 @@
 <script>import { ActiveCollisionTypes, CoefficientCombineRule, Collider, ColliderDesc } from '@dimforge/rapier3d-compat';
-import { createRawEventDispatcher, SceneGraphObject, useFrame } from '@threlte/core';
+import { createRawEventDispatcher, SceneGraphObject, useTask } from '@threlte/core';
 import { onDestroy, onMount, tick } from 'svelte';
 import { Object3D, Quaternion, Vector3 } from 'three';
 import { useCollisionGroups } from '../../hooks/useCollisionGroups';
@@ -109,10 +109,10 @@ export const refresh = () => {
  * 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'
 });
 $: {
     if (!hasRigidBodyParent && type === 'dynamic')

package/dist/components/Debug/Debug.svelte

@@ -1,11 +1,11 @@
-<script>import { T, useFrame } from '@threlte/core';
+<script>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/World/InnerWorld.svelte

@@ -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

@@ -15,7 +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;
+        stage?: import("@threlte/core").Key | import("@threlte/core").Stage | undefined;
     };
     events: {
         [evt: string]: CustomEvent<any>;

package/dist/components/World/World.svelte

@@ -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.
+* This is passed to the useTask handler.
 * Use this to control when the rapier physics engine is updating the scene.
 * @default undefined
 */
-export let order = 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,5 +1,5 @@
 import { Collider, EventQueue } from '@dimforge/rapier3d-compat';
-import { useFrame } from '@threlte/core';
+import { useTask } from '@threlte/core';
 import { derived } from 'svelte/store';
 import { Object3D, Quaternion, Vector3 } from 'three';
 const tempObject = new Object3D();
@@ -23,9 +23,9 @@ const getEventDispatchers = (ctx, collider1, collider2) => {
         rigidBodyDispatcher2
     };
 };
-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
@@ -122,6 +122,12 @@ export const useFrameHandler = (ctx, order) => {
                 return;
             }
             const { colliderDispatcher1, colliderDispatcher2, rigidBodyDispatcher1, rigidBodyDispatcher2 } = getEventDispatchers(ctx, collider1, collider2);
+            if (!colliderDispatcher1 &&
+                !colliderDispatcher2 &&
+                !rigidBodyDispatcher1 &&
+                !rigidBodyDispatcher2) {
+                return;
+            }
             const rigidBody1 = collider1.parent();
             const rigidBody2 = collider2.parent();
             if (started) {
@@ -225,7 +231,7 @@ export const useFrameHandler = (ctx, order) => {
                 });
             }
         });
-    }, { order });
+    }, { stage });
     // replacing the original pause and resume functions as well as the paused property
     ctx.pause = () => stop();
     ctx.resume = () => start();

package/dist/recipes/BasicPlayerController.svelte

@@ -1,4 +1,4 @@
-<script>import { createRawEventDispatcher, T, useFrame } from '@threlte/core';
+<script>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:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@threlte/rapier",
-  "version": "1.1.4",
+  "version": "2.0.0",
   "author": "Grischa Erbe <hello@legrisch.com> (https://legrisch.com)",
   "license": "MIT",
   "devDependencies": {
@@ -27,7 +27,7 @@
     "type-fest": "^2.13.0",
     "typescript": "^5.0.0",
     "vite": "^4.3.6",
-    "@threlte/core": "7.0.4"
+    "@threlte/core": "7.0.12"
   },
   "peerDependencies": {
     "svelte": ">=4",
@@ -47,6 +47,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",