zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- binaryangle.h: Minor clean up of PlayerHorizon/PlayerAngle structs.

Browse source 
* Sync PlayerHorizon's `settarget()` with changes to PlayerAngle's from 19d9e1a947.
* For each struct's `addadjustment()`, multiply value by unit there rather than always within `processhelpers()`.
* Properly use `xs_CRoundToUInt()` within PlayerAngle's `processhelpers()` method instead of the signed version.
* Use `abs()` within PlayerAngle's `processhelpers()` like PlayerHorizon's.
This commit is contained in:
Mitchell Richters 2020-10-18 22:00:39 +11:00
parent 19d9e1a947
commit 4e07942cff
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
source/core/gameinput.h
View file

@ -11,8 +11,7 @@ fixed_t getincangleq16(fixed_t c, fixed_t n);
struct PlayerHorizon struct PlayerHorizon
{ {
fixedhoriz horiz, ohoriz, horizoff, ohorizoff; fixedhoriz horiz, ohoriz, horizoff, ohorizoff;
fixed_t target; double adjustment, target;
double adjustment;
void backup() void backup()
{ {
@ -30,7 +29,7 @@ struct PlayerHorizon
{ {
if (!cl_syncinput) if (!cl_syncinput)
{ {
adjustment += value; adjustment += value * FRACUNIT;
} }
else else
{ {
@ -47,7 +46,7 @@ struct PlayerHorizon
{ {
if (!cl_syncinput) if (!cl_syncinput)
{ {
target = FloatToFixed(value); target = value * FRACUNIT;
if (target == 0) target += 1; if (target == 0) target += 1;
} }
else else
@ -71,7 +70,7 @@ struct PlayerHorizon
} }
else if (adjustment) else if (adjustment)
{ {
horiz += q16horiz(FloatToFixed(scaleAdjust * adjustment)); horiz += q16horiz(xs_CRoundToInt(scaleAdjust * adjustment));
} }
} }
@ -82,7 +81,7 @@ struct PlayerHorizon
fixedhoriz interpolatedsum(double const smoothratio) fixedhoriz interpolatedsum(double const smoothratio)
{ {
double const ratio = smoothratio / FRACUNIT; double const ratio = smoothratio * (1. / FRACUNIT);
fixed_t const prev = (ohoriz + ohorizoff).asq16(); fixed_t const prev = (ohoriz + ohorizoff).asq16();
fixed_t const curr = (horiz + horizoff).asq16(); fixed_t const curr = (horiz + horizoff).asq16();
return q16horiz(prev + xs_CRoundToInt(ratio * (curr - prev))); return q16horiz(prev + xs_CRoundToInt(ratio * (curr - prev)));
@ -113,7 +112,7 @@ struct PlayerAngle
{ {
if (!cl_syncinput) if (!cl_syncinput)
{ {
adjustment += value; adjustment += value * BAMUNIT;
} }
else else
{ {
@ -144,9 +143,9 @@ struct PlayerAngle
{ {
if (target) if (target)
{ {
ang = bamang(ang.asbam() + xs_CRoundToInt(scaleAdjust * (target - ang.asbam()))); ang += bamang(xs_CRoundToUInt(scaleAdjust * (target - ang.asbam())));
if (ang.asbam() - target < BAMUNIT) if (abs(ang.asbam() - target) < BAMUNIT)
{ {
ang = bamang(target); ang = bamang(target);
target = 0; target = 0;
@ -154,7 +153,7 @@ struct PlayerAngle
} }
else if (adjustment) else if (adjustment)
{ {
ang += bamang(xs_CRoundToUInt(scaleAdjust * adjustment * BAMUNIT)); ang += bamang(xs_CRoundToUInt(scaleAdjust * adjustment));
} }
} }