Skip to content

[CG] Fix cg_fovViewModel when cg_fovAspectAdjust #1345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SomaZ wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −7
Open

[CG] Fix cg_fovViewModel when cg_fovAspectAdjust #1345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions code/cgame/cg_weapons.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,9 +1126,10 @@ void CG_AddViewWeapon( playerState_t *ps )
AnglesToAxis( angles, hand.axis );


if ( cg_fovViewmodel.integer ) {
float fracDistFOV = tanf( cg.refdef.fov_x * ( M_PI/180 ) * 0.5f );
float fracWeapFOV = (1.0f / fracDistFOV) * tanf( actualFOV * (M_PI / 180) * 0.5f );
if ( cg_fovViewmodel.integer )
{
float fracDistFOV = tanf( cg_fov.value * ( M_PI/180 ) * 0.5f );
float fracWeapFOV = (1.0f / fracDistFOV) * tanf( cg_fovViewmodel.value * (M_PI / 180) * 0.5f );
VectorScale( hand.axis[0], fracWeapFOV, hand.axis[0] );
}

Expand Down
4 changes: 2 additions & 2 deletions codeJK2/cgame/cg_weapons.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1039,8 +1039,8 @@ void CG_AddViewWeapon( playerState_t *ps )

if ( cg_fovViewmodel.integer )
{
float fracDistFOV = tanf( cg.refdef.fov_x * ( M_PI/180 ) * 0.5f );
float fracWeapFOV = ( 1.0f / fracDistFOV ) * tanf( cgFov * ( M_PI/180 ) * 0.5f );
float fracDistFOV = tanf( cg_fov.value * ( M_PI/180 ) * 0.5f );
float fracWeapFOV = ( 1.0f / fracDistFOV ) * tanf( cg_fovViewmodel.value * ( M_PI/180 ) * 0.5f );
VectorScale( hand.axis[0], fracWeapFOV, hand.axis[0] );
}

Expand Down
4 changes: 2 additions & 2 deletions codemp/cgame/cg_weapons.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,8 +848,8 @@ void CG_AddViewWeapon( playerState_t *ps ) {

if ( cg_fovViewmodel.integer )
{
float fracDistFOV = tanf( cg.refdef.fov_x * ( M_PI/180 ) * 0.5f );
float fracWeapFOV = ( 1.0f / fracDistFOV ) * tanf( cgFov * ( M_PI/180 ) * 0.5f );
float fracDistFOV = tanf( cg_fov.value * ( M_PI/180 ) * 0.5f );
float fracWeapFOV = ( 1.0f / fracDistFOV ) * tanf( cg_fovViewmodel.value * ( M_PI/180 ) * 0.5f );
VectorScale( hand.axis[0], fracWeapFOV, hand.axis[0] );
}

Expand Down
Loading