Skip to content

Added cg_zoomSensitivity for correct sens scaling #19

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

Closed
ryvnf wants to merge 1 commit into from
Closed

Added cg_zoomSensitivity for correct sens scaling #19

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
1 change: 1 addition & 0 deletions code/cgame/cg_local.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1334,6 +1334,7 @@ extern vmCvar_t cg_ignore;
extern vmCvar_t cg_simpleItems;
extern vmCvar_t cg_fov;
extern vmCvar_t cg_zoomFov;
extern vmCvar_t cg_zoomSensitivity;
extern vmCvar_t cg_thirdPersonRange;
extern vmCvar_t cg_thirdPersonAngle;
extern vmCvar_t cg_thirdPerson;
Expand Down
4 changes: 3 additions & 1 deletion code/cgame/cg_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ vmCvar_t cg_ignore;
vmCvar_t cg_simpleItems;
vmCvar_t cg_fov;
vmCvar_t cg_zoomFov;
vmCvar_t cg_zoomSensitivity;
vmCvar_t cg_thirdPerson;
vmCvar_t cg_thirdPersonRange;
vmCvar_t cg_thirdPersonAngle;
Expand Down Expand Up @@ -308,7 +309,8 @@ static cvarTable_t cvarTable[] = {// bk001129
{ &cg_ignore, "cg_ignore", "0", 0}, // used for debugging
{ &cg_autoswitch, "cg_autoswitch", "1", CVAR_ARCHIVE},
{ &cg_drawGun, "cg_drawGun", "1", CVAR_ARCHIVE},
{ &cg_zoomFov, "cg_zoomfov", "22.5", CVAR_ARCHIVE},
{ &cg_zoomFov, "cg_zoomFov", "22.5", CVAR_ARCHIVE},
{ &cg_zoomSensitivity, "cg_zoomSensitivity", "0", CVAR_ARCHIVE},
{ &cg_fov, "cg_fov", "90", CVAR_ARCHIVE},
{ &cg_viewsize, "cg_viewsize", "100", CVAR_ARCHIVE},
{ &cg_viewnudge, "cg_viewnudge", "0", CVAR_ARCHIVE},
Expand Down
15 changes: 12 additions & 3 deletions code/cgame/cg_view.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// for a 3D rendering
#include "cg_local.h"

#define degrees(v) (v * 180.0 / M_PI)
#define radians(v) (v * M_PI / 180.0)

/*
=============================================================================
Expand Down Expand Up @@ -638,9 +640,9 @@ static int CG_CalcFov( void ) {
fov_x = fov_x * 0.93 * (cg.xyspeed * (0.0006) + 1);
}

x = cg.refdef.width / tan( fov_x / 360 * M_PI );
x = cg.refdef.width / tan( radians(fov_x) / 2.0 );
fov_y = atan2( cg.refdef.height, x );
fov_y = fov_y * 360 / M_PI;
fov_y = degrees(fov_y) * 2;

// warp if underwater
contents = CG_PointContents( cg.refdef.vieworg, -1 );
Expand All @@ -664,7 +666,14 @@ static int CG_CalcFov( void ) {
cg.zoomSensitivity = 1;
}
else {
cg.zoomSensitivity = cg.refdef.fov_y / 75.0;
float zoomSensitivity = cg_zoomSensitivity.value;
if (zoomSensitivity == 0.0) {
// use legacy zoom sensitivity formula
cg.zoomSensitivity = cg.refdef.fov_y / 75.0;
} else {
// use corrected zoom sensitivity formula
cg.zoomSensitivity = zoomSensitivity * tan(radians(cg.refdef.fov_x) / 2.0) / tan(radians(cg_fov.value) / 2.0);
}
}

return inwater;
Expand Down