@gg-web-engine/matter 0.0.38 → 0.0.39

package/dist/components/matter-rigid-body.component.d.ts

@@ -1,9 +1,10 @@
-import { CollisionGroup, Entity2d, Gg2dWorld, IRigidBody2dComponent, IVisualScene2dComponent, Point2, VisualTypeDocRepo2D } from '@gg-web-engine/core';
+import { CollisionGroup, DebugBody2DSettings, Entity2d, Gg2dWorld, IRigidBody2dComponent, IVisualScene2dComponent, Point2, Shape2DDescriptor, VisualTypeDocRepo2D } from '@gg-web-engine/core';
 import { Body } from 'matter-js';
 import { MatterPhysicsTypeDocRepo } from '../types';
 import { MatterWorldComponent } from './matter-world.component';
 export declare class MatterRigidBodyComponent implements IRigidBody2dComponent<MatterPhysicsTypeDocRepo> {
     nativeBody: Body;
+    readonly shape: Shape2DDescriptor;
     get position(): Point2;
     set position(value: Point2);
     get rotation(): number;
@@ -14,7 +15,8 @@ export declare class MatterRigidBodyComponent implements IRigidBody2dComponent<M
     set angularVelocity(value: number);
     name: string;
     entity: Entity2d | null;
-    constructor(nativeBody: Body);
+    get debugBodySettings(): DebugBody2DSettings;
+    constructor(nativeBody: Body, shape: Shape2DDescriptor);
     get interactWithCollisionGroups(): CollisionGroup[];
     set interactWithCollisionGroups(value: CollisionGroup[] | 'all');
     get ownCollisionGroups(): CollisionGroup[];

package/dist/components/matter-rigid-body.component.js

@@ -1,8 +1,9 @@
 import { Pnt2, } from '@gg-web-engine/core';
 import { Body, Composite, Vector } from 'matter-js';
 export class MatterRigidBodyComponent {
-    constructor(nativeBody) {
+    constructor(nativeBody, shape) {
         this.nativeBody = nativeBody;
+        this.shape = shape;
         this.name = '';
         this.entity = null;
     }
@@ -30,6 +31,14 @@ export class MatterRigidBodyComponent {
     set angularVelocity(value) {
         Body.setAngularVelocity(this.nativeBody, value);
     }
+    get debugBodySettings() {
+        if (isFinite(this.nativeBody.mass)) {
+            return { shape: this.shape, type: 'RIGID_DYNAMIC', sleeping: this.nativeBody.isSleeping };
+        }
+        else {
+            return { shape: this.shape, type: 'RIGID_STATIC' };
+        }
+    }
     get interactWithCollisionGroups() {
         throw new Error('Collision groups not implemented for Matter.js');
     }
@@ -48,9 +57,11 @@ export class MatterRigidBodyComponent {
     }
     addToWorld(world) {
         Composite.add(world.physicsWorld.matterWorld, this.nativeBody);
+        world.physicsWorld.added$.next(this);
     }
     removeFromWorld(world) {
         Composite.remove(world.physicsWorld.matterWorld, this.nativeBody);
+        world.physicsWorld.removed$.next(this);
     }
     dispose() { }
     resetMotion() {

package/dist/components/matter-world.component.d.ts

@@ -1,23 +1,23 @@
-import { CollisionGroup, Gg2dWorld, IDebugPhysicsDrawer, IPhysicsWorld2dComponent, Point2 } from '@gg-web-engine/core';
+import { CollisionGroup, IPhysicsWorld2dComponent, Point2 } from '@gg-web-engine/core';
 import { Engine, World } from 'matter-js';
 import { MatterFactory } from '../matter-factory';
 import { MatterPhysicsTypeDocRepo } from '../types';
+import { Subject } from 'rxjs';
+import { MatterRigidBodyComponent } from './matter-rigid-body.component';
 export declare class MatterWorldComponent implements IPhysicsWorld2dComponent<MatterPhysicsTypeDocRepo> {
     protected matterEngine: Engine | null;
     get matterWorld(): World | null;
     readonly factory: MatterFactory;
+    readonly added$: Subject<MatterRigidBodyComponent>;
+    readonly removed$: Subject<MatterRigidBodyComponent>;
+    readonly children: MatterRigidBodyComponent[];
     private _gravity;
     get gravity(): Point2;
     set gravity(value: Point2);
-    private _timeScale;
-    get timeScale(): number;
-    set timeScale(value: number);
-    get physicsDebugViewActive(): boolean;
+    constructor();
     init(): Promise<void>;
     registerCollisionGroup(): CollisionGroup;
     deregisterCollisionGroup(group: CollisionGroup): void;
     simulate(delta: number): void;
-    startDebugger(world: Gg2dWorld, drawer: IDebugPhysicsDrawer<Point2, number>): void;
-    stopDebugger(): void;
     dispose(): void;
 }

package/dist/components/matter-world.component.js

@@ -9,13 +9,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { Engine } from 'matter-js';
 import { MatterFactory } from '../matter-factory';
+import { Subject } from 'rxjs';
 // TODO implement bindings for collision groups. Matter.js has elegant solution for that, read body.collisionFilter
 export class MatterWorldComponent {
     constructor() {
         this.matterEngine = null;
         this.factory = new MatterFactory();
+        this.added$ = new Subject();
+        this.removed$ = new Subject();
+        this.children = [];
         this._gravity = { x: 0, y: 9.82 };
-        this._timeScale = 1;
+        this.added$.subscribe(c => this.children.push(c));
+        this.removed$.subscribe(c => this.children.splice(this.children.indexOf(c), 1));
     }
     get matterWorld() {
         return this.matterEngine && this.matterEngine.world;
@@ -30,15 +35,6 @@ export class MatterWorldComponent {
             this.matterEngine.gravity.y = this._gravity.y;
         }
     }
-    get timeScale() {
-        return this._timeScale;
-    }
-    set timeScale(value) {
-        this._timeScale = value;
-    }
-    get physicsDebugViewActive() {
-        return false;
-    }
     init() {
         return __awaiter(this, void 0, void 0, function* () {
             this.matterEngine = Engine.create({ gravity: Object.assign(Object.assign({}, this._gravity), { scale: 0.0001 }) });
@@ -51,15 +47,7 @@ export class MatterWorldComponent {
         throw new Error('Collision groups not implemented for Matter.js');
     }
     simulate(delta) {
-        Engine.update(this.matterEngine, this._timeScale * delta);
-    }
-    startDebugger(world, drawer) {
-        // TODO
-        throw new Error('Matter.js DebugDrawer not implemented');
-    }
-    stopDebugger() {
-        // TODO
-        throw new Error('Matter.js DebugDrawer not implemented');
+        Engine.update(this.matterEngine, delta);
     }
     dispose() {
         Engine.clear(this.matterEngine);

package/dist/matter-factory.js

@@ -17,7 +17,7 @@ export class MatterFactory {
         }
         nativeBody.position = Vector.create(((_a = transform === null || transform === void 0 ? void 0 : transform.position) === null || _a === void 0 ? void 0 : _a.x) || 0, ((_b = transform === null || transform === void 0 ? void 0 : transform.position) === null || _b === void 0 ? void 0 : _b.y) || 0);
         nativeBody.angle = (transform === null || transform === void 0 ? void 0 : transform.rotation) || 0;
-        return new MatterRigidBodyComponent(nativeBody);
+        return new MatterRigidBodyComponent(nativeBody, descriptor.shape);
     }
     createTrigger(descriptor, transform) {
         throw new Error('Triggers not implemented for Matter.js');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gg-web-engine/matter",
-  "version": "0.0.38",
+  "version": "0.0.39",
   "description": "An attempt to create open source game engine for browser",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,13 +30,15 @@
   },
   "devDependencies": {
     "@types/matter-js": "0.19.6",
-    "@gg-web-engine/core": "0.0.38",
+    "@gg-web-engine/core": "0.0.39",
     "matter-js": "0.19.0",
     "prettier": "^2.8.6",
+    "rxjs": "7.8.1",
     "typescript": "~4.7.2"
   },
   "peerDependencies": {
-    "@gg-web-engine/core": "0.0.38",
-    "matter-js": "0.19.0"
+    "@gg-web-engine/core": "0.0.39",
+    "matter-js": "0.19.0",
+    "rxjs": "7.8.1"
   }
 }