@gg-web-engine/rapier2d 0.0.56 → 0.0.57

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

@@ -28,13 +28,13 @@ export declare class Rapier2dRigidBodyComponent implements IRigidBody2dComponent
         RigidBodyDesc,
         Omit<Omit<Body2DOptions, 'dynamic'>, 'mass'>
     ];
-    get debugBodySettings(): DebugBody2DSettings;
+    readonly debugBodySettings: DebugBody2DSettings;
     constructor(world: Rapier2dWorldComponent, _colliderDescr: ColliderDesc[], shape: Shape2DDescriptor, _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');
+    get interactWithCollisionGroups(): ReadonlyArray<CollisionGroup>;
+    set interactWithCollisionGroups(value: ReadonlyArray<CollisionGroup> | 'all');
+    get ownCollisionGroups(): ReadonlyArray<CollisionGroup>;
+    set ownCollisionGroups(value: ReadonlyArray<CollisionGroup> | 'all');
     clone(): Rapier2dRigidBodyComponent;
     addToWorld(world: Gg2dWorld<VisualTypeDocRepo2D, Rapier2dPhysicsTypeDocRepo>): void;
     removeFromWorld(world: Gg2dWorld<VisualTypeDocRepo2D, Rapier2dPhysicsTypeDocRepo>): void;

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

@@ -1,4 +1,4 @@
-import { BitMask, Pnt2, } from '@gg-web-engine/core';
+import { BitMask, DebugBody2DSettings, Pnt2, } from '@gg-web-engine/core';
 import { Vector2, } from '@dimforge/rapier2d-compat';
 export class Rapier2dRigidBodyComponent {
     get position() {
@@ -53,15 +53,6 @@ export class Rapier2dRigidBodyComponent {
     get factoryProps() {
         return [this._colliderDescr, this.shape, this._bodyDescr, this._colliderOptions];
     }
-    get debugBodySettings() {
-        var _a;
-        if (this._bodyDescr.mass > 0) {
-            return { shape: this.shape, type: 'RIGID_DYNAMIC', sleeping: !!((_a = this._nativeBody) === null || _a === void 0 ? void 0 : _a.isSleeping()) };
-        }
-        else {
-            return { shape: this.shape, type: 'RIGID_STATIC' };
-        }
-    }
     constructor(world, _colliderDescr, shape, _bodyDescr, _colliderOptions) {
         this.world = world;
         this._colliderDescr = _colliderDescr;
@@ -72,7 +63,12 @@ export class Rapier2dRigidBodyComponent {
         this._nativeBody = null;
         this._nativeBodyColliders = null;
         this.name = '';
+        this.debugBodySettings = new DebugBody2DSettings(this._bodyDescr.mass > 0
+            ? { type: 'RIGID_DYNAMIC', sleeping: () => { var _a; return !!((_a = this._nativeBody) === null || _a === void 0 ? void 0 : _a.isSleeping()); } }
+            : { type: 'RIGID_STATIC' }, this.shape);
         this.collisionGroups = BitMask.full(32);
+        this.ownCollisionGroups = (_colliderOptions === null || _colliderOptions === void 0 ? void 0 : _colliderOptions.ownCollisionGroups) || [world.mainCollisionGroup];
+        this.interactWithCollisionGroups = (_colliderOptions === null || _colliderOptions === void 0 ? void 0 : _colliderOptions.interactWithCollisionGroups) || [world.mainCollisionGroup];
     }
     get interactWithCollisionGroups() {
         return BitMask.unpack(this.collisionGroups, 16);

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

@@ -13,7 +13,8 @@ export declare class Rapier2dTriggerComponent extends Rapier2dRigidBodyComponent
     get onEntityLeft(): Observable<Rapier2dRigidBodyComponent>;
     protected readonly onEnter$: Subject<Rapier2dRigidBodyComponent>;
     protected readonly onLeft$: Subject<Rapier2dRigidBodyComponent>;
-    get debugBodySettings(): DebugBody2DSettings;
+    readonly debugBodySettings: DebugBody2DSettings;
+    protected intersectionsAmount: number;
     constructor(world: Rapier2dWorldComponent, _colliderDescr: ColliderDesc[], shape: Shape2DDescriptor, _bodyDescr: RigidBodyDesc);
     addToWorld(world: Gg2dWorld<VisualTypeDocRepo2D, Rapier2dPhysicsTypeDocRepo>): void;
     checkOverlaps(): void;

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

@@ -1,5 +1,6 @@
-import { Subject } from 'rxjs';
+import { map, merge, Subject } from 'rxjs';
 import { Rapier2dRigidBodyComponent } from './rapier-2d-rigid-body.component';
+import { DebugBody2DSettings, } from '@gg-web-engine/core';
 export class Rapier2dTriggerComponent extends Rapier2dRigidBodyComponent {
     get onEntityEntered() {
         return this.onEnter$.asObservable();
@@ -7,9 +8,6 @@ export class Rapier2dTriggerComponent extends Rapier2dRigidBodyComponent {
     get onEntityLeft() {
         return this.onLeft$.asObservable();
     }
-    get debugBodySettings() {
-        return { shape: this.shape, type: 'TRIGGER' };
-    }
     constructor(world, _colliderDescr, shape, _bodyDescr) {
         super(world, _colliderDescr, shape, _bodyDescr, null);
         this.world = world;
@@ -18,11 +16,22 @@ export class Rapier2dTriggerComponent extends Rapier2dRigidBodyComponent {
         this._bodyDescr = _bodyDescr;
         this.onEnter$ = new Subject();
         this.onLeft$ = new Subject();
+        this.debugBodySettings = new DebugBody2DSettings({ type: 'TRIGGER', activated: () => this.intersectionsAmount > 0 }, this.shape);
+        this.intersectionsAmount = 0;
+        merge(this.onEnter$.pipe(map(() => true)), this.onLeft$.pipe(map(() => false))).subscribe(enter => {
+            if (enter) {
+                this.intersectionsAmount++;
+            }
+            else {
+                this.intersectionsAmount--;
+            }
+        });
     }
     addToWorld(world) {
         if (world.physicsWorld != this.world) {
             throw new Error('Rapier2D bodies cannot be shared between different worlds');
         }
+        this.intersectionsAmount = 0;
         this._nativeBody = this.world.nativeWorld.createRigidBody(this._bodyDescr);
         this._nativeBodyColliders = this._colliderDescr.map(c => this.world.nativeWorld.createCollider(c, this._nativeBody));
         this.world.handleIdEntityMap.set(this._nativeBody.handle, this);
@@ -45,6 +54,9 @@ export class Rapier2dTriggerComponent extends Rapier2dRigidBodyComponent {
     }
     clone() {
         const [colliderDescr, sd, bd] = super.factoryProps;
-        return new Rapier2dTriggerComponent(this.world, colliderDescr, sd, bd);
+        const component = new Rapier2dTriggerComponent(this.world, colliderDescr, sd, bd);
+        component.ownCollisionGroups = this.ownCollisionGroups;
+        component.interactWithCollisionGroups = this.interactWithCollisionGroups;
+        return component;
     }
 }

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

@@ -14,6 +14,7 @@ export declare class Rapier2dWorldComponent implements IPhysicsWorld2dComponent<
     private _gravity;
     get gravity(): Point2;
     set gravity(value: Point2);
+    readonly mainCollisionGroup: CollisionGroup;
     protected _nativeWorld: World | null;
     get nativeWorld(): World;
     private _eventQueue;

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

@@ -47,6 +47,7 @@ export class Rapier2dWorldComponent {
         this.children = [];
         this.unitScale = 100; // TODO abstractize somehow, hardcoded now
         this._gravity = Pnt2.scalarMult({ x: 0, y: 9.82 }, this.unitScale);
+        this.mainCollisionGroup = 0;
         this._nativeWorld = null;
         this._eventQueue = null;
         this.handleIdEntityMap = new Map();
@@ -68,7 +69,7 @@ export class Rapier2dWorldComponent {
         (_a = this._nativeWorld) === null || _a === void 0 ? void 0 : _a.step(this.eventQueue);
     }
     registerCollisionGroup() {
-        for (let i = 0; i < 16; i++) {
+        for (let i = 1; i < 16; i++) {
             if (!this.lockedCollisionGroups.includes(i)) {
                 this.lockedCollisionGroups.push(i);
                 return i;

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), descriptor.shape, this.createRigidBodyDescr(descriptor.body, transform), Object.assign({ friction: 0.5, restitution: 0.1, ownCollisionGroups: 'all', interactWithCollisionGroups: 'all' }, descriptor.body));
+        return new Rapier2dRigidBodyComponent(this.world, this.createColliderDescr(descriptor.shape), descriptor.shape, this.createRigidBodyDescr(descriptor.body, transform), Object.assign({ friction: 0.5, restitution: 0.1, ownCollisionGroups: [this.world.mainCollisionGroup], interactWithCollisionGroups: [this.world.mainCollisionGroup] }, descriptor.body));
     }
     createTrigger(descriptor, transform) {
         const colliderDescr = this.createColliderDescr(descriptor);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gg-web-engine/rapier2d",
-  "version": "0.0.56",
+  "version": "0.0.57",
   "description": "An attempt to create open source game engine for browser",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -28,7 +28,7 @@
   "homepage": "https://github.com/AndyGura/gg-web-engine#readme",
   "devDependencies": {
     "@dimforge/rapier2d-compat": "0.0.0-50223ff-20240729",
-    "@gg-web-engine/core": "0.0.56",
+    "@gg-web-engine/core": "0.0.57",
     "@types/jest": "^29.5.12",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
@@ -39,7 +39,7 @@
   },
   "peerDependencies": {
     "@dimforge/rapier2d-compat": "0.0.0-50223ff-20240729",
-    "@gg-web-engine/core": "0.0.56",
+    "@gg-web-engine/core": "0.0.57",
     "rxjs": "7.8.1"
   },
   "jest": {