From 5de9d6a900fb9cb1a858b8b448e1d269df83807f Mon Sep 17 00:00:00 2001 From: Maksim Date: Sat, 7 Nov 2020 23:28:26 +0100 Subject: [PATCH] iOS: fix shaders support and update defaultsettings --- build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj | 2 ++ src/defaultsettings.cpp | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj index 910d29d1..1b44880d 100644 --- a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj +++ b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj @@ -1810,6 +1810,7 @@ "USE_LUAJIT=1", "USE_SYSTEM_GMP=0", "HAVE_TOUCHSCREENGUI=1", + "ENABLE_GLES=1", ); HEADER_SEARCH_PATHS = ( "$(inherited)", @@ -1877,6 +1878,7 @@ "USE_LUAJIT=1", "USE_SYSTEM_GMP=0", "HAVE_TOUCHSCREENGUI=1", + "ENABLE_GLES=1", ); HEADER_SEARCH_PATHS = ( "$(inherited)", diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 8ae623f0..9afd081e 100755 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -388,7 +388,7 @@ void set_default_settings(Settings *settings) { settings->setDefault("keymap_toggle_debug", "KEY_KEY_V"); settings->setDefault("keymap_camera_mode", "KEY_KEY_C"); settings->setDefault("vsync", "true"); - + float ScaleFactor = [[NSScreen mainScreen] backingScaleFactor]; if (ScaleFactor >= 2) settings->setDefault("screen_dpi", "128"); @@ -452,7 +452,7 @@ void set_default_settings(Settings *settings) { settings->setDefault("client_unload_unused_data_timeout", "120"); settings->setDefault("client_mapblock_limit", "200"); settings->setDefault("fps_max", "35"); - settings->setDefault("pause_fps_max", "5"); + settings->setDefault("pause_fps_max", "10"); settings->setDefault("viewing_range", "30"); settings->setDefault("smooth_lighting", "false"); settings->setDefault("enable_3d_clouds", "false"); @@ -475,7 +475,6 @@ void set_default_settings(Settings *settings) { settings->setDefault("client_unload_unused_data_timeout", "300"); settings->setDefault("client_mapblock_limit", "300"); settings->setDefault("fps_max", "35"); - settings->setDefault("pause_fps_max", "10"); settings->setDefault("viewing_range", "60"); settings->setDefault("cloud_radius", "6"); settings->setDefault("active_block_range", "2");