@gg-web-engine/ammo 0.0.37 → 0.0.38

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

@@ -41,12 +41,14 @@ 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);
     }
     removeFromWorld(world) {
+        this.addedToWorld = false;
         this.chassisBody.removeFromWorld(world);
         this.world.dynamicAmmoWorld.removeAction(this.nativeVehicle);
     }
@@ -95,4 +97,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.js

@@ -1,5 +1,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) {
         super(world, _nativeBody);
@@ -49,10 +50,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-world.component.d.ts

@@ -1,4 +1,5 @@
 import { CollisionGroup, Gg3dWorld, IDebugPhysicsDrawer, IPhysicsWorld3dComponent, Point3, Point4, VisualTypeDocRepo3D } 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';
@@ -6,6 +7,7 @@ import { AmmoPhysicsTypeDocRepo } from '../types';
 export declare class AmmoWorldComponent implements IPhysicsWorld3dComponent<AmmoPhysicsTypeDocRepo> {
     private _factory;
     get factory(): AmmoFactory;
+    afterTick$: Subject<void>;
     private _loader;
     get loader(): AmmoLoader;
     private _gravity;

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

@@ -7,6 +7,7 @@ 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';
@@ -14,6 +15,7 @@ import { AmmoDebugger, AmmoDebugMode } from '../ammo-debugger';
 export class AmmoWorldComponent {
     constructor() {
         this._factory = null;
+        this.afterTick$ = new Subject();
         this._loader = null;
         this._gravity = { x: 0, y: 0, z: -9.82 };
         this._timeScale = 1;
@@ -78,6 +80,7 @@ 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);
+        this.afterTick$.next();
         if (this._debugger) {
             this._debugger.update();
         }
@@ -118,6 +121,7 @@ export class AmmoWorldComponent {
         }
     }
     dispose() {
+        this.afterTick$.complete();
         Ammo.destroy(this._dynamicAmmoWorld);
         Ammo.destroy(this.solver);
         Ammo.destroy(this.broadphase);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gg-web-engine/ammo",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "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.38",
     "@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.38",
+    "mini-signals": "2.0.0",
+    "rxjs": "7.8.1"
   },
   "jest": {
     "rootDir": ".",