quake2ts 0.0.198 → 0.0.199

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

@@ -3813,18 +3813,20 @@ import { ClientPrediction, interpolatePredictionState as interpolatePredictionSt
 import { ViewEffects } from "@quake2ts/cgame";
 
 // src/cgameBridge.ts
-function createCGameImport(imports) {
+function createCGameImport(imports, state) {
+  const picCache = /* @__PURE__ */ new Map();
+  const pendingPics = /* @__PURE__ */ new Set();
   const getRenderer = () => imports.engine.renderer;
   return {
-    // Frame timing - stubbed for now until we fix the access pattern
+    // Frame timing
     get tick_rate() {
-      return 10;
+      return state.tickRate;
     },
     get frame_time_s() {
-      return 0;
+      return state.frameTimeMs / 1e3;
     },
     get frame_time_ms() {
-      return 0;
+      return state.frameTimeMs;
     },
     // Console
     Com_Print: (msg) => {
@@ -3835,7 +3837,7 @@ function createCGameImport(imports) {
     },
     // Config strings
     get_configstring: (num) => {
-      return "";
+      return state.configStrings.get(num) || "";
     },
     // Memory (No-op in JS)
     TagMalloc: (size, tag) => ({}),
@@ -3845,27 +3847,27 @@ function createCGameImport(imports) {
     },
     // Cvars
     cvar: (name, value, flags) => {
+      const existing = imports.host?.cvars?.get(name);
+      if (existing) return existing;
       return null;
     },
     cvar_set: (name, value) => {
-      if (imports.host?.cvars) {
-        imports.host.cvars.setValue(name, value);
-      }
+      imports.host?.cvars?.setValue(name, value);
     },
     cvar_forceset: (name, value) => {
-      if (imports.host?.cvars) {
-        imports.host.cvars.setValue(name, value);
-      }
+      imports.host?.cvars?.setValue(name, value);
     },
     // Client state
     CL_FrameValid: () => true,
-    CL_FrameTime: () => 0,
-    CL_ClientTime: () => 0,
-    CL_ServerFrame: () => 0,
-    CL_ServerProtocol: () => 34,
+    // Always assume valid for now
+    CL_FrameTime: () => state.frameTimeMs,
+    CL_ClientTime: () => state.frameTimeMs,
+    // Use frame time as client time
+    CL_ServerFrame: () => state.serverFrame,
+    CL_ServerProtocol: () => state.serverProtocol,
     // Client info
     CL_GetClientName: (playerNum) => {
-      return `Player ${playerNum}`;
+      return state.getClientName(playerNum);
     },
     CL_GetClientPic: (playerNum) => {
       return "";
@@ -3874,25 +3876,55 @@ function createCGameImport(imports) {
       return "";
     },
     CL_GetKeyBinding: (key) => {
-      return `[${key}]`;
+      return state.getKeyBinding(key);
     },
     // Drawing
     Draw_RegisterPic: (name) => {
-      if (imports.engine.assets) {
+      if (picCache.has(name)) {
         return name;
       }
+      if (pendingPics.has(name)) {
+        return name;
+      }
+      pendingPics.add(name);
+      if (imports.engine.assets) {
+        imports.engine.assets.loadTexture(name).then((texture) => {
+          if (imports.engine.renderer) {
+            const pic = imports.engine.renderer.registerTexture(name, texture);
+            picCache.set(name, pic);
+          }
+          pendingPics.delete(name);
+        }).catch((err) => {
+          console.warn(`[CGameImport] Failed to load pic: ${name}`, err);
+          pendingPics.delete(name);
+        });
+      }
       return name;
     },
-    Draw_GetPicSize: (pic) => {
-      return { width: 32, height: 32 };
+    Draw_GetPicSize: (picHandle) => {
+      const name = picHandle;
+      const pic = picCache.get(name);
+      if (pic) {
+        return { width: pic.width, height: pic.height };
+      }
+      return { width: 0, height: 0 };
     },
     SCR_DrawChar: (x, y, char) => {
       getRenderer()?.drawString(x, y, String.fromCharCode(char));
     },
-    SCR_DrawPic: (x, y, pic) => {
-      const name = pic;
+    SCR_DrawPic: (x, y, picHandle) => {
+      const name = picHandle;
+      const pic = picCache.get(name);
+      if (pic) {
+        getRenderer()?.drawPic(x, y, pic);
+      }
     },
-    SCR_DrawColorPic: (x, y, pic, color, alpha) => {
+    SCR_DrawColorPic: (x, y, picHandle, color, alpha) => {
+      const name = picHandle;
+      const pic = picCache.get(name);
+      if (pic) {
+        getRenderer()?.drawPic(x, y, pic, [color.x, color.y, color.z, alpha]);
+      }
     },
     SCR_DrawFontString: (x, y, str3) => {
       getRenderer()?.drawString(x, y, str3);
@@ -3908,6 +3940,7 @@ function createCGameImport(imports) {
     SCR_SetAltTypeface: (alt) => {
     },
     SCR_DrawBind: (x, y, command) => {
+      const key = state.getKeyBinding(command);
       getRenderer()?.drawString(x, y, `[${command}]`);
     },
     // Localization
@@ -3915,11 +3948,10 @@ function createCGameImport(imports) {
     // State queries
     CL_GetTextInput: () => "",
     CL_GetWarnAmmoCount: () => 5,
-    // Low ammo threshold
-    CL_InAutoDemoLoop: () => false,
+    CL_InAutoDemoLoop: () => state.inAutoDemo,
     // Prediction Trace
     PM_Trace: (start, end, mins, maxs) => {
-      return imports.engine.trace(start, end);
+      return imports.engine.trace(start, end, mins, maxs);
     }
   };
 }
@@ -4821,6 +4853,9 @@ var ClientNetworkHandler = class {
     }
     return latestState;
   }
+  get latestServerFrame() {
+    return this.latestFrame?.serverFrame ?? 0;
+  }
 };
 
 // src/configStrings.ts
@@ -6238,7 +6273,32 @@ function createClient(imports) {
   let lastRendered;
   let lastView;
   let camera;
-  const cgameImport = createCGameImport(imports);
+  let clientInAutoDemo = false;
+  const stateProvider = {
+    get tickRate() {
+      return 10;
+    },
+    // Default 10Hz
+    get frameTimeMs() {
+      return latestFrame?.timeMs ?? 0;
+    },
+    get serverFrame() {
+      return demoHandler.latestServerFrame;
+    },
+    // Corrected access
+    get serverProtocol() {
+      return 34;
+    },
+    get configStrings() {
+      return configStrings;
+    },
+    getClientName: (num) => `Player ${num}`,
+    getKeyBinding: (key) => `[${key}]`,
+    get inAutoDemo() {
+      return clientInAutoDemo;
+    }
+  };
+  const cgameImport = createCGameImport(imports, stateProvider);
   const cg = GetCGameAPI(cgameImport);
   let fovValue = 90;
   let isZooming = false;