@gg-web-engine/rapier2d 0.0.37 → 0.0.39

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

@@ -1,10 +1,11 @@
-import { Body2DOptions, CollisionGroup, Entity2d, Gg2dWorld, IRigidBody2dComponent, Point2, VisualTypeDocRepo2D } from '@gg-web-engine/core';
+import { Body2DOptions, CollisionGroup, DebugBody2DSettings, Entity2d, Gg2dWorld, IRigidBody2dComponent, Point2, Shape2DDescriptor, VisualTypeDocRepo2D } from '@gg-web-engine/core';
 import { Collider, ColliderDesc, InteractionGroups, RigidBody, RigidBodyDesc } from '@dimforge/rapier2d-compat';
 import { Rapier2dWorldComponent } from './rapier-2d-world.component';
 import { Rapier2dPhysicsTypeDocRepo } from '../types';
 export declare class Rapier2dRigidBodyComponent implements IRigidBody2dComponent<Rapier2dPhysicsTypeDocRepo> {
     protected readonly world: Rapier2dWorldComponent;
     protected _colliderDescr: ColliderDesc[];
+    readonly shape: Shape2DDescriptor;
     protected _bodyDescr: RigidBodyDesc;
     protected _colliderOptions: Omit<Omit<Body2DOptions, 'dynamic'>, 'mass'>;
     entity: Entity2d | null;
@@ -21,8 +22,14 @@ export declare class Rapier2dRigidBodyComponent implements IRigidBody2dComponent
     get nativeBody(): RigidBody | null;
     set nativeBody(value: RigidBody | null);
     name: string;
-    get factoryProps(): [ColliderDesc[], RigidBodyDesc, Omit<Omit<Body2DOptions, 'dynamic'>, 'mass'>];
-    constructor(world: Rapier2dWorldComponent, _colliderDescr: ColliderDesc[], _bodyDescr: RigidBodyDesc, _colliderOptions: Omit<Omit<Body2DOptions, 'dynamic'>, 'mass'>);
+    get factoryProps(): [
+        ColliderDesc[],
+        Shape2DDescriptor,
+        RigidBodyDesc,
+        Omit<Omit<Body2DOptions, 'dynamic'>, 'mass'>
+    ];
+    get 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');

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

@@ -1,9 +1,10 @@
 import { BitMask, Pnt2, } from '@gg-web-engine/core';
 import { Vector2, } from '@dimforge/rapier2d-compat';
 export class Rapier2dRigidBodyComponent {
-    constructor(world, _colliderDescr, _bodyDescr, _colliderOptions) {
+    constructor(world, _colliderDescr, shape, _bodyDescr, _colliderOptions) {
         this.world = world;
         this._colliderDescr = _colliderDescr;
+        this.shape = shape;
         this._bodyDescr = _bodyDescr;
         this._colliderOptions = _colliderOptions;
         this.entity = null;
@@ -62,7 +63,16 @@ export class Rapier2dRigidBodyComponent {
         this._nativeBody = value;
     }
     get factoryProps() {
-        return [this._colliderDescr, this._bodyDescr, this._colliderOptions];
+        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' };
+        }
     }
     get interactWithCollisionGroups() {
         return BitMask.unpack(this.collisionGroups, 16);
@@ -124,6 +134,7 @@ export class Rapier2dRigidBodyComponent {
             return col;
         });
         this.world.handleIdEntityMap.set(this._nativeBody.handle, this);
+        this.world.added$.next(this);
     }
     removeFromWorld(world) {
         if (world.physicsWorld != this.world) {
@@ -138,6 +149,7 @@ export class Rapier2dRigidBodyComponent {
             this._nativeBody = null;
             this._nativeBodyColliders = null;
         }
+        this.world.removed$.next(this);
     }
     resetMotion() {
         this._nativeBody.setAngvel(0, false);

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

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

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

@@ -1,10 +1,11 @@
 import { Subject } from 'rxjs';
 import { Rapier2dRigidBodyComponent } from './rapier-2d-rigid-body.component';
 export class Rapier2dTriggerComponent extends Rapier2dRigidBodyComponent {
-    constructor(world, _colliderDescr, _bodyDescr) {
-        super(world, _colliderDescr, _bodyDescr, null);
+    constructor(world, _colliderDescr, shape, _bodyDescr) {
+        super(world, _colliderDescr, shape, _bodyDescr, null);
         this.world = world;
         this._colliderDescr = _colliderDescr;
+        this.shape = shape;
         this._bodyDescr = _bodyDescr;
         this.onEnter$ = new Subject();
         this.onLeft$ = new Subject();
@@ -15,6 +16,9 @@ export class Rapier2dTriggerComponent extends Rapier2dRigidBodyComponent {
     get onEntityLeft() {
         return this.onLeft$.asObservable();
     }
+    get debugBodySettings() {
+        return { shape: this.shape, type: 'TRIGGER' };
+    }
     addToWorld(world) {
         if (world.physicsWorld != this.world) {
             throw new Error('Rapier2D bodies cannot be shared between different worlds');
@@ -22,6 +26,7 @@ export class Rapier2dTriggerComponent extends Rapier2dRigidBodyComponent {
         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);
+        this.world.added$.next(this);
     }
     checkOverlaps() {
         this.world.eventQueue.drainCollisionEvents((h1, h2, started) => {
@@ -39,7 +44,7 @@ export class Rapier2dTriggerComponent extends Rapier2dRigidBodyComponent {
         });
     }
     clone() {
-        const [colliderDescr, bd] = super.factoryProps;
-        return new Rapier2dTriggerComponent(this.world, colliderDescr, bd);
+        const [colliderDescr, sd, bd] = super.factoryProps;
+        return new Rapier2dTriggerComponent(this.world, colliderDescr, sd, bd);
     }
 }

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

@@ -1,30 +1,29 @@
-import { CollisionGroup, Gg2dWorld, IDebugPhysicsDrawer, IPhysicsWorld2dComponent, Point2 } from '@gg-web-engine/core';
+import { CollisionGroup, 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';
 import { Rapier2dPhysicsTypeDocRepo } from '../types';
+import { Subject } from 'rxjs';
 export declare class Rapier2dWorldComponent implements IPhysicsWorld2dComponent<Rapier2dPhysicsTypeDocRepo> {
     private _factory;
     get factory(): Rapier2dFactory;
+    readonly added$: Subject<Rapier2dRigidBodyComponent>;
+    readonly removed$: Subject<Rapier2dRigidBodyComponent>;
+    readonly children: Rapier2dRigidBodyComponent[];
     private readonly unitScale;
     private _gravity;
     get gravity(): Point2;
     set gravity(value: Point2);
-    private _timeScale;
-    get timeScale(): number;
-    set timeScale(value: number);
-    get physicsDebugViewActive(): boolean;
     protected _nativeWorld: World | null;
     get nativeWorld(): World;
     private _eventQueue;
     get eventQueue(): EventQueue;
     readonly handleIdEntityMap: Map<number, Rapier2dRigidBodyComponent>;
+    constructor();
     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,19 +7,24 @@ 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 { Pnt2 } from '@gg-web-engine/core';
 import { EventQueue, init, Vector2, World } from '@dimforge/rapier2d-compat';
 import { Rapier2dFactory } from '../rapier-2d-factory';
+import { Subject } from 'rxjs';
 export class Rapier2dWorldComponent {
     constructor() {
         this._factory = null;
+        this.added$ = new Subject();
+        this.removed$ = new Subject();
+        this.children = [];
         this.unitScale = 100; // TODO abstractize somehow, hardcoded now
         this._gravity = Pnt2.scalarMult({ x: 0, y: 9.82 }, this.unitScale);
-        this._timeScale = 1;
         this._nativeWorld = null;
         this._eventQueue = null;
         this.handleIdEntityMap = new Map();
         this.lockedCollisionGroups = [];
+        this.added$.subscribe(c => this.children.push(c));
+        this.removed$.subscribe(c => this.children.splice(this.children.indexOf(c), 1));
     }
     get factory() {
         if (!this._factory) {
@@ -37,15 +42,6 @@ export class Rapier2dWorldComponent {
             this.nativeWorld.gravity.y = this._gravity.y;
         }
     }
-    get timeScale() {
-        return this._timeScale;
-    }
-    set timeScale(value) {
-        this._timeScale = value;
-    }
-    get physicsDebugViewActive() {
-        return false;
-    }
     get nativeWorld() {
         if (!this._nativeWorld) {
             throw new Error('Rapier2d world not initialized');
@@ -68,7 +64,7 @@ export class Rapier2dWorldComponent {
     }
     simulate(delta) {
         var _a;
-        this._nativeWorld.timestep = (this.timeScale * delta) / 1000;
+        this._nativeWorld.timestep = delta / 1000;
         (_a = this._nativeWorld) === null || _a === void 0 ? void 0 : _a.step(this.eventQueue);
     }
     registerCollisionGroup() {
@@ -83,14 +79,6 @@ export class Rapier2dWorldComponent {
     deregisterCollisionGroup(group) {
         this.lockedCollisionGroups = this.lockedCollisionGroups.filter(x => x !== group);
     }
-    startDebugger(world, drawer) {
-        // TODO
-        throw new Error('rapier-2d DebugDrawer not implemented');
-    }
-    stopDebugger() {
-        // TODO
-        throw new Error('rapier-2d DebugDrawer not implemented');
-    }
     dispose() {
         var _a;
         (_a = this._nativeWorld) === null || _a === void 0 ? void 0 : _a.free();

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, 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: 'all', interactWithCollisionGroups: 'all' }, descriptor.body));
     }
     createTrigger(descriptor, transform) {
         const colliderDescr = this.createColliderDescr(descriptor);
@@ -15,7 +15,7 @@ export class Rapier2dFactory {
             c.isSensor = true;
             c.setActiveEvents(ActiveEvents.COLLISION_EVENTS);
         });
-        return new Rapier2dTriggerComponent(this.world, colliderDescr, this.createRigidBodyDescr({ dynamic: false }, transform));
+        return new Rapier2dTriggerComponent(this.world, colliderDescr, descriptor, this.createRigidBodyDescr({ dynamic: false }, transform));
     }
     createColliderDescr(descriptor) {
         switch (descriptor.shape) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gg-web-engine/rapier2d",
-  "version": "0.0.37",
+  "version": "0.0.39",
   "description": "An attempt to create open source game engine for browser",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -27,20 +27,20 @@
   },
   "homepage": "https://github.com/AndyGura/gg-web-engine#readme",
   "devDependencies": {
-    "@dimforge/rapier2d-compat": "0.0.0-c23a138-20231001",
-    "@gg-web-engine/core": "0.0.37",
+    "@dimforge/rapier2d-compat": "0.0.0-98015b1-20240128",
+    "@gg-web-engine/core": "0.0.39",
     "@types/jest": "^29.5.0",
     "jest": "^29.5.0",
     "jest-environment-jsdom": "^29.5.0",
     "prettier": "^2.8.6",
-    "rxjs": "7.8.0",
+    "rxjs": "7.8.1",
     "ts-jest": "^29.0.5",
     "typescript": "~4.7.2"
   },
   "peerDependencies": {
-    "@dimforge/rapier2d-compat": "0.0.0-c23a138-20231001",
-    "@gg-web-engine/core": "0.0.37",
-    "rxjs": "7.8.0"
+    "@dimforge/rapier2d-compat": "0.0.0-98015b1-20240128",
+    "@gg-web-engine/core": "0.0.39",
+    "rxjs": "7.8.1"
   },
   "jest": {
     "rootDir": ".",