@threlte/rapier 1.1.4 → 2.0.1

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/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.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,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/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/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/RigidBody/RigidBody.svelte.d.ts

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

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

@@ -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,5 +1,5 @@
-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();
@@ -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/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/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/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:
@@ -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: {
@@ -21,6 +21,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,3 +1,4 @@
+/// <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';

package/package.json

@@ -1,40 +1,62 @@
 {
   "name": "@threlte/rapier",
-  "version": "1.1.4",
+  "version": "2.0.1",
   "author": "Grischa Erbe <hello@legrisch.com> (https://legrisch.com)",
   "license": "MIT",
+  "description": "Components and hooks to use the Rapier physics engine in Threlte",
   "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"
+    "@sveltejs/adapter-auto": "^3.1.1",
+    "@sveltejs/kit": "^2.4.3",
+    "@sveltejs/package": "^2.2.6",
+    "@sveltejs/vite-plugin-svelte": "^3.0.0",
+    "@types/node": "^20.11.6",
+    "@types/three": "^0.160.0",
+    "@typescript-eslint/eslint-plugin": "^6.19.1",
+    "@typescript-eslint/parser": "^6.19.1",
+    "@yushijinhun/three-minifier-rollup": "^0.4.0",
+    "eslint": "^8.56.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-svelte": "^2.35.1",
+    "prettier": "^3.2.4",
+    "prettier-plugin-svelte": "^3.1.2",
+    "publint": "^0.2.7",
+    "rimraf": "^5.0.5",
+    "svelte": "^4.2.9",
+    "svelte-check": "^3.6.3",
+    "svelte-preprocess": "^5.1.3",
+    "svelte2tsx": "^0.7.0",
+    "three": "^0.160.1",
+    "tslib": "^2.6.2",
+    "type-fest": "^4.10.1",
+    "typescript": "^5.3.3",
+    "vite": "^5.0.12",
+    "@threlte/core": "7.3.1"
   },
   "peerDependencies": {
+    "@dimforge/rapier3d-compat": ">=0.11",
     "svelte": ">=4",
-    "three": ">=0.133",
-    "@dimforge/rapier3d-compat": ">=0.11"
+    "three": ">=0.152"
   },
   "type": "module",
+  "keywords": [
+    "threlte",
+    "rapier",
+    "svelte",
+    "three",
+    "three.js",
+    "3d",
+    "physics"
+  ],
+  "homepage": "https://threlte.xyz",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/threlte/threlte.git",
+    "directory": "packages/rapier"
+  },
+  "bugs": {
+    "url": "https://github.com/threlte/threlte/issues"
+  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -47,6 +69,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",