@gg-web-engine/ammo 0.0.30 → 0.0.37

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

@@ -1,6 +1,6 @@
 import { CollisionGroup, Gg3dWorld, IEntity, Point3, Point4, VisualTypeDocRepo3D } from '@gg-web-engine/core';
 import { AmmoWorldComponent } from './ammo-world.component';
-import Ammo from 'ammojs-typed';
+import Ammo from '../ammo.js/ammo';
 import { AmmoPhysicsTypeDocRepo } from '../types';
 export declare abstract class AmmoBodyComponent<T extends Ammo.btCollisionObject> {
     protected readonly world: AmmoWorldComponent;

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

@@ -1,6 +1,5 @@
 import { BitMask } from '@gg-web-engine/core';
-import Ammo from 'ammojs-typed';
-import { ammoId } from '../ammo-utils';
+import Ammo from '../ammo.js/ammo';
 export class AmmoBodyComponent {
     constructor(world, _nativeBody) {
         this.world = world;
@@ -9,7 +8,7 @@ export class AmmoBodyComponent {
         this.addedToWorld = false;
         this._interactWithCGsMask = BitMask.full(16);
         this._ownCGsMask = BitMask.full(16);
-        AmmoBodyComponent.nativeBodyReverseMap.set(ammoId(this.nativeBody), this);
+        AmmoBodyComponent.nativeBodyReverseMap.set(Ammo.getPointer(this.nativeBody), this);
     }
     get position() {
         const origin = this.nativeBody.getWorldTransform().getOrigin();
@@ -36,9 +35,9 @@ export class AmmoBodyComponent {
         if (value == this._nativeBody) {
             return;
         }
-        AmmoBodyComponent.nativeBodyReverseMap.delete(ammoId(this._nativeBody));
+        AmmoBodyComponent.nativeBodyReverseMap.delete(Ammo.getPointer(this._nativeBody));
         this._nativeBody = value;
-        AmmoBodyComponent.nativeBodyReverseMap.set(ammoId(value), this);
+        AmmoBodyComponent.nativeBodyReverseMap.set(Ammo.getPointer(value), this);
     }
     get interactWithCollisionGroups() {
         return BitMask.unpack(this._interactWithCGsMask, 16);
@@ -95,7 +94,7 @@ export class AmmoBodyComponent {
         catch (_a) {
             // pass
         }
-        AmmoBodyComponent.nativeBodyReverseMap.delete(ammoId(this.nativeBody));
+        AmmoBodyComponent.nativeBodyReverseMap.delete(Ammo.getPointer(this.nativeBody));
     }
 }
 AmmoBodyComponent.nativeBodyReverseMap = new Map();

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

@@ -1,5 +1,5 @@
-import { Gg3dWorld, IRaycastVehicleComponent, Point3, Point4, RaycastVehicle3dEntity, SuspensionOptions, VisualTypeDocRepo3D, WheelOptions } from '@gg-web-engine/core';
-import Ammo from 'ammojs-typed';
+import { CollisionGroup, Gg3dWorld, IRaycastVehicleComponent, Point3, Point4, RaycastVehicle3dEntity, SuspensionOptions, VisualTypeDocRepo3D, WheelOptions } from '@gg-web-engine/core';
+import Ammo from '../ammo.js/ammo';
 import { AmmoRigidBodyComponent } from './ammo-rigid-body.component';
 import { AmmoWorldComponent } from './ammo-world.component';
 import { AmmoPhysicsTypeDocRepo } from '../types';
@@ -11,9 +11,16 @@ export declare class AmmoRaycastVehicleComponent extends AmmoRigidBodyComponent
     protected readonly wheelDirectionCS0: Ammo.btVector3;
     protected readonly wheelAxleCS: Ammo.btVector3;
     entity: RaycastVehicle3dEntity | null;
+    protected readonly raycaster: Ammo.btDefaultVehicleRaycaster;
+    get interactWithCollisionGroups(): CollisionGroup[];
+    set interactWithCollisionGroups(value: CollisionGroup[] | 'all');
+    get ownCollisionGroups(): CollisionGroup[];
+    set ownCollisionGroups(value: CollisionGroup[] | 'all');
+    refreshCG(): void;
     constructor(world: AmmoWorldComponent, chassisBody: AmmoRigidBodyComponent);
     get wheelSpeed(): number;
     addToWorld(world: Gg3dWorld<VisualTypeDocRepo3D, AmmoPhysicsTypeDocRepo>): void;
+    removeFromWorld(world: Gg3dWorld<VisualTypeDocRepo3D, AmmoPhysicsTypeDocRepo>): void;
     addWheel(options: WheelOptions, suspensionOptions: SuspensionOptions): void;
     setSteering(wheelIndex: number, steering: number): void;
     applyEngineForce(wheelIndex: number, force: number): void;

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

@@ -1,4 +1,5 @@
-import Ammo from 'ammojs-typed';
+import { BitMask, } from '@gg-web-engine/core';
+import Ammo from '../ammo.js/ammo';
 import { AmmoRigidBodyComponent } from './ammo-rigid-body.component';
 export class AmmoRaycastVehicleComponent extends AmmoRigidBodyComponent {
     constructor(world, chassisBody) {
@@ -9,23 +10,46 @@ export class AmmoRaycastVehicleComponent extends AmmoRigidBodyComponent {
         this.wheelDirectionCS0 = new Ammo.btVector3(0, 0, -1);
         this.wheelAxleCS = new Ammo.btVector3(1, 0, 0);
         this.entity = null;
-        this.nativeVehicle = new Ammo.btRaycastVehicle(this.vehicleTuning, this.chassisBody.nativeBody, new Ammo.btDefaultVehicleRaycaster(world.dynamicAmmoWorld));
+        this.raycaster = new Ammo.btDefaultVehicleRaycaster(world.dynamicAmmoWorld);
+        this.nativeVehicle = new Ammo.btRaycastVehicle(this.vehicleTuning, this.chassisBody.nativeBody, this.raycaster);
+        this.raycaster.set_m_collisionFilterGroup(BitMask.pack(this.chassisBody.ownCollisionGroups, 16));
+        this.raycaster.set_m_collisionFilterMask(BitMask.pack(this.chassisBody.interactWithCollisionGroups, 16));
         this.nativeVehicle.setCoordinateSystem(0, 2, 1);
     }
+    get interactWithCollisionGroups() {
+        return this.chassisBody.interactWithCollisionGroups;
+    }
+    set interactWithCollisionGroups(value) {
+        this.chassisBody.interactWithCollisionGroups = value;
+        this.raycaster.set_m_collisionFilterMask(BitMask.pack(this.chassisBody.interactWithCollisionGroups, 16));
+    }
+    get ownCollisionGroups() {
+        return this.chassisBody.ownCollisionGroups;
+    }
+    set ownCollisionGroups(value) {
+        this.chassisBody.ownCollisionGroups = value;
+        this.raycaster.set_m_collisionFilterGroup(BitMask.pack(this.chassisBody.ownCollisionGroups, 16));
+    }
+    refreshCG() {
+        this.chassisBody.refreshCG();
+    }
     get wheelSpeed() {
         // FIXME not correct (shows chassis speed in world)
         return this.nativeVehicle.getCurrentSpeedKmHour() / 3.6;
     }
     addToWorld(world) {
-        var _a;
         if (world.physicsWorld != this.world) {
             throw new Error('Ammo raycast vehicle cannot be shared between different worlds');
         }
         // TODO parked cars can be deactivated until we start handling them. Needs explicit activation call
         this.chassisBody.nativeBody.setActivationState(4); // btCollisionObject::DISABLE_DEACTIVATION
-        (_a = this.world.dynamicAmmoWorld) === null || _a === void 0 ? void 0 : _a.addRigidBody(this.chassisBody.nativeBody);
+        this.chassisBody.addToWorld(world);
         this.world.dynamicAmmoWorld.addAction(this.nativeVehicle);
     }
+    removeFromWorld(world) {
+        this.chassisBody.removeFromWorld(world);
+        this.world.dynamicAmmoWorld.removeAction(this.nativeVehicle);
+    }
     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);
         wheelInfo.set_m_suspensionStiffness(suspensionOptions.stiffness);
@@ -48,11 +72,15 @@ export class AmmoRaycastVehicleComponent extends AmmoRigidBodyComponent {
         return this.nativeVehicle.getWheelInfo(wheelIndex).get_m_raycastInfo().get_m_groundObject() > 0;
     }
     getWheelTransform(wheelIndex) {
+        // Ammo.js provides wrong wheel rotation when using coordinate system `0, 2, 1`, but it is correct if set `0, 1, 2`
+        this.nativeVehicle.setCoordinateSystem(0, 1, 2);
         // when interpolated transform set to `true`, wheels are jittering relatively to car on high speeds
         this.nativeVehicle.updateWheelTransform(wheelIndex, false);
+        this.nativeVehicle.setCoordinateSystem(0, 2, 1);
         const transform = this.nativeVehicle.getWheelTransformWS(wheelIndex);
         const origin = transform.getOrigin();
         const quaternion = transform.getRotation();
+        quaternion.normalize();
         return {
             position: { x: origin.x(), y: origin.y(), z: origin.z() },
             rotation: { x: quaternion.x(), y: quaternion.y(), z: quaternion.z(), w: quaternion.w() },

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

@@ -1,5 +1,5 @@
 import { AmmoWorldComponent } from './ammo-world.component';
-import Ammo from 'ammojs-typed';
+import Ammo from '../ammo.js/ammo';
 import { AmmoBodyComponent } from './ammo-body.component';
 import { Entity3d, Gg3dWorld, IRigidBody3dComponent, Point3, VisualTypeDocRepo3D } from '@gg-web-engine/core';
 import { AmmoPhysicsTypeDocRepo } from '../types';

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

@@ -1,4 +1,4 @@
-import Ammo from 'ammojs-typed';
+import Ammo from '../ammo.js/ammo';
 import { AmmoBodyComponent } from './ammo-body.component';
 export class AmmoRigidBodyComponent extends AmmoBodyComponent {
     constructor(world, _nativeBody) {
@@ -23,8 +23,8 @@ export class AmmoRigidBodyComponent extends AmmoBodyComponent {
     }
     clone() {
         return this.world.factory.createRigidBodyFromShape(this._nativeBody.getCollisionShape(), {
-            dynamic: !this._nativeBody.isStaticObject(),
-            mass: 5,
+            dynamic: !this._nativeBody.isStaticOrKinematicObject(),
+            mass: this._nativeBody.getMass(),
             friction: this._nativeBody.getFriction(),
             restitution: this._nativeBody.getRestitution(),
         }, {

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

@@ -1,7 +1,7 @@
 import { Gg3dWorld, IEntity, ITrigger3dComponent, VisualTypeDocRepo3D } from '@gg-web-engine/core';
 import { AmmoWorldComponent } from './ammo-world.component';
 import { Observable, Subject } from 'rxjs';
-import Ammo from 'ammojs-typed';
+import Ammo from '../ammo.js/ammo';
 import { AmmoBodyComponent } from './ammo-body.component';
 import { AmmoRigidBodyComponent } from './ammo-rigid-body.component';
 import { AmmoPhysicsTypeDocRepo } from '../types';

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

@@ -1,6 +1,6 @@
 import { filter, map, Subject } from 'rxjs';
+import Ammo from '../ammo.js/ammo';
 import { AmmoBodyComponent } from './ammo-body.component';
-import { ammoId } from '../ammo-utils';
 export class AmmoTriggerComponent extends AmmoBodyComponent {
     constructor(world, _nativeBody) {
         super(world, _nativeBody);
@@ -23,7 +23,7 @@ export class AmmoTriggerComponent extends AmmoBodyComponent {
         for (const overlap of this.overlaps.keys()) {
             if (!newOverlaps.has(overlap)) {
                 this.overlaps.delete(overlap);
-                this.onLeft$.next(ammoId(overlap));
+                this.onLeft$.next(Ammo.getPointer(overlap));
             }
             else {
                 newOverlaps.delete(overlap);
@@ -31,7 +31,7 @@ export class AmmoTriggerComponent extends AmmoBodyComponent {
         }
         for (const newOverlap of newOverlaps) {
             this.overlaps.add(newOverlap);
-            this.onEnter$.next(ammoId(newOverlap));
+            this.onEnter$.next(Ammo.getPointer(newOverlap));
         }
     }
     clone() {
@@ -50,7 +50,7 @@ export class AmmoTriggerComponent extends AmmoBodyComponent {
         var _a;
         super.removeFromWorld(world);
         for (const body of this.overlaps) {
-            this.onLeft$.next(ammoId(body));
+            this.onLeft$.next(Ammo.getPointer(body));
         }
         this.overlaps.clear();
         (_a = this.world.dynamicAmmoWorld) === null || _a === void 0 ? void 0 : _a.removeCollisionObject(this.nativeBody);

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

@@ -1,5 +1,5 @@
 import { CollisionGroup, Gg3dWorld, IDebugPhysicsDrawer, IPhysicsWorld3dComponent, Point3, Point4, VisualTypeDocRepo3D } from '@gg-web-engine/core';
-import Ammo from 'ammojs-typed';
+import Ammo from '../ammo.js/ammo';
 import { AmmoFactory } from '../ammo-factory';
 import { AmmoLoader } from '../ammo-loader';
 import { AmmoPhysicsTypeDocRepo } from '../types';

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

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import Ammo from 'ammojs-typed';
+import Ammo from '../ammo.js/ammo';
 import { AmmoFactory } from '../ammo-factory';
 import { AmmoLoader } from '../ammo-loader';
 import { AmmoDebugger, AmmoDebugMode } from '../ammo-debugger';
@@ -66,6 +66,9 @@ export class AmmoWorldComponent {
             this.solver = new Ammo.btSequentialImpulseConstraintSolver();
             this.gravityVector = new Ammo.btVector3(this._gravity.x, this._gravity.y, this._gravity.z);
             this._dynamicAmmoWorld = new Ammo.btDiscreteDynamicsWorld(this.dispatcher, this.broadphase, this.solver, this.collisionConfiguration);
+            // fix the problem when dynamic objects clip in the static/kinematic objects, moved manually.
+            // the problem is introduced in bullet here: https://github.com/bulletphysics/bullet3/commit/96c1ee42565d951347e515e40f41f71d0963d2d0
+            this._dynamicAmmoWorld.getSolverInfo().set_m_erp2(0.8);
             this._dynamicAmmoWorld.getPairCache().setInternalGhostPairCallback(this.ghostPairCallback);
             this._dynamicAmmoWorld.setGravity(this.gravityVector);
             this._factory = new AmmoFactory(this);

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+export { default as Ammo } from './ammo.js/ammo';
 export * from './components/ammo-rigid-body.component';
 export * from './components/ammo-trigger.component';
 export * from './components/ammo-raycast-vehicle.component';

package/dist/index.js

@@ -1,3 +1,4 @@
+export { default as Ammo } from './ammo.js/ammo';
 export * from './components/ammo-rigid-body.component';
 export * from './components/ammo-trigger.component';
 export * from './components/ammo-raycast-vehicle.component';

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@gg-web-engine/ammo",
-  "version": "0.0.30",
+  "version": "0.0.37",
   "description": "An attempt to create open source game engine for browser",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "jest",
     "prettier-format": "prettier --config ../core/.prettierrc 'src/**/*.ts' --write",
-    "prepublish": "rm -rf ./dist/ && tsc",
-    "build": "tsc"
+    "prepublish": "rm -rf ./dist/ && tsc && cp -R ./src/ammo.js ./dist",
+    "build": "rm -rf ./dist/ && tsc && cp -R ./src/ammo.js ./dist"
   },
   "repository": {
     "type": "git",
@@ -34,15 +34,39 @@
   "dependencies": {
   },
   "devDependencies": {
-    "@gg-web-engine/core": "0.0.30",
-    "ammojs-typed": "1.0.6",
+    "@gg-web-engine/core": "0.0.37",
+    "@types/jest": "^29.5.0",
+    "jest": "^29.5.0",
+    "jest-environment-jsdom": "^29.5.0",
     "mini-signals": "2.0.0",
     "prettier": "^2.8.6",
+    "ts-jest": "^29.0.5",
     "typescript": "~4.7.2"
   },
   "peerDependencies": {
-    "@gg-web-engine/core": "0.0.30",
-    "ammojs-typed": "1.0.6",
+    "@gg-web-engine/core": "0.0.37",
     "mini-signals": "2.0.0"
+  },
+  "jest": {
+    "rootDir": ".",
+    "testRegex": "\\.spec\\.ts$",
+    "transform": {
+      "^.+\\.(t|j)s$": ["ts-jest", { "tsconfig": { "esModuleInterop": true } }]
+    },
+    "moduleNameMapper": {
+      "@gg-web-engine/core": "<rootDir>/../core/src/index.ts"
+    },
+    "preset": "ts-jest/presets/default",
+    "collectCoverageFrom": [
+      "**/*.ts",
+      "!**/*.module.ts"
+    ],
+    "coveragePathIgnorePatterns": [
+      "<rootDir>/node_modules/",
+      "<rootDir>/dist/",
+      "<rootDir>/test/"
+    ],
+    "coverageDirectory": "./coverage",
+    "testEnvironment": "jsdom"
   }
 }

package/test/components/ammo-trigger.component.spec.ts

@@ -0,0 +1,122 @@
+import { Pnt3 } from '@gg-web-engine/core';
+import { AmmoFactory, AmmoWorldComponent } from '../../src';
+
+describe(`AmmoTriggerComponent`, () => {
+
+  let world: AmmoWorldComponent;
+  let factory: AmmoFactory;
+  beforeEach(async () => {
+    if (world) {
+      world.dispose();
+    }
+    world = new AmmoWorldComponent();
+    factory = new AmmoFactory(world);
+    await world.init();
+    world.gravity = Pnt3.O;
+  });
+
+  afterAll(() => {
+    world.dispose();
+  });
+
+  it(`should detect object intersection`, async () => {
+    const trigger = factory.createTrigger({ shape: 'BOX', dimensions: { x: 10, y: 10, z: 10 } });
+    trigger.addToWorld({ physicsWorld: world } as any);
+    const ball = factory.createRigidBody({
+      shape: { shape: 'SPHERE', radius: 1 },
+      body: { dynamic: true, mass: 1 },
+    }, { position: { x: 0, y: 0, z: 12 } });
+    ball.addToWorld({ physicsWorld: world } as any);
+    ball.linearVelocity = { x: 0, y: 0, z: -10 };
+    let enterRegistered = false;
+    let exitRegistered = false;
+    trigger.onEntityEntered.subscribe(((obj) => {
+      enterRegistered = obj === ball;
+    }));
+    trigger.onEntityLeft.subscribe(((obj) => {
+      exitRegistered = obj === ball;
+    }));
+    world.simulate(500);
+    trigger.checkOverlaps(); // trigger entity performs that on tick
+    expect(enterRegistered).toBe(false);
+    expect(exitRegistered).toBe(false);
+
+    world.simulate(500);
+    trigger.checkOverlaps();
+    expect(enterRegistered).toBe(true);
+    expect(exitRegistered).toBe(false);
+  });
+
+  it(`should detect end of object intersection`, async () => {
+    const trigger = factory.createTrigger({ shape: 'BOX', dimensions: { x: 10, y: 10, z: 10 } });
+    trigger.addToWorld({ physicsWorld: world } as any);
+    const ball = factory.createRigidBody({
+      shape: { shape: 'SPHERE', radius: 1 },
+      body: { dynamic: true, mass: 1 },
+    }, { position: { x: 0, y: 0, z: 12 } });
+    ball.addToWorld({ physicsWorld: world } as any);
+    ball.linearVelocity = { x: 0, y: 0, z: -10 };
+    let exitRegistered = false;
+    trigger.onEntityLeft.subscribe(((obj) => {
+      exitRegistered = obj === ball;
+    }));
+    world.simulate(1000);
+    trigger.checkOverlaps();
+    expect(exitRegistered).toBe(false);
+    world.simulate(1000);
+    trigger.checkOverlaps();
+    expect(exitRegistered).toBe(true);
+  });
+
+  it(`should fire object intersection if spawned inside`, async () => {
+    const trigger = factory.createTrigger({ shape: 'BOX', dimensions: { x: 10, y: 10, z: 10 } });
+    trigger.addToWorld({ physicsWorld: world } as any);
+    const ball = factory.createRigidBody({
+      shape: { shape: 'SPHERE', radius: 1 },
+      body: { dynamic: true, mass: 1 },
+    }, { position: { x: 0, y: 0, z: 0 } });
+    ball.addToWorld({ physicsWorld: world } as any);
+    let enterRegistered = false;
+    trigger.onEntityEntered.subscribe(((obj) => {
+      enterRegistered = obj === ball;
+    }));
+    world.simulate(1000);
+    trigger.checkOverlaps();
+    expect(enterRegistered).toBe(true);
+  });
+
+  it(`should fire end of object intersection if trigger removed`, async () => {
+    const trigger = factory.createTrigger({ shape: 'BOX', dimensions: { x: 10, y: 10, z: 10 } });
+    trigger.addToWorld({ physicsWorld: world } as any);
+    const ball = factory.createRigidBody({
+      shape: { shape: 'SPHERE', radius: 1 },
+      body: { dynamic: true, mass: 1 },
+    }, { position: { x: 0, y: 0, z: 0 } });
+    ball.addToWorld({ physicsWorld: world } as any);
+    let exitRegistered = false;
+    trigger.onEntityLeft.subscribe(((obj) => {
+      exitRegistered = obj === ball;
+    }));
+    trigger.checkOverlaps();
+    trigger.removeFromWorld({ physicsWorld: world } as any);
+    expect(exitRegistered).toBe(true);
+  });
+
+  it(`should fire end of object intersection if object removed`, async () => {
+    const trigger = factory.createTrigger({ shape: 'BOX', dimensions: { x: 10, y: 10, z: 10 } });
+    trigger.addToWorld({ physicsWorld: world } as any);
+    const ball = factory.createRigidBody({
+      shape: { shape: 'SPHERE', radius: 1 },
+      body: { dynamic: true, mass: 1 },
+    }, { position: { x: 0, y: 0, z: 0 } });
+    ball.addToWorld({ physicsWorld: world } as any);
+    let exitRegistered = false;
+    trigger.onEntityLeft.subscribe(((obj) => {
+      exitRegistered = obj === ball;
+    }));
+    trigger.checkOverlaps();
+    ball.removeFromWorld({ physicsWorld: world } as any);
+    trigger.checkOverlaps();
+    expect(exitRegistered).toBe(true);
+  });
+});

package/tsconfig.json

@@ -2,7 +2,7 @@
   "extends": "./../../tsconfig.base.json",
   "compilerOptions": {
     "baseUrl": "./src/",
-    "outDir": "./dist/",
+    "outDir": "./dist/"
   },
-  "include": ["*.ts", "**/*.ts"],
+  "include": ["src/*.ts", "src/**/*.ts"],
 }

package/dist/ammo-utils.d.ts

@@ -1,2 +0,0 @@
-import Ammo from 'ammojs-typed';
-export declare const ammoId: (body: Ammo.btCollisionObject) => number;

package/dist/ammo-utils.js

@@ -1 +0,0 @@
-export const ammoId = body => body.a;