mirror of
https://github.com/DrBeef/Raze.git
synced 2024-11-29 23:42:33 +00:00
8bcbc1b892
* Intended to make the look left/right keys better, but doesn't work properly for weapons made up of layered parts of varying sizes. * Fixes #879.
86 lines
3 KiB
C++
86 lines
3 KiB
C++
#pragma once
|
|
|
|
#include "serializer.h"
|
|
#include "gamefuncs.h"
|
|
|
|
struct PlayerAngles
|
|
{
|
|
// Player viewing angles, separate from the camera.
|
|
DRotator PrevViewAngles, ViewAngles;
|
|
|
|
// Player camera angles, not for direct manipulation within the playsim.
|
|
DRotator RenderAngles;
|
|
|
|
// Holder of current yaw spin state for the 180 degree turn.
|
|
DAngle YawSpin;
|
|
|
|
friend FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerAngles& w, PlayerAngles* def);
|
|
|
|
// Prototypes.
|
|
void doPitchKeys(InputPacket* const input);
|
|
void doYawKeys(InputPacket* const input);
|
|
void doViewPitch(const bool canslopetilt, const bool climbing = false);
|
|
void doViewYaw(InputPacket* const input);
|
|
|
|
// General methods.
|
|
void initialize(DCoreActor* const actor, const DAngle viewyaw = nullAngle)
|
|
{
|
|
if (pActor = actor) RenderAngles = PrevLerpAngles = pActor->spr.Angles;
|
|
PrevViewAngles.Yaw = ViewAngles.Yaw = viewyaw;
|
|
}
|
|
DAngle getPitchWithView()
|
|
{
|
|
return ClampViewPitch(pActor->spr.Angles.Pitch + ViewAngles.Pitch);
|
|
}
|
|
|
|
// Render angle functions.
|
|
DRotator getRenderAngles(const double interpfrac)
|
|
{
|
|
// Get angles and return with clamped off pitch.
|
|
auto angles = RenderAngles + interpolatedvalue(PrevViewAngles, ViewAngles, interpfrac);
|
|
angles.Pitch = ClampViewPitch(angles.Pitch);
|
|
return angles;
|
|
}
|
|
void updateRenderAngles(const double interpfrac)
|
|
{
|
|
// Apply the current interpolated angle state to the render angles.
|
|
const auto lerpAngles = interpolatedvalue(pActor->PrevAngles, pActor->spr.Angles, interpfrac);
|
|
RenderAngles += lerpAngles - PrevLerpAngles;
|
|
PrevLerpAngles = lerpAngles;
|
|
}
|
|
void resetRenderAngles()
|
|
{
|
|
// Apply any last remaining ticrate angle updates and reset variables.
|
|
RenderAngles += pActor->spr.Angles - PrevLerpAngles;
|
|
PrevLerpAngles = pActor->spr.Angles = RenderAngles;
|
|
PrevViewAngles = ViewAngles;
|
|
}
|
|
|
|
// Draw code helpers.
|
|
auto getCrosshairOffsets(const double interpfrac)
|
|
{
|
|
// Set up angles and return as pair with roll as the 2nd object since all callers inevitably need it.
|
|
const auto viewAngles = interpolatedvalue(PrevViewAngles, ViewAngles, interpfrac);
|
|
return std::make_pair(DVector2(160, 120 * -viewAngles.Roll.Tan()) * -viewAngles.Yaw.Tan() / tan(r_fov * pi::pi() / 360.), viewAngles.Roll);
|
|
}
|
|
auto getWeaponOffsets(const double interpfrac)
|
|
{
|
|
// Push the Y down a bit since the weapon is at the edge of the screen. Also null roll for now.
|
|
auto offsets = getCrosshairOffsets(interpfrac); offsets.first.Y *= 4.; offsets.second = nullAngle;
|
|
return offsets;
|
|
}
|
|
|
|
private:
|
|
// Private data which should never be accessed publically.
|
|
DRotator PrevLerpAngles;
|
|
DCoreActor* pActor;
|
|
};
|
|
|
|
class FSerializer;
|
|
FSerializer& Serialize(FSerializer& arc, const char* keyname, PlayerAngles& w, PlayerAngles* def);
|
|
|
|
|
|
void updateTurnHeldAmt(const double scaleAdjust);
|
|
bool isTurboTurnTime();
|
|
void resetTurnHeldAmt();
|
|
void processMovement(InputPacket* const currInput, InputPacket* const inputBuffer, ControlInfo* const hidInput, const double scaleAdjust, const int drink_amt = 0, const bool allowstrafe = true, const double turnscale = 1);
|