teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-19 07:31:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- gameinput.cpp/h: Consolidate all the return to zero code for angles and horizons into class members, using technique from horizoff as basis.

Browse source
This commit is contained in:
Mitch Richters 2021-11-07 11:37:12 +11:00
parent 9a1c80c464
commit 72531e61db
2 changed files with 22 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
source/core/gameinput.cpp
View file

@ -320,14 +320,8 @@ void PlayerHorizon::applyinput(float const horz, ESyncBits* actions, double cons
// return to center if conditions met.
if ((*actions & SB_CENTERVIEW) && !(*actions & (SB_LOOK_UP|SB_LOOK_DOWN)) && horiz.asq16())
{
// move horiz back to 0
horiz -= getscaledhoriz(CNTRSPEED, scaleAdjust, &horiz);
if (abs(horiz.asq16()) < (FRACUNIT >> 2))
{
// not looking anymore because horiz is back at 0
horiz = q16horiz(0);
*actions &= ~SB_CENTERVIEW;
}
scaletozero(horiz, CNTRSPEED, scaleAdjust);
if (!horiz.asq16()) *actions &= ~SB_CENTERVIEW;
}
}
else
@ -374,20 +368,9 @@ enum
void PlayerAngle::applyinput(float const avel, ESyncBits* actions, double const scaleAdjust)
{
if (rotscrnang.asbam())
{
// return rotscrnang to 0
auto sgn = Sgn(rotscrnang.signedbam());
rotscrnang -= getscaledangle(LOOKROTRETBASE, scaleAdjust, &rotscrnang, sgn);
if (sgn != Sgn(rotscrnang.signedbam())) rotscrnang = bamang(0);
}
if (look_ang.asbam())
{
// return look_ang to 0
look_ang -= getscaledangle(+LOOKROTRETBASE * 0.5, scaleAdjust, &look_ang);
if (abs(look_ang.signedbam()) < (BAMUNIT >> 2)) look_ang = bamang(0);
}
// Process angle return to zeros.
if (rotscrnang.asbam()) scaletozero(rotscrnang, LOOKROTRETBASE, scaleAdjust);
if (look_ang.asbam()) scaletozero(look_ang, +LOOKROTRETBASE * 0.5, scaleAdjust);
// Process keyboard input.
auto doLookKeys = [&](ESyncBits_ const key, double const direction)
@ -501,16 +484,15 @@ void PlayerHorizon::calcviewpitch(vec2_t const pos, binangle const ang, bool con
{
// tilt when climbing but you can't even really tell it.
if (horizoff.asq16() < IntToFixed(100))
{ auto temphorizoff = buildhoriz(100) - horizoff;
{
auto temphorizoff = buildhoriz(100) - horizoff;
horizoff += getscaledhoriz(4.375, scaleAdjust, &temphorizoff, 1.);
}
}
else if (horizoff.asq16())
{
// Make horizoff grow towards 0 since horizoff is not modified when you're not on a slope.
auto sgn = Sgn(horizoff.asq16());
horizoff -= getscaledhoriz(4.375, scaleAdjust, &horizoff, sgn);
if (sgn != Sgn(horizoff.asq16())) horizoff = q16horiz(0);
scaletozero(horizoff, 4.375, scaleAdjust, Sgn(horizoff.asq16()));
}
}
}

16
source/core/gameinput.h
View file

@ -70,11 +70,17 @@ struct PlayerHorizon
// Draw code helpers.
double horizsumfrac(double const smoothratio) { return (!SyncInput() ? sum() : interpolatedsum(smoothratio)).asbuildf() * (1. / 16.); }
// Ticrate scale helper.
// Ticrate scale helpers.
fixedhoriz getscaledhoriz(double const value, double const scaleAdjust = 1., fixedhoriz* const object = nullptr, double const push = 0.)
{
return buildfhoriz(scaleAdjust * (((object ? object->asbuildf() : 1.) * getTicrateScale(value)) + push));
}
void scaletozero(fixedhoriz& object, double const value, double const scaleAdjust, double const push = 0.)
{
auto sgn = Sgn(object.asq16());
object -= getscaledhoriz(value, scaleAdjust, &object, push == 0 ? sgn * (1. / 3.) : push);
if (sgn != Sgn(object.asq16())) object = q16horiz(0);
}
// Ticrate playsim adjustment processor.
void processhelpers(double const scaleAdjust)
@ -181,11 +187,17 @@ struct PlayerAngle
double look_anghalf(double const smoothratio) { return (!SyncInput() ? look_ang : interpolatedlookang(smoothratio)).signedbuildf() * 0.5; }
double looking_arc(double const smoothratio) { return fabs((!SyncInput() ? look_ang : interpolatedlookang(smoothratio)).signedbuildf()) * (1. / 9.); }
// Ticrate scale helper.
// Ticrate scale helpers.
binangle getscaledangle(double const value, double const scaleAdjust = 1., binangle* const object = nullptr, double const push = 0.)
{
return buildfang(scaleAdjust * (((object ? object->signedbuildf() : 1.) * getTicrateScale(value)) + push));
}
void scaletozero(binangle& object, double const value, double const scaleAdjust, double const push = 0.)
{
auto sgn = Sgn(object.signedbam());
object -= getscaledangle(value, scaleAdjust, &object, push == 0 ? sgn * (1. / 3.) : push);
if (sgn != Sgn(object.signedbam())) object = bamang(0);
}
// Ticrate playsim adjustment processor.
void processhelpers(double const scaleAdjust)