@gg-web-engine/ammo 0.0.37 → 0.0.39

package/dist/ammo-factory.d.ts

@@ -18,11 +18,11 @@ export declare class AmmoFactory implements IPhysicsBody3dComponentFactory<AmmoP
     }): AmmoTriggerComponent;
     createRaycastVehicle(chassis: AmmoRigidBodyComponent): AmmoRaycastVehicleComponent;
     protected createShape(descriptor: Shape3DDescriptor): Ammo.btCollisionShape;
-    createRigidBodyFromShape(shape: Ammo.btCollisionShape, options: Partial<Body3DOptions>, transform?: {
+    createRigidBodyFromShape(nativeShape: Ammo.btCollisionShape, shapeDescr: Shape3DDescriptor, options: Partial<Body3DOptions>, transform?: {
         position?: Point3;
         rotation?: Point4;
     }): AmmoRigidBodyComponent;
-    createTriggerFromShape(shape: Ammo.btCollisionShape, transform?: {
+    createTriggerFromShape(nativeShape: Ammo.btCollisionShape, shapeDescr: Shape3DDescriptor, transform?: {
         position?: Point3;
         rotation?: Point4;
     }): AmmoTriggerComponent;

package/dist/ammo-factory.js

@@ -8,10 +8,10 @@ export class AmmoFactory {
         this.world = world;
     }
     createRigidBody(descriptor, transform) {
-        return this.createRigidBodyFromShape(this.createShape(descriptor.shape), descriptor.body, transform);
+        return this.createRigidBodyFromShape(this.createShape(descriptor.shape), descriptor.shape, descriptor.body, transform);
     }
     createTrigger(descriptor, transform) {
-        return this.createTriggerFromShape(this.createShape(descriptor), transform);
+        return this.createTriggerFromShape(this.createShape(descriptor), descriptor, transform);
     }
     createRaycastVehicle(chassis) {
         return new AmmoRaycastVehicleComponent(this.world, chassis);
@@ -75,7 +75,7 @@ export class AmmoFactory {
         }
         throw new Error(`Shape "${descriptor.shape}" not implemented for Ammo.js`);
     }
-    createRigidBodyFromShape(shape, options, transform) {
+    createRigidBodyFromShape(nativeShape, shapeDescr, options, transform) {
         if (options.dynamic === false) {
             options.mass = 0;
         }
@@ -86,8 +86,8 @@ export class AmmoFactory {
         ammoTransform.setRotation(new Ammo.btQuaternion(rot.x, rot.y, rot.z, rot.w));
         const motionState = new Ammo.btDefaultMotionState(ammoTransform);
         const localInertia = new Ammo.btVector3(0, 0, 0);
-        shape.calculateLocalInertia(options.mass || 0, localInertia);
-        const environmentBodyCI = new Ammo.btRigidBodyConstructionInfo(options.mass || 0, motionState, shape, localInertia);
+        nativeShape.calculateLocalInertia(options.mass || 0, localInertia);
+        const environmentBodyCI = new Ammo.btRigidBodyConstructionInfo(options.mass || 0, motionState, nativeShape, localInertia);
         if (options.friction) {
             environmentBodyCI.set_m_friction(options.friction);
             environmentBodyCI.set_m_rollingFriction(options.friction);
@@ -95,7 +95,7 @@ export class AmmoFactory {
         if (options.restitution) {
             environmentBodyCI.set_m_restitution(options.restitution);
         }
-        const comp = new AmmoRigidBodyComponent(this.world, new Ammo.btRigidBody(environmentBodyCI));
+        const comp = new AmmoRigidBodyComponent(this.world, new Ammo.btRigidBody(environmentBodyCI), shapeDescr);
         if (options.ownCollisionGroups && options.ownCollisionGroups !== 'all') {
             comp.ownCollisionGroups = options.ownCollisionGroups;
         }
@@ -104,10 +104,10 @@ export class AmmoFactory {
         }
         return comp;
     }
-    createTriggerFromShape(shape, transform) {
+    createTriggerFromShape(nativeShape, shapeDescr, transform) {
         var _a, _b, _c, _d, _e, _f, _g;
         const ghostObject = new Ammo.btPairCachingGhostObject();
-        ghostObject.setCollisionShape(shape);
+        ghostObject.setCollisionShape(nativeShape);
         ghostObject.setCollisionFlags(ghostObject.getCollisionFlags() | 4); // 4 is a CF_NO_CONTACT_RESPONSE collision flag
         ghostObject
             .getWorldTransform()
@@ -115,6 +115,6 @@ export class AmmoFactory {
         ghostObject
             .getWorldTransform()
             .setRotation(new Ammo.btQuaternion(((_d = transform === null || transform === void 0 ? void 0 : transform.rotation) === null || _d === void 0 ? void 0 : _d.x) || 0, ((_e = transform === null || transform === void 0 ? void 0 : transform.rotation) === null || _e === void 0 ? void 0 : _e.y) || 0, ((_f = transform === null || transform === void 0 ? void 0 : transform.rotation) === null || _f === void 0 ? void 0 : _f.z) || 0, ((_g = transform === null || transform === void 0 ? void 0 : transform.rotation) === null || _g === void 0 ? void 0 : _g.w) || 1));
-        return new AmmoTriggerComponent(this.world, ghostObject);
+        return new AmmoTriggerComponent(this.world, ghostObject, shapeDescr);
     }
 }

package/dist/components/ammo-body.component.d.ts

@@ -1,10 +1,11 @@
-import { CollisionGroup, Gg3dWorld, IEntity, Point3, Point4, VisualTypeDocRepo3D } from '@gg-web-engine/core';
+import { CollisionGroup, Gg3dWorld, IEntity, Point3, Point4, Shape3DDescriptor, VisualTypeDocRepo3D } from '@gg-web-engine/core';
 import { AmmoWorldComponent } from './ammo-world.component';
 import Ammo from '../ammo.js/ammo';
 import { AmmoPhysicsTypeDocRepo } from '../types';
 export declare abstract class AmmoBodyComponent<T extends Ammo.btCollisionObject> {
     protected readonly world: AmmoWorldComponent;
     protected _nativeBody: T;
+    readonly shape: Shape3DDescriptor;
     protected static nativeBodyReverseMap: Map<number, AmmoBodyComponent<any>>;
     get position(): Point3;
     set position(value: Point3);
@@ -22,7 +23,7 @@ export declare abstract class AmmoBodyComponent<T extends Ammo.btCollisionObject
     set interactWithCollisionGroups(value: CollisionGroup[] | 'all');
     get ownCollisionGroups(): CollisionGroup[];
     set ownCollisionGroups(value: CollisionGroup[] | 'all');
-    protected constructor(world: AmmoWorldComponent, _nativeBody: T);
+    protected constructor(world: AmmoWorldComponent, _nativeBody: T, shape: Shape3DDescriptor);
     abstract clone(): AmmoBodyComponent<T>;
     addToWorld(world: Gg3dWorld<VisualTypeDocRepo3D, AmmoPhysicsTypeDocRepo>): void;
     removeFromWorld(world: Gg3dWorld<VisualTypeDocRepo3D, AmmoPhysicsTypeDocRepo>): void;

package/dist/components/ammo-body.component.js

@@ -1,9 +1,10 @@
-import { BitMask } from '@gg-web-engine/core';
+import { BitMask, } from '@gg-web-engine/core';
 import Ammo from '../ammo.js/ammo';
 export class AmmoBodyComponent {
-    constructor(world, _nativeBody) {
+    constructor(world, _nativeBody, shape) {
         this.world = world;
         this._nativeBody = _nativeBody;
+        this.shape = shape;
         this.name = '';
         this.addedToWorld = false;
         this._interactWithCGsMask = BitMask.full(16);
@@ -80,12 +81,14 @@ export class AmmoBodyComponent {
             throw new Error('Ammo bodies cannot be shared between different worlds');
         }
         this.addedToWorld = true;
+        this.world.added$.next(this);
     }
     removeFromWorld(world) {
         if (world.physicsWorld != this.world) {
             throw new Error('Ammo bodies cannot be shared between different worlds');
         }
         this.addedToWorld = false;
+        this.world.removed$.next(this);
     }
     dispose() {
         try {

package/dist/components/ammo-raycast-vehicle.component.d.ts

@@ -32,4 +32,5 @@ export declare class AmmoRaycastVehicleComponent extends AmmoRigidBodyComponent
     };
     resetSuspension(): void;
     clone(): AmmoRaycastVehicleComponent;
+    resetMotion(): void;
 }

package/dist/components/ammo-raycast-vehicle.component.js

@@ -3,7 +3,7 @@ import Ammo from '../ammo.js/ammo';
 import { AmmoRigidBodyComponent } from './ammo-rigid-body.component';
 export class AmmoRaycastVehicleComponent extends AmmoRigidBodyComponent {
     constructor(world, chassisBody) {
-        super(world, chassisBody.nativeBody);
+        super(world, chassisBody.nativeBody, chassisBody.shape);
         this.world = world;
         this.chassisBody = chassisBody;
         this.vehicleTuning = new Ammo.btVehicleTuning();
@@ -41,14 +41,18 @@ export class AmmoRaycastVehicleComponent extends AmmoRigidBodyComponent {
         if (world.physicsWorld != this.world) {
             throw new Error('Ammo raycast vehicle cannot be shared between different worlds');
         }
+        this.addedToWorld = true;
         // TODO parked cars can be deactivated until we start handling them. Needs explicit activation call
         this.chassisBody.nativeBody.setActivationState(4); // btCollisionObject::DISABLE_DEACTIVATION
         this.chassisBody.addToWorld(world);
         this.world.dynamicAmmoWorld.addAction(this.nativeVehicle);
+        this.world.added$.next(this);
     }
     removeFromWorld(world) {
+        this.addedToWorld = false;
         this.chassisBody.removeFromWorld(world);
         this.world.dynamicAmmoWorld.removeAction(this.nativeVehicle);
+        this.world.removed$.next(this);
     }
     addWheel(options, suspensionOptions) {
         const wheelInfo = this.nativeVehicle.addWheel(new Ammo.btVector3(options.position.x, options.position.y, options.position.z), this.wheelDirectionCS0, this.wheelAxleCS, suspensionOptions.restLength, options.tyreRadius, this.vehicleTuning, options.isFront);
@@ -95,4 +99,8 @@ export class AmmoRaycastVehicleComponent extends AmmoRigidBodyComponent {
     clone() {
         return new AmmoRaycastVehicleComponent(this.world, this.chassisBody.clone());
     }
+    resetMotion() {
+        this.resetSuspension();
+        super.resetMotion();
+    }
 }

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

@@ -1,17 +1,19 @@
 import { AmmoWorldComponent } from './ammo-world.component';
 import Ammo from '../ammo.js/ammo';
 import { AmmoBodyComponent } from './ammo-body.component';
-import { Entity3d, Gg3dWorld, IRigidBody3dComponent, Point3, VisualTypeDocRepo3D } from '@gg-web-engine/core';
+import { DebugBody3DSettings, Entity3d, Gg3dWorld, IRigidBody3dComponent, Point3, Shape3DDescriptor, VisualTypeDocRepo3D } from '@gg-web-engine/core';
 import { AmmoPhysicsTypeDocRepo } from '../types';
 export declare class AmmoRigidBodyComponent extends AmmoBodyComponent<Ammo.btRigidBody> implements IRigidBody3dComponent<AmmoPhysicsTypeDocRepo> {
     protected readonly world: AmmoWorldComponent;
     protected _nativeBody: Ammo.btRigidBody;
+    readonly shape: Shape3DDescriptor;
     entity: Entity3d | null;
     get linearVelocity(): Point3;
     set linearVelocity(value: Point3);
     get angularVelocity(): Point3;
     set angularVelocity(value: Point3);
-    constructor(world: AmmoWorldComponent, _nativeBody: Ammo.btRigidBody);
+    get debugBodySettings(): DebugBody3DSettings;
+    constructor(world: AmmoWorldComponent, _nativeBody: Ammo.btRigidBody, shape: Shape3DDescriptor);
     clone(): AmmoRigidBodyComponent;
     addToWorld(world: Gg3dWorld<VisualTypeDocRepo3D, AmmoPhysicsTypeDocRepo>): void;
     removeFromWorld(world: Gg3dWorld<VisualTypeDocRepo3D, AmmoPhysicsTypeDocRepo>): void;

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

@@ -1,10 +1,12 @@
 import Ammo from '../ammo.js/ammo';
 import { AmmoBodyComponent } from './ammo-body.component';
+import { first } from 'rxjs';
 export class AmmoRigidBodyComponent extends AmmoBodyComponent {
-    constructor(world, _nativeBody) {
-        super(world, _nativeBody);
+    constructor(world, _nativeBody, shape) {
+        super(world, _nativeBody, shape);
         this.world = world;
         this._nativeBody = _nativeBody;
+        this.shape = shape;
         this.entity = null;
     }
     get linearVelocity() {
@@ -21,8 +23,16 @@ export class AmmoRigidBodyComponent extends AmmoBodyComponent {
     set angularVelocity(value) {
         this.nativeBody.setAngularVelocity(new Ammo.btVector3(value.x, value.y, value.z));
     }
+    get debugBodySettings() {
+        if (this._nativeBody.isStaticOrKinematicObject()) {
+            return { shape: this.shape, type: 'RIGID_STATIC' };
+        }
+        else {
+            return { shape: this.shape, type: 'RIGID_DYNAMIC', sleeping: !this._nativeBody.isActive() };
+        }
+    }
     clone() {
-        return this.world.factory.createRigidBodyFromShape(this._nativeBody.getCollisionShape(), {
+        return this.world.factory.createRigidBodyFromShape(this._nativeBody.getCollisionShape(), this.shape, {
             dynamic: !this._nativeBody.isStaticOrKinematicObject(),
             mass: this._nativeBody.getMass(),
             friction: this._nativeBody.getFriction(),
@@ -34,13 +44,13 @@ export class AmmoRigidBodyComponent extends AmmoBodyComponent {
     }
     addToWorld(world) {
         var _a;
-        super.addToWorld(world);
         (_a = this.world.dynamicAmmoWorld) === null || _a === void 0 ? void 0 : _a.addRigidBody(this.nativeBody, this._ownCGsMask, this._interactWithCGsMask);
+        super.addToWorld(world);
     }
     removeFromWorld(world) {
         var _a;
-        super.removeFromWorld(world);
         (_a = this.world.dynamicAmmoWorld) === null || _a === void 0 ? void 0 : _a.removeRigidBody(this.nativeBody);
+        super.removeFromWorld(world);
     }
     refreshCG() {
         var _a, _b;
@@ -49,10 +59,33 @@ export class AmmoRigidBodyComponent extends AmmoBodyComponent {
     }
     resetMotion() {
         const emptyVector = new Ammo.btVector3();
-        this.nativeBody.setLinearVelocity(emptyVector);
-        this.nativeBody.setAngularVelocity(emptyVector);
-        this.nativeBody.clearForces();
-        this.nativeBody.updateInertiaTensor();
+        if (!this.addedToWorld) {
+            this.nativeBody.clearForces();
+            this.nativeBody.setLinearVelocity(emptyVector);
+            this.nativeBody.setAngularVelocity(emptyVector);
+        }
+        else {
+            // when resetting object motion state in ammo.js while it's added to the simulation,
+            // on the next tick it randomly gets broken (linear velocity vector has NaN components and then position too)
+            // By removing and adding the object to the world it happens less often
+            const ammoWorld = this.world;
+            this.removeFromWorld({ physicsWorld: ammoWorld });
+            const position = this.position;
+            const rotation = this.rotation;
+            this.nativeBody.clearForces();
+            this.nativeBody.setLinearVelocity(emptyVector);
+            this.nativeBody.setAngularVelocity(emptyVector);
+            this.world.afterTick$.pipe(first()).subscribe(() => {
+                this.addToWorld({ physicsWorld: ammoWorld });
+                const newLinVel = this.linearVelocity;
+                if (isNaN(newLinVel.x) || isNaN(newLinVel.y) || isNaN(newLinVel.z)) {
+                    console.warn('resetMotion caused ammo body to have broken velocity. Fixing');
+                    this.position = position;
+                    this.rotation = rotation;
+                    this.resetMotion();
+                }
+            });
+        }
         Ammo.destroy(emptyVector);
     }
 }

package/dist/components/ammo-trigger.component.d.ts

@@ -1,4 +1,4 @@
-import { Gg3dWorld, IEntity, ITrigger3dComponent, VisualTypeDocRepo3D } from '@gg-web-engine/core';
+import { DebugBody3DSettings, Gg3dWorld, IEntity, ITrigger3dComponent, Shape3DDescriptor, VisualTypeDocRepo3D } from '@gg-web-engine/core';
 import { AmmoWorldComponent } from './ammo-world.component';
 import { Observable, Subject } from 'rxjs';
 import Ammo from '../ammo.js/ammo';
@@ -8,10 +8,12 @@ import { AmmoPhysicsTypeDocRepo } from '../types';
 export declare class AmmoTriggerComponent extends AmmoBodyComponent<Ammo.btPairCachingGhostObject> implements ITrigger3dComponent<AmmoPhysicsTypeDocRepo> {
     protected readonly world: AmmoWorldComponent;
     protected _nativeBody: Ammo.btPairCachingGhostObject;
+    readonly shape: Shape3DDescriptor;
     entity: IEntity | null;
+    get debugBodySettings(): DebugBody3DSettings;
     get onEntityEntered(): Observable<AmmoRigidBodyComponent>;
     get onEntityLeft(): Observable<AmmoRigidBodyComponent | null>;
-    constructor(world: AmmoWorldComponent, _nativeBody: Ammo.btPairCachingGhostObject);
+    constructor(world: AmmoWorldComponent, _nativeBody: Ammo.btPairCachingGhostObject, shape: Shape3DDescriptor);
     protected readonly onEnter$: Subject<number>;
     protected readonly onLeft$: Subject<number>;
     protected readonly overlaps: Set<Ammo.btCollisionObject>;

package/dist/components/ammo-trigger.component.js

@@ -2,15 +2,19 @@ import { filter, map, Subject } from 'rxjs';
 import Ammo from '../ammo.js/ammo';
 import { AmmoBodyComponent } from './ammo-body.component';
 export class AmmoTriggerComponent extends AmmoBodyComponent {
-    constructor(world, _nativeBody) {
-        super(world, _nativeBody);
+    constructor(world, _nativeBody, shape) {
+        super(world, _nativeBody, shape);
         this.world = world;
         this._nativeBody = _nativeBody;
+        this.shape = shape;
         this.entity = null;
         this.onEnter$ = new Subject();
         this.onLeft$ = new Subject();
         this.overlaps = new Set();
     }
+    get debugBodySettings() {
+        return { shape: this.shape, type: 'TRIGGER' };
+    }
     get onEntityEntered() {
         return this.onEnter$.pipe(map(b => AmmoBodyComponent.nativeBodyReverseMap.get(b)), filter(x => !!x));
     }
@@ -35,7 +39,7 @@ export class AmmoTriggerComponent extends AmmoBodyComponent {
         }
     }
     clone() {
-        return this.world.factory.createTriggerFromShape(this._nativeBody.getCollisionShape(), {
+        return this.world.factory.createTriggerFromShape(this._nativeBody.getCollisionShape(), this.shape, {
             position: this.position,
             rotation: this.rotation,
         });
@@ -48,12 +52,12 @@ export class AmmoTriggerComponent extends AmmoBodyComponent {
     }
     removeFromWorld(world) {
         var _a;
-        super.removeFromWorld(world);
         for (const body of this.overlaps) {
             this.onLeft$.next(Ammo.getPointer(body));
         }
         this.overlaps.clear();
         (_a = this.world.dynamicAmmoWorld) === null || _a === void 0 ? void 0 : _a.removeCollisionObject(this.nativeBody);
+        super.removeFromWorld(world);
     }
     refreshCG() {
         var _a, _b;

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

@@ -1,22 +1,23 @@
-import { CollisionGroup, Gg3dWorld, IDebugPhysicsDrawer, IPhysicsWorld3dComponent, Point3, Point4, VisualTypeDocRepo3D } from '@gg-web-engine/core';
+import { CollisionGroup, IPhysicsWorld3dComponent, Point3 } from '@gg-web-engine/core';
+import { Subject } from 'rxjs';
 import Ammo from '../ammo.js/ammo';
 import { AmmoFactory } from '../ammo-factory';
 import { AmmoLoader } from '../ammo-loader';
 import { AmmoPhysicsTypeDocRepo } from '../types';
+import { AmmoRigidBodyComponent } from './ammo-rigid-body.component';
+import { AmmoTriggerComponent } from './ammo-trigger.component';
 export declare class AmmoWorldComponent implements IPhysicsWorld3dComponent<AmmoPhysicsTypeDocRepo> {
     private _factory;
     get factory(): AmmoFactory;
+    readonly afterTick$: Subject<void>;
+    readonly added$: Subject<AmmoRigidBodyComponent | AmmoTriggerComponent>;
+    readonly removed$: Subject<AmmoRigidBodyComponent | AmmoTriggerComponent>;
+    readonly children: (AmmoRigidBodyComponent | AmmoTriggerComponent)[];
     private _loader;
     get loader(): AmmoLoader;
     private _gravity;
     get gravity(): Point3;
     set gravity(value: Point3);
-    private _timeScale;
-    get timeScale(): number;
-    set timeScale(value: number);
-    private _debugger;
-    private _debugDrawer;
-    get physicsDebugViewActive(): boolean;
     get dynamicAmmoWorld(): Ammo.btDiscreteDynamicsWorld | undefined;
     private collisionConfiguration;
     private dispatcher;
@@ -25,12 +26,11 @@ export declare class AmmoWorldComponent implements IPhysicsWorld3dComponent<Ammo
     private solver;
     private gravityVector;
     protected _dynamicAmmoWorld: Ammo.btDiscreteDynamicsWorld | undefined;
+    constructor();
     init(): Promise<void>;
     simulate(delta: number): void;
     protected lockedCollisionGroups: number[];
     registerCollisionGroup(): CollisionGroup;
     deregisterCollisionGroup(group: CollisionGroup): void;
-    startDebugger(world: Gg3dWorld<VisualTypeDocRepo3D, AmmoPhysicsTypeDocRepo>, drawer: IDebugPhysicsDrawer<Point3, Point4>): void;
-    stopDebugger(world: Gg3dWorld<VisualTypeDocRepo3D, AmmoPhysicsTypeDocRepo>): void;
     dispose(): void;
 }

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

@@ -7,19 +7,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { Subject } from 'rxjs';
 import Ammo from '../ammo.js/ammo';
 import { AmmoFactory } from '../ammo-factory';
 import { AmmoLoader } from '../ammo-loader';
-import { AmmoDebugger, AmmoDebugMode } from '../ammo-debugger';
 export class AmmoWorldComponent {
     constructor() {
         this._factory = null;
+        this.afterTick$ = new Subject();
+        this.added$ = new Subject();
+        this.removed$ = new Subject();
+        this.children = [];
         this._loader = null;
         this._gravity = { x: 0, y: 0, z: -9.82 };
-        this._timeScale = 1;
-        this._debugger = null;
-        this._debugDrawer = null;
         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) {
@@ -44,15 +47,6 @@ export class AmmoWorldComponent {
             (_a = this._dynamicAmmoWorld) === null || _a === void 0 ? void 0 : _a.setGravity(this.gravityVector);
         }
     }
-    get timeScale() {
-        return this._timeScale;
-    }
-    set timeScale(value) {
-        this._timeScale = value;
-    }
-    get physicsDebugViewActive() {
-        return !!this._debugger;
-    }
     get dynamicAmmoWorld() {
         return this._dynamicAmmoWorld;
     }
@@ -77,10 +71,8 @@ export class AmmoWorldComponent {
     }
     simulate(delta) {
         var _a;
-        (_a = this._dynamicAmmoWorld) === null || _a === void 0 ? void 0 : _a.stepSimulation((this._timeScale * delta) / 1000, 100, this._timeScale * 0.01);
-        if (this._debugger) {
-            this._debugger.update();
-        }
+        (_a = this._dynamicAmmoWorld) === null || _a === void 0 ? void 0 : _a.stepSimulation(delta / 1000, 100, 0.01);
+        this.afterTick$.next();
     }
     registerCollisionGroup() {
         for (let i = 0; i < 16; i++) {
@@ -94,38 +86,13 @@ export class AmmoWorldComponent {
     deregisterCollisionGroup(group) {
         this.lockedCollisionGroups = this.lockedCollisionGroups.filter(x => x !== group);
     }
-    startDebugger(world, drawer) {
-        var _a;
-        if (!this._debugger) {
-            this._debugger = new AmmoDebugger(this, drawer);
-            (_a = this.dynamicAmmoWorld) === null || _a === void 0 ? void 0 : _a.setDebugDrawer(this._debugger.ammoInstance);
-        }
-        this._debugger.setDebugMode(AmmoDebugMode.DrawWireframe);
-        this._debugDrawer = drawer;
-        this._debugDrawer.addToWorld(world);
-    }
-    stopDebugger(world) {
-        var _a;
-        if (this._debugger) {
-            (_a = this.dynamicAmmoWorld) === null || _a === void 0 ? void 0 : _a.setDebugDrawer(null);
-            Ammo.destroy(this._debugger.ammoInstance);
-            this._debugger = null;
-        }
-        if (this._debugDrawer) {
-            this._debugDrawer.removeFromWorld(world);
-            this._debugDrawer.dispose();
-            this._debugDrawer = null;
-        }
-    }
     dispose() {
+        this.afterTick$.complete();
         Ammo.destroy(this._dynamicAmmoWorld);
         Ammo.destroy(this.solver);
         Ammo.destroy(this.broadphase);
         Ammo.destroy(this.dispatcher);
         Ammo.destroy(this.collisionConfiguration);
-        if (this._debugger) {
-            Ammo.destroy(this._debugger.ammoInstance);
-        }
         this._dynamicAmmoWorld = this.solver = this.broadphase = this.dispatcher = this.collisionConfiguration = undefined;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gg-web-engine/ammo",
-  "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",
@@ -34,18 +34,20 @@
   "dependencies": {
   },
   "devDependencies": {
-    "@gg-web-engine/core": "0.0.37",
+    "@gg-web-engine/core": "0.0.39",
     "@types/jest": "^29.5.0",
     "jest": "^29.5.0",
     "jest-environment-jsdom": "^29.5.0",
     "mini-signals": "2.0.0",
     "prettier": "^2.8.6",
+    "rxjs": "7.8.1",
     "ts-jest": "^29.0.5",
     "typescript": "~4.7.2"
   },
   "peerDependencies": {
-    "@gg-web-engine/core": "0.0.37",
-    "mini-signals": "2.0.0"
+    "@gg-web-engine/core": "0.0.39",
+    "mini-signals": "2.0.0",
+    "rxjs": "7.8.1"
   },
   "jest": {
     "rootDir": ".",

package/dist/ammo-debugger.d.ts

@@ -1,38 +0,0 @@
-import Ammo from './ammo.js/ammo';
-import { IDebugPhysicsDrawer, Point3, Point4 } from '@gg-web-engine/core';
-import { AmmoWorldComponent } from './components/ammo-world.component';
-export declare const DebugBufferSize: number;
-export declare enum AmmoDebugMode {
-    NoDebug = 0,
-    DrawWireframe = 1,
-    DrawAabb = 2,
-    DrawFeaturesText = 4,
-    DrawContactPoints = 8,
-    NoDeactivation = 16,
-    NoHelpText = 32,
-    DrawText = 64,
-    ProfileTimings = 128,
-    EnableSatComparison = 256,
-    DisableBulletLCP = 512,
-    EnableCCD = 1024,
-    DrawConstraints = 2048,
-    DrawConstraintLimits = 4096,
-    FastWireframe = 8192,
-    DrawNormals = 16384,
-    MAX_DEBUG_DRAW_MODE = 4294967295
-}
-export declare class AmmoDebugger implements Ammo.btIDebugDraw {
-    protected readonly world: AmmoWorldComponent;
-    private readonly drawer;
-    protected debugMode: AmmoDebugMode;
-    constructor(world: AmmoWorldComponent, drawer: IDebugPhysicsDrawer<Point3, Point4>);
-    readonly ammoInstance: Ammo.btIDebugDraw;
-    draw3dText(location: Ammo.btVector3, textString: string): void;
-    drawContactPoint(pointOnB: Ammo.btVector3, normalOnB: Ammo.btVector3, distance: number, lifeTime: number, color: Ammo.btVector3): void;
-    drawLine(from: Ammo.btVector3, to: Ammo.btVector3, color: Ammo.btVector3): void;
-    getDebugMode(): number;
-    update(): void;
-    setDebugFlags(flags: AmmoDebugMode[]): void;
-    setDebugMode(debugMode: number): void;
-    reportErrorWarning(warningString: string): void;
-}

package/dist/ammo-debugger.js

@@ -1,77 +0,0 @@
-import Ammo from './ammo.js/ammo';
-export const DebugBufferSize = 3 * 1000000;
-export var AmmoDebugMode;
-(function (AmmoDebugMode) {
-    AmmoDebugMode[AmmoDebugMode["NoDebug"] = 0] = "NoDebug";
-    AmmoDebugMode[AmmoDebugMode["DrawWireframe"] = 1] = "DrawWireframe";
-    AmmoDebugMode[AmmoDebugMode["DrawAabb"] = 2] = "DrawAabb";
-    AmmoDebugMode[AmmoDebugMode["DrawFeaturesText"] = 4] = "DrawFeaturesText";
-    AmmoDebugMode[AmmoDebugMode["DrawContactPoints"] = 8] = "DrawContactPoints";
-    AmmoDebugMode[AmmoDebugMode["NoDeactivation"] = 16] = "NoDeactivation";
-    AmmoDebugMode[AmmoDebugMode["NoHelpText"] = 32] = "NoHelpText";
-    AmmoDebugMode[AmmoDebugMode["DrawText"] = 64] = "DrawText";
-    AmmoDebugMode[AmmoDebugMode["ProfileTimings"] = 128] = "ProfileTimings";
-    AmmoDebugMode[AmmoDebugMode["EnableSatComparison"] = 256] = "EnableSatComparison";
-    AmmoDebugMode[AmmoDebugMode["DisableBulletLCP"] = 512] = "DisableBulletLCP";
-    AmmoDebugMode[AmmoDebugMode["EnableCCD"] = 1024] = "EnableCCD";
-    AmmoDebugMode[AmmoDebugMode["DrawConstraints"] = 2048] = "DrawConstraints";
-    AmmoDebugMode[AmmoDebugMode["DrawConstraintLimits"] = 4096] = "DrawConstraintLimits";
-    AmmoDebugMode[AmmoDebugMode["FastWireframe"] = 8192] = "FastWireframe";
-    AmmoDebugMode[AmmoDebugMode["DrawNormals"] = 16384] = "DrawNormals";
-    AmmoDebugMode[AmmoDebugMode["MAX_DEBUG_DRAW_MODE"] = 4294967295] = "MAX_DEBUG_DRAW_MODE";
-})(AmmoDebugMode || (AmmoDebugMode = {}));
-const deserializeVector = function (vec) {
-    if (!isNaN(+vec)) {
-        const heap = Ammo.HEAPF32;
-        return {
-            x: heap[+vec / 4],
-            y: heap[(+vec + 4) / 4],
-            z: heap[(+vec + 8) / 4],
-        };
-    }
-    return { x: vec.x(), y: vec.y(), z: vec.z() };
-};
-export class AmmoDebugger {
-    constructor(world, drawer) {
-        this.world = world;
-        this.drawer = drawer;
-        this.debugMode = AmmoDebugMode.DrawWireframe;
-        this.ammoInstance = new Ammo.DebugDrawer();
-        this.ammoInstance.drawLine = this.drawLine.bind(this);
-        this.ammoInstance.drawContactPoint = this.drawContactPoint.bind(this);
-        this.ammoInstance.reportErrorWarning = this.reportErrorWarning.bind(this);
-        this.ammoInstance.draw3dText = this.draw3dText.bind(this);
-        this.ammoInstance.setDebugMode = this.setDebugMode.bind(this);
-        this.ammoInstance.getDebugMode = this.getDebugMode.bind(this);
-    }
-    draw3dText(location, textString) {
-        console.log('DRAWER DEBUG', 'draw3dtext');
-    }
-    drawContactPoint(pointOnB, normalOnB, distance, lifeTime, color) {
-        this.drawer.drawContactPoint(deserializeVector(pointOnB), deserializeVector(normalOnB), deserializeVector(color));
-    }
-    drawLine(from, to, color) {
-        this.drawer.drawLine(deserializeVector(from), deserializeVector(to), deserializeVector(color));
-    }
-    getDebugMode() {
-        return this.debugMode;
-    }
-    update() {
-        var _a;
-        (_a = this.world.dynamicAmmoWorld) === null || _a === void 0 ? void 0 : _a.debugDrawWorld();
-        this.drawer.update();
-    }
-    setDebugFlags(flags) {
-        let res = 0;
-        for (const flag of flags) {
-            res = res | flag;
-        }
-        this.setDebugMode(res);
-    }
-    setDebugMode(debugMode) {
-        this.debugMode = debugMode;
-    }
-    reportErrorWarning(warningString) {
-        console.log('DRAWER DEBUG', 'reportErrorWarning', warningString);
-    }
-}