2020-10-11 14:33:43 +00:00
|
|
|
#pragma once
|
|
|
|
|
|
|
|
#include "m_fixed.h"
|
|
|
|
#include "binaryangle.h"
|
|
|
|
#include "gamecvars.h"
|
|
|
|
#include "packet.h"
|
|
|
|
|
|
|
|
int getincangle(int c, int n);
|
|
|
|
fixed_t getincangleq16(fixed_t c, fixed_t n);
|
|
|
|
|
|
|
|
struct PlayerHorizon
|
|
|
|
{
|
|
|
|
fixedhoriz horiz, ohoriz, horizoff, ohorizoff;
|
2020-10-18 11:00:39 +00:00
|
|
|
double adjustment, target;
|
2020-10-11 14:33:43 +00:00
|
|
|
|
|
|
|
void backup()
|
|
|
|
{
|
|
|
|
ohoriz = horiz;
|
|
|
|
ohorizoff = horizoff;
|
|
|
|
}
|
|
|
|
|
|
|
|
void restore()
|
|
|
|
{
|
|
|
|
horiz = ohoriz;
|
|
|
|
horizoff = ohorizoff;
|
|
|
|
}
|
|
|
|
|
|
|
|
void addadjustment(double value)
|
|
|
|
{
|
|
|
|
if (!cl_syncinput)
|
|
|
|
{
|
2020-10-18 11:00:39 +00:00
|
|
|
adjustment += value * FRACUNIT;
|
2020-10-11 14:33:43 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
horiz += q16horiz(FloatToFixed(value));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void resetadjustment()
|
|
|
|
{
|
|
|
|
adjustment = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void settarget(double value, bool backup = false)
|
|
|
|
{
|
|
|
|
if (!cl_syncinput)
|
|
|
|
{
|
2020-10-18 11:00:39 +00:00
|
|
|
target = value * FRACUNIT;
|
2020-10-11 14:33:43 +00:00
|
|
|
if (target == 0) target += 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
horiz = q16horiz(FloatToFixed(value));
|
|
|
|
if (backup) ohoriz = horiz;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void processhelpers(double const scaleAdjust)
|
|
|
|
{
|
|
|
|
if (target)
|
|
|
|
{
|
|
|
|
horiz += q16horiz(xs_CRoundToInt(scaleAdjust * (target - horiz.asq16())));
|
|
|
|
|
|
|
|
if (abs(horiz.asq16() - target) < FRACUNIT)
|
|
|
|
{
|
|
|
|
horiz = q16horiz(target);
|
|
|
|
target = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (adjustment)
|
|
|
|
{
|
2020-10-18 11:00:39 +00:00
|
|
|
horiz += q16horiz(xs_CRoundToInt(scaleAdjust * adjustment));
|
2020-10-11 14:33:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-10-18 11:43:42 +00:00
|
|
|
fixedhoriz osum()
|
|
|
|
{
|
|
|
|
return ohoriz + ohorizoff;
|
|
|
|
}
|
|
|
|
|
2020-10-11 14:33:43 +00:00
|
|
|
fixedhoriz sum()
|
|
|
|
{
|
|
|
|
return horiz + horizoff;
|
|
|
|
}
|
|
|
|
|
|
|
|
fixedhoriz interpolatedsum(double const smoothratio)
|
|
|
|
{
|
2020-10-18 11:00:39 +00:00
|
|
|
double const ratio = smoothratio * (1. / FRACUNIT);
|
2020-10-18 11:43:42 +00:00
|
|
|
fixed_t const prev = osum().asq16();
|
|
|
|
fixed_t const curr = sum().asq16();
|
2020-10-11 14:33:43 +00:00
|
|
|
return q16horiz(prev + xs_CRoundToInt(ratio * (curr - prev)));
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
struct PlayerAngle
|
|
|
|
{
|
|
|
|
binangle ang, oang;
|
|
|
|
lookangle look_ang, olook_ang, rotscrnang, orotscrnang, spin;
|
2020-10-18 10:31:36 +00:00
|
|
|
double adjustment, target;
|
2020-10-11 14:33:43 +00:00
|
|
|
|
|
|
|
void backup()
|
|
|
|
{
|
|
|
|
oang = ang;
|
|
|
|
olook_ang = look_ang;
|
|
|
|
orotscrnang = rotscrnang;
|
|
|
|
}
|
|
|
|
|
|
|
|
void restore()
|
|
|
|
{
|
|
|
|
ang = oang;
|
|
|
|
look_ang = olook_ang;
|
|
|
|
rotscrnang = orotscrnang;
|
|
|
|
}
|
|
|
|
|
|
|
|
void addadjustment(double value)
|
|
|
|
{
|
|
|
|
if (!cl_syncinput)
|
|
|
|
{
|
2020-10-18 11:00:39 +00:00
|
|
|
adjustment += value * BAMUNIT;
|
2020-10-11 14:33:43 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ang += bamang(xs_CRoundToUInt(value * BAMUNIT));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void resetadjustment()
|
|
|
|
{
|
|
|
|
adjustment = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void settarget(double value, bool backup = false)
|
|
|
|
{
|
|
|
|
if (!cl_syncinput)
|
|
|
|
{
|
2020-10-18 10:31:36 +00:00
|
|
|
target = value * BAMUNIT;
|
2020-10-12 03:51:53 +00:00
|
|
|
if (target == 0) target += 1;
|
2020-10-11 14:33:43 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ang = bamang(xs_CRoundToUInt(value * BAMUNIT));
|
|
|
|
if (backup) oang = ang;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void processhelpers(double const scaleAdjust)
|
|
|
|
{
|
|
|
|
if (target)
|
|
|
|
{
|
2020-10-18 11:00:39 +00:00
|
|
|
ang += bamang(xs_CRoundToUInt(scaleAdjust * (target - ang.asbam())));
|
2020-10-11 14:33:43 +00:00
|
|
|
|
2020-10-18 11:00:39 +00:00
|
|
|
if (abs(ang.asbam() - target) < BAMUNIT)
|
2020-10-11 14:33:43 +00:00
|
|
|
{
|
|
|
|
ang = bamang(target);
|
|
|
|
target = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (adjustment)
|
|
|
|
{
|
2020-10-18 11:00:39 +00:00
|
|
|
ang += bamang(xs_CRoundToUInt(scaleAdjust * adjustment));
|
2020-10-11 14:33:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-10-18 11:43:42 +00:00
|
|
|
binangle osum()
|
|
|
|
{
|
|
|
|
return bamang(oang.asbam() + olook_ang.asbam());
|
|
|
|
}
|
|
|
|
|
2020-10-11 14:33:43 +00:00
|
|
|
binangle sum()
|
|
|
|
{
|
|
|
|
return bamang(ang.asbam() + look_ang.asbam());
|
|
|
|
}
|
|
|
|
|
|
|
|
binangle interpolatedsum(double const smoothratio)
|
|
|
|
{
|
2020-10-18 11:05:21 +00:00
|
|
|
double const ratio = smoothratio * (1. / FRACUNIT);
|
2020-10-12 05:28:05 +00:00
|
|
|
uint32_t const dang = UINT32_MAX >> 1;
|
2020-10-18 11:43:42 +00:00
|
|
|
int64_t const prev = osum().asbam();
|
|
|
|
int64_t const curr = sum().asbam();
|
2020-10-11 14:33:43 +00:00
|
|
|
return bamang(prev + xs_CRoundToUInt(ratio * (((curr + dang - prev) & 0xFFFFFFFF) - dang)));
|
|
|
|
}
|
|
|
|
|
|
|
|
lookangle interpolatedrotscrn(double const smoothratio)
|
|
|
|
{
|
|
|
|
double const ratio = smoothratio / FRACUNIT;
|
|
|
|
return bamlook(orotscrnang.asbam() + xs_CRoundToInt(ratio * (rotscrnang.asbam() - orotscrnang.asbam())));
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2020-10-11 14:55:12 +00:00
|
|
|
class FSerializer;
|
|
|
|
FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerAngle& w, PlayerAngle* def);
|
|
|
|
FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerHorizon& w, PlayerHorizon* def);
|
|
|
|
|
2020-10-11 14:33:43 +00:00
|
|
|
void processMovement(InputPacket* currInput, InputPacket* inputBuffer, ControlInfo* const hidInput, double const scaleAdjust, int const drink_amt = 0, bool const allowstrafe = true, double const turnscale = 1);
|
|
|
|
void sethorizon(fixedhoriz* horiz, float const horz, ESyncBits* actions, double const scaleAdjust);
|
|
|
|
void applylook(PlayerAngle* angle, float const avel, ESyncBits* actions, double const scaleAdjust, bool const crouching);
|
|
|
|
|