@threlte/rapier 1.1.2 → 1.1.3

package/dist/components/Colliders/AutoColliders.svelte

@@ -6,6 +6,8 @@ import { useCollisionGroups } from '../../hooks/useCollisionGroups';
 import { useHasEventListeners } from '../../hooks/useHasEventListener';
 import { useRapier } from '../../hooks/useRapier';
 import { useRigidBody } from '../../hooks/useRigidBody';
+import { useCreateEvent } from '../../lib/useCreateEvent';
+import { useParentRigidbodyObject } from '../../lib/rigidBodyObjectContext';
 import { applyColliderActiveEvents } from '../../lib/applyColliderActiveEvents';
 import { createCollidersFromChildren } from '../../lib/createCollidersFromChildren';
 import { eulerToQuaternion } from '../../lib/eulerToQuaternion';
@@ -22,7 +24,9 @@ export let centerOfMass = undefined;
 export let principalAngularInertia = undefined;
 export let angularInertiaLocalFrame = undefined;
 const group = new Group();
+const { updateRef } = useCreateEvent();
 const rigidBody = useRigidBody();
+const rigidBodyParentObject = useParentRigidbodyObject();
 const { world, addColliderToContext, removeColliderFromContext } = useRapier();
 export let colliders = [];
 const collisionGroups = useCollisionGroups();
@@ -38,7 +42,7 @@ const cleanup = () => {
 };
 export const create = () => {
     cleanup();
-    colliders = createCollidersFromChildren(group, shape ?? 'convexHull', world, rigidBody);
+    colliders = createCollidersFromChildren(group, shape ?? 'convexHull', world, rigidBody, rigidBodyParentObject);
     colliders.forEach((c) => addColliderToContext(c, group, dispatcher));
     collisionGroups.registerColliders(colliders);
     colliders.forEach((collider) => {
@@ -63,6 +67,7 @@ export const create = () => {
                 collider.setMass(mass);
         }
     });
+    updateRef(colliders);
 };
 onMount(() => {
     create();

package/dist/components/Colliders/Collider.svelte

@@ -6,6 +6,8 @@ import { useCollisionGroups } from '../../hooks/useCollisionGroups';
 import { useHasEventListeners } from '../../hooks/useHasEventListener';
 import { useRapier } from '../../hooks/useRapier';
 import { useRigidBody } from '../../hooks/useRigidBody';
+import { useParentRigidbodyObject } from '../../lib/rigidBodyObjectContext';
+import { useCreateEvent } from '../../lib/useCreateEvent';
 import { applyColliderActiveEvents } from '../../lib/applyColliderActiveEvents';
 import { eulerToQuaternion } from '../../lib/eulerToQuaternion';
 import { getWorldPosition, getWorldQuaternion } from '../../lib/getWorldTransforms';
@@ -25,7 +27,9 @@ export let centerOfMass = undefined;
 export let principalAngularInertia = undefined;
 export let angularInertiaLocalFrame = undefined;
 const object = new Object3D();
+const { updateRef } = useCreateEvent();
 const rigidBody = useRigidBody();
+const parentRigidBodyObject = useParentRigidbodyObject();
 const hasRigidBodyParent = !!rigidBody;
 const rapierContext = useRapier();
 const { world } = rapierContext;
@@ -43,6 +47,8 @@ onMount(async () => {
     // @ts-ignore
     const colliderDesc = ColliderDesc[shape](...scaledArgs);
     collider = world.createCollider(colliderDesc, rigidBody);
+    collider.setActiveCollisionTypes(ActiveCollisionTypes.ALL);
+    updateRef(collider);
     /**
      * Add collider to context
      */
@@ -54,13 +60,9 @@ onMount(async () => {
     if (hasRigidBodyParent) {
         const rigidBodyWorldPos = new Vector3();
         const rigidBodyWorldQuatInversed = new Quaternion();
-        object.traverseAncestors((child) => {
-            if (child.userData.isRigidBody) {
-                child.getWorldPosition(rigidBodyWorldPos);
-                child.getWorldQuaternion(rigidBodyWorldQuatInversed);
-                rigidBodyWorldQuatInversed.invert();
-            }
-        });
+        parentRigidBodyObject?.getWorldPosition(rigidBodyWorldPos);
+        parentRigidBodyObject?.getWorldQuaternion(rigidBodyWorldQuatInversed);
+        rigidBodyWorldQuatInversed.invert();
         const worldPosition = object.getWorldPosition(new Vector3()).sub(rigidBodyWorldPos);
         const worldRotation = object
             .getWorldQuaternion(new Quaternion())
@@ -74,33 +76,29 @@ onMount(async () => {
     }
 });
 const { hasEventListeners: colliderHasEventListeners } = useHasEventListeners();
-$: {
-    if (collider) {
-        applyColliderActiveEvents(collider, colliderHasEventListeners, rigidBody?.userData?.hasEventListeners);
-        collider.setActiveCollisionTypes(ActiveCollisionTypes.ALL);
-        collider.setRestitution(restitution ?? 0);
-        collider.setContactForceEventThreshold(1);
-        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);
-            }
-        }
+$: collider?.setRestitution(restitution ?? 0);
+$: collider?.setRestitutionCombineRule(restitutionCombineRule ?? CoefficientCombineRule.Average);
+$: collider?.setFriction(friction ?? 0.7);
+$: collider?.setFrictionCombineRule(frictionCombineRule ?? CoefficientCombineRule.Average);
+$: collider?.setSensor(sensor ?? false);
+$: collider?.setContactForceEventThreshold(contactForceEventThreshold ?? 0);
+$: if (density)
+    collider?.setDensity(density);
+$: if (collider && mass) {
+    if (centerOfMass && principalAngularInertia && angularInertiaLocalFrame) {
+        collider.setMassProperties(mass, { x: centerOfMass[0], y: centerOfMass[1], z: centerOfMass[2] }, {
+            x: principalAngularInertia[0],
+            y: principalAngularInertia[1],
+            z: principalAngularInertia[2]
+        }, eulerToQuaternion(angularInertiaLocalFrame));
+    }
+    else {
+        collider.setMass(mass);
     }
 }
+$: if (collider) {
+    applyColliderActiveEvents(collider, colliderHasEventListeners, rigidBody?.userData?.hasEventListeners);
+}
 export const refresh = () => {
     if (!collider)
         return;

package/dist/components/Debug/Debug.svelte

@@ -3,12 +3,7 @@ import { onDestroy } from 'svelte';
 import { BufferAttribute, BufferGeometry } from 'three';
 import { useRapier } from '../../hooks/useRapier';
 const { world, debug } = useRapier();
-const buffers = world.debugRender();
-const vertices = new BufferAttribute(buffers.vertices, 3);
-const colors = new BufferAttribute(buffers.colors, 4);
 const geometry = new BufferGeometry();
-geometry.setAttribute('position', vertices);
-geometry.setAttribute('color', colors);
 debug.set(true);
 useFrame(() => {
     const buffers = world.debugRender();
@@ -18,16 +13,15 @@ useFrame(() => {
     geometry.setAttribute('color', colors);
 });
 onDestroy(() => {
-    geometry.dispose();
     debug.set(false);
 });
 </script>
 
-<T.LineSegments renderOrder={Infinity}>
-  <T
-    is={geometry}
-    attach="geometry"
-  />
+<T.LineSegments
+  frustumCulled={false}
+  renderOrder={Infinity}
+>
+  <T is={geometry} />
   <T.LineBasicMaterial
     vertexColors
     {...$$restProps}

package/dist/components/RigidBody/RigidBody.svelte

@@ -5,6 +5,8 @@ import { useHasEventListeners } from '../../hooks/useHasEventListener';
 import { useRapier } from '../../hooks/useRapier';
 import { getWorldPosition, getWorldQuaternion, getWorldScale } from '../../lib/getWorldTransforms';
 import { parseRigidBodyType } from '../../lib/parseRigidBodyType';
+import { setParentRigidbodyObject } from '../../lib/rigidBodyObjectContext';
+import { useCreateEvent } from '../../lib/useCreateEvent';
 const { world, rapier, addRigidBodyToContext, removeRigidBodyFromContext } = useRapier();
 export let linearVelocity = undefined;
 export let angularVelocity = undefined;
@@ -22,11 +24,8 @@ export let dominance = 0;
 export let enabled = true;
 export let userData = {};
 const dispatcher = createRawEventDispatcher();
+const { updateRef } = useCreateEvent();
 const object = new Object3D();
-/**
- * Used to traverseAncestors to restore transform
- */
-object.userData.isRigidBody = true;
 /**
  * isSleeping used for events "sleep" and "wake" in `useFrameHandler`
  */
@@ -56,6 +55,7 @@ const initPosition = async () => {
     rigidBodyTemp.setTranslation(worldPosition, true);
     rigidBodyTemp.setRotation(worldQuaternion, true);
     rigidBody = rigidBodyTemp;
+    updateRef(rigidBody);
 };
 initPosition();
 /**
@@ -93,6 +93,10 @@ $: rigidBodyTemp.userData = {
  * hook onto.
  */
 setContext('threlte-rapier-rigidbody', rigidBodyTemp);
+/**
+ * Used by child colliders to restore transform
+ */
+setParentRigidbodyObject(object);
 /**
  * Add the mesh to the context
  */

package/dist/lib/createCollidersFromChildren.d.ts

@@ -13,4 +13,4 @@ import type { AutoCollidersShapes } from '../types/types';
  * @param rigidBody
  * @returns
  */
-export declare const createCollidersFromChildren: (object: Object3D, collidersType: AutoCollidersShapes, world: World, rigidBody?: RigidBody) => Collider[];
+export declare const createCollidersFromChildren: (object: Object3D, collidersType: AutoCollidersShapes, world: World, rigidBody?: RigidBody, rigidBodyParentObject?: Object3D) => Collider[];

package/dist/lib/createCollidersFromChildren.js

@@ -1,5 +1,12 @@
 import { ActiveEvents, Collider, ColliderDesc, World, RigidBody } from '@dimforge/rapier3d-compat';
 import { Mesh, Quaternion, Vector3 } from 'three';
+const offset = new Vector3();
+const worldPosition = new Vector3();
+const worldQuaternion = new Quaternion();
+const worldScale = new Vector3();
+const size = new Vector3();
+const rigidBodyWorldPos = new Vector3();
+const rigidBodyWorldQuatInversed = new Quaternion();
 /**
  *
  * Creates collider descriptions including default translations
@@ -12,39 +19,34 @@ import { Mesh, Quaternion, Vector3 } from 'three';
  * @param rigidBody
  * @returns
  */
-export const createCollidersFromChildren = (object, collidersType, world, rigidBody) => {
+export const createCollidersFromChildren = (object, collidersType, world, rigidBody, rigidBodyParentObject) => {
     const colliders = [];
     let description;
-    const offset = new Vector3();
     /**
      * Trying to find the parent RigidBody.
      * If we find something, good. If not,
      * the Colliders are created on the world positions
      * of the meshes they resemble.
      */
-    const rigidBodyWorldPos = new Vector3();
-    const rigidBodyWorldQuatInversed = new Quaternion();
-    object.traverseAncestors((child) => {
-        if (child.userData.isRigidBody) {
-            child.getWorldPosition(rigidBodyWorldPos);
-            child.getWorldQuaternion(rigidBodyWorldQuatInversed);
-            rigidBodyWorldQuatInversed.invert();
-        }
-    });
+    rigidBodyWorldPos.set(0, 0, 0);
+    rigidBodyWorldQuatInversed.set(0, 0, 0, 1);
+    rigidBodyParentObject?.getWorldPosition(rigidBodyWorldPos);
+    rigidBodyParentObject?.getWorldQuaternion(rigidBodyWorldQuatInversed).invert();
     object.traverse((child) => {
         if ('isMesh' in child) {
             const { geometry } = child;
-            const worldPos = child.getWorldPosition(new Vector3());
-            const { x, y, z } = worldPos.sub(rigidBodyWorldPos);
-            const worldQuat = child.getWorldQuaternion(new Quaternion());
-            const { x: rx, y: ry, z: rz, w: rw } = worldQuat.clone().premultiply(rigidBodyWorldQuatInversed);
-            const scale = child.getWorldScale(new Vector3());
+            const worldPos = child.getWorldPosition(worldPosition);
+            const translation = worldPos.sub(rigidBodyWorldPos);
+            const worldQuat = child.getWorldQuaternion(worldQuaternion);
+            const rotation = worldQuat.clone().premultiply(rigidBodyWorldQuatInversed);
+            const scale = child.getWorldScale(worldScale);
+            offset.set(0, 0, 0);
             switch (collidersType) {
                 case 'cuboid':
                     {
                         geometry.computeBoundingBox();
                         const { boundingBox } = geometry;
-                        const size = boundingBox.getSize(new Vector3());
+                        boundingBox.getSize(size);
                         boundingBox.getCenter(offset);
                         description = ColliderDesc.cuboid((size.x / 2) * scale.x, (size.y / 2) * scale.y, (size.z / 2) * scale.z);
                     }
@@ -60,31 +62,28 @@ export const createCollidersFromChildren = (object, collidersType, world, rigidB
                     break;
                 case 'trimesh':
                     {
-                        const g = geometry.clone().scale(scale.x, scale.y, scale.z);
-                        description = ColliderDesc.trimesh(g.attributes.position.array, g.index?.array);
+                        description = ColliderDesc.trimesh(new Float32Array(geometry.attributes.position.array), new Uint32Array(geometry.index?.array ?? []));
                     }
                     break;
                 case 'capsule':
                     {
                         geometry.computeBoundingBox();
                         const { boundingBox } = geometry;
-                        const size = boundingBox.getSize(new Vector3());
+                        boundingBox.getSize(size);
                         boundingBox.getCenter(offset);
                         const radius = Math.max((size.x / 2) * scale.x, (size.z / 2) * scale.z);
                         description = ColliderDesc.capsule((size.y / 2) * scale.y - radius, radius);
                     }
                     break;
                 case 'convexHull':
-                    // eslint-disable-next-line no-case-declarations
-                    const g = geometry.clone().scale(scale.x, scale.y, scale.z);
                     {
-                        description = ColliderDesc.convexHull(g.attributes.position.array);
+                        description = ColliderDesc.convexHull(new Float32Array(geometry.attributes.position.array));
                     }
                     break;
             }
             description
-                .setTranslation(x + offset.x, y + offset.y, z + offset.z)
-                .setRotation({ x: rx, y: ry, z: rz, w: rw })
+                .setTranslation(translation.x + offset.x, translation.y + offset.y, translation.z + offset.z)
+                .setRotation(rotation)
                 .setActiveEvents(ActiveEvents.COLLISION_EVENTS);
             const collider = world.createCollider(description, rigidBody);
             colliders.push(collider);

package/dist/lib/createRapierContext.js

@@ -1,5 +1,4 @@
 import RAPIER from '@dimforge/rapier3d-compat';
-import { currentWritable } from '@threlte/core';
 import { readable, writable } from 'svelte/store';
 export const createRapierContext = (...args) => {
     const world = new RAPIER.World(...args);

package/dist/lib/rigidBodyObjectContext.d.ts

@@ -0,0 +1,2 @@
+export declare const useParentRigidbodyObject: () => THREE.Object3D | undefined;
+export declare const setParentRigidbodyObject: (object3d: THREE.Object3D) => void;

package/dist/lib/rigidBodyObjectContext.js

@@ -0,0 +1,8 @@
+import { getContext, setContext } from 'svelte';
+const key = Symbol('threlte-rapier-rigidbody-object3d');
+export const useParentRigidbodyObject = () => {
+    return getContext(key);
+};
+export const setParentRigidbodyObject = (object3d) => {
+    setContext(key, object3d);
+};

package/dist/lib/useCreateEvent.d.ts

@@ -0,0 +1,3 @@
+export declare const useCreateEvent: <T>() => {
+    updateRef: (newRef: T) => void;
+};

package/dist/lib/useCreateEvent.js

@@ -0,0 +1,31 @@
+import { onDestroy } from 'svelte';
+import { createRawEventDispatcher } from '@threlte/core';
+export const useCreateEvent = () => {
+    const dispatchRaw = createRawEventDispatcher();
+    const cleanupFunctions = [];
+    let ref = undefined;
+    const dispatchCreateEvent = () => {
+        // call every cleanup function
+        cleanupFunctions.forEach((cleanup) => cleanup());
+        // clear the cleanup functions array
+        cleanupFunctions.length = 0;
+        const cleanup = (callback) => {
+            // add cleanup function to array
+            cleanupFunctions.push(callback);
+        };
+        if (ref === undefined)
+            return;
+        dispatchRaw('create', { ref, cleanup });
+    };
+    const updateRef = (newRef) => {
+        ref = newRef;
+        dispatchCreateEvent();
+    };
+    onDestroy(() => {
+        // call every cleanup function
+        cleanupFunctions.forEach((cleanup) => cleanup());
+    });
+    return {
+        updateRef
+    };
+};

package/dist/types/types.d.ts

@@ -6,6 +6,10 @@ 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: {
+        ref: Collider;
+        cleanup: (callback: () => void) => void;
+    };
     collisionenter: {
         targetCollider: Collider;
         targetRigidBody: RigidBody | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@threlte/rapier",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "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": "6.0.7"
+    "@threlte/core": "6.1.1"
   },
   "peerDependencies": {
     "svelte": ">=4",