Ticket #2882: t2882_limit_fps_v3.patch

binaries/data/config/default.cfg

@@ -317 +317 @@
 
 [gui]
 cursorblinkrate = 0.5             ; Cursor blink rate in seconds (0.0 to disable blinking)
 scale = 1.0                       ; GUI scaling factor, for improved compatibility with 4K displays
 
+[gui.menu]
+limit_fps = true                  ; Limit FPS in the menus and loading screen
+
 [gui.session]
 attacknotificationmessage = true  ; Show attack notification messages
 camerajump.threshold = 40         ; How close do we have to be to the actual location in order to jump back to the previous one?
 timeelapsedcounter = false        ; Show the game duration in the top right corner
 

binaries/data/mods/public/gui/options/options.js

@@ -12 +12 @@
         [translate("Detailed Tooltips"), translate("Show detailed tooltips for trainable units in unit-producing buildings."), {"config":"showdetailedtooltips"}, "boolean"],
         [translate("FPS Overlay"), translate("Show frames per second in top right corner."), {"config":"overlay.fps"}, "boolean"],
         [translate("Realtime Overlay"), translate("Show current system time in top right corner."), {"config":"overlay.realtime"}, "boolean"],
         [translate("Gametime Overlay"), translate("Show current simulation time in top right corner."), {"config":"gui.session.timeelapsedcounter"}, "boolean"],
         [translate("Ceasefire Time Overlay"), translate("Always show the remaining ceasefire time."), {"config":"gui.session.ceasefirecounter"}, "boolean"],
-        [translate("Persist match settings"), translate("Save and restore match settings for quick reuse when hosting another game"), {"config":"persistmatchsettings"}, "boolean"],
+        [translate("Persist Match Settings"), translate("Save and restore match settings for quick reuse when hosting another game"), {"config":"persistmatchsettings"}, "boolean"],
     ],
     "graphicsSetting":
     [
         [translate("Prefer GLSL"), translate("Use OpenGL 2.0 shaders (recommended)"), {"renderer":"PreferGLSL", "config":"preferglsl"}, "boolean"],
         [translate("Post Processing"), translate("Use screen-space postprocessing filters (HDR, Bloom, DOF, etc)"), {"renderer":"Postproc", "config":"postproc"}, "boolean"],
@@ -31 +31 @@
         [translate("Real Water Depth"), translate("Use actual water depth in rendering calculations"), {"renderer":"WaterRealDepth", "config":"waterrealdepth"}, "boolean"],
         [translate("Water Reflections"), translate("Allow water to reflect a mirror image"), {"renderer":"WaterReflection", "config":"waterreflection"}, "boolean"],
         [translate("Water Refraction"), translate("Use a real water refraction map and not transparency"), {"renderer":"WaterRefraction", "config":"waterrefraction"}, "boolean"],
         [translate("Shadows on Water"), translate("Cast shadows on water"), {"renderer":"WaterShadows", "config":"watershadows"}, "boolean"],
         [translate("VSync"), translate("Run vertical sync to fix screen tearing. REQUIRES GAME RESTART"), {"config":"vsync"}, "boolean"],
+        [translate("Limit FPS in Menus"), translate("Limit frames per second in all menus."), {"config":"gui.menu.limit_fps"}, "boolean"],
     ],
     "soundSetting":
     [
         [translate("Master Gain"), translate("Master audio gain"), {"config":"sound.mastergain", "function":"Engine.SetMasterGain(Number(this.caption));"}, "number"],
         [translate("Music Gain"), translate("In game music gain"), {"config":"sound.musicgain", "function":"Engine.SetMusicGain(Number(this.caption));"}, "number"],

source/main.cpp

@@ -41 +41 @@
 #include "lib/external_libraries/libsdl.h"
 
 #include "ps/ArchiveBuilder.h"
 #include "ps/CConsole.h"
 #include "ps/CLogger.h"
+#include "ps/ConfigDB.h"
 #include "ps/Filesystem.h"
 #include "ps/Game.h"
 #include "ps/Globals.h"
 #include "ps/Hotkey.h"
 #include "ps/Loader.h"
@@ -298 +299 @@
         need_update = false;
         // don't use SDL_WaitEvent: don't want the main loop to freeze until app focus is restored
         SDL_Delay(10);
     }
 
-    // TODO: throttling: limit update and render frequency to the minimum.
+    // Throttling: limit update and render frequency to the minimum.
     // this is mostly relevant for "inactive" state, so that other windows
     // get enough CPU time, but it's always nice for power+thermal management.
+    const float maxFPSMenu = 50.0;
+    bool limit_fps = false;
+    CFG_GET_VAL("gui.menu.limit_fps", limit_fps);
+    if (limit_fps && (!g_Game || !g_Game->IsGameStarted()))
+        SDL_Delay((1000.0 / maxFPSMenu) - realTimeSinceLastFrame);
 
 
     // this scans for changed files/directories and reloads them, thus
     // allowing hotloading (changes are immediately assimilated in-game).
     ReloadChangedFiles();