@gg-web-engine/rapier2d 0.0.28 → 0.0.30

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

@@ -1,7 +1,8 @@
-import { Body2DOptions, Entity2d, Gg2dWorld, IRigidBody2dComponent, IVisualScene2dComponent, Point2 } from '@gg-web-engine/core';
-import { Collider, ColliderDesc, RigidBody, RigidBodyDesc } from '@dimforge/rapier2d-compat';
+import { Body2DOptions, CollisionGroup, Entity2d, Gg2dWorld, IRigidBody2dComponent, Point2, VisualTypeDocRepo2D } from '@gg-web-engine/core';
+import { Collider, ColliderDesc, InteractionGroups, RigidBody, RigidBodyDesc } from '@dimforge/rapier2d-compat';
 import { Rapier2dWorldComponent } from './rapier-2d-world.component';
-export declare class Rapier2dRigidBodyComponent implements IRigidBody2dComponent<Rapier2dWorldComponent> {
+import { Rapier2dPhysicsTypeDocRepo } from '../types';
+export declare class Rapier2dRigidBodyComponent implements IRigidBody2dComponent<Rapier2dPhysicsTypeDocRepo> {
     protected readonly world: Rapier2dWorldComponent;
     protected _colliderDescr: ColliderDesc[];
     protected _bodyDescr: RigidBodyDesc;
@@ -22,9 +23,14 @@ export declare class Rapier2dRigidBodyComponent implements IRigidBody2dComponent
     name: string;
     get factoryProps(): [ColliderDesc[], RigidBodyDesc, Omit<Omit<Body2DOptions, 'dynamic'>, 'mass'>];
     constructor(world: Rapier2dWorldComponent, _colliderDescr: ColliderDesc[], _bodyDescr: RigidBodyDesc, _colliderOptions: Omit<Omit<Body2DOptions, 'dynamic'>, 'mass'>);
+    protected collisionGroups: InteractionGroups;
+    get interactWithCollisionGroups(): CollisionGroup[];
+    set interactWithCollisionGroups(value: CollisionGroup[] | 'all');
+    get ownCollisionGroups(): CollisionGroup[];
+    set ownCollisionGroups(value: CollisionGroup[] | 'all');
     clone(): Rapier2dRigidBodyComponent;
-    addToWorld(world: Gg2dWorld<IVisualScene2dComponent, Rapier2dWorldComponent>): void;
-    removeFromWorld(world: Gg2dWorld<IVisualScene2dComponent, Rapier2dWorldComponent>): void;
+    addToWorld(world: Gg2dWorld<VisualTypeDocRepo2D, Rapier2dPhysicsTypeDocRepo>): void;
+    removeFromWorld(world: Gg2dWorld<VisualTypeDocRepo2D, Rapier2dPhysicsTypeDocRepo>): void;
     resetMotion(): void;
     dispose(): void;
 }

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

@@ -1,5 +1,5 @@
-import { Pnt2, } from '@gg-web-engine/core';
-import { Vector2 } from '@dimforge/rapier2d-compat';
+import { BitMask, Pnt2, } from '@gg-web-engine/core';
+import { Vector2, } from '@dimforge/rapier2d-compat';
 export class Rapier2dRigidBodyComponent {
     constructor(world, _colliderDescr, _bodyDescr, _colliderOptions) {
         this.world = world;
@@ -10,6 +10,7 @@ export class Rapier2dRigidBodyComponent {
         this._nativeBody = null;
         this._nativeBodyColliders = null;
         this.name = '';
+        this.collisionGroups = BitMask.full(32);
     }
     get position() {
         return Pnt2.clone(this.nativeBody ? this.nativeBody.translation() : this._bodyDescr.translation);
@@ -63,6 +64,50 @@ export class Rapier2dRigidBodyComponent {
     get factoryProps() {
         return [this._colliderDescr, this._bodyDescr, 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() {
         // TODO probably need to clone factory props to not share the same reference?
         return new Rapier2dRigidBodyComponent(this.world, ...this.factoryProps);

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

@@ -1,9 +1,10 @@
 import { Observable, Subject } from 'rxjs';
 import { ColliderDesc, RigidBodyDesc } from '@dimforge/rapier2d-compat';
 import { Rapier2dRigidBodyComponent } from './rapier-2d-rigid-body.component';
-import { Gg2dWorld, ITrigger2dComponent, IVisualScene2dComponent } from '@gg-web-engine/core';
+import { Gg2dWorld, ITrigger2dComponent, VisualTypeDocRepo2D } from '@gg-web-engine/core';
 import { Rapier2dWorldComponent } from './rapier-2d-world.component';
-export declare class Rapier2dTriggerComponent extends Rapier2dRigidBodyComponent implements ITrigger2dComponent<Rapier2dWorldComponent> {
+import { Rapier2dPhysicsTypeDocRepo } from '../types';
+export declare class Rapier2dTriggerComponent extends Rapier2dRigidBodyComponent implements ITrigger2dComponent<Rapier2dPhysicsTypeDocRepo> {
     protected readonly world: Rapier2dWorldComponent;
     protected _colliderDescr: ColliderDesc[];
     protected _bodyDescr: RigidBodyDesc;
@@ -12,7 +13,7 @@ export declare class Rapier2dTriggerComponent extends Rapier2dRigidBodyComponent
     protected readonly onEnter$: Subject<Rapier2dRigidBodyComponent>;
     protected readonly onLeft$: Subject<Rapier2dRigidBodyComponent>;
     constructor(world: Rapier2dWorldComponent, _colliderDescr: ColliderDesc[], _bodyDescr: RigidBodyDesc);
-    addToWorld(world: Gg2dWorld<IVisualScene2dComponent, Rapier2dWorldComponent>): void;
+    addToWorld(world: Gg2dWorld<VisualTypeDocRepo2D, Rapier2dPhysicsTypeDocRepo>): void;
     checkOverlaps(): void;
     clone(): Rapier2dTriggerComponent;
 }

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

@@ -1,8 +1,9 @@
-import { Gg2dWorld, IDebugPhysicsDrawer, IPhysicsWorld2dComponent, Point2 } from '@gg-web-engine/core';
+import { CollisionGroup, Gg2dWorld, IDebugPhysicsDrawer, IPhysicsWorld2dComponent, Point2 } from '@gg-web-engine/core';
 import { EventQueue, World } from '@dimforge/rapier2d-compat';
 import { Rapier2dRigidBodyComponent } from './rapier-2d-rigid-body.component';
 import { Rapier2dFactory } from '../rapier-2d-factory';
-export declare class Rapier2dWorldComponent implements IPhysicsWorld2dComponent {
+import { Rapier2dPhysicsTypeDocRepo } from '../types';
+export declare class Rapier2dWorldComponent implements IPhysicsWorld2dComponent<Rapier2dPhysicsTypeDocRepo> {
     private _factory;
     get factory(): Rapier2dFactory;
     private readonly unitScale;
@@ -20,6 +21,9 @@ export declare class Rapier2dWorldComponent implements IPhysicsWorld2dComponent
     readonly handleIdEntityMap: Map<number, Rapier2dRigidBodyComponent>;
     init(): Promise<void>;
     simulate(delta: number): void;
+    protected lockedCollisionGroups: number[];
+    registerCollisionGroup(): CollisionGroup;
+    deregisterCollisionGroup(group: CollisionGroup): void;
     startDebugger(world: Gg2dWorld, drawer: IDebugPhysicsDrawer<Point2, number>): void;
     stopDebugger(): void;
     dispose(): void;

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

@@ -7,8 +7,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { Pnt2 } from '@gg-web-engine/core';
-import { init, EventQueue, Vector2, World } from '@dimforge/rapier2d-compat';
+import { Pnt2, } from '@gg-web-engine/core';
+import { EventQueue, init, Vector2, World } from '@dimforge/rapier2d-compat';
 import { Rapier2dFactory } from '../rapier-2d-factory';
 export class Rapier2dWorldComponent {
     constructor() {
@@ -19,6 +19,7 @@ export class Rapier2dWorldComponent {
         this._nativeWorld = null;
         this._eventQueue = null;
         this.handleIdEntityMap = new Map();
+        this.lockedCollisionGroups = [];
     }
     get factory() {
         if (!this._factory) {
@@ -70,6 +71,18 @@ export class Rapier2dWorldComponent {
         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 2D supports only 16');
+    }
+    deregisterCollisionGroup(group) {
+        this.lockedCollisionGroups = this.lockedCollisionGroups.filter(x => x !== group);
+    }
     startDebugger(world, drawer) {
         // TODO
         throw new Error('rapier-2d DebugDrawer not implemented');

package/dist/index.d.ts

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

package/dist/index.js

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

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

@@ -3,7 +3,8 @@ import { ColliderDesc, RigidBodyDesc } from '@dimforge/rapier2d-compat';
 import { Rapier2dRigidBodyComponent } from './components/rapier-2d-rigid-body.component';
 import { Rapier2dTriggerComponent } from './components/rapier-2d-trigger.component';
 import { Rapier2dWorldComponent } from './components/rapier-2d-world.component';
-export declare class Rapier2dFactory implements IPhysicsBody2dComponentFactory<Rapier2dRigidBodyComponent, Rapier2dTriggerComponent> {
+import { Rapier2dPhysicsTypeDocRepo } from './types';
+export declare class Rapier2dFactory implements IPhysicsBody2dComponentFactory<Rapier2dPhysicsTypeDocRepo> {
     protected readonly world: Rapier2dWorldComponent;
     constructor(world: Rapier2dWorldComponent);
     createRigidBody(descriptor: BodyShape2DDescriptor, transform?: {

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

@@ -7,7 +7,7 @@ export class Rapier2dFactory {
         this.world = world;
     }
     createRigidBody(descriptor, transform) {
-        return new Rapier2dRigidBodyComponent(this.world, this.createColliderDescr(descriptor.shape), this.createRigidBodyDescr(descriptor.body, transform), Object.assign({ friction: 0.5, restitution: 0.1 }, descriptor.body));
+        return new Rapier2dRigidBodyComponent(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);

package/dist/types.d.ts

@@ -0,0 +1,8 @@
+import { Rapier2dFactory } from './rapier-2d-factory';
+import { Rapier2dRigidBodyComponent } from './components/rapier-2d-rigid-body.component';
+import { Rapier2dTriggerComponent } from './components/rapier-2d-trigger.component';
+export declare type Rapier2dPhysicsTypeDocRepo = {
+    factory: Rapier2dFactory;
+    rigidBody: Rapier2dRigidBodyComponent;
+    trigger: Rapier2dTriggerComponent;
+};

package/dist/types.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gg-web-engine/rapier2d",
-  "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",
@@ -28,14 +28,14 @@
   "homepage": "https://github.com/AndyGura/gg-web-engine#readme",
   "devDependencies": {
     "@dimforge/rapier2d-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/rapier2d-compat": "0.0.0-c23a138-20231001",
-    "@gg-web-engine/core": "0.0.28",
+    "@gg-web-engine/core": "0.0.30",
     "rxjs": "7.8.0"
   }
 }