crt0mega/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2021-09-07 08:09:38 +00:00
Code Issues Projects Releases Wiki Activity

Update car-follow free cam

Browse Source 
Added frameTime variable to Process_FollowCar_SA, and update references to GetTimeStepFix() to instead use frameTime.
Fixes a crash that happens when pausing and unpausing with the timestepfix adjusted freecam active
This commit is contained in:
Zach Charo 2021-08-07 22:09:17 -05:00 committed by GitHub
parent 2b7f8ebfcc
commit a30ff24bad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/Cam.cpp
View File

@ -4878,6 +4878,7 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
} }
float nextDistance = Max(newDistance, minDistForVehType); float nextDistance = Max(newDistance, minDistForVehType);
static float frameTime = CTimer::GetTimeStepFix();
CA_MAX_DISTANCE = newDistance; CA_MAX_DISTANCE = newDistance;
CA_MIN_DISTANCE = 3.5f; CA_MIN_DISTANCE = 3.5f;
@ -4892,12 +4893,12 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
if (isCar || isBike) { if (isCar || isBike) {
// 0.4f: CAR_FOV_START_SPEED // 0.4f: CAR_FOV_START_SPEED
if (DotProduct(car->GetForward(), car->m_vecMoveSpeed) > 0.4f) if (DotProduct(car->GetForward(), car->m_vecMoveSpeed) > 0.4f)
FOV += (DotProduct(car->GetForward(), car->m_vecMoveSpeed) - 0.4f) * (CTimer::GetTimeStep() / CTimer::GetTimeStepFix()); FOV += (DotProduct(car->GetForward(), car->m_vecMoveSpeed) - 0.4f) * (CTimer::GetTimeStep() / frameTime);
} }
if (FOV > DefaultFOV) if (FOV > DefaultFOV)
// 0.98f: CAR_FOV_FADE_MULT // 0.98f: CAR_FOV_FADE_MULT
FOV = Pow(0.98f, CTimer::GetTimeStep() / CTimer::GetTimeStepFix()) * (FOV - DefaultFOV) + DefaultFOV; FOV = Pow(0.98f, CTimer::GetTimeStep() / frameTime) * (FOV - DefaultFOV) + DefaultFOV;
FOV = Clamp(FOV, DefaultFOV, DefaultFOV + 30.0f); FOV = Clamp(FOV, DefaultFOV, DefaultFOV + 30.0f);
} }
@ -4965,8 +4966,8 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
else if (velocityRightHeading > camRightHeading + PI) else if (velocityRightHeading > camRightHeading + PI)
velocityRightHeading = velocityRightHeading - TWOPI; velocityRightHeading = velocityRightHeading - TWOPI;
float betaChangeMult1 = (CTimer::GetTimeStep() / CTimer::GetTimeStepFix()) * CARCAM_SET[camSetArrPos][10]; float betaChangeMult1 = (CTimer::GetTimeStep() / frameTime) * CARCAM_SET[camSetArrPos][10];
float betaChangeLimit = (CTimer::GetTimeStep() / CTimer::GetTimeStepFix()) * CARCAM_SET[camSetArrPos][11]; float betaChangeLimit = (CTimer::GetTimeStep() / frameTime) * CARCAM_SET[camSetArrPos][11];
float betaChangeMult2 = (car->m_vecMoveSpeed - DotProduct(car->m_vecMoveSpeed, Front) * Front).Magnitude(); float betaChangeMult2 = (car->m_vecMoveSpeed - DotProduct(car->m_vecMoveSpeed, Front) * Front).Magnitude();
@ -5028,8 +5029,8 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
} else { } else {
targetAlpha = maxAlphaAllowed; targetAlpha = maxAlphaAllowed;
} }
float maxAlphaBlendAmount = (CTimer::GetTimeStep() / CTimer::GetTimeStepFix()) * CARCAM_SET[camSetArrPos][6]; float maxAlphaBlendAmount = (CTimer::GetTimeStep() / frameTime) * CARCAM_SET[camSetArrPos][6];
float targetAlphaBlendAmount = (1.0f - Pow(CARCAM_SET[camSetArrPos][5], CTimer::GetTimeStep() / CTimer::GetTimeStepFix())) * (targetAlpha - Alpha); float targetAlphaBlendAmount = (1.0f - Pow(CARCAM_SET[camSetArrPos][5], (CTimer::GetTimeStep() / frameTime))) * (targetAlpha - Alpha);
if (targetAlphaBlendAmount <= maxAlphaBlendAmount) { if (targetAlphaBlendAmount <= maxAlphaBlendAmount) {
if (targetAlphaBlendAmount < -maxAlphaBlendAmount) if (targetAlphaBlendAmount < -maxAlphaBlendAmount)
targetAlphaBlendAmount = -maxAlphaBlendAmount; targetAlphaBlendAmount = -maxAlphaBlendAmount;
@ -5125,7 +5126,7 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
float betaSpeedFromStickX = xMovement * CARCAM_SET[camSetArrPos][12]; float betaSpeedFromStickX = xMovement * CARCAM_SET[camSetArrPos][12];
float newAngleSpeedMaxBlendAmount = CARCAM_SET[camSetArrPos][9]; float newAngleSpeedMaxBlendAmount = CARCAM_SET[camSetArrPos][9];
float angleChangeStep = Pow(CARCAM_SET[camSetArrPos][8], CTimer::GetTimeStepFix()); float angleChangeStep = Pow(CARCAM_SET[camSetArrPos][8], frameTime);
float targetBetaWithStickBlendAmount = betaSpeedFromStickX + (targetBeta - Beta) / Max(CTimer::GetTimeStep(), 1.0f); float targetBetaWithStickBlendAmount = betaSpeedFromStickX + (targetBeta - Beta) / Max(CTimer::GetTimeStep(), 1.0f);
if (targetBetaWithStickBlendAmount < -newAngleSpeedMaxBlendAmount) if (targetBetaWithStickBlendAmount < -newAngleSpeedMaxBlendAmount)
@ -5135,7 +5136,7 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
float angleChangeStepLeft = 1.0f - angleChangeStep; float angleChangeStepLeft = 1.0f - angleChangeStep;
BetaSpeed = targetBetaWithStickBlendAmount * angleChangeStepLeft + angleChangeStep * BetaSpeed; BetaSpeed = targetBetaWithStickBlendAmount * angleChangeStepLeft + angleChangeStep * BetaSpeed;
if (Abs(BetaSpeed) < 0.0001f * CTimer::GetTimeStepFix()) if (Abs(BetaSpeed) < 0.0001f * frameTime)
BetaSpeed = 0.0f; BetaSpeed = 0.0f;
float betaChangePerFrame; float betaChangePerFrame;
@ -5176,7 +5177,7 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
AlphaSpeed = maxAlphaSpeed; AlphaSpeed = maxAlphaSpeed;
} }
if (Abs(AlphaSpeed) < 0.0001f * CTimer::GetTimeStepFix()) if (Abs(AlphaSpeed) < 0.0001f * frameTime)
AlphaSpeed = 0.0f; AlphaSpeed = 0.0f;
float alphaWithSpeedAccounted; float alphaWithSpeedAccounted;
@ -5200,12 +5201,12 @@ CCam::Process_FollowCar_SA(const CVector& CameraTarget, float TargetOrientation,
} }
// Prevent unsignificant angle changes // Prevent unsignificant angle changes
if (Abs(lastAlpha - Alpha) < 0.0001f * CTimer::GetTimeStepFix()) if (Abs(lastAlpha - Alpha) < 0.0001f * frameTime)
Alpha = lastAlpha; Alpha = lastAlpha;
lastAlpha = Alpha; lastAlpha = Alpha;
if (Abs(lastBeta - Beta) < 0.0001f * CTimer::GetTimeStepFix()) if (Abs(lastBeta - Beta) < 0.0001f * frameTime)
Beta = lastBeta; Beta = lastBeta;
lastBeta = Beta; lastBeta = Beta;