@gg-web-engine/ammo 0.0.39 → 0.0.48

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

@@ -1,16 +1,6 @@
 import { BitMask, } from '@gg-web-engine/core';
 import Ammo from '../ammo.js/ammo';
 export class AmmoBodyComponent {
-    constructor(world, _nativeBody, shape) {
-        this.world = world;
-        this._nativeBody = _nativeBody;
-        this.shape = shape;
-        this.name = '';
-        this.addedToWorld = false;
-        this._interactWithCGsMask = BitMask.full(16);
-        this._ownCGsMask = BitMask.full(16);
-        AmmoBodyComponent.nativeBodyReverseMap.set(Ammo.getPointer(this.nativeBody), this);
-    }
     get position() {
         const origin = this.nativeBody.getWorldTransform().getOrigin();
         return { x: origin.x(), y: origin.y(), z: origin.z() };
@@ -76,6 +66,16 @@ export class AmmoBodyComponent {
             }
         }
     }
+    constructor(world, _nativeBody, shape) {
+        this.world = world;
+        this._nativeBody = _nativeBody;
+        this.shape = shape;
+        this.name = '';
+        this.addedToWorld = false;
+        this._interactWithCGsMask = BitMask.full(16);
+        this._ownCGsMask = BitMask.full(16);
+        AmmoBodyComponent.nativeBodyReverseMap.set(Ammo.getPointer(this.nativeBody), this);
+    }
     addToWorld(world) {
         if (world.physicsWorld != this.world) {
             throw new Error('Ammo bodies cannot be shared between different worlds');

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

@@ -2,20 +2,6 @@ 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) {
-        super(world, chassisBody.nativeBody, chassisBody.shape);
-        this.world = world;
-        this.chassisBody = chassisBody;
-        this.vehicleTuning = new Ammo.btVehicleTuning();
-        this.wheelDirectionCS0 = new Ammo.btVector3(0, 0, -1);
-        this.wheelAxleCS = new Ammo.btVector3(1, 0, 0);
-        this.entity = null;
-        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;
     }
@@ -33,6 +19,20 @@ export class AmmoRaycastVehicleComponent extends AmmoRigidBodyComponent {
     refreshCG() {
         this.chassisBody.refreshCG();
     }
+    constructor(world, chassisBody) {
+        super(world, chassisBody.nativeBody, chassisBody.shape);
+        this.world = world;
+        this.chassisBody = chassisBody;
+        this.vehicleTuning = new Ammo.btVehicleTuning();
+        this.wheelDirectionCS0 = new Ammo.btVector3(0, 0, -1);
+        this.wheelAxleCS = new Ammo.btVector3(1, 0, 0);
+        this.entity = null;
+        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 wheelSpeed() {
         // FIXME not correct (shows chassis speed in world)
         return this.nativeVehicle.getCurrentSpeedKmHour() / 3.6;

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

@@ -2,13 +2,6 @@ import Ammo from '../ammo.js/ammo';
 import { AmmoBodyComponent } from './ammo-body.component';
 import { first } from 'rxjs';
 export class AmmoRigidBodyComponent extends AmmoBodyComponent {
-    constructor(world, _nativeBody, shape) {
-        super(world, _nativeBody, shape);
-        this.world = world;
-        this._nativeBody = _nativeBody;
-        this.shape = shape;
-        this.entity = null;
-    }
     get linearVelocity() {
         const v = this.nativeBody.getLinearVelocity();
         return { x: v.x(), y: v.y(), z: v.z() };
@@ -31,6 +24,13 @@ export class AmmoRigidBodyComponent extends AmmoBodyComponent {
             return { shape: this.shape, type: 'RIGID_DYNAMIC', sleeping: !this._nativeBody.isActive() };
         }
     }
+    constructor(world, _nativeBody, shape) {
+        super(world, _nativeBody, shape);
+        this.world = world;
+        this._nativeBody = _nativeBody;
+        this.shape = shape;
+        this.entity = null;
+    }
     clone() {
         return this.world.factory.createRigidBodyFromShape(this._nativeBody.getCollisionShape(), this.shape, {
             dynamic: !this._nativeBody.isStaticOrKinematicObject(),

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

@@ -2,6 +2,15 @@ import { filter, map, Subject } from 'rxjs';
 import Ammo from '../ammo.js/ammo';
 import { AmmoBodyComponent } from './ammo-body.component';
 export class AmmoTriggerComponent extends AmmoBodyComponent {
+    get debugBodySettings() {
+        return { shape: this.shape, type: 'TRIGGER' };
+    }
+    get onEntityEntered() {
+        return this.onEnter$.pipe(map(b => AmmoBodyComponent.nativeBodyReverseMap.get(b)), filter(x => !!x));
+    }
+    get onEntityLeft() {
+        return this.onLeft$.pipe(map(b => AmmoBodyComponent.nativeBodyReverseMap.get(b) || null));
+    }
     constructor(world, _nativeBody, shape) {
         super(world, _nativeBody, shape);
         this.world = world;
@@ -12,15 +21,6 @@ export class AmmoTriggerComponent extends AmmoBodyComponent {
         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));
-    }
-    get onEntityLeft() {
-        return this.onLeft$.pipe(map(b => AmmoBodyComponent.nativeBodyReverseMap.get(b) || null));
-    }
     checkOverlaps() {
         const numOverlappingObjects = this.nativeBody.getNumOverlappingObjects();
         const newOverlaps = new Set(new Array(numOverlappingObjects).fill(null).map((_, i) => this.nativeBody.getOverlappingObject(i)));

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

@@ -12,18 +12,6 @@ import Ammo from '../ammo.js/ammo';
 import { AmmoFactory } from '../ammo-factory';
 import { AmmoLoader } from '../ammo-loader';
 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.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) {
             throw new Error('Ammo world not initialized');
@@ -50,6 +38,18 @@ export class AmmoWorldComponent {
     get dynamicAmmoWorld() {
         return this._dynamicAmmoWorld;
     }
+    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.lockedCollisionGroups = [];
+        this.added$.subscribe(c => this.children.push(c));
+        this.removed$.subscribe(c => this.children.splice(this.children.indexOf(c), 1));
+    }
     init() {
         return __awaiter(this, void 0, void 0, function* () {
             yield Ammo.bind(Ammo)(Ammo);

package/dist/types.d.ts

@@ -3,7 +3,7 @@ import { AmmoTriggerComponent } from './components/ammo-trigger.component';
 import { AmmoRaycastVehicleComponent } from './components/ammo-raycast-vehicle.component';
 import { AmmoFactory } from './ammo-factory';
 import { AmmoLoader } from './ammo-loader';
-export declare type AmmoPhysicsTypeDocRepo = {
+export type AmmoPhysicsTypeDocRepo = {
     factory: AmmoFactory;
     loader: AmmoLoader;
     rigidBody: AmmoRigidBodyComponent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gg-web-engine/ammo",
-  "version": "0.0.39",
+  "version": "0.0.48",
   "description": "An attempt to create open source game engine for browser",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -34,18 +34,18 @@
   "dependencies": {
   },
   "devDependencies": {
-    "@gg-web-engine/core": "0.0.39",
-    "@types/jest": "^29.5.0",
-    "jest": "^29.5.0",
-    "jest-environment-jsdom": "^29.5.0",
+    "@gg-web-engine/core": "0.0.48",
+    "@types/jest": "^29.5.12",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "mini-signals": "2.0.0",
-    "prettier": "^2.8.6",
+    "prettier": "^3.3.3",
     "rxjs": "7.8.1",
-    "ts-jest": "^29.0.5",
-    "typescript": "~4.7.2"
+    "ts-jest": "^29.2.4",
+    "typescript": "~5.5.4"
   },
   "peerDependencies": {
-    "@gg-web-engine/core": "0.0.39",
+    "@gg-web-engine/core": "0.0.48",
     "mini-signals": "2.0.0",
     "rxjs": "7.8.1"
   },