@dice-o-rolla/dice-physics-rapier 0.1.0 → 0.2.0

package/dist/rapier-physics-world.d.ts

@@ -1,5 +1,5 @@
 import type { Vector3Like } from '@dice-o-rolla/dice-core';
-import type { CreatePhysicsDieOptions, PhysicsDieHandle, PhysicsWorld, TrayOptions } from '@dice-o-rolla/dice-physics';
+import type { CreatePhysicsDieOptions, PhysicsCollisionEvent, PhysicsImpactEvent, PhysicsDieHandle, PhysicsWorld, TrayOptions } from '@dice-o-rolla/dice-physics';
 export interface RapierPhysicsWorldOptions {
     readonly gravity?: Vector3Like;
 }
@@ -10,6 +10,9 @@ export declare class RapierPhysicsWorld implements PhysicsWorld {
     createDie(options: CreatePhysicsDieOptions): PhysicsDieHandle;
     configureTray(options: TrayOptions): void;
     setGravity(gravity: Vector3Like): void;
+    setCollisionEventsEnabled(enabled: boolean): void;
+    drainCollisionEvents(): readonly PhysicsCollisionEvent[];
+    drainImpactEvents(): readonly PhysicsImpactEvent[];
     step(dtSeconds: number): void;
     removeDie(id: string): void;
     clear(): void;

package/dist/rapier-physics-world.js

@@ -6,13 +6,18 @@ const DEFAULT_GRAVITY = { x: 0, y: -9.81, z: 0 };
 export class RapierPhysicsWorld {
     #rapier;
     #world;
+    #eventQueue;
     #dice = new Map();
+    #colliderDice = new Map();
+    #dieColliders = new Map();
     #trayBody;
+    #collisionEventsEnabled = false;
     #destroyed = false;
     constructor(rapier, gravity) {
         assertVector(gravity, 'gravity');
         this.#rapier = rapier;
         this.#world = new rapier.World(gravity);
+        this.#eventQueue = new rapier.EventQueue(true);
     }
     static async create(options = {}) {
         const rapier = await initializeRapier();
@@ -37,9 +42,15 @@ export class RapierPhysicsWorld {
             .setCanSleep(true)
             .setCcdEnabled(true);
         const colliderDescriptor = createConvexHullCollider(this.#rapier, options.collider, options.scale, options.mass, options.material);
+        colliderDescriptor.setActiveEvents(this.#collisionEventsEnabled
+            ? this.#rapier.ActiveEvents.COLLISION_EVENTS |
+                this.#rapier.ActiveEvents.CONTACT_FORCE_EVENTS
+            : this.#rapier.ActiveEvents.NONE);
         const body = this.#world.createRigidBody(bodyDescriptor);
         try {
-            this.#world.createCollider(colliderDescriptor, body);
+            const collider = this.#world.createCollider(colliderDescriptor, body);
+            this.#colliderDice.set(collider.handle, options.id);
+            this.#dieColliders.set(options.id, collider.handle);
         }
         catch (error) {
             this.#world.removeRigidBody(body);
@@ -82,17 +93,70 @@ export class RapierPhysicsWorld {
         assertVector(gravity, 'gravity');
         this.#world.gravity = { x: gravity.x, y: gravity.y, z: gravity.z };
     }
+    setCollisionEventsEnabled(enabled) {
+        this.#assertAlive();
+        this.#collisionEventsEnabled = enabled;
+        const activeEvents = enabled
+            ? this.#rapier.ActiveEvents.COLLISION_EVENTS | this.#rapier.ActiveEvents.CONTACT_FORCE_EVENTS
+            : this.#rapier.ActiveEvents.NONE;
+        for (const die of this.#dice.values()) {
+            for (let index = 0; index < die.body.numColliders(); index += 1) {
+                die.body.collider(index).setActiveEvents(activeEvents);
+            }
+        }
+        this.#eventQueue.clear();
+    }
+    drainCollisionEvents() {
+        this.#assertAlive();
+        const events = [];
+        this.#eventQueue.drainCollisionEvents((firstHandle, secondHandle, started) => {
+            const first = this.#colliderDice.get(firstHandle);
+            const second = this.#colliderDice.get(secondHandle);
+            const dieId = first ?? second;
+            if (dieId === undefined)
+                return;
+            const otherDieId = first === undefined || second === undefined ? undefined : second;
+            events.push(Object.freeze({
+                dieId,
+                ...(otherDieId === undefined ? {} : { otherDieId }),
+                started,
+            }));
+        });
+        return Object.freeze(events);
+    }
+    drainImpactEvents() {
+        this.#assertAlive();
+        const events = [];
+        this.#eventQueue.drainContactForceEvents((contact) => {
+            const first = this.#colliderDice.get(contact.collider1());
+            const second = this.#colliderDice.get(contact.collider2());
+            const dieId = first ?? second;
+            if (dieId === undefined)
+                return;
+            const otherDieId = first === undefined || second === undefined ? undefined : second;
+            events.push(Object.freeze({
+                dieId,
+                ...(otherDieId === undefined ? {} : { otherDieId }),
+                force: contact.totalForceMagnitude(),
+            }));
+        });
+        return Object.freeze(events);
+    }
     step(dtSeconds) {
         this.#assertAlive();
         assertPositive(dtSeconds, 'dtSeconds');
         this.#world.timestep = dtSeconds;
-        this.#world.step();
+        this.#world.step(this.#collisionEventsEnabled ? this.#eventQueue : undefined);
     }
     removeDie(id) {
         this.#assertAlive();
         const die = this.#dice.get(id);
         if (die === undefined)
             return;
+        const colliderHandle = this.#dieColliders.get(id);
+        if (colliderHandle !== undefined)
+            this.#colliderDice.delete(colliderHandle);
+        this.#dieColliders.delete(id);
         this.#world.removeRigidBody(die.body);
         die.invalidate();
         this.#dice.delete(id);
@@ -104,12 +168,16 @@ export class RapierPhysicsWorld {
             die.invalidate();
         }
         this.#dice.clear();
+        this.#colliderDice.clear();
+        this.#dieColliders.clear();
+        this.#eventQueue.clear();
     }
     destroy() {
         if (this.#destroyed)
             return;
         this.clear();
         this.#removeTray();
+        this.#eventQueue.free();
         this.#world.free();
         this.#destroyed = true;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dice-o-rolla/dice-physics-rapier",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Rapier 3D physics backend for physical dice simulation.",
   "keywords": [
     "dice",
@@ -8,7 +8,16 @@
     "rapier",
     "wasm"
   ],
+  "homepage": "https://github.com/creepiest-space/dice-o-rolla#readme",
+  "bugs": {
+    "url": "https://github.com/creepiest-space/dice-o-rolla/issues"
+  },
   "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/creepiest-space/dice-o-rolla.git",
+    "directory": "packages/dice-physics-rapier"
+  },
   "files": [
     "dist",
     "README.md",
@@ -31,8 +40,8 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@dice-o-rolla/dice-core": "0.1.0",
-    "@dice-o-rolla/dice-physics": "0.1.0",
+    "@dice-o-rolla/dice-core": "0.2.0",
+    "@dice-o-rolla/dice-physics": "0.2.0",
     "@dimforge/rapier3d-compat": "^0.20.0"
   },
   "engines": {