tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix camera recoil restore overshooting at low framerates.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2019-09-11 20:04:21 +02:00
parent c56d56c2d1
commit 97e18b9ed4
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs
View File

@@ -13,10 +13,10 @@ namespace Content.Client.GameObjects.Components.Mobs
public sealed class CameraRecoilComponent : SharedCameraRecoilComponent public sealed class CameraRecoilComponent : SharedCameraRecoilComponent
{ {
// Maximum rate of magnitude restore towards 0 kick. // Maximum rate of magnitude restore towards 0 kick.
private const float RestoreRateMax = 1.5f; private const float RestoreRateMax = 2f;
// Minimum rate of magnitude restore towards 0 kick. // Minimum rate of magnitude restore towards 0 kick.
private const float RestoreRateMin = 0.5f; private const float RestoreRateMin = 1f;
// Time in seconds since the last kick that lerps RestoreRateMin and RestoreRateMax // Time in seconds since the last kick that lerps RestoreRateMin and RestoreRateMax
private const float RestoreRateRamp = 0.05f; private const float RestoreRateRamp = 0.05f;
@@ -77,7 +77,19 @@ namespace Content.Client.GameObjects.Components.Mobs
var normalized = _currentKick.Normalized; var normalized = _currentKick.Normalized;
var restoreRate = FloatMath.Lerp(RestoreRateMin, RestoreRateMax, Math.Min(1, _lastKickTime/RestoreRateRamp)); var restoreRate = FloatMath.Lerp(RestoreRateMin, RestoreRateMax, Math.Min(1, _lastKickTime/RestoreRateRamp));
var restore = normalized * restoreRate * frameTime; var restore = normalized * restoreRate * frameTime;
_currentKick -= restore; var (x, y) = _currentKick - restore;
if (Math.Sign(x) != Math.Sign(_currentKick.X))
{
x = 0;
}
if (Math.Sign(y) != Math.Sign(_currentKick.Y))
{
y = 0;
}
_currentKick = (x, y);
_updateEye(); _updateEye();
} }