ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix max FPS order for iOS STK

Browse Source
This commit is contained in:
Benau 2021-05-21 16:21:06 +08:00
parent fd10286f9d
commit ae32b8fc61
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/user_config.hpp
View File

@ -922,7 +922,7 @@ namespace UserConfigParams
"Quality of anisotropic filtering (usual values include 2-4-8-16; 0 to disable)") ); "Quality of anisotropic filtering (usual values include 2-4-8-16; 0 to disable)") );
PARAM_PREFIX IntUserConfigParam m_swap_interval PARAM_PREFIX IntUserConfigParam m_swap_interval
PARAM_DEFAULT( IntUserConfigParam(0, "swap_interval", PARAM_DEFAULT( IntUserConfigParam(0, "swap-interval",
&m_graphics_quality, &m_graphics_quality,
"Swap interval for vsync: 0 = disabled, 1 = full") ); "Swap interval for vsync: 0 = disabled, 1 = full") );
PARAM_PREFIX BoolUserConfigParam m_motionblur PARAM_PREFIX BoolUserConfigParam m_motionblur

5
src/main_android.cpp
View File

@ -66,11 +66,6 @@ void override_default_params_for_mobile()
// Enable multitouch race GUI // Enable multitouch race GUI
UserConfigParams::m_multitouch_draw_gui = true; UserConfigParams::m_multitouch_draw_gui = true;
#ifdef IOS_STK
// Default 30 fps for battery saving (only used in iOS)
UserConfigParams::m_swap_interval = 2;
#endif
#ifdef ANDROID #ifdef ANDROID
// For usage in StringUtils::getUserAgentString // For usage in StringUtils::getUserAgentString
if (SDL_IsAndroidTV()) if (SDL_IsAndroidTV())

4
src/main_loop.cpp
View File

@ -311,9 +311,9 @@ float MainLoop::getLimitedDt()
// For iOS devices most at locked at 60, for new iPad Pro supports 120 // For iOS devices most at locked at 60, for new iPad Pro supports 120
// which is currently m_max_fps // which is currently m_max_fps
const int max_fps = const int max_fps =
UserConfigParams::m_swap_interval == 2 ? 30 : UserConfigParams::m_swap_interval == 2 ? UserConfigParams::m_max_fps :
UserConfigParams::m_swap_interval == 1 ? 60 : UserConfigParams::m_swap_interval == 1 ? 60 :
UserConfigParams::m_max_fps; 30;
#else #else
const int max_fps = (irr_driver->isRecording() && const int max_fps = (irr_driver->isRecording() &&
UserConfigParams::m_limit_game_fps ) UserConfigParams::m_limit_game_fps )

4
src/states_screens/options/options_screen_video.cpp
View File

@ -234,9 +234,9 @@ void OptionsScreenVideo::init()
#ifdef IOS_STK #ifdef IOS_STK
//I18N: In the video options, maximum frame per second //I18N: In the video options, maximum frame per second
getWidget("vsync_label")->setText(_("Maximum FPS")); getWidget("vsync_label")->setText(_("Maximum FPS"));
vsync->addLabel("120");
vsync->addLabel("60");
vsync->addLabel("30"); vsync->addLabel("30");
vsync->addLabel("60");
vsync->addLabel("120");
vsync->setValue(UserConfigParams::m_swap_interval); vsync->setValue(UserConfigParams::m_swap_interval);
#else #else
vsync->addLabel(_("Disabled")); vsync->addLabel(_("Disabled"));