Touchscreen: Allow camera movement while digging without touch_use_cr…

…osshair
minetest · Jan 24, 2024 · fcbc7fc · fcbc7fc
1 parent 4468813
commit fcbc7fc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
@@ -156,7 +156,7 @@ touchscreen_threshold (Touchscreen threshold) int 20 0 100
 #    Touchscreen sensitivity multiplier.
 #
 #    Requires: touchscreen_gui
-touchscreen_sensitivity (Touchscreen sensitivity) float 0.2 0.001 10.0
+touchscreen_sensitivity (Touchscreen sensitivity) float 0.1 0.001 10.0
 
 #    Use crosshair to select object instead of whole screen.
 #    If enabled, a crosshair will be shown and will be used for selecting object.

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
@@ -478,7 +478,7 @@ void set_default_settings()
 
 #ifdef HAVE_TOUCHSCREENGUI
 	settings->setDefault("touchscreen_threshold", "20");
-	settings->setDefault("touchscreen_sensitivity", "0.2");
+	settings->setDefault("touchscreen_sensitivity", "0.1");
 	settings->setDefault("touch_use_crosshair", "false");
 	settings->setDefault("fixed_virtual_joystick", "false");
 	settings->setDefault("virtual_joystick_triggers_aux1", "false");

diff --git a/src/gui/touchscreengui.cpp b/src/gui/touchscreengui.cpp
@@ -813,17 +813,14 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
 		if (m_has_move_id && event.TouchInput.ID == m_move_id) {
 			if (dir_free.getLengthSQ() > touch_threshold_sq || m_move_has_really_moved) {
 				m_move_has_really_moved = true;
-
 				m_pointer_pos[event.TouchInput.ID] = touch_pos;
 
-				if (m_tap_state == TapState::None || m_draw_crosshair) {
-					// adapt to similar behavior as pc screen
-					const double d = g_settings->getFloat("touchscreen_sensitivity", 0.001f, 10.0f) * 3.0f;
+				// adapt to similar behavior as pc screen
+				const double d = g_settings->getFloat("touchscreen_sensitivity", 0.001f, 10.0f) * 3.0f;
 
-					// update camera_yaw and camera_pitch
-					m_camera_yaw_change -= dir_free.X * d;
-					m_camera_pitch_change += dir_free.Y * d;
-				}
+				// update camera_yaw and camera_pitch
+				m_camera_yaw_change -= dir_free.X * d;
+				m_camera_pitch_change += dir_free.Y * d;
 			}
 		}