@gg-web-engine/ammo 0.0.49 → 0.0.57

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

@@ -18,11 +18,11 @@ export declare abstract class AmmoBodyComponent<T extends Ammo.btCollisionObject
     protected addedToWorld: boolean;
     protected _interactWithCGsMask: number;
     protected _ownCGsMask: number;
-    get interactWithCollisionGroups(): CollisionGroup[];
+    get interactWithCollisionGroups(): ReadonlyArray<CollisionGroup>;
     abstract refreshCG(): void;
-    set interactWithCollisionGroups(value: CollisionGroup[] | 'all');
-    get ownCollisionGroups(): CollisionGroup[];
-    set ownCollisionGroups(value: CollisionGroup[] | 'all');
+    set interactWithCollisionGroups(value: ReadonlyArray<CollisionGroup> | 'all');
+    get ownCollisionGroups(): ReadonlyArray<CollisionGroup>;
+    set ownCollisionGroups(value: ReadonlyArray<CollisionGroup> | 'all');
     protected constructor(world: AmmoWorldComponent, _nativeBody: T, shape: Shape3DDescriptor);
     abstract clone(): AmmoBodyComponent<T>;
     addToWorld(world: Gg3dWorld<VisualTypeDocRepo3D, AmmoPhysicsTypeDocRepo>): void;

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

@@ -75,6 +75,7 @@ export class AmmoBodyComponent {
         this._interactWithCGsMask = BitMask.full(16);
         this._ownCGsMask = BitMask.full(16);
         AmmoBodyComponent.nativeBodyReverseMap.set(Ammo.getPointer(this.nativeBody), this);
+        this.ownCollisionGroups = this.interactWithCollisionGroups = [world.mainCollisionGroup];
     }
     addToWorld(world) {
         if (world.physicsWorld != this.world) {

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

@@ -12,10 +12,10 @@ export declare class AmmoRaycastVehicleComponent extends AmmoRigidBodyComponent
     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');
+    get interactWithCollisionGroups(): ReadonlyArray<CollisionGroup>;
+    set interactWithCollisionGroups(value: ReadonlyArray<CollisionGroup> | 'all');
+    get ownCollisionGroups(): ReadonlyArray<CollisionGroup>;
+    set ownCollisionGroups(value: ReadonlyArray<CollisionGroup> | 'all');
     refreshCG(): void;
     constructor(world: AmmoWorldComponent, chassisBody: AmmoRigidBodyComponent);
     get wheelSpeed(): number;

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

@@ -6,15 +6,19 @@ export class AmmoRaycastVehicleComponent extends AmmoRigidBodyComponent {
         return this.chassisBody.interactWithCollisionGroups;
     }
     set interactWithCollisionGroups(value) {
-        this.chassisBody.interactWithCollisionGroups = value;
-        this.raycaster.set_m_collisionFilterMask(BitMask.pack(this.chassisBody.interactWithCollisionGroups, 16));
+        if (this.chassisBody) {
+            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));
+        if (this.chassisBody) {
+            this.chassisBody.ownCollisionGroups = value;
+            this.raycaster.set_m_collisionFilterGroup(BitMask.pack(this.chassisBody.ownCollisionGroups, 16));
+        }
     }
     refreshCG() {
         this.chassisBody.refreshCG();

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

@@ -12,7 +12,7 @@ export declare class AmmoRigidBodyComponent extends AmmoBodyComponent<Ammo.btRig
     set linearVelocity(value: Point3);
     get angularVelocity(): Point3;
     set angularVelocity(value: Point3);
-    get debugBodySettings(): DebugBody3DSettings;
+    readonly debugBodySettings: DebugBody3DSettings;
     constructor(world: AmmoWorldComponent, _nativeBody: Ammo.btRigidBody, shape: Shape3DDescriptor);
     clone(): AmmoRigidBodyComponent;
     addToWorld(world: Gg3dWorld<VisualTypeDocRepo3D, AmmoPhysicsTypeDocRepo>): void;

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 { DebugBody3DSettings, } from '@gg-web-engine/core';
 import { first } from 'rxjs';
 export class AmmoRigidBodyComponent extends AmmoBodyComponent {
     get linearVelocity() {
@@ -16,20 +17,15 @@ 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() };
-        }
-    }
     constructor(world, _nativeBody, shape) {
         super(world, _nativeBody, shape);
         this.world = world;
         this._nativeBody = _nativeBody;
         this.shape = shape;
         this.entity = null;
+        this.debugBodySettings = new DebugBody3DSettings(this._nativeBody.isStaticOrKinematicObject()
+            ? { type: 'RIGID_STATIC' }
+            : { type: 'RIGID_DYNAMIC', sleeping: () => !this._nativeBody.isActive() }, this.shape);
     }
     clone() {
         return this.world.factory.createRigidBodyFromShape(this._nativeBody.getCollisionShape(), this.shape, {

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

@@ -10,7 +10,7 @@ export declare class AmmoTriggerComponent extends AmmoBodyComponent<Ammo.btPairC
     protected _nativeBody: Ammo.btPairCachingGhostObject;
     readonly shape: Shape3DDescriptor;
     entity: IEntity | null;
-    get debugBodySettings(): DebugBody3DSettings;
+    readonly debugBodySettings: DebugBody3DSettings;
     get onEntityEntered(): Observable<AmmoRigidBodyComponent>;
     get onEntityLeft(): Observable<AmmoRigidBodyComponent | null>;
     constructor(world: AmmoWorldComponent, _nativeBody: Ammo.btPairCachingGhostObject, shape: Shape3DDescriptor);

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

@@ -1,10 +1,8 @@
+import { DebugBody3DSettings, } from '@gg-web-engine/core';
 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));
     }
@@ -17,6 +15,7 @@ export class AmmoTriggerComponent extends AmmoBodyComponent {
         this._nativeBody = _nativeBody;
         this.shape = shape;
         this.entity = null;
+        this.debugBodySettings = new DebugBody3DSettings({ type: 'TRIGGER', activated: () => this.overlaps.size > 0 }, this.shape);
         this.onEnter$ = new Subject();
         this.onLeft$ = new Subject();
         this.overlaps = new Set();

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

@@ -18,6 +18,7 @@ export declare class AmmoWorldComponent implements IPhysicsWorld3dComponent<Ammo
     private _gravity;
     get gravity(): Point3;
     set gravity(value: Point3);
+    readonly mainCollisionGroup: CollisionGroup;
     maxSubSteps?: number;
     fixedTimeStep?: number;
     get dynamicAmmoWorld(): Ammo.btDiscreteDynamicsWorld | undefined;

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

@@ -46,6 +46,7 @@ export class AmmoWorldComponent {
         this.children = [];
         this._loader = null;
         this._gravity = { x: 0, y: 0, z: -9.82 };
+        this.mainCollisionGroup = 0;
         this.maxSubSteps = 100;
         this.fixedTimeStep = 0.01;
         this.lockedCollisionGroups = [];
@@ -77,7 +78,7 @@ export class AmmoWorldComponent {
         this.afterTick$.next();
     }
     registerCollisionGroup() {
-        for (let i = 0; i < 16; i++) {
+        for (let i = 1; i < 16; i++) {
             if (!this.lockedCollisionGroups.includes(i)) {
                 this.lockedCollisionGroups.push(i);
                 return i;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gg-web-engine/ammo",
-  "version": "0.0.49",
+  "version": "0.0.57",
   "description": "An attempt to create open source game engine for browser",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -34,7 +34,7 @@
   "dependencies": {
   },
   "devDependencies": {
-    "@gg-web-engine/core": "0.0.49",
+    "@gg-web-engine/core": "0.0.57",
     "@types/jest": "^29.5.12",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
@@ -45,7 +45,7 @@
     "typescript": "~5.5.4"
   },
   "peerDependencies": {
-    "@gg-web-engine/core": "0.0.49",
+    "@gg-web-engine/core": "0.0.57",
     "mini-signals": "2.0.0",
     "rxjs": "7.8.1"
   },