zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 23:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: Finalise cleanup from remaining code in getinput() to processWeapopn().

Browse source
This commit is contained in:
Mitchell Richters 2020-09-06 21:46:18 +10:00
parent e94bd9da04
commit dfc3a13428
1 changed files with 25 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
source/sw/src/input.cpp
View file

@ -76,7 +76,7 @@ enum
RUNTURN = (28), RUNTURN = (28),
PREAMBLETURN = 3, PREAMBLETURN = 3,
NORMALKEYMOVE = 35, NORMALKEYMOVE = 35,
MAXVEL = ((NORMALKEYMOVE * 2) + 10), MAXFVEL = ((NORMALKEYMOVE * 2) + 10),
MAXSVEL = ((NORMALKEYMOVE * 2) + 10), MAXSVEL = ((NORMALKEYMOVE * 2) + 10),
MAXANGVEL = 100, MAXANGVEL = 100,
MAXHORIZVEL = 128 MAXHORIZVEL = 128
@ -212,6 +212,10 @@ static void processWeapon(PLAYERp const pp)
static void processMovement(PLAYERp const pp, ControlInfo* const hidInput, bool const mouseaim) static void processMovement(PLAYERp const pp, ControlInfo* const hidInput, bool const mouseaim)
{ {
double const scaleAdjust = InputScale(); double const scaleAdjust = InputScale();
bool const strafeKey = buttonMap.ButtonDown(gamefunc_Strafe) && !pp->sop;
int32_t turnamount, keymove;
int32_t fvel = 0, svel = 0;
fixed_t q16avel = 0, q16horz = 0;
// If in 2D follow mode, scroll around using glob vars // If in 2D follow mode, scroll around using glob vars
// Tried calling this in domovethings, but key response it too poor, skips key presses // Tried calling this in domovethings, but key response it too poor, skips key presses
@ -219,57 +223,43 @@ static void processMovement(PLAYERp const pp, ControlInfo* const hidInput, bool
if (automapFollow && automapMode != am_off && pp == Player + myconnectindex && !Prediction) if (automapFollow && automapMode != am_off && pp == Player + myconnectindex && !Prediction)
MoveScrollMode2D(Player + myconnectindex, hidInput); MoveScrollMode2D(Player + myconnectindex, hidInput);
int32_t turnamount;
int32_t keymove;
if (loc.actions & SB_RUN) if (loc.actions & SB_RUN)
{ {
if (pp->sop_control) turnamount = pp->sop_control ? RUNTURN * 3 : RUNTURN;
turnamount = RUNTURN * 3;
else
turnamount = RUNTURN;
keymove = NORMALKEYMOVE << 1; keymove = NORMALKEYMOVE << 1;
} }
else else
{ {
if (pp->sop_control) turnamount = pp->sop_control ? NORMALTURN * 3 : NORMALTURN;
turnamount = NORMALTURN * 3;
else
turnamount = NORMALTURN;
keymove = NORMALKEYMOVE; keymove = NORMALKEYMOVE;
} }
int32_t svel = 0, vel = 0; if (strafeKey)
fixed_t q16horz = 0, q16angvel = 0;
if (buttonMap.ButtonDown(gamefunc_Strafe) && !pp->sop)
{ {
svel -= (hidInput->mousex * inputScale) * 4.f; svel -= (hidInput->mousex * inputScale) * 4.f;
svel -= hidInput->dyaw * keymove; svel -= hidInput->dyaw * keymove;
} }
else else
{ {
q16angvel += FloatToFixed((hidInput->mousex + (scaleAdjust * hidInput->dyaw)) * inputScale); q16avel += FloatToFixed((hidInput->mousex + (scaleAdjust * hidInput->dyaw)) * inputScale);
} }
if (mouseaim) if (mouseaim)
q16horz -= FloatToFixed(hidInput->mousey * inputScale); q16horz -= FloatToFixed(hidInput->mousey * inputScale);
else else
vel -= (hidInput->mousey * inputScale) * 8.f; fvel -= (hidInput->mousey * inputScale) * 8.f;
if (in_mouseflip) if (in_mouseflip)
q16horz = -q16horz; q16horz = -q16horz;
q16horz -= FloatToFixed(scaleAdjust * (hidInput->dpitch * inputScale)); q16horz -= FloatToFixed(scaleAdjust * (hidInput->dpitch * inputScale));
svel -= hidInput->dx * keymove; svel -= hidInput->dx * keymove;
vel -= hidInput->dz * keymove; fvel -= hidInput->dz * keymove;
if (buttonMap.ButtonDown(gamefunc_Strafe) && !pp->sop) if (strafeKey)
{ {
if (buttonMap.ButtonDown(gamefunc_Turn_Left)) if (buttonMap.ButtonDown(gamefunc_Turn_Left))
svel -= -keymove; svel += keymove;
if (buttonMap.ButtonDown(gamefunc_Turn_Right)) if (buttonMap.ButtonDown(gamefunc_Turn_Right))
svel -= keymove; svel -= keymove;
} }
@ -278,28 +268,12 @@ static void processMovement(PLAYERp const pp, ControlInfo* const hidInput, bool
if (buttonMap.ButtonDown(gamefunc_Turn_Left) || (buttonMap.ButtonDown(gamefunc_Strafe_Left) && pp->sop)) if (buttonMap.ButtonDown(gamefunc_Turn_Left) || (buttonMap.ButtonDown(gamefunc_Strafe_Left) && pp->sop))
{ {
turnheldtime += synctics; turnheldtime += synctics;
if (cl_syncinput) q16avel -= FloatToFixed(scaleAdjust * (turnheldtime >= TURBOTURNTIME ? turnamount : PREAMBLETURN));
{
if (turnheldtime >= TURBOTURNTIME)
q16angvel -= IntToFixed(turnamount);
else
q16angvel -= IntToFixed(PREAMBLETURN);
}
else
q16angvel -= FloatToFixed(scaleAdjust * (turnheldtime >= TURBOTURNTIME ? turnamount : PREAMBLETURN));
} }
else if (buttonMap.ButtonDown(gamefunc_Turn_Right) || (buttonMap.ButtonDown(gamefunc_Strafe_Right) && pp->sop)) else if (buttonMap.ButtonDown(gamefunc_Turn_Right) || (buttonMap.ButtonDown(gamefunc_Strafe_Right) && pp->sop))
{ {
turnheldtime += synctics; turnheldtime += synctics;
if (cl_syncinput) q16avel += FloatToFixed(scaleAdjust * (turnheldtime >= TURBOTURNTIME ? turnamount : PREAMBLETURN));
{
if (turnheldtime >= TURBOTURNTIME)
q16angvel += IntToFixed(turnamount);
else
q16angvel += IntToFixed(PREAMBLETURN);
}
else
q16angvel += FloatToFixed(scaleAdjust * (turnheldtime >= TURBOTURNTIME ? turnamount : PREAMBLETURN));
} }
else else
{ {
@ -311,42 +285,32 @@ static void processMovement(PLAYERp const pp, ControlInfo* const hidInput, bool
svel += keymove; svel += keymove;
if (buttonMap.ButtonDown(gamefunc_Strafe_Right) && !pp->sop) if (buttonMap.ButtonDown(gamefunc_Strafe_Right) && !pp->sop)
svel += -keymove; svel -= keymove;
if (buttonMap.ButtonDown(gamefunc_Move_Forward)) if (buttonMap.ButtonDown(gamefunc_Move_Forward))
{ fvel += keymove;
vel += keymove;
}
if (buttonMap.ButtonDown(gamefunc_Move_Backward)) if (buttonMap.ButtonDown(gamefunc_Move_Backward))
vel += -keymove; fvel -= keymove;
q16angvel = clamp(q16angvel, -IntToFixed(MAXANGVEL), IntToFixed(MAXANGVEL)); if (!cl_syncinput)
q16horz = clamp(q16horz, -IntToFixed(MAXHORIZVEL), IntToFixed(MAXHORIZVEL));
void DoPlayerTeleportPause(PLAYERp pp);
if (cl_syncinput)
{ {
q16angvel = q16angvel; fixed_t const prevcamq16ang = pp->camq16ang, prevcamq16horiz = pp->camq16horiz;
q16horz = q16horz;
}
else
{
fixed_t prevcamq16ang = pp->camq16ang, prevcamq16horiz = pp->camq16horiz;
if (TEST(pp->Flags2, PF2_INPUT_CAN_TURN)) if (TEST(pp->Flags2, PF2_INPUT_CAN_TURN))
DoPlayerTurn(pp, &pp->camq16ang, q16angvel, scaleAdjust); DoPlayerTurn(pp, &pp->camq16ang, q16avel, scaleAdjust);
if (TEST(pp->Flags2, PF2_INPUT_CAN_AIM)) if (TEST(pp->Flags2, PF2_INPUT_CAN_AIM))
DoPlayerHorizon(pp, &pp->camq16horiz, q16horz, scaleAdjust); DoPlayerHorizon(pp, &pp->camq16horiz, q16horz, scaleAdjust);
pp->oq16ang += pp->camq16ang - prevcamq16ang; pp->oq16ang += pp->camq16ang - prevcamq16ang;
pp->oq16horiz += pp->camq16horiz - prevcamq16horiz; pp->oq16horiz += pp->camq16horiz - prevcamq16horiz;
} }
loc.fvel = clamp(loc.fvel + vel, -MAXVEL, MAXVEL); loc.fvel = clamp(loc.fvel + fvel, -MAXFVEL, MAXFVEL);
loc.svel = clamp(loc.svel + svel, -MAXSVEL, MAXSVEL); loc.svel = clamp(loc.svel + svel, -MAXSVEL, MAXSVEL);
loc.q16avel += q16angvel; loc.q16avel = clamp(loc.q16avel + q16avel, -IntToFixed(MAXANGVEL), IntToFixed(MAXANGVEL));
loc.q16horz += q16horz; loc.q16horz = clamp(loc.q16horz + q16horz, -IntToFixed(MAXHORIZVEL), IntToFixed(MAXHORIZVEL));
} }
void GameInterface::GetInput(InputPacket *packet, ControlInfo* const hidInput) void GameInterface::GetInput(InputPacket *packet, ControlInfo* const hidInput)