quake2ts 0.0.268 → 0.0.270

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

@@ -115,10 +115,11 @@ declare function interpolatePredictionState(previous: PredictionState, latest: P
 declare class ClientPrediction {
     private readonly settings;
     private readonly trace;
+    private readonly pointContents;
     private baseFrame;
     private commands;
     private predicted;
-    constructor(trace: PmoveTraceFn, settings?: Partial<PredictionSettings>);
+    constructor(trace: PmoveTraceFn, pointContents: (p: Vec3) => number, settings?: Partial<PredictionSettings>);
     setAuthoritative(frame: GameFrameResult<PredictionState>): PredictionState;
     enqueueCommand(cmd: UserCommand): PredictionState;
     getPredictedState(): PredictionState;

package/packages/cgame/dist/index.js

@@ -1,4 +1,4 @@
-import { angleVectors, clampViewAngles, ZERO_VEC3, hasPmFlag, PmFlag, dotVec3, PmType, WaterLevel, angleMod, applyPmoveFriction, buildWaterWish, buildAirGroundWish, applyPmoveAccelerate, applyPmoveAirAccelerate, addVec3, scaleVec3, applyPmove, ConfigStringIndex, MAX_MODELS, MAX_SOUNDS, MAX_IMAGES, PlayerStat } from '@quake2ts/shared';
+import { angleVectors, clampViewAngles, ZERO_VEC3, hasPmFlag, PmFlag, dotVec3, PmType, WaterLevel, angleMod, applyPmove, ConfigStringIndex, MAX_MODELS, MAX_SOUNDS, MAX_IMAGES, PlayerStat } from '@quake2ts/shared';
 
 var __defProp = Object.defineProperty;
 var __export = (target, all) => {
@@ -928,7 +928,6 @@ var DEFAULTS = {
 };
 var DEFAULT_GRAVITY = 800;
 var ZERO_VEC32 = { x: 0, y: 0, z: 0 };
-var MSEC_MAX = 250;
 function defaultPredictionState() {
   return {
     origin: ZERO_VEC32,
@@ -1028,69 +1027,26 @@ function interpolatePredictionState(previous, latest, alpha) {
     ammo: lerp2(previous.ammo || 0, latest.ammo || 0, clamped)
   };
 }
-function simulateCommand(state, cmd, settings, trace) {
-  const frametime = Math.min(Math.max(cmd.msec, 0), MSEC_MAX) / 1e3;
-  const onGround = hasPmFlag(state.pmFlags, PmFlag.OnGround);
-  const onLadder = hasPmFlag(state.pmFlags, PmFlag.OnLadder);
-  let velocity = applyPmoveFriction({
-    velocity: state.velocity,
-    frametime,
-    onGround,
-    groundIsSlick: settings.groundIsSlick,
-    onLadder,
-    waterlevel: state.waterLevel,
-    pmFriction: settings.pmFriction,
-    pmStopSpeed: settings.pmStopSpeed,
-    pmWaterFriction: settings.pmWaterFriction
-  });
-  const { viewangles, forward, right } = clampViewAngles({
+function simulateCommand(state, cmd, settings, trace, pointContents) {
+  const pmoveCmd = {
+    forwardmove: cmd.forwardmove,
+    sidemove: cmd.sidemove,
+    upmove: cmd.upmove,
+    buttons: cmd.buttons
+  };
+  const newState = applyPmove(state, pmoveCmd, trace, pointContents);
+  const { viewangles } = clampViewAngles({
     pmFlags: state.pmFlags,
     cmdAngles: cmd.angles,
     deltaAngles: state.deltaAngles ?? ZERO_VEC32
   });
-  const wish = state.waterLevel > WaterLevel.None ? buildWaterWish({ forward, right, cmd, maxSpeed: settings.pmWaterSpeed }) : buildAirGroundWish({ forward, right, cmd, maxSpeed: settings.pmMaxSpeed });
-  if (state.waterLevel > WaterLevel.None) {
-    velocity = applyPmoveAccelerate({
-      velocity,
-      wishdir: wish.wishdir,
-      wishspeed: wish.wishspeed,
-      accel: settings.pmWaterAccelerate,
-      frametime
-    });
-  } else if (onGround || onLadder) {
-    const maxSpeed = hasPmFlag(state.pmFlags, PmFlag.Ducked) ? settings.pmDuckSpeed : settings.pmMaxSpeed;
-    const clampedWish = wish.wishspeed > maxSpeed ? {
-      wishdir: wish.wishdir,
-      wishspeed: maxSpeed
-    } : wish;
-    velocity = applyPmoveAccelerate({
-      velocity,
-      wishdir: clampedWish.wishdir,
-      wishspeed: clampedWish.wishspeed,
-      accel: settings.pmAccelerate,
-      frametime
-    });
-  } else {
-    velocity = applyPmoveAirAccelerate({
-      velocity,
-      wishdir: wish.wishdir,
-      wishspeed: wish.wishspeed,
-      accel: settings.pmAirAccelerate,
-      frametime
-    });
-    velocity = { ...velocity, z: velocity.z - (state.gravity ?? DEFAULT_GRAVITY) * frametime };
-  }
-  const traceResult = trace(state.origin, addVec3(state.origin, scaleVec3(velocity, frametime)));
-  const origin = traceResult.endpos;
   return {
-    ...state,
-    origin,
-    velocity,
+    ...newState,
     viewAngles: viewangles
   };
 }
 var ClientPrediction = class {
-  constructor(trace, settings = {}) {
+  constructor(trace, pointContents, settings = {}) {
     this.baseFrame = {
       frame: 0,
       timeMs: 0,
@@ -1100,6 +1056,7 @@ var ClientPrediction = class {
     this.predicted = defaultPredictionState();
     this.settings = { ...DEFAULTS, ...settings };
     this.trace = trace;
+    this.pointContents = pointContents;
     this.predicted = this.baseFrame.state ?? defaultPredictionState();
   }
   setAuthoritative(frame) {
@@ -1118,7 +1075,7 @@ var ClientPrediction = class {
   recompute() {
     let state = normalizeState(this.baseFrame.state);
     for (const cmd of this.commands) {
-      state = simulateCommand(state, cmd, this.settings, this.trace);
+      state = simulateCommand(state, cmd, this.settings, this.trace, this.pointContents);
     }
     this.predicted = state;
     return state;