FOV mouse sensitivity setting

builtin/settingtypes.txt

@@ -112,6 +112,10 @@ invert_mouse (Invert mouse) bool false
 #    Mouse sensitivity multiplier.
 mouse_sensitivity (Mouse sensitivity) float 0.2 0.001 10.0
 
+#    ADS mouse sensitivity multiplier.
+ads_sensitivity (ADS sensitivity) float 1.0 0.0 100.0
+
+
 [*Touchscreen]
 
 #    The length in pixels it takes for touch screen interaction to start.

minetest.conf.example

@@ -61,6 +61,10 @@
 #    type: float
 # mouse_sensitivity = 0.2
 
+#    ADS mouse sensitivity multiplier.
+#    type: float
+# ADS_sensitivity = 1.0
+
 #    If enabled, "Aux1" key instead of "Sneak" key is used for climbing down and
 #    descending.
 #    type: bool

src/client/game.cpp

@@ -895,6 +895,7 @@ class Game {
 	bool m_cache_enable_noclip;
 	bool m_cache_enable_free_move;
 	f32  m_cache_mouse_sensitivity;
+	f32  m_cache_ads_sensitivity;
 	f32  m_cache_joystick_frustum_sensitivity;
 	f32  m_repeat_place_time;
 	f32  m_cache_cam_smoothing;
@@ -934,6 +935,8 @@ Game::Game() :
 		&settingChangedCallback, this);
 	g_settings->registerChangedCallback("mouse_sensitivity",
 		&settingChangedCallback, this);
+	g_settings->registerChangedCallback("ads_sensitivity",
+		&settingChangedCallback, this);
 	g_settings->registerChangedCallback("joystick_frustum_sensitivity",
 		&settingChangedCallback, this);
 	g_settings->registerChangedCallback("repeat_place_time",
@@ -994,6 +997,8 @@ Game::~Game()
 		&settingChangedCallback, this);
 	g_settings->deregisterChangedCallback("mouse_sensitivity",
 		&settingChangedCallback, this);
+	g_settings->deregisterChangedCallback("ads_sensitivity",
+		&settingChangedCallback, this);
 	g_settings->deregisterChangedCallback("repeat_place_time",
 		&settingChangedCallback, this);
 	g_settings->deregisterChangedCallback("noclip",
@@ -2438,12 +2443,14 @@ void Game::updateCameraDirection(CameraOrientation *cam, float dtime)
 // responsiveness independently of FOV.
 f32 Game::getSensitivityScaleFactor() const
 {
-	f32 fov_y = client->getCamera()->getFovY();
-
-	// Multiply by a constant such that it becomes 1.0 at 72 degree FOV and
-	// 16:9 aspect ratio to minimize disruption of existing sensitivity
-	// settings.
-	return tan(fov_y / 2.0f) * 1.3763818698f;
+	if (m_cache_ads_sensitivity == 0) {
+		return 1.0f;
+	} else {
+		// Multiply by a constant such that it becomes 1.0 at 72 degree FOV
+		// to minimize disruption of existing sensitivity settings.
+		f32 fov_y = client->getCamera()->getFovY();
+		return pow(tan(fov_y / 2.0f) * 1.3763818698f, m_cache_ads_sensitivity);
+	}
 }
 
 void Game::updateCameraOrientation(CameraOrientation *cam, float dtime)
@@ -2461,7 +2468,7 @@ void Game::updateCameraOrientation(CameraOrientation *cam, float dtime)
 			dist.Y = -dist.Y;
 		}
 
-		f32 sens_scale = getSensitivityScaleFactor();
+		const f32 sens_scale = getSensitivityScaleFactor();
 		cam->camera_yaw   -= dist.X * m_cache_mouse_sensitivity * sens_scale;
 		cam->camera_pitch += dist.Y * m_cache_mouse_sensitivity * sens_scale;
 
@@ -4135,8 +4142,9 @@ void Game::readSettings()
 	m_cache_enable_particles             = g_settings->getBool("enable_particles");
 	m_cache_enable_fog                   = g_settings->getBool("enable_fog");
 	m_cache_mouse_sensitivity            = g_settings->getFloat("mouse_sensitivity", 0.001f, 10.0f);
+  m_cache_ads_sensitivity              = g_settings->getFloat("ads_sensitivity");
 	m_cache_joystick_frustum_sensitivity = std::max(g_settings->getFloat("joystick_frustum_sensitivity"), 0.001f);
-	m_repeat_place_time                  = g_settings->getFloat("repeat_place_time", 0.25f, 2.0);
+	m_repeat_place_time                  = g_settings->getFloat("repeat_place_time", 0.25f, 2.0f);
 
 	m_cache_enable_noclip                = g_settings->getBool("noclip");
 	m_cache_enable_free_move             = g_settings->getBool("free_move");
@@ -4151,7 +4159,7 @@ void Game::readSettings()
 
 	m_cache_fog_start = rangelim(m_cache_fog_start, 0.0f, 0.99f);
 	m_cache_cam_smoothing = rangelim(m_cache_cam_smoothing, 0.01f, 1.0f);
-	m_cache_mouse_sensitivity = rangelim(m_cache_mouse_sensitivity, 0.001, 100.0);
+	m_cache_mouse_sensitivity = rangelim(m_cache_mouse_sensitivity, 0.001f, 100.0f);
 
 	m_does_lost_focus_pause_game = g_settings->getBool("pause_on_lost_focus");
 }

src/defaultsettings.cpp

@@ -280,6 +280,7 @@ void set_default_settings()
 	// Input
 	settings->setDefault("invert_mouse", "false");
 	settings->setDefault("mouse_sensitivity", "0.2");
+	settings->setDefault("ads_sensitivity", "1.0");
 	settings->setDefault("repeat_place_time", "0.25");
 	settings->setDefault("safe_dig_and_place", "false");
 	settings->setDefault("random_input", "false");