joshua
/
re3-mirror
mirror of https://github.com/GTAmodding/re3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

IFDEF tidyup: remove FIX_BUGS inside IMPROVED_CAMERA

This commit is contained in:
Veyrdite 2021-07-29 23:07:54 +10:00
parent 606977688e
commit 0736304795
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/core/Cam.cpp
View File

@ -3895,17 +3895,12 @@ CCam::Process_Debug(const CVector&, float, float, float)
if(Alpha > DEGTORAD(89.5f)) Alpha = DEGTORAD(89.5f);
else if(Alpha < DEGTORAD(-89.5f)) Alpha = DEGTORAD(-89.5f);
#ifdef FIX_BUGS
// Time factor makes debug camera usable even at 400FPS
const float Time = CTimer::GetTimeStepNonClipped();
#else
const float Time = 1.0f;
#endif
const float TimeStep = CTimer::GetTimeStepNonClipped();
if(CPad::GetPad(1)->GetSquare() || KEYDOWN('W'))
Speed += 0.1f * Time;
Speed += 0.1f * TimeStep;
else if(CPad::GetPad(1)->GetCross() || KEYDOWN('S'))
Speed -= 0.1f * Time;
Speed -= 0.1f * TimeStep;
else
Speed = 0.0f;
if(Speed > 70.0f) Speed = 70.0f;
@ -3913,9 +3908,9 @@ CCam::Process_Debug(const CVector&, float, float, float)
if(KEYDOWN(rsRIGHT) || KEYDOWN('D'))
PanSpeedX += 0.1f * Time;
PanSpeedX += 0.1f * TimeStep;
else if(KEYDOWN(rsLEFT) || KEYDOWN('A'))
PanSpeedX -= 0.1f * Time;
PanSpeedX -= 0.1f * TimeStep;
else
PanSpeedX = 0.0f;
if(PanSpeedX > 70.0f) PanSpeedX = 70.0f;
@ -3923,9 +3918,9 @@ CCam::Process_Debug(const CVector&, float, float, float)
if(KEYDOWN(rsUP))
PanSpeedY += 0.1f * Time;
PanSpeedY += 0.1f * TimeStep;
else if(KEYDOWN(rsDOWN))
PanSpeedY -= 0.1f * Time;
PanSpeedY -= 0.1f * TimeStep;
else
PanSpeedY = 0.0f;
if(PanSpeedY > 70.0f) PanSpeedY = 70.0f;
@ -3933,12 +3928,12 @@ CCam::Process_Debug(const CVector&, float, float, float)
Front = TargetCoors - Source;
Front.Normalise();
Source = Source + Front * Speed * Time;
Source = Source + Front * Speed * TimeStep;
Up = CVector{ 0.0f, 0.0f, 1.0f };
CVector Right = CrossProduct(Front, Up);
Up = CrossProduct(Right, Front);
Source = Source + Up * PanSpeedY * Time + Right * PanSpeedX * Time;
Source = Source + Up * PanSpeedY * TimeStep + Right * PanSpeedX * TimeStep;
if(Source.z < -450.0f)
Source.z = -450.0f;
@ -3961,11 +3956,7 @@ CCam::Process_Debug(const CVector&, float, float, float)
Source.y += 1.0f;
GetVectorsReadyForRW();
#ifdef FIX_BUGS
CPad::GetPad(0)->SetDisablePlayerControls(PLAYERCONTROL_CAMERA);
#else
CPad::GetPad(0)->DisablePlayerControls = PLAYERCONTROL_CAMERA;
#endif
if(CPad::GetPad(1)->GetLeftShockJustDown() && gbBigWhiteDebugLightSwitchedOn)
CShadows::StoreShadowToBeRendered(SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &Source,