@gg-web-engine/matter 0.0.20 → 0.0.24

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

@@ -0,0 +1,18 @@
+import { Entity2d, Gg2dWorld, IRigidBody2dComponent, IVisualScene2dComponent, Point2 } from '@gg-web-engine/core';
+import { MatterWorldComponent } from './matter-world.component';
+import { Body } from 'matter-js';
+export declare class MatterRigidBodyComponent implements IRigidBody2dComponent<MatterWorldComponent> {
+    nativeBody: Body;
+    get position(): Point2;
+    set position(value: Point2);
+    get rotation(): number;
+    set rotation(value: number);
+    name: string;
+    entity: Entity2d | null;
+    constructor(nativeBody: Body);
+    clone(): MatterRigidBodyComponent;
+    addToWorld(world: Gg2dWorld<IVisualScene2dComponent, MatterWorldComponent>): void;
+    removeFromWorld(world: Gg2dWorld<IVisualScene2dComponent, MatterWorldComponent>): void;
+    dispose(): void;
+    resetMotion(): void;
+}

package/dist/{impl/gg-2d-body.js → components/matter-rigid-body.component.js}

@@ -1,6 +1,6 @@
 import { Pnt2 } from '@gg-web-engine/core';
 import { Body, Composite, Vector } from 'matter-js';
-export class Gg2dBody {
+export class MatterRigidBodyComponent {
     constructor(nativeBody) {
         this.nativeBody = nativeBody;
         this.name = '';
@@ -18,19 +18,15 @@ export class Gg2dBody {
     set rotation(value) {
         this.nativeBody.angle = value;
     }
-    get scale() {
-        // hmm, is it even possible to be different?
-        return { x: 1, y: 1 };
-    }
     clone() {
         // TODO
         throw new Error('Gg2dBody.clone() not implemented for Matter.js');
     }
     addToWorld(world) {
-        Composite.add(world.matterWorld, this.nativeBody);
+        Composite.add(world.physicsWorld.matterWorld, this.nativeBody);
     }
     removeFromWorld(world) {
-        Composite.remove(world.matterWorld, this.nativeBody);
+        Composite.remove(world.physicsWorld.matterWorld, this.nativeBody);
     }
     dispose() { }
     resetMotion() {

package/dist/{impl/gg-2d-physics-world.d.ts → components/matter-world.component.d.ts}

@@ -1,10 +1,10 @@
-import { IGg2dPhysicsWorld, GgDebugPhysicsDrawer, Point2, Gg2dWorld } from '@gg-web-engine/core';
+import { IDebugPhysicsDrawer, Point2, Gg2dWorld, IPhysicsWorld2dComponent } from '@gg-web-engine/core';
 import { Engine, World } from 'matter-js';
-import { Gg2dBodyFactory } from './gg-2d-body-factory';
-export declare class Gg2dPhysicsWorld implements IGg2dPhysicsWorld {
+import { MatterFactory } from '../matter-factory';
+export declare class MatterWorldComponent implements IPhysicsWorld2dComponent {
     protected matterEngine: Engine | null;
     get matterWorld(): World | null;
-    readonly factory: Gg2dBodyFactory;
+    readonly factory: MatterFactory;
     private _gravity;
     get gravity(): Point2;
     set gravity(value: Point2);
@@ -14,7 +14,7 @@ export declare class Gg2dPhysicsWorld implements IGg2dPhysicsWorld {
     get physicsDebugViewActive(): boolean;
     init(): Promise<void>;
     simulate(delta: number): void;
-    startDebugger(world: Gg2dWorld, drawer: GgDebugPhysicsDrawer<Point2, number>): void;
+    startDebugger(world: Gg2dWorld, drawer: IDebugPhysicsDrawer<Point2, number>): void;
     stopDebugger(): void;
     dispose(): void;
 }

package/dist/{impl/gg-2d-physics-world.js → components/matter-world.component.js}

@@ -8,11 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { Engine } from 'matter-js';
-import { Gg2dBodyFactory } from './gg-2d-body-factory';
-export class Gg2dPhysicsWorld {
+import { MatterFactory } from '../matter-factory';
+export class MatterWorldComponent {
     constructor() {
         this.matterEngine = null;
-        this.factory = new Gg2dBodyFactory();
+        this.factory = new MatterFactory();
         this._gravity = { x: 0, y: 9.82 };
         this._timeScale = 1;
     }

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-export * from './impl/gg-2d-body';
-export * from './impl/gg-2d-body-factory';
-export * from './impl/gg-2d-physics-world';
+export * from './components/matter-rigid-body.component';
+export * from './components/matter-world.component';
+export * from './matter-factory';

package/dist/index.js

@@ -1,3 +1,3 @@
-export * from './impl/gg-2d-body';
-export * from './impl/gg-2d-body-factory';
-export * from './impl/gg-2d-physics-world';
+export * from './components/matter-rigid-body.component';
+export * from './components/matter-world.component';
+export * from './matter-factory';

package/dist/matter-factory.d.ts

@@ -0,0 +1,13 @@
+import { BodyShape2DDescriptor, IPhysicsBody2dComponentFactory, Point2, Shape2DDescriptor } from '@gg-web-engine/core';
+import { MatterRigidBodyComponent } from './components/matter-rigid-body.component';
+export declare class MatterFactory implements IPhysicsBody2dComponentFactory<MatterRigidBodyComponent, any> {
+    createRigidBody(descriptor: BodyShape2DDescriptor, transform?: {
+        position?: Point2;
+        rotation?: number;
+    }): MatterRigidBodyComponent;
+    createTrigger(descriptor: Shape2DDescriptor, transform?: {
+        position?: Point2;
+        rotation?: number;
+    }): any;
+    private transformOptions;
+}

package/dist/{impl/gg-2d-body-factory.js → matter-factory.js}

@@ -1,6 +1,6 @@
-import { Gg2dBody } from './gg-2d-body';
+import { MatterRigidBodyComponent } from './components/matter-rigid-body.component';
 import { Bodies, Vector } from 'matter-js';
-export class Gg2dBodyFactory {
+export class MatterFactory {
     createRigidBody(descriptor, transform) {
         var _a, _b;
         let nativeBody = null;
@@ -17,7 +17,7 @@ export class Gg2dBodyFactory {
         }
         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 Gg2dBody(nativeBody);
+        return new MatterRigidBodyComponent(nativeBody);
     }
     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.20",
+  "version": "0.0.24",
   "description": "An attempt to create open source game engine for browser",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,14 +29,14 @@
   "dependencies": {
   },
   "devDependencies": {
-    "@types/matter-js": "^0.18.2",
-    "@gg-web-engine/core": "^0.0.20",
-    "matter-js": "^0.19.0",
+    "@types/matter-js": "0.19.1",
+    "@gg-web-engine/core": "0.0.24",
+    "matter-js": "0.19.0",
     "prettier": "^2.8.6",
     "typescript": "~4.7.2"
   },
   "peerDependencies": {
-    "@gg-web-engine/core": "^0.0.20",
-    "matter-js": "^0.19.0"
+    "@gg-web-engine/core": "0.0.24",
+    "matter-js": "0.19.0"
   }
 }

package/dist/impl/gg-2d-body-factory.d.ts

@@ -1,13 +0,0 @@
-import { BodyShape2DDescriptor, IGg2dBodyFactory, Point2, Shape2DDescriptor } from '@gg-web-engine/core';
-import { Gg2dBody } from './gg-2d-body';
-export declare class Gg2dBodyFactory implements IGg2dBodyFactory<Gg2dBody, any> {
-    createRigidBody(descriptor: BodyShape2DDescriptor, transform?: {
-        position?: Point2;
-        rotation?: number;
-    }): Gg2dBody;
-    createTrigger(descriptor: Shape2DDescriptor, transform?: {
-        position?: Point2;
-        rotation?: number;
-    }): any;
-    private transformOptions;
-}

package/dist/impl/gg-2d-body.d.ts

@@ -1,19 +0,0 @@
-import { Gg2dEntity, IGg2dBody, Point2 } from '@gg-web-engine/core';
-import { Gg2dPhysicsWorld } from './gg-2d-physics-world';
-import { Body } from 'matter-js';
-export declare class Gg2dBody implements IGg2dBody {
-    nativeBody: Body;
-    get position(): Point2;
-    set position(value: Point2);
-    get rotation(): number;
-    set rotation(value: number);
-    get scale(): Point2;
-    name: string;
-    entity: Gg2dEntity | null;
-    constructor(nativeBody: Body);
-    clone(): Gg2dBody;
-    addToWorld(world: Gg2dPhysicsWorld): void;
-    removeFromWorld(world: Gg2dPhysicsWorld): void;
-    dispose(): void;
-    resetMotion(): void;
-}