oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Don't use fps_max_unfocused for the pause menu

Browse source 
Nowadays, we have things like buttons that change appearance on hover, or scoll bars
in the pause menu. These do not work fine with low fps.
This commit is contained in:
Desour 2025-02-10 17:15:57 +01:00 • committed by DS
parent a57677120a
commit 191cb117f9
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
builtin/settingtypes.txt
View file

@ -256,8 +256,8 @@ fps_max (Maximum FPS) int 60 1 4294967295
# Vertical screen synchronization. Your system may still force VSync on even if this is disabled. # Vertical screen synchronization. Your system may still force VSync on even if this is disabled.
vsync (VSync) bool false vsync (VSync) bool false
# Maximum FPS when the window is not focused, or when the game is paused. # Maximum FPS when the window is not focused.
fps_max_unfocused (FPS when unfocused or paused) int 20 1 4294967295 fps_max_unfocused (FPS when unfocused) int 20 1 4294967295
# View distance in nodes. # View distance in nodes.
viewing_range (Viewing range) int 190 20 4000 viewing_range (Viewing range) int 190 20 4000

4
src/client/game.cpp
View file

@ -968,7 +968,7 @@ void Game::run()
// Calculate dtime = // Calculate dtime =
// m_rendering_engine->run() from this iteration // m_rendering_engine->run() from this iteration
// + Sleep time until the wanted FPS are reached // + Sleep time until the wanted FPS are reached
draw_times.limit(device, &dtime, g_menumgr.pausesGame()); draw_times.limit(device, &dtime);
framemarker.start(); framemarker.start();
@ -2504,7 +2504,7 @@ inline void Game::step(f32 dtime)
ZoneScoped; ZoneScoped;
if (server) { if (server) {
float fps_max = (!device->isWindowFocused() || g_menumgr.pausesGame()) ? float fps_max = !device->isWindowFocused() ?
g_settings->getFloat("fps_max_unfocused") : g_settings->getFloat("fps_max_unfocused") :
g_settings->getFloat("fps_max"); g_settings->getFloat("fps_max");
fps_max = std::max(fps_max, 1.0f); fps_max = std::max(fps_max, 1.0f);

4
src/client/renderingengine.cpp
View file

@ -34,9 +34,9 @@ void FpsControl::reset()
last_time = porting::getTimeUs(); last_time = porting::getTimeUs();
} }
void FpsControl::limit(IrrlichtDevice *device, f32 *dtime, bool assume_paused) void FpsControl::limit(IrrlichtDevice *device, f32 *dtime)
{ {
const float fps_limit = (device->isWindowFocused() && !assume_paused) const float fps_limit = device->isWindowFocused()
? g_settings->getFloat("fps_max") ? g_settings->getFloat("fps_max")
: g_settings->getFloat("fps_max_unfocused"); : g_settings->getFloat("fps_max_unfocused");
const u64 frametime_min = 1000000.0f / std::max(fps_limit, 1.0f); const u64 frametime_min = 1000000.0f / std::max(fps_limit, 1.0f);

2
src/client/renderingengine.h
View file

@ -45,7 +45,7 @@ struct FpsControl {
void reset(); void reset();
void limit(IrrlichtDevice *device, f32 *dtime, bool assume_paused = false); void limit(IrrlichtDevice *device, f32 *dtime);
u32 getBusyMs() const { return busy_time / 1000; } u32 getBusyMs() const { return busy_time / 1000; }