@gg-web-engine/ammo 0.0.24 → 0.0.28

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

@@ -1,7 +1,7 @@
-import { Gg3dWorld, IEntity, IRigidBody3dComponent, IVisualScene3dComponent, Point3, Point4 } from '@gg-web-engine/core';
+import { Gg3dWorld, IEntity, IVisualScene3dComponent, Point3, Point4 } from '@gg-web-engine/core';
 import { AmmoWorldComponent } from './ammo-world.component';
 import Ammo from 'ammojs-typed';
-export declare abstract class AmmoBodyComponent<T extends Ammo.btCollisionObject> implements IRigidBody3dComponent<AmmoWorldComponent> {
+export declare abstract class AmmoBodyComponent<T extends Ammo.btCollisionObject> {
     protected readonly world: AmmoWorldComponent;
     protected _nativeBody: T;
     protected static nativeBodyReverseMap: Map<number, AmmoBodyComponent<any>>;
@@ -19,5 +19,4 @@ export declare abstract class AmmoBodyComponent<T extends Ammo.btCollisionObject
     abstract addToWorld(world: Gg3dWorld<IVisualScene3dComponent, AmmoWorldComponent>): void;
     abstract removeFromWorld(world: Gg3dWorld<IVisualScene3dComponent, AmmoWorldComponent>): void;
     dispose(): void;
-    abstract resetMotion(): void;
 }

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

@@ -1,16 +1,16 @@
-import { RaycastVehicle3dEntity, IRaycastVehicleComponent, Point3, Point4, SuspensionOptions, WheelOptions, Gg3dWorld, IVisualScene3dComponent } from '@gg-web-engine/core';
+import { Gg3dWorld, IRaycastVehicleComponent, IVisualScene3dComponent, Point3, Point4, RaycastVehicle3dEntity, WheelOptions, SuspensionOptions } from '@gg-web-engine/core';
 import Ammo from 'ammojs-typed';
 import { AmmoRigidBodyComponent } from './ammo-rigid-body.component';
 import { AmmoWorldComponent } from './ammo-world.component';
 export declare class AmmoRaycastVehicleComponent extends AmmoRigidBodyComponent implements IRaycastVehicleComponent<AmmoWorldComponent> {
     protected readonly world: AmmoWorldComponent;
-    chassisBody: Ammo.btRigidBody;
+    chassisBody: AmmoRigidBodyComponent;
     readonly nativeVehicle: Ammo.btRaycastVehicle;
     readonly vehicleTuning: Ammo.btVehicleTuning;
     protected readonly wheelDirectionCS0: Ammo.btVector3;
     protected readonly wheelAxleCS: Ammo.btVector3;
     entity: RaycastVehicle3dEntity | null;
-    constructor(world: AmmoWorldComponent, chassisBody: Ammo.btRigidBody);
+    constructor(world: AmmoWorldComponent, chassisBody: AmmoRigidBodyComponent);
     get wheelSpeed(): number;
     addToWorld(world: Gg3dWorld<IVisualScene3dComponent, AmmoWorldComponent>): void;
     addWheel(options: WheelOptions, suspensionOptions: SuspensionOptions): void;

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

@@ -1,14 +1,14 @@
 import { AmmoRigidBodyComponent } from './ammo-rigid-body.component';
 export class AmmoRaycastVehicleComponent extends AmmoRigidBodyComponent {
     constructor(world, chassisBody) {
-        super(world, chassisBody);
+        super(world, chassisBody.nativeBody);
         this.world = world;
         this.chassisBody = chassisBody;
         this.vehicleTuning = new this.ammo.btVehicleTuning();
         this.wheelDirectionCS0 = new this.ammo.btVector3(0, 0, -1);
         this.wheelAxleCS = new this.ammo.btVector3(1, 0, 0);
         this.entity = null;
-        this.nativeVehicle = new this.ammo.btRaycastVehicle(this.vehicleTuning, this.chassisBody, new this.ammo.btDefaultVehicleRaycaster(world.dynamicAmmoWorld));
+        this.nativeVehicle = new this.ammo.btRaycastVehicle(this.vehicleTuning, this.chassisBody.nativeBody, new this.ammo.btDefaultVehicleRaycaster(world.dynamicAmmoWorld));
         this.nativeVehicle.setCoordinateSystem(0, 2, 1);
     }
     get wheelSpeed() {
@@ -21,12 +21,12 @@ export class AmmoRaycastVehicleComponent extends AmmoRigidBodyComponent {
             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.setActivationState(4); // btCollisionObject::DISABLE_DEACTIVATION
-        (_a = this.world.dynamicAmmoWorld) === null || _a === void 0 ? void 0 : _a.addRigidBody(this.chassisBody);
+        this.chassisBody.nativeBody.setActivationState(4); // btCollisionObject::DISABLE_DEACTIVATION
+        (_a = this.world.dynamicAmmoWorld) === null || _a === void 0 ? void 0 : _a.addRigidBody(this.chassisBody.nativeBody);
         this.world.dynamicAmmoWorld.addAction(this.nativeVehicle);
     }
     addWheel(options, suspensionOptions) {
-        const wheelInfo = this.nativeVehicle.addWheel(new this.ammo.btVector3(options.position.x, options.position.y, options.position.z * 2), this.wheelDirectionCS0, this.wheelAxleCS, suspensionOptions.restLength, options.tyre_radius, this.vehicleTuning, options.isFront);
+        const wheelInfo = this.nativeVehicle.addWheel(new this.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);
         wheelInfo.set_m_wheelsDampingRelaxation(suspensionOptions.damping);
         wheelInfo.set_m_wheelsDampingCompression(suspensionOptions.compression);

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

@@ -1,11 +1,15 @@
 import { AmmoWorldComponent } from './ammo-world.component';
 import Ammo from 'ammojs-typed';
 import { AmmoBodyComponent } from './ammo-body.component';
-import { Entity3d, Gg3dWorld, IVisualScene3dComponent } from '@gg-web-engine/core';
-export declare class AmmoRigidBodyComponent extends AmmoBodyComponent<Ammo.btRigidBody> {
+import { Entity3d, Gg3dWorld, IRigidBody3dComponent, IVisualScene3dComponent, Point3 } from '@gg-web-engine/core';
+export declare class AmmoRigidBodyComponent extends AmmoBodyComponent<Ammo.btRigidBody> implements IRigidBody3dComponent<AmmoWorldComponent> {
     protected readonly world: AmmoWorldComponent;
     protected _nativeBody: Ammo.btRigidBody;
     entity: Entity3d | null;
+    get linearVelocity(): Point3;
+    set linearVelocity(value: Point3);
+    get angularVelocity(): Point3;
+    set angularVelocity(value: Point3);
     constructor(world: AmmoWorldComponent, _nativeBody: Ammo.btRigidBody);
     clone(): AmmoRigidBodyComponent;
     addToWorld(world: Gg3dWorld<IVisualScene3dComponent, AmmoWorldComponent>): void;

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

@@ -6,6 +6,20 @@ export class AmmoRigidBodyComponent extends AmmoBodyComponent {
         this._nativeBody = _nativeBody;
         this.entity = null;
     }
+    get linearVelocity() {
+        const v = this.nativeBody.getLinearVelocity();
+        return { x: v.x(), y: v.y(), z: v.z() };
+    }
+    set linearVelocity(value) {
+        this.nativeBody.setLinearVelocity(new this.ammo.btVector3(value.x, value.y, value.z));
+    }
+    get angularVelocity() {
+        const v = this.nativeBody.getAngularVelocity();
+        return { x: v.x(), y: v.y(), z: v.z() };
+    }
+    set angularVelocity(value) {
+        this.nativeBody.setAngularVelocity(new this.ammo.btVector3(value.x, value.y, value.z));
+    }
     clone() {
         return this.world.factory.createRigidBodyFromShape(this._nativeBody.getCollisionShape(), {
             dynamic: !this._nativeBody.isStaticObject(),

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

@@ -3,12 +3,13 @@ import { AmmoWorldComponent } from './ammo-world.component';
 import { Observable, Subject } from 'rxjs';
 import Ammo from 'ammojs-typed';
 import { AmmoBodyComponent } from './ammo-body.component';
+import { AmmoRigidBodyComponent } from './ammo-rigid-body.component';
 export declare class AmmoTriggerComponent extends AmmoBodyComponent<Ammo.btPairCachingGhostObject> implements ITrigger3dComponent<AmmoWorldComponent> {
     protected readonly world: AmmoWorldComponent;
     protected _nativeBody: Ammo.btPairCachingGhostObject;
     entity: IEntity | null;
-    get onEntityEntered(): Observable<AmmoBodyComponent<any>>;
-    get onEntityLeft(): Observable<AmmoBodyComponent<any> | null>;
+    get onEntityEntered(): Observable<AmmoRigidBodyComponent>;
+    get onEntityLeft(): Observable<AmmoRigidBodyComponent | null>;
     constructor(world: AmmoWorldComponent, _nativeBody: Ammo.btPairCachingGhostObject);
     protected readonly onEnter$: Subject<number>;
     protected readonly onLeft$: Subject<number>;
@@ -18,5 +19,4 @@ export declare class AmmoTriggerComponent extends AmmoBodyComponent<Ammo.btPairC
     addToWorld(world: Gg3dWorld<IVisualScene3dComponent, AmmoWorldComponent>): void;
     removeFromWorld(world: Gg3dWorld<IVisualScene3dComponent, AmmoWorldComponent>): void;
     dispose(): void;
-    resetMotion(): void;
 }

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

@@ -65,5 +65,4 @@ export class AmmoTriggerComponent extends AmmoBodyComponent {
         this.onEnter$.complete();
         this.onLeft$.complete();
     }
-    resetMotion() { }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gg-web-engine/ammo",
-  "version": "0.0.24",
+  "version": "0.0.28",
   "description": "An attempt to create open source game engine for browser",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -34,14 +34,14 @@
   "dependencies": {
   },
   "devDependencies": {
-    "@gg-web-engine/core": "0.0.24",
+    "@gg-web-engine/core": "0.0.28",
     "ammojs-typed": "1.0.6",
     "mini-signals": "2.0.0",
     "prettier": "^2.8.6",
     "typescript": "~4.7.2"
   },
   "peerDependencies": {
-    "@gg-web-engine/core": "0.0.24",
+    "@gg-web-engine/core": "0.0.28",
     "ammojs-typed": "1.0.6",
     "mini-signals": "2.0.0"
   }