quake2ts 0.0.298 → 0.0.301

package/packages/cgame/dist/index.d.cts

@@ -17,6 +17,9 @@ interface CGameImport {
     TagFree(ptr: unknown): void;
     FreeTags(tag: number): void;
     cvar(name: string, value: string, flags: number): unknown;
+    Cvar_Get(name: string, value: string, flags: number): {
+        value: number;
+    };
     cvar_set(name: string, value: string): void;
     cvar_forceset(name: string, value: string): void;
     CL_FrameValid(): boolean;
@@ -119,9 +122,13 @@ declare class ClientPrediction {
     private baseFrame;
     private commands;
     private predicted;
+    private predictionError;
     constructor(trace: PmoveTraceFn, pointContents: (p: Vec3) => number, settings?: Partial<PredictionSettings>);
     setAuthoritative(frame: GameFrameResult<PredictionState>): PredictionState;
+    getPredictionError(): Vec3;
+    decayError(frametime: number): void;
     enqueueCommand(cmd: UserCommand): PredictionState;
+    getCommand(sequence: number): UserCommand | undefined;
     getPredictedState(): PredictionState;
     private recompute;
 }

package/packages/cgame/dist/index.d.ts

@@ -17,6 +17,9 @@ interface CGameImport {
     TagFree(ptr: unknown): void;
     FreeTags(tag: number): void;
     cvar(name: string, value: string, flags: number): unknown;
+    Cvar_Get(name: string, value: string, flags: number): {
+        value: number;
+    };
     cvar_set(name: string, value: string): void;
     cvar_forceset(name: string, value: string): void;
     CL_FrameValid(): boolean;
@@ -119,9 +122,13 @@ declare class ClientPrediction {
     private baseFrame;
     private commands;
     private predicted;
+    private predictionError;
     constructor(trace: PmoveTraceFn, pointContents: (p: Vec3) => number, settings?: Partial<PredictionSettings>);
     setAuthoritative(frame: GameFrameResult<PredictionState>): PredictionState;
+    getPredictionError(): Vec3;
+    decayError(frametime: number): void;
     enqueueCommand(cmd: UserCommand): PredictionState;
+    getCommand(sequence: number): UserCommand | undefined;
     getPredictedState(): PredictionState;
     private recompute;
 }

package/packages/cgame/dist/index.js

@@ -1,4 +1,4 @@
-import { angleVectors, clampViewAngles, ZERO_VEC3, hasPmFlag, PmFlag, dotVec3, PmType, WaterLevel, angleMod, applyPmove, PlayerStat, PowerupId, G_GetPowerupStat, WEAPON_WHEEL_ORDER, WEAPON_AMMO_MAP, G_GetAmmoStat, ConfigStringIndex, MAX_MODELS, MAX_SOUNDS, MAX_IMAGES } from '@quake2ts/shared';
+import { angleVectors, clampViewAngles, ZERO_VEC3, hasPmFlag, PmFlag, dotVec3, PmType, WaterLevel, subtractVec3, lengthVec3, scaleVec3, angleMod, applyPmove, PlayerStat, PowerupId, G_GetPowerupStat, WEAPON_WHEEL_ORDER, WEAPON_AMMO_MAP, G_GetAmmoStat, ConfigStringIndex, MAX_MODELS, MAX_SOUNDS, MAX_IMAGES } from '@quake2ts/shared';
 
 var __defProp = Object.defineProperty;
 var __export = (target, all) => {
@@ -928,6 +928,7 @@ var DEFAULTS = {
 };
 var DEFAULT_GRAVITY = 800;
 var ZERO_VEC32 = { x: 0, y: 0, z: 0 };
+var CMD_BACKUP = 64;
 function defaultPredictionState() {
   return {
     origin: ZERO_VEC32,
@@ -1056,6 +1057,7 @@ var ClientPrediction = class {
     };
     this.commands = [];
     this.predicted = defaultPredictionState();
+    this.predictionError = ZERO_VEC32;
     this.settings = { ...DEFAULTS, ...settings };
     this.trace = trace;
     this.pointContents = pointContents;
@@ -1063,14 +1065,57 @@ var ClientPrediction = class {
   }
   setAuthoritative(frame) {
     const normalized = normalizeState(frame.state);
+    if (frame.frame <= this.baseFrame.frame) {
+      return this.predicted;
+    }
+    let predictedAtFrame;
+    const relevantCommands = this.commands.filter((c) => c.sequence <= frame.frame && c.sequence > this.baseFrame.frame);
+    if (relevantCommands.length > 0 || this.baseFrame.frame === frame.frame) {
+      let tempState = normalizeState(this.baseFrame.state);
+      for (const cmd of relevantCommands) {
+        tempState = simulateCommand(tempState, cmd, this.settings, this.trace, this.pointContents);
+      }
+      predictedAtFrame = tempState;
+    }
+    if (predictedAtFrame) {
+      const error = subtractVec3(predictedAtFrame.origin, normalized.origin);
+      const errorLen = lengthVec3(error);
+      if (errorLen > 10) {
+        this.predictionError = ZERO_VEC32;
+      } else if (errorLen > 0.1) {
+        this.predictionError = error;
+      } else {
+        this.predictionError = ZERO_VEC32;
+      }
+    } else {
+      this.predictionError = ZERO_VEC32;
+    }
     this.baseFrame = { ...frame, state: normalized };
-    this.commands = this.commands.filter((cmd) => (cmd.serverFrame ?? Number.MAX_SAFE_INTEGER) > frame.frame);
+    this.commands = this.commands.filter((cmd) => cmd.sequence > frame.frame);
     return this.recompute();
   }
+  getPredictionError() {
+    return this.predictionError;
+  }
+  // Decay error over time - usually called once per client frame
+  decayError(frametime) {
+    const len2 = lengthVec3(this.predictionError);
+    if (len2 > 0) {
+      const decay = len2 * 10 * frametime;
+      const scale2 = Math.max(0, len2 - decay) / len2;
+      this.predictionError = scaleVec3(this.predictionError, scale2);
+    }
+  }
   enqueueCommand(cmd) {
     this.commands.push(cmd);
+    if (this.commands.length > CMD_BACKUP) {
+      this.commands.shift();
+    }
     return this.recompute();
   }
+  getCommand(sequence) {
+    return this.commands.find((c) => c.sequence === sequence);
+  }
   getPredictedState() {
     return this.predicted;
   }
@@ -1086,6 +1131,7 @@ var ClientPrediction = class {
 
 // src/index.ts
 var cgi2 = null;
+var cg_predict = null;
 function Init() {
   if (!cgi2) {
     console.error("CGame Init: cgame imports not set");
@@ -1093,6 +1139,8 @@ function Init() {
   }
   cgi2.Com_Print("===== CGame Initialization =====\n");
   CG_InitScreen(cgi2);
+  cg_predict = cgi2.Cvar_Get("cg_predict", "1", 0);
+  cgi2.Cvar_Get("cg_showmiss", "0", 0);
   cgi2.Com_Print("CGame initialized\n");
 }
 function Shutdown() {
@@ -1154,6 +1202,9 @@ function Pmove(pmove) {
   if (!pm || !pm.s || !pm.cmd || !cgi2) {
     return;
   }
+  if (cg_predict && cg_predict.value === 0) {
+    return;
+  }
   const traceAdapter = (start, end, mins, maxs) => {
     const zero2 = { x: 0, y: 0, z: 0 };
     return cgi2.PM_Trace(