@gg-web-engine/rapier3d 0.0.28 → 0.0.30

package/dist/components/rapier-3d-raycast-vehicle.component.d.ts

@@ -1,8 +1,9 @@
-import { Gg3dWorld, IRaycastVehicleComponent, IVisualScene3dComponent, Point3, Point4, SuspensionOptions, WheelOptions } from '@gg-web-engine/core';
+import { Gg3dWorld, IRaycastVehicleComponent, IVisualScene3dComponent, Point3, Point4, SuspensionOptions, VisualTypeDocRepo3D, WheelOptions } from '@gg-web-engine/core';
 import { DynamicRayCastVehicleController } from '@dimforge/rapier3d-compat';
 import { Rapier3dRigidBodyComponent } from './rapier-3d-rigid-body.component';
 import { Rapier3dWorldComponent } from './rapier-3d-world.component';
-export declare class Rapier3dRaycastVehicleComponent extends Rapier3dRigidBodyComponent implements IRaycastVehicleComponent<Rapier3dWorldComponent> {
+import { Rapier3dPhysicsTypeDocRepo } from '../types';
+export declare class Rapier3dRaycastVehicleComponent extends Rapier3dRigidBodyComponent implements IRaycastVehicleComponent<Rapier3dPhysicsTypeDocRepo> {
     protected readonly world: Rapier3dWorldComponent;
     private chassisBody;
     protected _nativeVehicle: DynamicRayCastVehicleController | null;
@@ -10,8 +11,8 @@ export declare class Rapier3dRaycastVehicleComponent extends Rapier3dRigidBodyCo
     private wheelDescr;
     constructor(world: Rapier3dWorldComponent, chassisBody: Rapier3dRigidBodyComponent);
     get wheelSpeed(): number;
-    addToWorld(world: Gg3dWorld<IVisualScene3dComponent, Rapier3dWorldComponent>): void;
-    removeFromWorld(world: Gg3dWorld<IVisualScene3dComponent, Rapier3dWorldComponent>): void;
+    addToWorld(world: Gg3dWorld<VisualTypeDocRepo3D, Rapier3dPhysicsTypeDocRepo, IVisualScene3dComponent, Rapier3dWorldComponent>): void;
+    removeFromWorld(world: Gg3dWorld<VisualTypeDocRepo3D, Rapier3dPhysicsTypeDocRepo, IVisualScene3dComponent, Rapier3dWorldComponent>): void;
     addWheel(options: WheelOptions, suspensionOptions: SuspensionOptions): void;
     setSteering(wheelIndex: number, steering: number): void;
     applyEngineForce(wheelIndex: number, force: number): void;
@@ -22,5 +23,6 @@ export declare class Rapier3dRaycastVehicleComponent extends Rapier3dRigidBodyCo
         rotation: Point4;
     };
     resetSuspension(): void;
+    clone(): Rapier3dRaycastVehicleComponent;
     dispose(): void;
 }

package/dist/components/rapier-3d-raycast-vehicle.component.js

@@ -81,6 +81,9 @@ export class Rapier3dRaycastVehicleComponent extends Rapier3dRigidBodyComponent
     resetSuspension() {
         // TODO
     }
+    clone() {
+        return new Rapier3dRaycastVehicleComponent(this.world, this.chassisBody.clone());
+    }
     dispose() {
         var _a;
         (_a = this.nativeVehicle) === null || _a === void 0 ? void 0 : _a.free();

package/dist/components/rapier-3d-rigid-body.component.d.ts

@@ -1,7 +1,9 @@
-import { Body3DOptions, Entity3d, Gg3dWorld, IRigidBody3dComponent, IVisualScene3dComponent, Point3, Point4 } from '@gg-web-engine/core';
+import { Body3DOptions, CollisionGroup, Entity3d, Gg3dWorld, IRigidBody3dComponent, Point3, Point4, VisualTypeDocRepo3D } from '@gg-web-engine/core';
 import { Collider, ColliderDesc, RigidBody, RigidBodyDesc } from '@dimforge/rapier3d-compat';
 import { Rapier3dWorldComponent } from './rapier-3d-world.component';
-export declare class Rapier3dRigidBodyComponent implements IRigidBody3dComponent<Rapier3dWorldComponent> {
+import { Rapier3dPhysicsTypeDocRepo } from '../types';
+import { InteractionGroups } from '@dimforge/rapier3d-compat/geometry/interaction_groups';
+export declare class Rapier3dRigidBodyComponent implements IRigidBody3dComponent<Rapier3dPhysicsTypeDocRepo> {
     protected readonly world: Rapier3dWorldComponent;
     protected _colliderDescr: ColliderDesc[];
     protected _bodyDescr: RigidBodyDesc;
@@ -22,9 +24,14 @@ export declare class Rapier3dRigidBodyComponent implements IRigidBody3dComponent
     name: string;
     get factoryProps(): [ColliderDesc[], RigidBodyDesc, Omit<Omit<Body3DOptions, 'dynamic'>, 'mass'>];
     constructor(world: Rapier3dWorldComponent, _colliderDescr: ColliderDesc[], _bodyDescr: RigidBodyDesc, _colliderOptions: Omit<Omit<Body3DOptions, 'dynamic'>, 'mass'>);
+    protected collisionGroups: InteractionGroups;
+    get interactWithCollisionGroups(): CollisionGroup[];
+    set interactWithCollisionGroups(value: CollisionGroup[] | 'all');
+    get ownCollisionGroups(): CollisionGroup[];
+    set ownCollisionGroups(value: CollisionGroup[] | 'all');
     clone(): Rapier3dRigidBodyComponent;
-    addToWorld(world: Gg3dWorld<IVisualScene3dComponent, Rapier3dWorldComponent>): void;
-    removeFromWorld(world: Gg3dWorld<IVisualScene3dComponent, Rapier3dWorldComponent>): void;
+    addToWorld(world: Gg3dWorld<VisualTypeDocRepo3D, Rapier3dPhysicsTypeDocRepo>): void;
+    removeFromWorld(world: Gg3dWorld<VisualTypeDocRepo3D, Rapier3dPhysicsTypeDocRepo>): void;
     resetMotion(): void;
     dispose(): void;
 }

package/dist/components/rapier-3d-rigid-body.component.js

@@ -1,4 +1,4 @@
-import { Pnt3, Qtrn, } from '@gg-web-engine/core';
+import { BitMask, Pnt3, Qtrn, } from '@gg-web-engine/core';
 import { ColliderDesc, Quaternion, RigidBodyDesc, Vector3 } from '@dimforge/rapier3d-compat';
 export class Rapier3dRigidBodyComponent {
     constructor(world, _colliderDescr, _bodyDescr, _colliderOptions) {
@@ -10,6 +10,9 @@ export class Rapier3dRigidBodyComponent {
         this._nativeBody = null;
         this._nativeBodyColliders = null;
         this.name = '';
+        this.collisionGroups = BitMask.full(32);
+        this.ownCollisionGroups = (_colliderOptions === null || _colliderOptions === void 0 ? void 0 : _colliderOptions.ownCollisionGroups) || 'all';
+        this.interactWithCollisionGroups = (_colliderOptions === null || _colliderOptions === void 0 ? void 0 : _colliderOptions.interactWithCollisionGroups) || 'all';
     }
     get position() {
         return Pnt3.clone(this.nativeBody ? this.nativeBody.translation() : this._bodyDescr.translation);
@@ -79,8 +82,54 @@ export class Rapier3dRigidBodyComponent {
         // TODO more fields here?
         return [colliderDescr, bd, this._colliderOptions];
     }
+    get interactWithCollisionGroups() {
+        return BitMask.unpack(this.collisionGroups, 16);
+    }
+    set interactWithCollisionGroups(value) {
+        let mask;
+        if (value === 'all') {
+            mask = BitMask.full(16);
+        }
+        else {
+            mask = BitMask.pack(value, 16);
+        }
+        mask = mask | (this.collisionGroups & (BitMask.full(16) << 16));
+        if (mask === this.collisionGroups) {
+            return;
+        }
+        this.collisionGroups = mask;
+        if (this.nativeBody) {
+            for (let i = 0; i < this.nativeBody.numColliders(); i++) {
+                this.nativeBody.collider(i).setCollisionGroups(this.collisionGroups);
+            }
+        }
+    }
+    get ownCollisionGroups() {
+        return BitMask.unpack(this.collisionGroups >> 16, 16);
+    }
+    set ownCollisionGroups(value) {
+        let mask;
+        if (value === 'all') {
+            mask = BitMask.full(16);
+        }
+        else {
+            mask = BitMask.pack(value, 16);
+        }
+        mask = (mask << 16) | (this.collisionGroups & BitMask.full(16));
+        if (mask === this.collisionGroups) {
+            return;
+        }
+        this.collisionGroups = mask;
+        if (this.nativeBody) {
+            for (let i = 0; i < this.nativeBody.numColliders(); i++) {
+                this.nativeBody.collider(i).setCollisionGroups(this.collisionGroups);
+            }
+        }
+    }
     clone() {
-        return new Rapier3dRigidBodyComponent(this.world, ...this.factoryProps);
+        const comp = new Rapier3dRigidBodyComponent(this.world, ...this.factoryProps);
+        comp.collisionGroups = this.collisionGroups;
+        return comp;
     }
     addToWorld(world) {
         if (world.physicsWorld != this.world) {
@@ -91,6 +140,7 @@ export class Rapier3dRigidBodyComponent {
             const col = this.world.nativeWorld.createCollider(c, this._nativeBody);
             col.setFriction(this._colliderOptions.friction);
             col.setRestitution(this._colliderOptions.restitution);
+            col.setCollisionGroups(this.collisionGroups);
             return col;
         });
         this.world.handleIdEntityMap.set(this._nativeBody.handle, this);

package/dist/components/rapier-3d-trigger.component.d.ts

@@ -1,9 +1,10 @@
 import { Observable, Subject } from 'rxjs';
 import { ColliderDesc, RigidBodyDesc } from '@dimforge/rapier3d-compat';
 import { Rapier3dRigidBodyComponent } from './rapier-3d-rigid-body.component';
-import { Gg3dWorld, ITrigger3dComponent, IVisualScene3dComponent } from '@gg-web-engine/core';
+import { Gg3dWorld, ITrigger3dComponent, VisualTypeDocRepo3D } from '@gg-web-engine/core';
 import { Rapier3dWorldComponent } from './rapier-3d-world.component';
-export declare class Rapier3dTriggerComponent extends Rapier3dRigidBodyComponent implements ITrigger3dComponent<Rapier3dWorldComponent> {
+import { Rapier3dPhysicsTypeDocRepo } from '../types';
+export declare class Rapier3dTriggerComponent extends Rapier3dRigidBodyComponent implements ITrigger3dComponent<Rapier3dPhysicsTypeDocRepo> {
     protected readonly world: Rapier3dWorldComponent;
     protected _colliderDescr: ColliderDesc[];
     protected _bodyDescr: RigidBodyDesc;
@@ -12,7 +13,7 @@ export declare class Rapier3dTriggerComponent extends Rapier3dRigidBodyComponent
     protected readonly onEnter$: Subject<Rapier3dRigidBodyComponent>;
     protected readonly onLeft$: Subject<Rapier3dRigidBodyComponent>;
     constructor(world: Rapier3dWorldComponent, _colliderDescr: ColliderDesc[], _bodyDescr: RigidBodyDesc);
-    addToWorld(world: Gg3dWorld<IVisualScene3dComponent, Rapier3dWorldComponent>): void;
+    addToWorld(world: Gg3dWorld<VisualTypeDocRepo3D, Rapier3dPhysicsTypeDocRepo>): void;
     checkOverlaps(): void;
     clone(): Rapier3dTriggerComponent;
 }

package/dist/components/rapier-3d-world.component.d.ts

@@ -1,9 +1,10 @@
-import { Gg3dWorld, IDebugPhysicsDrawer, IPhysicsWorld3dComponent, Point3, Point4 } from '@gg-web-engine/core';
+import { CollisionGroup, Gg3dWorld, IDebugPhysicsDrawer, IPhysicsWorld3dComponent, Point3, Point4 } from '@gg-web-engine/core';
 import { EventQueue, World } from '@dimforge/rapier3d-compat';
 import { Rapier3dRigidBodyComponent } from './rapier-3d-rigid-body.component';
 import { Rapier3dFactory } from '../rapier-3d-factory';
 import { Rapier3dLoader } from '../rapier-3d-loader';
-export declare class Rapier3dWorldComponent implements IPhysicsWorld3dComponent {
+import { Rapier3dPhysicsTypeDocRepo } from '../types';
+export declare class Rapier3dWorldComponent implements IPhysicsWorld3dComponent<Rapier3dPhysicsTypeDocRepo> {
     private _factory;
     get factory(): Rapier3dFactory;
     private _loader;
@@ -22,6 +23,9 @@ export declare class Rapier3dWorldComponent implements IPhysicsWorld3dComponent
     readonly handleIdEntityMap: Map<number, Rapier3dRigidBodyComponent>;
     init(): Promise<void>;
     simulate(delta: number): void;
+    protected lockedCollisionGroups: number[];
+    registerCollisionGroup(): CollisionGroup;
+    deregisterCollisionGroup(group: CollisionGroup): void;
     startDebugger(world: Gg3dWorld, drawer: IDebugPhysicsDrawer<Point3, Point4>): void;
     stopDebugger(): void;
     dispose(): void;

package/dist/components/rapier-3d-world.component.js

@@ -19,6 +19,7 @@ export class Rapier3dWorldComponent {
         this._nativeWorld = null;
         this._eventQueue = null;
         this.handleIdEntityMap = new Map();
+        this.lockedCollisionGroups = [];
     }
     get factory() {
         if (!this._factory) {
@@ -78,6 +79,18 @@ export class Rapier3dWorldComponent {
         this._nativeWorld.timestep = (this.timeScale * delta) / 1000;
         (_a = this._nativeWorld) === null || _a === void 0 ? void 0 : _a.step(this.eventQueue);
     }
+    registerCollisionGroup() {
+        for (let i = 0; i < 16; i++) {
+            if (!this.lockedCollisionGroups.includes(i)) {
+                this.lockedCollisionGroups.push(i);
+                return i;
+            }
+        }
+        throw new Error('App tries to register 17th collision group, but rapier 3D supports only 16');
+    }
+    deregisterCollisionGroup(group) {
+        this.lockedCollisionGroups = this.lockedCollisionGroups.filter(x => x !== group);
+    }
     startDebugger(world, drawer) {
         // TODO
         throw new Error('rapier-3d DebugDrawer not implemented');

package/dist/index.d.ts

@@ -3,3 +3,4 @@ export * from './components/rapier-3d-trigger.component';
 export * from './components/rapier-3d-world.component';
 export * from './rapier-3d-factory';
 export * from './rapier-3d-loader';
+export * from './types';

package/dist/index.js

@@ -4,3 +4,4 @@ export * from './components/rapier-3d-trigger.component';
 export * from './components/rapier-3d-world.component';
 export * from './rapier-3d-factory';
 export * from './rapier-3d-loader';
+export * from './types';

package/dist/rapier-3d-factory.d.ts

@@ -3,7 +3,8 @@ import { ColliderDesc, RigidBodyDesc } from '@dimforge/rapier3d-compat';
 import { Rapier3dRigidBodyComponent } from './components/rapier-3d-rigid-body.component';
 import { Rapier3dTriggerComponent } from './components/rapier-3d-trigger.component';
 import { Rapier3dWorldComponent } from './components/rapier-3d-world.component';
-export declare class Rapier3dFactory implements IPhysicsBody3dComponentFactory<Rapier3dRigidBodyComponent, Rapier3dTriggerComponent> {
+import { Rapier3dPhysicsTypeDocRepo } from './types';
+export declare class Rapier3dFactory implements IPhysicsBody3dComponentFactory<Rapier3dPhysicsTypeDocRepo> {
     protected readonly world: Rapier3dWorldComponent;
     constructor(world: Rapier3dWorldComponent);
     createRigidBody(descriptor: BodyShape3DDescriptor, transform?: {
@@ -14,6 +15,7 @@ export declare class Rapier3dFactory implements IPhysicsBody3dComponentFactory<R
         position?: Point3;
         rotation?: Point4;
     }): Rapier3dTriggerComponent;
+    createRaycastVehicle(chassis: Rapier3dRigidBodyComponent): never;
     createColliderDescr(descriptor: Shape3DDescriptor): ColliderDesc[];
     createRigidBodyDescr(options: Partial<Body3DOptions>, transform?: {
         position?: Point3;

package/dist/rapier-3d-factory.js

@@ -7,7 +7,7 @@ export class Rapier3dFactory {
         this.world = world;
     }
     createRigidBody(descriptor, transform) {
-        return new Rapier3dRigidBodyComponent(this.world, this.createColliderDescr(descriptor.shape), this.createRigidBodyDescr(descriptor.body, transform), Object.assign({ friction: 0.5, restitution: 0.1 }, descriptor.body));
+        return new Rapier3dRigidBodyComponent(this.world, this.createColliderDescr(descriptor.shape), this.createRigidBodyDescr(descriptor.body, transform), Object.assign({ friction: 0.5, restitution: 0.1, ownCollisionGroups: 'all', interactWithCollisionGroups: 'all' }, descriptor.body));
     }
     createTrigger(descriptor, transform) {
         const colliderDescr = this.createColliderDescr(descriptor);
@@ -17,9 +17,17 @@ export class Rapier3dFactory {
         });
         return new Rapier3dTriggerComponent(this.world, colliderDescr, this.createRigidBodyDescr({ dynamic: false }, transform));
     }
+    createRaycastVehicle(chassis) {
+        throw new Error('Raycast vehicle bindings for rapier3D are not implemented');
+    }
     createColliderDescr(descriptor) {
         const yToZUp = Qtrn.rotAround(Qtrn.O, Pnt3.X, Math.PI / 2);
         switch (descriptor.shape) {
+            // TODO looks like not exposed in rapier3d-compat
+            // case 'PLANE':
+            //   return [
+            //     ColliderDesc.halfspace(new Vector3(0, 0, 1)),
+            //   ];
             case 'BOX':
                 return [
                     ColliderDesc.cuboid(descriptor.dimensions.x / 2, descriptor.dimensions.y / 2, descriptor.dimensions.z / 2),

package/dist/rapier-3d-loader.d.ts

@@ -1,6 +1,7 @@
 import { IPhysicsBody3dComponentLoader } from '@gg-web-engine/core';
 import { Rapier3dWorldComponent } from './components/rapier-3d-world.component';
-export declare class Rapier3dLoader extends IPhysicsBody3dComponentLoader {
+import { Rapier3dPhysicsTypeDocRepo } from './types';
+export declare class Rapier3dLoader extends IPhysicsBody3dComponentLoader<Rapier3dPhysicsTypeDocRepo> {
     protected readonly world: Rapier3dWorldComponent;
     constructor(world: Rapier3dWorldComponent);
 }

package/dist/types.d.ts

@@ -0,0 +1,11 @@
+import { Rapier3dFactory } from './rapier-3d-factory';
+import { Rapier3dLoader } from './rapier-3d-loader';
+import { Rapier3dRigidBodyComponent } from './components/rapier-3d-rigid-body.component';
+import { Rapier3dTriggerComponent } from './components/rapier-3d-trigger.component';
+export declare type Rapier3dPhysicsTypeDocRepo = {
+    factory: Rapier3dFactory;
+    loader: Rapier3dLoader;
+    rigidBody: Rapier3dRigidBodyComponent;
+    trigger: Rapier3dTriggerComponent;
+    raycastVehicle: never;
+};

package/dist/types.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gg-web-engine/rapier3d",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "description": "An attempt to create open source game engine for browser",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,14 +30,14 @@
   },
   "devDependencies": {
     "@dimforge/rapier3d-compat": "0.0.0-c23a138-20231001",
-    "@gg-web-engine/core": "0.0.28",
+    "@gg-web-engine/core": "0.0.30",
     "prettier": "^2.8.6",
     "rxjs": "7.8.0",
     "typescript": "~4.7.2"
   },
   "peerDependencies": {
     "@dimforge/rapier3d-compat": "0.0.0-c23a138-20231001",
-    "@gg-web-engine/core": "0.0.28",
+    "@gg-web-engine/core": "0.0.30",
     "rxjs": "7.8.0"
   }
 }