zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-30 20:51:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Refactor the pitch tilting/panning code.

Browse source 
* Made it work on the player's view pitch and not their actual pitch.
* Drastically simplifies implementation and allows its use even with mouse aiming.
This commit is contained in:
Mitchell Richters 2023-03-25 16:52:04 +11:00
parent 7ecf6b26c3
commit 79f7ca976b
3 changed files with 7 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
source/games/exhumed/src/player.cpp
View file

@ -368,7 +368,6 @@ void RestartPlayer(int nPlayer)
if (nPlayer == nLocalPlayer)
{
RestoreGreenPal();
plr->bPlayerPan = plr->bLockPan = false;
}
plr->ototalvel = plr->totalvel = 0;
@ -1273,7 +1272,7 @@ static void doPlayerFloorDamage(Player* const pPlayer)
const auto pPlayerActor = pPlayer->pActor;
pPlayer->nThrust /= 2;
if (pPlayer->nPlayer == nLocalPlayer && abs(pPlayerActor->vel.Z) > 2 && !pPlayerActor->spr.Angles.Pitch.Sgn() && cl_slopetilting)
if (pPlayer->nPlayer == nLocalPlayer && abs(pPlayerActor->vel.Z) > 2)
pPlayer->nDestVertPan = nullAngle;
if (pPlayerActor->vel.Z >= 6500 / 256.)
@ -1426,11 +1425,7 @@ static bool doPlayerMovement(Player* const pPlayer)
}
}
if (!pPlayer->bPlayerPan && !pPlayer->bLockPan)
{
pPlayer->nDestVertPan = maphoriz((pPlayerActor->spr.pos.Z - spr_pos.Z) * 2.);
}
pPlayer->nDestVertPan = maphoriz((pPlayerActor->spr.pos.Z - spr_pos.Z) * 2.);
pPlayer->ototalvel = pPlayer->totalvel;
pPlayer->totalvel = int((spr_pos.XY() - pPlayerActor->spr.pos.XY()).Length() * worldtoint);
@ -1637,28 +1632,14 @@ static void doPlayerPitch(Player* const pPlayer)
pPlayer->Angles.doPitchKeys(pInput);
if (pInput->actions & (SB_AIM_UP | SB_AIM_DOWN) || pInput->horz)
if (cl_slopetilting)
{
pPlayer->nDestVertPan = pPlayerActor->spr.Angles.Pitch;
pPlayer->bPlayerPan = pPlayer->bLockPan = true;
const double nVertPan = deltaangle(pPlayer->Angles.ViewAngles.Pitch, pPlayer->nDestVertPan).Tan() * 32.;
pPlayer->Angles.ViewAngles.Pitch += maphoriz(abs(nVertPan) >= 4 ? Sgn(nVertPan) * 4. : nVertPan * 2.);
}
else if (pInput->actions & (SB_LOOK_UP | SB_LOOK_DOWN | SB_CENTERVIEW))
else
{
pPlayer->nDestVertPan = pPlayerActor->spr.Angles.Pitch;
pPlayer->bPlayerPan = pPlayer->bLockPan = false;
}
if (pPlayer->totalvel > 20)
{
pPlayer->bPlayerPan = false;
}
if (cl_slopetilting && !pPlayer->bPlayerPan && !pPlayer->bLockPan)
{
if (double nVertPan = deltaangle(pPlayerActor->spr.Angles.Pitch, pPlayer->nDestVertPan).Tan() * 32.)
{
pPlayerActor->spr.Angles.Pitch += maphoriz(abs(nVertPan) >= 4 ? clamp(nVertPan, -4., 4.) : nVertPan * 2.);
}
pPlayer->Angles.ViewAngles.Pitch = nullAngle;
}
}
@ -1990,8 +1971,6 @@ DEFINE_FIELD_X(ExhumedPlayer, Player, nNextWeapon);
DEFINE_FIELD_X(ExhumedPlayer, Player, nState);
DEFINE_FIELD_X(ExhumedPlayer, Player, nLastWeapon);
DEFINE_FIELD_X(ExhumedPlayer, Player, nRun);
DEFINE_FIELD_X(ExhumedPlayer, Player, bPlayerPan);
DEFINE_FIELD_X(ExhumedPlayer, Player, bLockPan);
DEFINE_ACTION_FUNCTION(_Exhumed, GetViewPlayer)
{

1
source/games/exhumed/src/player.h
View file

@ -76,7 +76,6 @@ struct Player
int16_t nState;
int16_t nLastWeapon;
int16_t nRun;
bool bPlayerPan, bLockPan;
DAngle nDestVertPan;
InputPacket input;

1
wadsrc/static/zscript/games/exhumed/exhumedgame.zs
View file

@ -61,7 +61,6 @@ struct ExhumedPlayer native
native int16 nLastWeapon;
native int16 bIsFiring;
native int16 nRun;
native bool bPlayerPan, bLockPan;
//fixedhoriz nDestVertPan;
//PlayerHorizon horizon;