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

- Add getTicrateAngle() to reduce the amount of times DAngle::fromDeg() needs to be called in input code.

Browse source
This commit is contained in:
Mitchell Richters 2023-10-07 09:37:45 +11:00 committed by Christoph Oelckers
parent bbbb61f450
commit d3811c7816
2 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
source/core/gameinput.cpp
View file

@ -63,12 +63,17 @@ bool crouch_toggle = false;
//
//---------------------------------------------------------------------------
static inline DAngle getscaledangle(const DAngle angle, const double scale, const double push)
static inline DAngle getTicrateAngle(const double value)
{
return (angle.Normalized180() * getTicrateScale(scale)) + DAngle::fromDeg(push);
return DAngle::fromDeg(getTicrateScale(value));
}
bool scaletozero(DAngle& angle, const double scale, const double push)
static inline DAngle getscaledangle(const DAngle angle, const double scale, const DAngle push)
{
return (angle.Normalized180() * getTicrateScale(scale)) + push;
}
bool scaletozero(DAngle& angle, const double scale, const DAngle push)
{
const auto sgn = angle.Sgn();
@ -116,7 +121,7 @@ void GameInput::processMovement(const double turnscale, const bool allowstrafe,
// set up variables.
InputPacket thisInput{};
keymove = 1 << int(!!(inputBuffer.actions & SB_RUN));
const auto hidspeed = DAngle::fromDeg(getTicrateScale(YAW_TURNSPEEDS[2]));
const auto hidspeed = getTicrateAngle(YAW_TURNSPEEDS[2]);
// get all input amounts.
const auto turning = buttonMap.ButtonDown(gamefunc_Turn_Right) -
@ -139,7 +144,7 @@ void GameInput::processMovement(const double turnscale, const bool allowstrafe,
{
const double turndir = clamp(turning + strafing * !allowstrafe, -1., 1.);
const double tttscale = 1. / (1 + !(cl_noturnscaling || isTurboTurnTime()) * 2.8);
const DAngle turnspeed = DAngle::fromDeg(getTicrateScale(YAW_TURNSPEEDS[keymove]) * tttscale);
const DAngle turnspeed = getTicrateAngle(YAW_TURNSPEEDS[keymove]) * tttscale;
thisInput.ang.Yaw += MOUSE_SCALE * mouseInput.X * m_yaw;
thisInput.ang.Yaw -= hidspeed * joyAxes[JOYAXIS_Yaw] * scaleAdjust;
thisInput.ang.Yaw += turnspeed * turndir * scaleAdjust;
@ -234,8 +239,7 @@ void GameInput::processVehicle(const double baseVel, const double velScale, cons
// Apply inputs.
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 -= DAngle::fromDeg(turnVel * joyAxes[JOYAXIS_Yaw] - turnVel * kbdDir);
thisInput.ang.Yaw *= scaleAdjust;
inputBuffer.ang.Yaw += thisInput.ang.Yaw;
if (kbdDir) updateTurnHeldAmt(); else turnheldtime = 0;
@ -406,12 +410,12 @@ void PlayerAngles::doPitchInput(InputPacket* const input)
// Process keyboard input.
if (const auto aiming = aimingDown - aimingUp)
{
pActor->spr.Angles.Pitch += DAngle::fromDeg(getTicrateScale(PITCH_AIMSPEED) * aiming);
pActor->spr.Angles.Pitch += getTicrateAngle(PITCH_AIMSPEED) * aiming;
input->actions &= ~SB_CENTERVIEW;
}
if (const auto looking = lookingDown - lookingUp)
{
pActor->spr.Angles.Pitch += DAngle::fromDeg(getTicrateScale(PITCH_LOOKSPEED) * looking);
pActor->spr.Angles.Pitch += getTicrateAngle(PITCH_LOOKSPEED) * looking;
input->actions |= SB_CENTERVIEW;
}
@ -455,7 +459,7 @@ void PlayerAngles::doYawInput(InputPacket* const input)
if (YawSpin < nullAngle)
{
// return spin to 0
DAngle add = DAngle::fromDeg(getTicrateScale(!(input->actions & SB_CROUCH) ? YAW_SPINSTAND : YAW_SPINCROUCH));
DAngle add = getTicrateAngle(!(input->actions & SB_CROUCH) ? YAW_SPINSTAND : YAW_SPINCROUCH);
YawSpin += add;
if (YawSpin > nullAngle)
{
@ -535,8 +539,8 @@ void PlayerAngles::doViewYaw(InputPacket* const input)
// Process keyboard input.
if (const auto looking = !!(input->actions & SB_LOOK_RIGHT) - !!(input->actions & SB_LOOK_LEFT))
{
ViewAngles.Yaw += DAngle::fromDeg(getTicrateScale(YAW_LOOKINGSPEED) * looking);
ViewAngles.Roll += DAngle::fromDeg(getTicrateScale(YAW_ROTATESPEED) * looking);
ViewAngles.Yaw += getTicrateAngle(YAW_LOOKINGSPEED) * looking;
ViewAngles.Roll += getTicrateAngle(YAW_ROTATESPEED) * looking;
}
}
@ -561,7 +565,7 @@ void PlayerAngles::doRollInput(InputPacket* const input, const DVector2& nVelVec
{
// Console-like yaw rolling. Adjustment == ~(90/32) for keyboard turning. Clamp is 1.5x this value.
const auto rollAdj = input->ang.Yaw * ROLL_TILTAVELSCALE * rollAmp;
const auto rollMax = DAngle::fromDeg((90. / 32. * 1.5) * cl_viewtiltscale);
const auto rollMax = ROLL_TILTAVELMAX * cl_viewtiltscale;
scaletozero(pActor->spr.Angles.Roll, ROLL_TILTRETURN);
pActor->spr.Angles.Roll = clamp(pActor->spr.Angles.Roll + rollAdj, -rollMax, rollMax);
}

5
source/core/gameinput.h
View file

@ -203,6 +203,7 @@ private:
// Constants used throughout input functions.
static constexpr double ROLL_TILTAVELSCALE = (1966426. / 12000000.);
static constexpr DAngle ROLL_TILTAVELMAX = DAngle::fromDeg(90. / 32. * 1.5);
static constexpr double ROLL_TILTRETURN = 15.;
static constexpr double YAW_LOOKINGSPEED = 801.5625;
static constexpr double YAW_ROTATESPEED = 63.28125;
@ -215,11 +216,11 @@ private:
static constexpr double PITCH_HORIZOFFSPEED = 4.375;
static constexpr DAngle PITCH_CNTRSINEOFFSET = DAngle90 / 8.;
static constexpr DAngle PITCH_HORIZOFFCLIMB = DAngle::fromDeg(-127076387. / 3344227.);
static constexpr double PITCH_HORIZOFFPUSH = (14115687. / 31535389.);
static constexpr DAngle PITCH_HORIZOFFPUSH = DAngle::fromDeg(14115687. / 31535389.);
};
extern GameInput gameInput;
class FSerializer;
FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerAngles& w, PlayerAngles* def);
bool scaletozero(DAngle& angle, const double scale, const double push = (7646143. / 110386328.));
bool scaletozero(DAngle& angle, const double scale, const DAngle push = DAngle::fromDeg(7646143. / 110386328.));