quake2ts 0.0.284 → 0.0.288

package/packages/client/dist/cjs/index.cjs

@@ -9589,6 +9589,91 @@ var DEMO_ITEM_MAPPING = [
   // IT_ITEM_COMPASS
 ];
 
+// src/entities.ts
+function lerp2(a, b, t) {
+  return a + (b - a) * t;
+}
+function lerpAngle(a, b, t) {
+  return lerp2(a, b, t);
+}
+function buildRenderableEntities(latestEntities, previousEntities, alpha, configStrings, imports) {
+  const renderables = [];
+  const assets = imports.engine.assets;
+  if (!assets) return renderables;
+  let prevMap;
+  if (previousEntities instanceof Map) {
+    prevMap = previousEntities;
+  } else {
+    prevMap = new Map(previousEntities.map((e) => [e.number, e]));
+  }
+  for (const ent of latestEntities) {
+    const prev = prevMap.get(ent.number) ?? ent;
+    const modelIndex = ent.modelIndex ?? ent.modelindex;
+    const skinNum = ent.skinNum ?? ent.skinnum;
+    if (modelIndex === void 0) continue;
+    const modelName = configStrings.getModelName(modelIndex);
+    if (!modelName) continue;
+    const model = assets.getMd2Model(modelName) || assets.getMd3Model(modelName);
+    if (!model) continue;
+    const origin = {
+      x: lerp2(prev.origin.x, ent.origin.x, alpha),
+      y: lerp2(prev.origin.y, ent.origin.y, alpha),
+      z: lerp2(prev.origin.z, ent.origin.z, alpha)
+    };
+    const angles = {
+      x: lerpAngle(prev.angles.x, ent.angles.x, alpha),
+      y: lerpAngle(prev.angles.y, ent.angles.y, alpha),
+      z: lerpAngle(prev.angles.z, ent.angles.z, alpha)
+    };
+    const frame = ent.frame;
+    const prevFrame = prev.frame;
+    const scaleA = prev.scale !== void 0 ? prev.scale : 1;
+    const scaleB = ent.scale !== void 0 ? ent.scale : 1;
+    const scale3 = lerp2(scaleA, scaleB, alpha);
+    const getAlpha = (val) => val === void 0 || val === 0 ? 255 : val;
+    const alphaA = getAlpha(prev.alpha);
+    const alphaB = getAlpha(ent.alpha);
+    const alphaVal = lerp2(alphaA, alphaB, alpha);
+    const normalizedAlpha = alphaVal / 255;
+    const mat = mat4_exports.create();
+    mat4_exports.translate(mat, mat, [origin.x, origin.y, origin.z]);
+    mat4_exports.rotateZ(mat, mat, angles.z * Math.PI / 180);
+    mat4_exports.rotateY(mat, mat, angles.y * Math.PI / 180);
+    mat4_exports.rotateX(mat, mat, angles.x * Math.PI / 180);
+    mat4_exports.scale(mat, mat, [scale3, scale3, scale3]);
+    const skinName = skinNum !== void 0 && skinNum > 0 ? configStrings.getImageName(skinNum) : void 0;
+    if (model.header.magic === 844121161) {
+      renderables.push({
+        type: "md2",
+        model,
+        // Cast to Md2Model
+        blend: {
+          frame0: prevFrame,
+          frame1: frame,
+          lerp: alpha
+        },
+        transform: mat,
+        skin: skinName,
+        alpha: normalizedAlpha
+      });
+    } else if (model.header.magic === 860898377) {
+      renderables.push({
+        type: "md3",
+        model,
+        blend: {
+          frame0: prevFrame,
+          frame1: frame,
+          lerp: alpha
+        },
+        transform: mat,
+        alpha: normalizedAlpha
+        // Lighting? Skins?
+      });
+    }
+  }
+  return renderables;
+}
+
 // src/demo/handler.ts
 var MAX_CONFIGSTRINGS3 = 32768;
 var ClientNetworkHandler = class {
@@ -9596,6 +9681,8 @@ var ClientNetworkHandler = class {
     this.configstrings = new Array(MAX_CONFIGSTRINGS3).fill("");
     this.entities = /* @__PURE__ */ new Map();
     // Current frame entities
+    this.previousEntities = /* @__PURE__ */ new Map();
+    // Previous frame entities
     this.baselines = /* @__PURE__ */ new Map();
     this.previousFrame = null;
     this.latestFrame = null;
@@ -9619,8 +9706,10 @@ var ClientNetworkHandler = class {
     console.log(`Demo: Server Data - Protocol: ${protocol}, Level: ${levelName}, Tick: ${tickRate ?? 10}`);
     this.configstrings.fill("");
     this.entities.clear();
+    this.previousEntities.clear();
     this.baselines.clear();
     this.latestFrame = null;
+    this.previousFrame = null;
     this.playerNum = playerNum;
     if (this.callbacks?.onServerData) {
       this.callbacks.onServerData(protocol, tickRate);
@@ -9638,6 +9727,7 @@ var ClientNetworkHandler = class {
   onFrame(frame) {
     if (this.latestFrame) {
       this.previousFrame = this.latestFrame;
+      this.previousEntities = this.entities;
     }
     this.latestFrame = frame;
     this.stats = [...frame.playerState.stats];
@@ -9948,7 +10038,10 @@ var ClientNetworkHandler = class {
     if (this.previousFrame && timeMs !== void 0) {
       const latestServerTime = this.latestFrame.serverFrame * 100;
       const previousServerTime = this.previousFrame.serverFrame * 100;
-      if (timeMs >= previousServerTime && timeMs <= latestServerTime) {
+      if (timeMs <= 1) {
+        const previousState = this.convertFrameToPredictionState(this.previousFrame);
+        return (0, import_cgame.interpolatePredictionState)(previousState, latestState, Math.max(0, Math.min(1, timeMs)));
+      } else if (timeMs >= previousServerTime && timeMs <= latestServerTime) {
         const alpha = (timeMs - previousServerTime) / (latestServerTime - previousServerTime);
         const previousState = this.convertFrameToPredictionState(this.previousFrame);
         return (0, import_cgame.interpolatePredictionState)(previousState, latestState, Math.max(0, Math.min(1, alpha)));
@@ -9956,6 +10049,27 @@ var ClientNetworkHandler = class {
     }
     return latestState;
   }
+  getRenderableEntities(alpha, configStrings) {
+    if (!this.latestFrame) return [];
+    if (!this.imports) return [];
+    const latest = Array.from(this.entities.values());
+    const previous = this.previousEntities.size > 0 ? this.previousEntities : latest;
+    return buildRenderableEntities(
+      latest,
+      previous,
+      alpha,
+      configStrings,
+      this.imports
+    );
+  }
+  getDemoCamera(alpha) {
+    const ps = this.getPredictionState(alpha);
+    return {
+      origin: ps.origin,
+      angles: ps.viewAngles,
+      fov: ps.fov ?? 90
+    };
+  }
   get latestServerFrame() {
     return this.latestFrame?.serverFrame ?? 0;
   }
@@ -10874,82 +10988,6 @@ var WheelMenuSystem = class {
   }
 };
 
-// src/entities.ts
-function lerp2(a, b, t) {
-  return a + (b - a) * t;
-}
-function lerpAngle(a, b, t) {
-  return lerp2(a, b, t);
-}
-function buildRenderableEntities(latestEntities, previousEntities, alpha, configStrings, imports) {
-  const renderables = [];
-  const assets = imports.engine.assets;
-  if (!assets) return renderables;
-  const prevMap = new Map(previousEntities.map((e) => [e.number, e]));
-  for (const ent of latestEntities) {
-    const prev = prevMap.get(ent.number) ?? ent;
-    const modelName = configStrings.getModelName(ent.modelIndex);
-    if (!modelName) continue;
-    const model = assets.getMd2Model(modelName) || assets.getMd3Model(modelName);
-    if (!model) continue;
-    const origin = {
-      x: lerp2(prev.origin.x, ent.origin.x, alpha),
-      y: lerp2(prev.origin.y, ent.origin.y, alpha),
-      z: lerp2(prev.origin.z, ent.origin.z, alpha)
-    };
-    const angles = {
-      x: lerpAngle(prev.angles.x, ent.angles.x, alpha),
-      y: lerpAngle(prev.angles.y, ent.angles.y, alpha),
-      z: lerpAngle(prev.angles.z, ent.angles.z, alpha)
-    };
-    const frame = ent.frame;
-    const prevFrame = prev.frame;
-    const scaleA = prev.scale !== void 0 ? prev.scale : 1;
-    const scaleB = ent.scale !== void 0 ? ent.scale : 1;
-    const scale3 = lerp2(scaleA, scaleB, alpha);
-    const getAlpha = (val) => val === void 0 || val === 0 ? 255 : val;
-    const alphaA = getAlpha(prev.alpha);
-    const alphaB = getAlpha(ent.alpha);
-    const alphaVal = lerp2(alphaA, alphaB, alpha);
-    const normalizedAlpha = alphaVal / 255;
-    const mat = mat4_exports.create();
-    mat4_exports.translate(mat, mat, [origin.x, origin.y, origin.z]);
-    mat4_exports.rotateZ(mat, mat, angles.z * Math.PI / 180);
-    mat4_exports.rotateY(mat, mat, angles.y * Math.PI / 180);
-    mat4_exports.rotateX(mat, mat, angles.x * Math.PI / 180);
-    mat4_exports.scale(mat, mat, [scale3, scale3, scale3]);
-    if (model.header.magic === 844121161) {
-      renderables.push({
-        type: "md2",
-        model,
-        // Cast to Md2Model
-        blend: {
-          frame0: prevFrame,
-          frame1: frame,
-          lerp: alpha
-        },
-        transform: mat,
-        skin: ent.skinNum > 0 ? configStrings.getImageName(ent.skinNum) : void 0,
-        alpha: normalizedAlpha
-      });
-    } else if (model.header.magic === 860898377) {
-      renderables.push({
-        type: "md3",
-        model,
-        blend: {
-          frame0: prevFrame,
-          frame1: frame,
-          lerp: alpha
-        },
-        transform: mat,
-        alpha: normalizedAlpha
-        // Lighting? Skins?
-      });
-    }
-  }
-  return renderables;
-}
-
 // src/net/browserWsDriver.ts
 var BrowserWebSocketNetDriver = class {
   constructor() {