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

- PlayerHorizon: Replicate changes to settarget() and processhelpers() methods from 39fe9efaff.

Browse source
This commit is contained in:
Mitchell Richters 2021-03-31 19:44:50 +11:00
parent 39fe9efaff
commit bf2d8078a4
2 changed files with 40 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/core/binaryangle.h
View file

@ -398,6 +398,7 @@ class fixedhoriz
friend constexpr fixedhoriz q16horiz(fixed_t v); friend constexpr fixedhoriz q16horiz(fixed_t v);
friend constexpr fixedhoriz buildhoriz(int v); friend constexpr fixedhoriz buildhoriz(int v);
friend constexpr fixedhoriz buildfhoriz(double v);
friend fixedhoriz pitchhoriz(double v); friend fixedhoriz pitchhoriz(double v);
friend fixedhoriz bamhoriz(int32_t v); friend fixedhoriz bamhoriz(int32_t v);
@ -496,6 +497,7 @@ public:
inline constexpr fixedhoriz q16horiz(fixed_t v) { return fixedhoriz(v); } inline constexpr fixedhoriz q16horiz(fixed_t v) { return fixedhoriz(v); }
inline constexpr fixedhoriz buildhoriz(int v) { return fixedhoriz(IntToFixed(v)); } inline constexpr fixedhoriz buildhoriz(int v) { return fixedhoriz(IntToFixed(v)); }
inline constexpr fixedhoriz buildfhoriz(double v) { return fixedhoriz(FloatToFixed(v)); }
inline fixedhoriz pitchhoriz(double v) { return fixedhoriz(PitchToHoriz(v)); } inline fixedhoriz pitchhoriz(double v) { return fixedhoriz(PitchToHoriz(v)); }
inline fixedhoriz bamhoriz(int32_t v) { return pitchhoriz(BAMToPitch(v)); } inline fixedhoriz bamhoriz(int32_t v) { return pitchhoriz(BAMToPitch(v)); }

48
source/core/gameinput.h
View file

@ -12,8 +12,8 @@ lookangle getincanglebam(binangle a, binangle na);
struct PlayerHorizon struct PlayerHorizon
{ {
fixedhoriz horiz, ohoriz, horizoff, ohorizoff; fixedhoriz horiz, ohoriz, horizoff, ohorizoff, target;
double adjustment, target; double adjustment;
void backup() void backup()
{ {
@ -44,30 +44,58 @@ struct PlayerHorizon
adjustment = 0; adjustment = 0;
} }
void settarget(int value, bool backup = false)
{
if (!SyncInput() && !backup)
{
target = buildhoriz(value);
if (target.asq16() == 0) target = q16horiz(1);
}
else
{
horiz = buildhoriz(value);
if (backup) ohoriz = horiz;
}
}
void settarget(double value, bool backup = false) void settarget(double value, bool backup = false)
{ {
if (!SyncInput() && !backup) if (!SyncInput() && !backup)
{ {
target = value * FRACUNIT; target = buildfhoriz(value);
if (target == 0) target += 1; if (target.asq16() == 0) target = q16horiz(1);
} }
else else
{ {
horiz = q16horiz(FloatToFixed(value)); horiz = buildfhoriz(value);
if (backup) ohoriz = horiz;
}
}
void settarget(fixedhoriz value, bool backup = false)
{
if (!SyncInput() && !backup)
{
target = value;
if (target.asq16() == 0) target = q16horiz(1);
}
else
{
horiz = value;
if (backup) ohoriz = horiz; if (backup) ohoriz = horiz;
} }
} }
void processhelpers(double const scaleAdjust) void processhelpers(double const scaleAdjust)
{ {
if (target) if (target.asq16())
{ {
horiz += q16horiz(xs_CRoundToInt(scaleAdjust * (target - horiz.asq16()))); horiz += q16horiz(xs_CRoundToInt(scaleAdjust * (target - horiz).asq16()));
if (abs(horiz.asq16() - target) < FRACUNIT) if (abs((horiz - target).asq16()) < FRACUNIT)
{ {
horiz = q16horiz(target); horiz = target;
target = 0; target = q16horiz(0);
} }
} }
else if (adjustment) else if (adjustment)