quake2ts 0.0.187 → 0.0.188

package/packages/game/dist/esm/index.js

@@ -2208,15 +2208,16 @@ function checkTriggers(ent, system) {
   if (ent.movetype === 0 /* None */) {
     return;
   }
-  system.forEachEntity((other) => {
-    if (other === ent) return;
-    if (other.solid !== 1 /* Trigger */) return;
-    if (!other.touch) return;
-    if (ent.absmax.x < other.absmin.x || ent.absmin.x > other.absmax.x) return;
-    if (ent.absmax.y < other.absmin.y || ent.absmin.y > other.absmax.y) return;
-    if (ent.absmax.z < other.absmin.z || ent.absmin.z > other.absmax.z) return;
+  const candidates = system.findInBox(ent.absmin, ent.absmax);
+  for (const other of candidates) {
+    if (other === ent) continue;
+    if (other.solid !== 1 /* Trigger */) continue;
+    if (!other.touch) continue;
+    if (ent.absmax.x < other.absmin.x || ent.absmin.x > other.absmax.x) continue;
+    if (ent.absmax.y < other.absmin.y || ent.absmin.y > other.absmax.y) continue;
+    if (ent.absmax.z < other.absmin.z || ent.absmin.z > other.absmax.z) continue;
     other.touch(other, ent);
-  });
+  }
 }
 
 // src/physics/movement.ts
@@ -2536,6 +2537,9 @@ var EntityPool = class {
     }
     return count;
   }
+  getByIndex(index) {
+    return this.entities[index];
+  }
   [Symbol.iterator]() {
     let current = this.activeHead;
     return {
@@ -2797,7 +2801,7 @@ var EntitySystem = class {
     this.thinkScheduler = new ThinkScheduler();
     this.engine = engine;
     this.deathmatch = deathmatch ?? false;
-    this.imports = imports || {
+    const defaultImports = {
       trace: () => ({
         allsolid: false,
         startsolid: false,
@@ -2821,11 +2825,14 @@ var EntitySystem = class {
           z: ent.origin.z + ent.maxs.z
         };
       },
+      areaEdicts: () => null,
+      // Default to null to signal fallback
       multicast: () => {
       },
       unicast: () => {
       }
     };
+    this.imports = { ...defaultImports, ...imports };
     this.gravity = gravity || { x: 0, y: 0, z: 0 };
     this.callbackToName = /* @__PURE__ */ new Map();
     if (callbackRegistry) {
@@ -2943,14 +2950,37 @@ var EntitySystem = class {
     }
     return Array.from(matches).filter((entity) => entity.inUse && !entity.freePending);
   }
+  findInBox(mins, maxs) {
+    const indices = this.imports.areaEdicts(mins, maxs);
+    if (indices === null) {
+      const results2 = [];
+      const bounds = { min: mins, max: maxs };
+      for (const entity of this.pool) {
+        if (!entity.inUse || entity.freePending || entity.solid === 0 /* Not */) continue;
+        if (boundsIntersect(bounds, computeBounds(entity))) {
+          results2.push(entity);
+        }
+      }
+      return results2;
+    }
+    const results = [];
+    for (const index of indices) {
+      const entity = this.pool.getByIndex(index);
+      if (entity && entity.inUse && !entity.freePending) {
+        results.push(entity);
+      }
+    }
+    return results;
+  }
   findByRadius(origin, radius) {
+    const mins = { x: origin.x - radius, y: origin.y - radius, z: origin.z - radius };
+    const maxs = { x: origin.x + radius, y: origin.y + radius, z: origin.z + radius };
+    const candidates = this.findInBox(mins, maxs);
     const matches = [];
-    for (const entity of this.pool) {
-      if (entity.inUse && !entity.freePending) {
-        const distance2 = lengthVec3(subtractVec3(origin, entity.origin));
-        if (distance2 <= radius) {
-          matches.push(entity);
-        }
+    for (const entity of candidates) {
+      const distance2 = lengthVec3(subtractVec3(origin, entity.origin));
+      if (distance2 <= radius) {
+        matches.push(entity);
       }
     }
     return matches;
@@ -3160,35 +3190,19 @@ var EntitySystem = class {
     const world = this.pool.world;
     const activeEntities = [];
     for (const entity of this.pool) {
-      if (entity === world) {
-        continue;
-      }
-      if (!entity.inUse || entity.freePending || entity.solid === 0 /* Not */) {
-        continue;
-      }
+      if (entity === world) continue;
+      if (!entity.inUse || entity.freePending || entity.solid === 0 /* Not */) continue;
       activeEntities.push(entity);
     }
-    for (let i = 0; i < activeEntities.length; i += 1) {
-      const first = activeEntities[i];
-      let firstBounds = null;
-      for (let j = i + 1; j < activeEntities.length; j += 1) {
-        const second = activeEntities[j];
-        if (!first.touch && !second.touch) {
-          continue;
-        }
-        if (!firstBounds) {
-          firstBounds = computeBounds(first);
-        }
+    for (const first of activeEntities) {
+      const candidates = this.findInBox(first.absmin, first.absmax);
+      const firstBounds = computeBounds(first);
+      for (const second of candidates) {
+        if (first === second) continue;
+        if (!first.touch) continue;
         const secondBounds = computeBounds(second);
-        if (!boundsIntersect(firstBounds, secondBounds)) {
-          continue;
-        }
-        if (first.touch) {
-          first.touch(first, second);
-        }
-        if (second.touch) {
-          second.touch(second, first);
-        }
+        if (!boundsIntersect(firstBounds, secondBounds)) continue;
+        first.touch(first, second);
       }
     }
   }
@@ -12853,13 +12867,29 @@ var WEAPONS = {
 
 // src/index.ts
 var ZERO_VEC38 = { x: 0, y: 0, z: 0 };
-function createGame({ trace, pointcontents, multicast, unicast }, engine, options) {
+function createGame(imports, engine, options) {
   const gravity = options.gravity;
   const deathmatch = options.deathmatch ?? false;
   const levelClock = new LevelClock();
   const frameLoop = new GameFrameLoop();
   const rng = options.random ?? new RandomGenerator();
-  const linkentity = (ent) => {
+  const trace = imports.trace || (() => ({
+    allsolid: false,
+    startsolid: false,
+    fraction: 1,
+    endpos: { x: 0, y: 0, z: 0 },
+    plane: null,
+    surfaceFlags: 0,
+    contents: 0,
+    ent: null
+  }));
+  const pointcontents = imports.pointcontents || (() => 0);
+  const multicast = imports.multicast || (() => {
+  });
+  const unicast = imports.unicast || (() => {
+  });
+  const linkentity = imports.linkentity;
+  const wrappedLinkEntity = (ent) => {
     ent.absmin = {
       x: ent.origin.x + ent.mins.x,
       y: ent.origin.y + ent.mins.y,
@@ -12870,8 +12900,19 @@ function createGame({ trace, pointcontents, multicast, unicast }, engine, option
       y: ent.origin.y + ent.maxs.y,
       z: ent.origin.z + ent.maxs.z
     };
+    if (linkentity) {
+      linkentity(ent);
+    }
+  };
+  const systemImports = {
+    ...imports,
+    trace,
+    pointcontents,
+    linkentity: wrappedLinkEntity,
+    multicast,
+    unicast
   };
-  const entities = new EntitySystem(engine, { trace, pointcontents, linkentity, multicast, unicast }, gravity, void 0, void 0, deathmatch);
+  const entities = new EntitySystem(engine, systemImports, gravity, void 0, void 0, deathmatch);
   frameLoop.addStage("prep", (context) => {
     levelClock.tick(context);
     entities.beginFrame(levelClock.current.timeSeconds);