]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/defaultsettings.cpp
projects / dragonfireclient.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Remove invalid fps_max on Mac
[dragonfireclient.git] / src / defaultsettings.cpp
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 177955589523db7c60631b400900d072e295d96c..d350008146424078f54d9600d2f1ab35e6d15203 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -27,8 +27,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapgen/mapgen.h" // Mapgen::setDefaultSettings
 #include "util/string.h"
 
-void set_default_settings(Settings *settings)
+void set_default_settings()
 {
+       Settings *settings = Settings::createLayer(SL_DEFAULTS);
+
        // Client and server
        settings->setDefault("language", "");
        settings->setDefault("name", "");
@@ -54,7 +56,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("client_unload_unused_data_timeout", "600");
        settings->setDefault("client_mapblock_limit", "7500");
        settings->setDefault("enable_build_where_you_stand", "false");
-       settings->setDefault("curl_timeout", "5000");
+       settings->setDefault("curl_timeout", "20000");
        settings->setDefault("curl_parallel_limit", "8");
        settings->setDefault("curl_file_download_timeout", "300000");
        settings->setDefault("curl_verify_cert", "true");
@@ -62,7 +64,8 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_client_modding", "false");
        settings->setDefault("max_out_chat_queue_size", "20");
        settings->setDefault("pause_on_lost_focus", "false");
-       settings->setDefault("enable_register_confirmation", "true");
+       settings->setDefault("enable_split_login_register", "true");
+       settings->setDefault("chat_weblink_color", "#8888FF");
 
        // Keymap
        settings->setDefault("remote_port", "30000");
@@ -78,7 +81,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_drop", "KEY_KEY_Q");
        settings->setDefault("keymap_zoom", "KEY_KEY_Z");
        settings->setDefault("keymap_inventory", "KEY_KEY_I");
-       settings->setDefault("keymap_special1", "KEY_KEY_E");
+       settings->setDefault("keymap_aux1", "KEY_KEY_E");
        settings->setDefault("keymap_chat", "KEY_KEY_T");
        settings->setDefault("keymap_cmd", "/");
        settings->setDefault("keymap_cmd_local", ".");
@@ -95,6 +98,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_increase_volume", "");
        settings->setDefault("keymap_decrease_volume", "");
        settings->setDefault("keymap_cinematic", "");
+       settings->setDefault("keymap_toggle_block_bounds", "");
        settings->setDefault("keymap_toggle_hud", "KEY_F1");
        settings->setDefault("keymap_toggle_chat", "KEY_F2");
        settings->setDefault("keymap_toggle_fog", "KEY_F3");
@@ -174,12 +178,12 @@ void set_default_settings(Settings *settings)
        settings->setDefault("screen_h", "600");
        settings->setDefault("autosave_screensize", "true");
        settings->setDefault("fullscreen", "false");
-       settings->setDefault("fullscreen_bpp", "24");
        settings->setDefault("vsync", "false");
        settings->setDefault("fov", "72");
        settings->setDefault("leaves_style", "fancy");
        settings->setDefault("connected_glass", "false");
        settings->setDefault("smooth_lighting", "true");
+       settings->setDefault("performance_tradeoffs", "false");
        settings->setDefault("lighting_alpha", "0.0");
        settings->setDefault("lighting_beta", "1.5");
        settings->setDefault("display_gamma", "1.0");
@@ -238,6 +242,8 @@ void set_default_settings(Settings *settings)
 #endif
        settings->setDefault("enable_particles", "true");
        settings->setDefault("arm_inertia", "true");
+       settings->setDefault("show_nametag_backgrounds", "true");
+       settings->setDefault("transparency_sorting_distance", "16");
 
        settings->setDefault("enable_minimap", "true");
        settings->setDefault("minimap_shape_round", "true");
@@ -258,6 +264,18 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_waving_leaves", "false");
        settings->setDefault("enable_waving_plants", "false");
 
+       // Effects Shadows
+       settings->setDefault("enable_dynamic_shadows", "false");
+       settings->setDefault("shadow_strength_gamma", "1.0");
+       settings->setDefault("shadow_map_max_distance", "200.0");
+       settings->setDefault("shadow_map_texture_size", "2048");
+       settings->setDefault("shadow_map_texture_32bit", "true");
+       settings->setDefault("shadow_map_color", "false");
+       settings->setDefault("shadow_filters", "1");
+       settings->setDefault("shadow_poisson_filter", "true");
+       settings->setDefault("shadow_update_frames", "8");
+       settings->setDefault("shadow_soft_radius", "5.0");
+       settings->setDefault("shadow_sky_body_orbit_tilt", "0.0");
 
        // Input
        settings->setDefault("invert_mouse", "false");
@@ -268,7 +286,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("aux1_descends", "false");
        settings->setDefault("doubletap_jump", "false");
        settings->setDefault("always_fly_fast", "true");
-#ifdef __ANDROID__
+#ifdef HAVE_TOUCHSCREENGUI
        settings->setDefault("autojump", "true");
 #else
        settings->setDefault("autojump", "false");
@@ -279,13 +297,13 @@ void set_default_settings(Settings *settings)
        settings->setDefault("joystick_type", "");
        settings->setDefault("repeat_joystick_button_time", "0.17");
        settings->setDefault("joystick_frustum_sensitivity", "170");
+       settings->setDefault("joystick_deadzone", "2048");
 
        // Main menu
        settings->setDefault("main_menu_path", "");
-       settings->setDefault("serverlist_file", "favoriteservers.txt");
+       settings->setDefault("serverlist_file", "favoriteservers.json");
 
-#if USE_FREETYPE
-       settings->setDefault("freetype", "true");
+       // General font settings
        settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "Arimo-Regular.ttf"));
        settings->setDefault("font_path_italic", porting::getDataPath("fonts" DIR_DELIM "Arimo-Italic.ttf"));
        settings->setDefault("font_path_bold", porting::getDataPath("fonts" DIR_DELIM "Arimo-Bold.ttf"));
@@ -294,26 +312,15 @@ void set_default_settings(Settings *settings)
        settings->setDefault("font_italic", "false");
        settings->setDefault("font_shadow", "1");
        settings->setDefault("font_shadow_alpha", "127");
+       settings->setDefault("font_size_divisible_by", "1");
        settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "Cousine-Regular.ttf"));
        settings->setDefault("mono_font_path_italic", porting::getDataPath("fonts" DIR_DELIM "Cousine-Italic.ttf"));
        settings->setDefault("mono_font_path_bold", porting::getDataPath("fonts" DIR_DELIM "Cousine-Bold.ttf"));
        settings->setDefault("mono_font_path_bold_italic", porting::getDataPath("fonts" DIR_DELIM "Cousine-BoldItalic.ttf"));
+       settings->setDefault("mono_font_size_divisible_by", "1");
        settings->setDefault("fallback_font_path", porting::getDataPath("fonts" DIR_DELIM "DroidSansFallbackFull.ttf"));
 
-       settings->setDefault("fallback_font_shadow", "1");
-       settings->setDefault("fallback_font_shadow_alpha", "128");
-
        std::string font_size_str = std::to_string(TTF_DEFAULT_FONT_SIZE);
-
-       settings->setDefault("fallback_font_size", font_size_str);
-#else
-       settings->setDefault("freetype", "false");
-       settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "mono_dejavu_sans"));
-       settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "mono_dejavu_sans"));
-
-       std::string font_size_str = std::to_string(DEFAULT_FONT_SIZE);
-#endif
-       // General font settings
        settings->setDefault("font_size", font_size_str);
        settings->setDefault("mono_font_size", font_size_str);
        settings->setDefault("chat_font_size", "0"); // Default "font_size"
@@ -379,12 +386,14 @@ void set_default_settings(Settings *settings)
        settings->setDefault("time_speed", "72");
        settings->setDefault("world_start_time", "6125");
        settings->setDefault("server_unload_unused_data_timeout", "29");
-       settings->setDefault("max_objects_per_block", "64");
+       settings->setDefault("max_objects_per_block", "256");
        settings->setDefault("server_map_save_interval", "5.3");
        settings->setDefault("chat_message_max_size", "500");
        settings->setDefault("chat_message_limit_per_10sec", "8.0");
        settings->setDefault("chat_message_limit_trigger_kick", "50");
        settings->setDefault("sqlite_synchronous", "2");
+       settings->setDefault("map_compression_level_disk", "-1");
+       settings->setDefault("map_compression_level_net", "-1");
        settings->setDefault("full_block_send_enable_min_time_from_building", "2.0");
        settings->setDefault("dedicated_server_step", "0.09");
        settings->setDefault("active_block_mgmt_interval", "2.0");
@@ -426,7 +435,7 @@ void set_default_settings(Settings *settings)
        // Mapgen
        settings->setDefault("mg_name", "v7");
        settings->setDefault("water_level", "1");
-       settings->setDefault("mapgen_limit", "31000");
+       settings->setDefault("mapgen_limit", "31007");
        settings->setDefault("chunksize", "5");
        settings->setDefault("fixed_map_seed", "");
        settings->setDefault("max_block_generate_distance", "10");
@@ -440,27 +449,31 @@ void set_default_settings(Settings *settings)
        settings->setDefault("server_name", "");
        settings->setDefault("server_description", "");
 
-       settings->setDefault("high_precision_fpu", "true");
        settings->setDefault("enable_console", "false");
        settings->setDefault("screen_dpi", "72");
+       settings->setDefault("display_density_factor", "1");
 
        // Altered settings for macOS
 #if defined(__MACH__) && defined(__APPLE__)
        settings->setDefault("keymap_sneak", "KEY_SHIFT");
-       settings->setDefault("fps_max", "0");
 #endif
 
+#ifdef HAVE_TOUCHSCREENGUI
+       settings->setDefault("touchtarget", "true");
+       settings->setDefault("touchscreen_threshold","20");
+       settings->setDefault("fixed_virtual_joystick", "false");
+       settings->setDefault("virtual_joystick_triggers_aux1", "false");
+       settings->setDefault("clickable_chat_weblinks", "false");
+#else
+       settings->setDefault("clickable_chat_weblinks", "true");
+#endif
        // Altered settings for Android
 #ifdef __ANDROID__
        settings->setDefault("screen_w", "0");
        settings->setDefault("screen_h", "0");
        settings->setDefault("fullscreen", "true");
-       settings->setDefault("touchtarget", "true");
-       settings->setDefault("TMPFolder", porting::path_cache);
-       settings->setDefault("touchscreen_threshold","20");
-       settings->setDefault("fixed_virtual_joystick", "false");
-       settings->setDefault("virtual_joystick_triggers_aux", "false");
        settings->setDefault("smooth_lighting", "false");
+       settings->setDefault("performance_tradeoffs", "true");
        settings->setDefault("max_simultaneous_block_sends_per_client", "10");
        settings->setDefault("emergequeue_limit_diskonly", "16");
        settings->setDefault("emergequeue_limit_generate", "16");
@@ -468,8 +481,9 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_3d_clouds", "false");
        settings->setDefault("fps_max", "30");
        settings->setDefault("fps_max_unfocused", "10");
-       settings->setDefault("max_objects_per_block", "20");
        settings->setDefault("sqlite_synchronous", "1");
+       settings->setDefault("map_compression_level_disk", "-1");
+       settings->setDefault("map_compression_level_net", "-1");
        settings->setDefault("server_map_save_interval", "15");
        settings->setDefault("client_mapblock_limit", "1000");
        settings->setDefault("active_block_range", "2");
Dragonfireclient is an utility client for the Voxelengine minetest (http://minetest.net/). The client was created by Elias Fleckenstein and is inspired by the Minecraft clients Liquid Bounce and Impact. Discord: https://discord.gg/kab99uu for more information.