ensl/NS
0
0
Fork 0
mirror of https://github.com/ENSL/NS.git synced 2024-11-29 15:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #10 from ENSL/pierow-commfix

Browse source 
added cl_widescreen and fix for commander item placement and background
This commit is contained in:
pierow 2018-05-06 20:16:47 -04:00 committed by GitHub
commit ca37f785ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
main/source/cl_dll/chud.h
View file

@ -22,6 +22,7 @@ public:
HSPRITE m_hsprCursor; HSPRITE m_hsprCursor;
float m_flTime; // the current client time float m_flTime; // the current client time
float m_fOldTime; // the time at which the HUD was last redrawn float m_fOldTime; // the time at which the HUD was last redrawn
float m_wsFOV; //fov recalc corrected for widescreen
double m_flTimeDelta; // the difference between flTime and fOldTime double m_flTimeDelta; // the difference between flTime and fOldTime
Vector m_vecOrigin; Vector m_vecOrigin;
Vector m_vecAngles; Vector m_vecAngles;

52
main/source/cl_dll/hud_update.cpp
View file

@ -47,51 +47,35 @@ int CHud::UpdateClientData(client_data_t *cdata, float time)
float height = ScreenHeight(); float height = ScreenHeight();
//horizontal+ widescreen view correction - engine uses vertical- //horizontal+ widescreen view correction - engine uses vertical-
//starts with hacked in commander view fix where commander fov was changed to 106 so the black background beind the map is fully rendered - remove that section and change comm fov back to 90 if fixed bool wstoggle = CVAR_GET_FLOAT("cl_widescreen") != 0;
if (gHUD.GetIsInTopDownMode()) if (wstoggle)
{ {
float commFOV; m_wsFOV = atanf(tan(m_iFOV * M_PI / 360) * 0.75 * width / height) * 360 / M_PI;
commFOV = atanf(tan(m_iFOV * M_PI / 360) * 0.5625 * width / height) * 360 / M_PI; //clamp for game balance
if (m_iFOV == 105 && m_wsFOV > 121)
//clamp
if (commFOV > 107)
{ {
commFOV = 106; m_wsFOV = 120;
} }
else if (commFOV < 90) else if (m_iFOV == 100 && m_wsFOV > 117)
{ {
commFOV = 90; m_wsFOV = 116;
}
else if (m_iFOV == 90 && m_wsFOV > 107)
{
m_wsFOV = 106;
}
else if (m_wsFOV < 90)
{
m_wsFOV = 90;
} }
cdata->fov = commFOV;
} }
else else
{ {
float newFOV; m_wsFOV = m_iFOV;
newFOV = atanf(tan(m_iFOV * M_PI / 360) * 0.75 * width / height) * 360 / M_PI;
//clamp for game balance
if (m_iFOV == 105 && newFOV > 121)
{
newFOV = 120;
}
else if (m_iFOV == 100 && newFOV > 117)
{
newFOV = 116;
}
else if (m_iFOV == 90 && newFOV > 107)
{
newFOV = 106;
}
else if (newFOV < 90)
{
newFOV = 90;
} }
cdata->fov = newFOV; cdata->fov = m_wsFOV;
}
CL_ResetButtonBits( m_iKeyBits ); CL_ResetButtonBits( m_iKeyBits );

2
main/source/cl_dll/input.cpp
View file

@ -137,6 +137,7 @@ cvar_t *cl_forcedefaultfov;
cvar_t *cl_dynamiclights; cvar_t *cl_dynamiclights;
cvar_t *cl_buildmessages; cvar_t *cl_buildmessages;
cvar_t *cl_particleinfo; cvar_t *cl_particleinfo;
cvar_t *cl_widescreen;
/* /*
=============================================================================== ===============================================================================
@ -1544,6 +1545,7 @@ void InitInput (void)
cl_cmhotkeys = gEngfuncs.pfnRegisterVariable ( kvCMHotkeys, "qwerasdfzxcv", FCVAR_ARCHIVE ); cl_cmhotkeys = gEngfuncs.pfnRegisterVariable ( kvCMHotkeys, "qwerasdfzxcv", FCVAR_ARCHIVE );
cl_forcedefaultfov = gEngfuncs.pfnRegisterVariable ( kvForceDefaultFOV, "0", FCVAR_ARCHIVE ); cl_forcedefaultfov = gEngfuncs.pfnRegisterVariable ( kvForceDefaultFOV, "0", FCVAR_ARCHIVE );
cl_particleinfo = gEngfuncs.pfnRegisterVariable ( kvParticleInfo, "0", FCVAR_ARCHIVE ); cl_particleinfo = gEngfuncs.pfnRegisterVariable ( kvParticleInfo, "0", FCVAR_ARCHIVE );
cl_widescreen = gEngfuncs.pfnRegisterVariable ( kvWidescreen, "1", FCVAR_ARCHIVE );
// Initialize third person camera controls. // Initialize third person camera controls.
CAM_Init(); CAM_Init();

2
main/source/cl_dll/util.cpp
View file

@ -177,7 +177,7 @@ void CreatePickingRay( int mousex, int mousey, Vector& outVecPickingRay )
// char gDebugMessage[256]; // char gDebugMessage[256];
float fovDegrees = gHUD.m_iFOV; float fovDegrees = gHUD.m_wsFOV;
//cl_entity_s* theLocalEntity = gEngfuncs.GetLocalPlayer(); //cl_entity_s* theLocalEntity = gEngfuncs.GetLocalPlayer();
//Vector vecRenderOrigin = theLocalEntity->origin; //Vector vecRenderOrigin = theLocalEntity->origin;

1
main/source/mod/AvHClientVariables.h
View file

@ -47,6 +47,7 @@ extern cvar_t* cl_musicdir;
// : // :
#define kvCMHotKeys "cl_cmhotkeys" #define kvCMHotKeys "cl_cmhotkeys"
#define kvForceDefaultFOV "cl_forcedefaultfov" #define kvForceDefaultFOV "cl_forcedefaultfov"
#define kvWidescreen "cl_widescreen"
#define kvCenterEntityID "cl_centerentityid" #define kvCenterEntityID "cl_centerentityid"
#define kvHighDetail "cl_highdetail" #define kvHighDetail "cl_highdetail"
#define kvCMHotkeys "cl_cmhotkeys" #define kvCMHotkeys "cl_cmhotkeys"

8
main/source/mod/AvHPlayer.cpp
View file

@ -7482,19 +7482,13 @@ void AvHPlayer::GetViewForUser3(AvHUser3 inUser3, bool inIsDucking, float& outFO
{ {
case AVH_USER3_NONE: case AVH_USER3_NONE:
case AVH_USER3_MARINE_PLAYER: case AVH_USER3_MARINE_PLAYER:
//case AVH_USER3_COMMANDER_PLAYER: case AVH_USER3_COMMANDER_PLAYER:
case AVH_USER3_ALIEN_PLAYER4: case AVH_USER3_ALIEN_PLAYER4:
default: default:
outFOV = 90; outFOV = 90;
outOffset = inIsDucking ? kDuckingViewHeightPercentage * HULL1_MAXZ : kStandingViewHeightPercentage * HULL0_MAXZ; outOffset = inIsDucking ? kDuckingViewHeightPercentage * HULL1_MAXZ : kStandingViewHeightPercentage * HULL0_MAXZ;
break; break;
//commander fov upped from 90 to prevent borders of black map background not drawing, compensated in hud_update
case AVH_USER3_COMMANDER_PLAYER:
outFOV = 106;
outOffset = inIsDucking ? kDuckingViewHeightPercentage * HULL1_MAXZ : kStandingViewHeightPercentage * HULL0_MAXZ;
break;
case AVH_USER3_ALIEN_PLAYER1: case AVH_USER3_ALIEN_PLAYER1:
outFOV = 105; outFOV = 105;
outOffset = 0; outOffset = 0;