Fix camera bob speed

Helco · Mar 21, 2024 · 8a67b08 · 8a67b08
1 parent d270881
commit 8a67b08
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/zzre/game/systems/camera/DuelCamera.cs b/zzre/game/systems/camera/DuelCamera.cs
@@ -144,22 +144,23 @@ private float GetClipDistance(Vector3 zeroDistPos, Vector3 targetPos, float dirS
 
     private float UpdateBobbing(float elapsedTime)
     {
+        var newCamPos = camera.Location.GlobalPosition with { Y = 0f };
         if (isFirstFrame)
         {
             isFirstFrame = false;
             totalCamTravel = 0f;
         }
         else
         {
-            var lastTravel = (oldCamPos - camera.Location.GlobalPosition).Length();
-            var lastSpeed = lastTravel / elapsedTime;
+            var lastTravel = (oldCamPos - newCamPos).Length();
+            var lastSpeed = lastTravel * elapsedTime / 60; // this adds (unoriginal) framerate-independence
             if (lastSpeed < MinimumCameraBobSpeed)
-                lastTravel = SimulatedBobSpeed * elapsedTime;
-            totalCamTravel += lastTravel * BobDistanceFactor;
+                lastSpeed = SimulatedBobSpeed * elapsedTime;
+            totalCamTravel += MathF.Floor(lastSpeed * BobDistanceFactor);
             if (totalCamTravel > TotalBobTravel)
                 totalCamTravel -= TotalBobTravel;
         }
-        oldCamPos = camera.Location.GlobalPosition;
+        oldCamPos = newCamPos;
         return MathF.Sin(totalCamTravel * BobCycle);
     }
 }