Simplify loading of Android version of menu

[dragonfireclient.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 945804ba82ac4c5b5c09905299cb1ff9dcd36a5d..e7b0e374516fd7a6157ac92064b84d68d24819c9 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -21,6 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "porting.h"
 #include "filesys.h"
 #include "config.h"
+#include "constants.h"
+#include "porting.h"
 
 void set_default_settings(Settings *settings)
 {
@@ -56,12 +58,13 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_camera_mode", "KEY_F7");
        settings->setDefault("keymap_increase_viewing_range_min", "+");
        settings->setDefault("keymap_decrease_viewing_range_min", "-");
-       settings->setDefault("anaglyph", "false");
-       settings->setDefault("anaglyph_strength", "0.1");
+       settings->setDefault("3d_mode", "none");
+       settings->setDefault("3d_paralax_strength", "0.025");
        settings->setDefault("aux1_descends", "false");
        settings->setDefault("doubletap_jump", "false");
        settings->setDefault("always_fly_fast", "true");
        settings->setDefault("directional_colored_fog", "true");
+       settings->setDefault("tooltip_show_delay", "400");
 
        // Some (temporary) keys for debugging
        settings->setDefault("keymap_print_debug_stacks", "KEY_KEY_P");
@@ -97,6 +100,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("view_bobbing", "true");
        settings->setDefault("new_style_water", "false");
        settings->setDefault("new_style_leaves", "true");
+       settings->setDefault("connected_glass", "false");
        settings->setDefault("smooth_lighting", "true");
        settings->setDefault("texture_path", "");
        settings->setDefault("shader_path", "");
@@ -117,6 +121,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("console_color", "(0,0,0)");
        settings->setDefault("console_alpha", "200");
        settings->setDefault("selectionbox_color", "(0,0,0)");
+       settings->setDefault("enable_node_highlighting", "false");
        settings->setDefault("crosshair_color", "(255,255,255)");
        settings->setDefault("crosshair_alpha", "255");
        settings->setDefault("gui_scaling", "1.0");
@@ -124,13 +129,15 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_sound", "true");
        settings->setDefault("sound_volume", "0.8");
        settings->setDefault("desynchronize_mapblock_texture_animation", "true");
+       settings->setDefault("selectionbox_width","2");
        settings->setDefault("hud_hotbar_max_width","1.0");
+       settings->setDefault("enable_local_map_saving", "false");
 
        settings->setDefault("mip_map", "false");
        settings->setDefault("anisotropic_filter", "false");
        settings->setDefault("bilinear_filter", "false");
        settings->setDefault("trilinear_filter", "false");
-       settings->setDefault("preload_item_visuals", "true");
+       settings->setDefault("preload_item_visuals", "false");
        settings->setDefault("enable_bumpmapping", "false");
        settings->setDefault("enable_parallax_occlusion", "false");
        settings->setDefault("generate_normalmaps", "false");
@@ -147,9 +154,12 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_shaders", "true");
        settings->setDefault("repeat_rightclick_time", "0.25");
        settings->setDefault("enable_particles", "true");
+       settings->setDefault("enable_mesh_cache", "true");
 
        settings->setDefault("curl_timeout", "5000");
        settings->setDefault("curl_parallel_limit", "8");
+       settings->setDefault("curl_file_download_timeout", "300000");
+       settings->setDefault("curl_verify_cert", "true");
 
        settings->setDefault("enable_remote_media_server", "true");
 
@@ -164,13 +174,11 @@ void set_default_settings(Settings *settings)
 #if USE_FREETYPE
        settings->setDefault("freetype", "true");
        settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "liberationsans.ttf"));
-       settings->setDefault("font_size", "13");
        settings->setDefault("font_shadow", "1");
        settings->setDefault("font_shadow_alpha", "128");
        settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "liberationmono.ttf"));
-       settings->setDefault("mono_font_size", "13");
        settings->setDefault("fallback_font_path", porting::getDataPath("fonts" DIR_DELIM "DroidSansFallbackFull.ttf"));
-       settings->setDefault("fallback_font_size", "13");
+
        settings->setDefault("fallback_font_shadow", "1");
        settings->setDefault("fallback_font_shadow_alpha", "128");
 #else
@@ -184,19 +192,18 @@ void set_default_settings(Settings *settings)
        settings->setDefault("workaround_window_size","5");
        settings->setDefault("max_packets_per_iteration","1024");
        settings->setDefault("port", "30000");
-       settings->setDefault("bind_address","");
+       settings->setDefault("bind_address", "");
        settings->setDefault("default_game", "minetest");
        settings->setDefault("motd", "");
        settings->setDefault("max_users", "15");
        settings->setDefault("strict_protocol_version_checking", "false");
        settings->setDefault("creative_mode", "false");
        settings->setDefault("enable_damage", "true");
-       settings->setDefault("only_peaceful_mobs", "false");
        settings->setDefault("fixed_map_seed", "");
        settings->setDefault("give_initial_stuff", "false");
        settings->setDefault("default_password", "");
        settings->setDefault("default_privs", "interact, shout");
-       settings->setDefault("unlimited_player_transfer_distance", "true");
+       settings->setDefault("player_transfer_distance", "0");
        settings->setDefault("enable_pvp", "true");
        settings->setDefault("disallow_empty_password", "false");
        settings->setDefault("disable_anticheat", "false");
@@ -228,16 +235,13 @@ void set_default_settings(Settings *settings)
        settings->setDefault("full_block_send_enable_min_time_from_building", "2.0");
        settings->setDefault("dedicated_server_step", "0.1");
        settings->setDefault("ignore_world_load_errors", "false");
-       settings->setDefault("congestion_control_aim_rtt", "0.2");
-       settings->setDefault("congestion_control_max_rate", "400");
-       settings->setDefault("congestion_control_min_rate", "10");
        settings->setDefault("remote_media", "");
        settings->setDefault("debug_log_level", "2");
        settings->setDefault("emergequeue_limit_total", "256");
        settings->setDefault("emergequeue_limit_diskonly", "32");
        settings->setDefault("emergequeue_limit_generate", "32");
        settings->setDefault("num_emerge_threads", "1");
-       
+
        // physics stuff
        settings->setDefault("movement_acceleration_default", "3");
        settings->setDefault("movement_acceleration_air", "2");
@@ -262,9 +266,6 @@ void set_default_settings(Settings *settings)
        settings->setDefault("chunksize", "5");
        settings->setDefault("mg_flags", "");
 
-       settings->setDefault("mgmath_generator", "mandelbox");
-
-
        // IPv6
        settings->setDefault("enable_ipv6", "true");
        settings->setDefault("ipv6_server", "false");
@@ -279,6 +280,54 @@ void set_default_settings(Settings *settings)
        settings->setDefault("high_precision_fpu", "true");
 
        settings->setDefault("language", "");
+
+#ifdef __ANDROID__
+       settings->setDefault("screenW", "0");
+       settings->setDefault("screenH", "0");
+       settings->setDefault("enable_shaders", "false");
+       settings->setDefault("fullscreen", "true");
+       settings->setDefault("enable_particles", "false");
+       settings->setDefault("video_driver", "ogles1");
+       settings->setDefault("touchtarget", "true");
+       settings->setDefault("TMPFolder","/sdcard/Minetest/tmp/");
+       settings->setDefault("touchscreen_threshold","20");
+       settings->setDefault("smooth_lighting", "false");
+       settings->setDefault("max_simultaneous_block_sends_per_client", "3");
+       settings->setDefault("emergequeue_limit_diskonly", "8");
+       settings->setDefault("emergequeue_limit_generate", "8");
+       settings->setDefault("preload_item_visuals", "false");
+
+       settings->setDefault("viewing_range_nodes_max", "50");
+       settings->setDefault("viewing_range_nodes_min", "20");
+       settings->setDefault("inventory_image_hack", "false");
+
+       //check for device with small screen
+       float x_inches = ((double) porting::getDisplaySize().X /
+                       (160 * porting::getDisplayDensity()));
+       if (x_inches  < 3.5) {
+               settings->setDefault("gui_scaling", "0.6");
+       }
+       else if (x_inches < 4.5) {
+               settings->setDefault("gui_scaling", "0.7");
+       }
+       settings->setDefault("curl_verify_cert","false");
+#endif
+}
+
+void late_init_default_settings(Settings* settings)
+{
+#ifndef SERVER
+       std::stringstream fontsize;
+       fontsize << floor(
+                       DEFAULT_FONT_SIZE *
+                       porting::getDisplayDensity() *
+                       settings->getFloat("gui_scaling")
+                       );
+
+       settings->setDefault("font_size", fontsize.str());
+       settings->setDefault("mono_font_size", fontsize.str());
+       settings->setDefault("fallback_font_size", fontsize.str());
+#endif
 }
 
 void override_default_settings(Settings *settings, Settings *from)