BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Small setting-related fixes (#13755)

Browse Source
This commit is contained in:
Gregor Parzefall 2023-08-27 20:18:41 +02:00 committed by GitHub
parent 852d6a7976
commit 7b56daa236
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
builtin/settingtypes.txt
View File

@ -91,6 +91,8 @@
camera_smoothing (Camera smoothing) float 0.0 0.0 0.99 camera_smoothing (Camera smoothing) float 0.0 0.0 0.99
# Smooths rotation of camera when in cinematic mode, 0 to disable. Enter cinematic mode by using the key set in Change Keys. # Smooths rotation of camera when in cinematic mode, 0 to disable. Enter cinematic mode by using the key set in Change Keys.
#
# Requires: keyboard_mouse
cinematic_camera_smoothing (Camera smoothing in cinematic mode) float 0.7 0.0 0.99 cinematic_camera_smoothing (Camera smoothing in cinematic mode) float 0.7 0.0 0.99
# If enabled, you can place nodes at the position (feet + eye level) where you stand. # If enabled, you can place nodes at the position (feet + eye level) where you stand.
@ -110,13 +112,16 @@ always_fly_fast (Always fly fast) bool true
# The time in seconds it takes between repeated node placements when holding # The time in seconds it takes between repeated node placements when holding
# the place button. # the place button.
#
# Requires: keyboard_mouse
repeat_place_time (Place repetition interval) float 0.25 0.16 2 repeat_place_time (Place repetition interval) float 0.25 0.16 2
# Automatically jump up single-node obstacles. # Automatically jump up single-node obstacles.
autojump (Automatic jumping) bool false autojump (Automatic jumping) bool false
# Prevent digging and placing from repeating when holding the mouse buttons. # Prevent digging and placing from repeating when holding the respective buttons.
# Enable this when you dig or place too often by accident. # Enable this when you dig or place too often by accident.
# On touchscreens, this only affects digging.
safe_dig_and_place (Safe digging and placing) bool false safe_dig_and_place (Safe digging and placing) bool false
[*Keyboard and Mouse] [*Keyboard and Mouse]
@ -143,10 +148,15 @@ invert_hotbar_mouse_wheel (Hotbar: Invert mouse wheel direction) bool false
[*Touchscreen] [*Touchscreen]
# The length in pixels it takes for touch screen interaction to start. # The length in pixels it takes for touchscreen interaction to start.
# #
# Requires: touchscreen_gui # Requires: touchscreen_gui
touchscreen_threshold (Touch screen threshold) int 20 0 100 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
# Use crosshair to select object instead of whole screen. # Use crosshair to select object instead of whole screen.
# If enabled, a crosshair will be shown and will be used for selecting object. # If enabled, a crosshair will be shown and will be used for selecting object.
@ -154,13 +164,13 @@ touchscreen_threshold (Touch screen threshold) int 20 0 100
# Requires: touchscreen_gui # Requires: touchscreen_gui
touch_use_crosshair (Use crosshair for touch screen) bool false touch_use_crosshair (Use crosshair for touch screen) bool false
# (Android) Fixes the position of virtual joystick. # Fixes the position of virtual joystick.
# If disabled, virtual joystick will center to first-touch's position. # If disabled, virtual joystick will center to first-touch's position.
# #
# Requires: touchscreen_gui # Requires: touchscreen_gui
fixed_virtual_joystick (Fixed virtual joystick) bool false fixed_virtual_joystick (Fixed virtual joystick) bool false
# (Android) Use virtual joystick to trigger "Aux1" button. # Use virtual joystick to trigger "Aux1" button.
# If enabled, virtual joystick will also tap "Aux1" button when out of main circle. # If enabled, virtual joystick will also tap "Aux1" button when out of main circle.
# #
# Requires: touchscreen_gui # Requires: touchscreen_gui

2
src/client/renderingengine.cpp
View File

@ -124,7 +124,7 @@ RenderingEngine::RenderingEngine(IEventReceiver *receiver)
// bpp, fsaa, vsync // bpp, fsaa, vsync
bool vsync = g_settings->getBool("vsync"); bool vsync = g_settings->getBool("vsync");
bool enable_fsaa = g_settings->get("antialiasing") == "fsaa"; bool enable_fsaa = g_settings->get("antialiasing") == "fsaa";
u16 fsaa = enable_fsaa ? g_settings->getU16("fsaa") : 0; u16 fsaa = enable_fsaa ? MYMAX(2, g_settings->getU16("fsaa")) : 0;
// Determine driver // Determine driver
auto driverType = chooseVideoDriver(); auto driverType = chooseVideoDriver();

5
src/defaultsettings.cpp
View File

@ -172,7 +172,7 @@ void set_default_settings()
#else #else
settings->setDefault("show_debug", "true"); settings->setDefault("show_debug", "true");
#endif #endif
settings->setDefault("fsaa", "0"); settings->setDefault("fsaa", "2");
settings->setDefault("undersampling", "1"); settings->setDefault("undersampling", "1");
settings->setDefault("world_aligned_mode", "enable"); settings->setDefault("world_aligned_mode", "enable");
settings->setDefault("autoscale_mode", "disable"); settings->setDefault("autoscale_mode", "disable");
@ -473,7 +473,8 @@ void set_default_settings()
#endif #endif
#ifdef HAVE_TOUCHSCREENGUI #ifdef HAVE_TOUCHSCREENGUI
settings->setDefault("touchscreen_threshold","20"); settings->setDefault("touchscreen_threshold", "20");
settings->setDefault("touchscreen_sensitivity", "0.2");
settings->setDefault("touch_use_crosshair", "false"); settings->setDefault("touch_use_crosshair", "false");
settings->setDefault("fixed_virtual_joystick", "false"); settings->setDefault("fixed_virtual_joystick", "false");
settings->setDefault("virtual_joystick_triggers_aux1", "false"); settings->setDefault("virtual_joystick_triggers_aux1", "false");

2
src/gui/touchscreengui.cpp
View File

@ -829,7 +829,7 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
m_pointer_pos[event.TouchInput.ID] = touch_pos; m_pointer_pos[event.TouchInput.ID] = touch_pos;
// adapt to similar behavior as pc screen // adapt to similar behavior as pc screen
const double d = g_settings->getFloat("mouse_sensitivity", 0.001f, 10.0f) * 3.0f; const double d = g_settings->getFloat("touchscreen_sensitivity", 0.001f, 10.0f) * 3.0f;
m_camera_yaw_change -= dir_free.X * d; m_camera_yaw_change -= dir_free.X * d;
m_camera_pitch = MYMIN(MYMAX(m_camera_pitch + (dir_free.Y * d), -180.0f), 180.0f); m_camera_pitch = MYMIN(MYMAX(m_camera_pitch + (dir_free.Y * d), -180.0f), 180.0f);