Skip to content
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

Jump to bottom

Small setting-related fixes #13755

Merged
merged 5 commits into from
Aug 27, 2023
Merged

Small setting-related fixes #13755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bda8dd2
Small setting-related fixes
grorp Aug 23, 2023
90653ac
Update settingtypes.txt
grorp Aug 24, 2023
a5b0775
Update touchscreengui.cpp
grorp Aug 24, 2023
a5fe52f
Update defaultsettings.cpp
grorp Aug 24, 2023
837a9c3
Two more things
grorp Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 15 additions & 5 deletions builtin/settingtypes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@
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.
#
# Requires: keyboard_mouse
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.
Expand All @@ -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 place button.
#
# Requires: keyboard_mouse
repeat_place_time (Place repetition interval) float 0.25 0.16 2

# Automatically jump up single-node obstacles.
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.
# On touchscreens, this only affects digging.
safe_dig_and_place (Safe digging and placing) bool false

[*Keyboard and Mouse]
Expand All @@ -143,24 +148,29 @@ invert_hotbar_mouse_wheel (Hotbar: Invert mouse wheel direction) bool false

[*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
touchscreen_threshold (Touchscreen threshold) int 20 0 100

# Touchscreen sensitivity multiplier.
#
# Requires: touchscreen_gui
touchscreen_threshold (Touch screen threshold) int 20 0 100
touchscreen_sensitivity (Touchscreen sensitivity) float 0.2 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.
#
# Requires: touchscreen_gui
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.
#
# Requires: touchscreen_gui
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.
#
# Requires: touchscreen_gui
Expand Down
2 changes: 1 addition & 1 deletion src/client/renderingengine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ RenderingEngine::RenderingEngine(IEventReceiver *receiver)
// bpp, fsaa, vsync
bool vsync = g_settings->getBool("vsync");
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
auto driverType = chooseVideoDriver();
Expand Down
5 changes: 3 additions & 2 deletions src/defaultsettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ void set_default_settings()
#else
settings->setDefault("show_debug", "true");
#endif
settings->setDefault("fsaa", "0");
settings->setDefault("fsaa", "2");
settings->setDefault("undersampling", "1");
settings->setDefault("world_aligned_mode", "enable");
settings->setDefault("autoscale_mode", "disable");
Expand Down Expand Up @@ -473,7 +473,8 @@ void set_default_settings()
#endif

#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("fixed_virtual_joystick", "false");
settings->setDefault("virtual_joystick_triggers_aux1", "false");
Expand Down
2 changes: 1 addition & 1 deletion src/gui/touchscreengui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ void TouchScreenGUI::translateEvent(const SEvent &event)
m_pointer_pos[event.TouchInput.ID] = touch_pos;

// 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_pitch = MYMIN(MYMAX(m_camera_pitch + (dir_free.Y * d), -180.0f), 180.0f);
Expand Down