zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 00:42:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Slight clean-up in gameinput.cpp.

Browse source
This commit is contained in:
Mitchell Richters 2023-10-05 19:06:39 +11:00 committed by Christoph Oelckers
parent ddd39775e6
commit 2ddd15b932
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
source/core/gameinput.cpp
View file

@ -63,11 +63,6 @@ bool crouch_toggle = false;
//
//---------------------------------------------------------------------------
inline void addCameraAngles(const DRotator& input)
{
PlayerArray[myconnectindex]->Angles.CameraAngles += input;
}
static inline DAngle getscaledangle(const DAngle angle, const double scale, const double push)
{
return (angle.Normalized180() * getTicrateScale(scale)) + DAngle::fromDeg(push);
@ -189,7 +184,7 @@ void GameInput::processMovement(const double turnscale, const bool allowstrafe,
// directly update player angles if we can.
if (scaleAdjust < 1)
{
addCameraAngles(thisInput.ang);
PlayerArray[myconnectindex]->Angles.CameraAngles += thisInput.ang;
}
}
@ -235,10 +230,10 @@ void GameInput::processVehicle(const double baseVel, const double velScale, cons
// Velocity setup.
const auto scaleVel = !(flags & VEH_SCALETURN) && (cl_noturnscaling || hidDir || isTurboTurnTime());
const auto turnVel = scaleVel ? baseVel : baseVel * velScale;
const auto mouseVel = abs(turnVel * mouseInput.X * m_yaw) * (45.f / 2048.f) / scaleAdjust;
const auto mouseVel = abs(turnVel * mouseInput.X * m_yaw) * (45. / 2048.) / scaleAdjust;
// Apply inputs.
thisInput.ang.Yaw += DAngle::fromDeg(((mouseVel > 1) ? sqrt(mouseVel) : mouseVel) * Sgn(turnVel) * Sgn(mouseInput.X) * Sgn(m_yaw));
thisInput.ang.Yaw += DAngle::fromDeg(((mouseVel > 1) ? g_sqrt(mouseVel) : mouseVel) * Sgn(turnVel) * Sgn(mouseInput.X) * Sgn(m_yaw));
thisInput.ang.Yaw -= DAngle::fromDeg(turnVel * joyAxes[JOYAXIS_Yaw]);
thisInput.ang.Yaw += DAngle::fromDeg(turnVel * kbdDir);
thisInput.ang.Yaw *= scaleAdjust;
@ -253,7 +248,7 @@ void GameInput::processVehicle(const double baseVel, const double velScale, cons
// directly update player angles if we can.
if (scaleAdjust < 1)
{
addCameraAngles(thisInput.ang);
PlayerArray[myconnectindex]->Angles.CameraAngles += thisInput.ang;
}
}

3
source/core/gameinput.h
View file

@ -129,7 +129,8 @@ struct PlayerAngles
DAngle YawSpin;
friend FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerAngles& w, PlayerAngles* def);
friend void addCameraAngles(const DRotator& input);
friend void GameInput::processMovement(const double turnscale, const bool allowstrafe, const int drink_amt);
friend void GameInput::processVehicle(const double baseVel, const double velScale, const unsigned flags);
// Prototypes.
void doPitchInput(InputPacket* const input);