zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-22 17:01:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Break down some increasingly long lines in GameInput::processMovement().

Browse source
This commit is contained in:
Mitchell Richters 2023-04-23 19:19:26 +10:00
parent 07c4b61260
commit e60e767232
3 changed files with 44 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
source/core/gameinput.cpp
View file

@ -109,39 +109,52 @@ void processCrouchToggle(bool& toggle, ESyncBits& actions, const bool crouchable
//
//---------------------------------------------------------------------------
void GameInput::processMovement(PlayerAngles* const plrAngles, const float scaleAdjust, const int drink_amt, const bool allowstrafe, const double turnscale)
void GameInput::processMovement(PlayerAngles* const plrAngles, const float scaleAdjust, const int drink_amt, const bool allowstrafe, const float turnscale)
{
// open up input packet for this session.
InputPacket thisInput{};
// set up variables.
InputPacket thisInput{};
const auto keymove = 1 << int(!!(inputBuffer.actions & SB_RUN));
const auto hidspeed = float(getTicrateScale(YAW_TURNSPEEDS[2]) * turnscale);
const auto turning = buttonMap.ButtonDown(gamefunc_Turn_Right) - buttonMap.ButtonDown(gamefunc_Turn_Left);
const auto moving = buttonMap.ButtonDown(gamefunc_Move_Forward) - buttonMap.ButtonDown(gamefunc_Move_Backward) + joyAxes[JOYAXIS_Forward] * scaleAdjust;
const auto strafing = buttonMap.ButtonDown(gamefunc_Strafe_Right) - buttonMap.ButtonDown(gamefunc_Strafe_Left) - joyAxes[JOYAXIS_Side] * scaleAdjust;
// process player angle input.
// get all input amounts.
const auto turning = buttonMap.ButtonDown(gamefunc_Turn_Right) -
buttonMap.ButtonDown(gamefunc_Turn_Left);
const auto moving = buttonMap.ButtonDown(gamefunc_Move_Forward) -
buttonMap.ButtonDown(gamefunc_Move_Backward) +
joyAxes[JOYAXIS_Forward] * scaleAdjust;
const auto strafing = buttonMap.ButtonDown(gamefunc_Strafe_Right) -
buttonMap.ButtonDown(gamefunc_Strafe_Left) -
joyAxes[JOYAXIS_Side] * scaleAdjust;
// process player yaw input.
if (!(buttonMap.ButtonDown(gamefunc_Strafe) && allowstrafe))
{
const float turndir = clamp(turning + strafing * !allowstrafe, -1.f, 1.f);
const float turnspeed = float(getTicrateScale(YAW_TURNSPEEDS[keymove]) * turnscale * (isTurboTurnTime() ? 1. : YAW_PREAMBLESCALE));
thisInput.avel += mouseInput.X * (1.f / 16.f) * m_yaw - (joyAxes[JOYAXIS_Yaw] * hidspeed - turndir * turnspeed) * scaleAdjust;
const float turnspeed = float(getTicrateScale(YAW_TURNSPEEDS[keymove]) / (!isTurboTurnTime() * 2.8 + 1));
thisInput.avel += mouseInput.X * MOUSE_SCALE * m_yaw;
thisInput.avel -= joyAxes[JOYAXIS_Yaw] * hidspeed * scaleAdjust;
thisInput.avel += turndir * turnscale * turnspeed * scaleAdjust;
if (turndir) updateTurnHeldAmt(scaleAdjust); else turnheldtime = 0;
}
else
{
thisInput.svel += mouseInput.X * (1.f / 16.f) * m_side - (joyAxes[JOYAXIS_Yaw] - turning) * keymove * scaleAdjust;
thisInput.svel += mouseInput.X * MOUSE_SCALE * m_side;
thisInput.svel -= joyAxes[JOYAXIS_Yaw] * keymove * scaleAdjust;
thisInput.svel += turning * turnscale * keymove * scaleAdjust;
}
// process player pitch input.
if (!(inputBuffer.actions & SB_AIMMODE))
{
thisInput.horz -= mouseInput.Y * (1.f / 16.f) * m_pitch + joyAxes[JOYAXIS_Pitch] * hidspeed * scaleAdjust;
thisInput.horz -= mouseInput.Y * MOUSE_SCALE * m_pitch;
thisInput.horz -= joyAxes[JOYAXIS_Pitch] * hidspeed * scaleAdjust;
}
else
{
thisInput.fvel += mouseInput.Y * (1.f / 16.f) * m_forward + joyAxes[JOYAXIS_Pitch] * keymove * scaleAdjust;
thisInput.fvel += mouseInput.Y * MOUSE_SCALE * m_forward;
thisInput.fvel += joyAxes[JOYAXIS_Pitch] * keymove * scaleAdjust;
}
// process movement input.
@ -150,7 +163,9 @@ void GameInput::processMovement(PlayerAngles* const plrAngles, const float scale
// process RR's drunk state.
if (isRR() && drink_amt >= 66 && drink_amt <= 87)
{
thisInput.svel += drink_amt & 1 ? -thisInput.fvel : thisInput.fvel;
}
// add collected input to game's local input accumulation packet.
inputBuffer.fvel = clamp(inputBuffer.fvel + thisInput.fvel, -(float)keymove, (float)keymove);
@ -187,21 +202,30 @@ void GameInput::processVehicle(PlayerAngles* const plrAngles, const float scaleA
const auto kbdForwards = buttonMap.ButtonDown(gamefunc_Move_Forward) || buttonMap.ButtonDown(gamefunc_Strafe);
const auto kbdBackward = buttonMap.ButtonDown(gamefunc_Move_Backward);
thisInput.fvel = kbdForwards - kbdBackward + joyAxes[JOYAXIS_Forward];
// This sync bit is the brake key.
if (buttonMap.ButtonDown(gamefunc_Run)) inputBuffer.actions |= SB_CROUCH;
}
if (canTurn)
{
// Keyboard turning.
const auto kbdLeft = buttonMap.ButtonDown(gamefunc_Turn_Left) || buttonMap.ButtonDown(gamefunc_Strafe_Left);
const auto kbdRight = buttonMap.ButtonDown(gamefunc_Turn_Right) || buttonMap.ButtonDown(gamefunc_Strafe_Right);
const auto kbdDir = kbdRight - kbdLeft;
// Input device turning.
const auto hidLeft = mouseInput.X < 0 || joyAxes[JOYAXIS_Yaw] > 0;
const auto hidRight = mouseInput.X > 0 || joyAxes[JOYAXIS_Yaw] < 0;
const auto kbdDir = kbdRight - kbdLeft;
// Velocity setup.
const auto turnVel = (!attenuate && (isTurboTurnTime() || hidLeft || hidRight)) ? (baseVel) : (baseVel * velScale);
const auto mouseVel = abs(turnVel * mouseInput.X * m_yaw) * (45.f / 2048.f) / scaleAdjust;
thisInput.avel += turnVel * -joyAxes[JOYAXIS_Yaw] + turnVel * kbdDir;
// Apply inputs.
thisInput.avel += ((mouseVel > 1) ? sqrtf(mouseVel) : mouseVel) * Sgn(turnVel) * Sgn(mouseInput.X) * Sgn(m_yaw);
thisInput.avel -= turnVel * joyAxes[JOYAXIS_Yaw];
thisInput.avel += turnVel * kbdDir;
thisInput.avel *= scaleAdjust;
if (kbdDir) updateTurnHeldAmt(scaleAdjust); else turnheldtime = 0;
}
@ -210,6 +234,7 @@ void GameInput::processVehicle(PlayerAngles* const plrAngles, const float scaleA
turnheldtime = 0;
}
// add collected input to game's local input accumulation packet.
inputBuffer.fvel = clamp(inputBuffer.fvel + thisInput.fvel, -1.00f, 1.00f);
inputBuffer.avel = clamp(inputBuffer.avel + thisInput.avel, -179.f, 179.f);

6
source/core/gameinput.h
View file

@ -17,7 +17,7 @@ class GameInput
};
static constexpr double YAW_TURNSPEEDS[3] = { 234.375 * (360. / 2048.), 890.625 * (360. / 2048.), 1548.75 * (360. / 2048.) };
static constexpr double YAW_PREAMBLESCALE = YAW_TURNSPEEDS[0] / YAW_TURNSPEEDS[1];
static constexpr float MOUSE_SCALE = (1.f / 16.f);
// Input received from the OS.
float joyAxes[NUM_JOYAXIS];
@ -68,7 +68,7 @@ public:
}
// Prototypes for large member functions.
void processMovement(PlayerAngles* const plrAngles, const float scaleAdjust, const int drink_amt = 0, const bool allowstrafe = true, const double turnscale = 1.);
void processMovement(PlayerAngles* const plrAngles, const float scaleAdjust, const int drink_amt = 0, const bool allowstrafe = true, const float turnscale = 1.f);
void processVehicle(PlayerAngles* const plrAngles, const float scaleAdjust, const float baseVel, const float velScale, const bool canMove, const bool canTurn, const bool attenuate);
void getInput(const double scaleAdjust, InputPacket* packet = nullptr);
};
@ -85,7 +85,7 @@ struct PlayerAngles
DAngle YawSpin;
friend FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerAngles& w, PlayerAngles* def);
friend void GameInput::processMovement(PlayerAngles* const plrAngles, const float scaleAdjust, const int drink_amt, const bool allowstrafe, const double turnscale);
friend void GameInput::processMovement(PlayerAngles* const plrAngles, const float scaleAdjust, const int drink_amt, const bool allowstrafe, const float turnscale);
friend void GameInput::processVehicle(PlayerAngles* const plrAngles, const float scaleAdjust, const float baseVel, const float velScale, const bool canMove, const bool canTurn, const bool attenuate);
// Prototypes.

2
source/games/sw/src/game.h
View file

@ -1892,7 +1892,7 @@ struct GameInterface : public ::GameInterface
void doPlayerMovement(const float scaleAdjust) override
{
const auto pp = &Player[myconnectindex];
gameInput.processMovement(&pp->Angles, scaleAdjust, 0, !pp->sop, pp->sop_control ? (3. / 1.40625) : 1.);
gameInput.processMovement(&pp->Angles, scaleAdjust, 0, !pp->sop, pp->sop_control ? (3.f / 1.40625f) : 1.f);
}