mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-04-25 09:14:22 +02:00
Code Issues Projects Releases Wiki Activity

Fix some tick schedule bugs

Browse Source 
Client wouldn't get ticked if the simulation was paused >_> Also fix some old bugs that would allow weird delay values to be derived when tick schedule was given weird target FPS values.
This commit is contained in:
Tamás Bálint Misius 2025-01-25 21:22:19 +01:00
parent bdcc753dff
commit c97a43b58f
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/PowderToySDL.cpp
View File

@ -17,8 +17,6 @@ bool vsyncHint = false;
WindowFrameOps currentFrameOps;
bool momentumScroll = true;
bool showAvatars = true;
uint64_t lastTick = 0;
uint64_t lastFpsUpdate = 0;
bool showLargeScreenDialog = false;
int mousex = 0;
int mousey = 0;
@ -53,7 +51,7 @@ public:
uint64_t Arm(float fps)
{
auto oldNowNs = startNs;
auto timeBlockDurationNs = uint64_t(UINT64_C(1'000'000'000) / fps);
auto timeBlockDurationNs = uint64_t(std::clamp(1e9f / fps, 1.f, 1e9f));
auto oldStartTimeBlock = oldStartNs / timeBlockDurationNs;
auto startTimeBlock = oldStartTimeBlock + 1U;
startNs = std::max(startNs, startTimeBlock * timeBlockDurationNs);
@ -67,6 +65,8 @@ public:
};
static FrameSchedule tickSchedule;
static FrameSchedule drawSchedule;
static FrameSchedule clientTickSchedule;
static FrameSchedule fpsUpdateSchedule;
void StartTextInput()
{
@ -455,16 +455,23 @@ std::optional<uint64_t> EngineProcess()
auto &engine = ui::Engine::Ref();
auto correctedFrameTime = tickSchedule.GetFrameTime();
correctedFrameTimeAvg = correctedFrameTimeAvg + (correctedFrameTime - correctedFrameTimeAvg) * 0.05;
if (correctedFrameTime && tickSchedule.GetNow() - lastFpsUpdate > UINT64_C(200'000'000))
{
engine.SetFps(1e9f / correctedFrameTimeAvg);
lastFpsUpdate = tickSchedule.GetNow();
}
if (tickSchedule.GetNow() - lastTick > UINT64_C(100'000'000))
{
lastTick = tickSchedule.GetNow();
TickClient();
auto nowNs = uint64_t(SDL_GetTicks()) * UINT64_C(1'000'000);
if (clientTickSchedule.HasElapsed(nowNs))
{
TickClient();
clientTickSchedule.SetNow(nowNs);
}
clientTickSchedule.Arm(10);
if (fpsUpdateSchedule.HasElapsed(nowNs))
{
engine.SetFps(1e9f / correctedFrameTimeAvg);
fpsUpdateSchedule.SetNow(nowNs);
}
fpsUpdateSchedule.Arm(5);
}
if (showLargeScreenDialog)
{
showLargeScreenDialog = false;

2
src/PowderToySDL.h
View File

@ -15,8 +15,6 @@ extern SDL_Renderer *sdl_renderer;
extern SDL_Texture *sdl_texture;
extern bool momentumScroll;
extern bool showAvatars;
extern uint64_t lastTick;
extern uint64_t lastFpsUpdate;
extern bool showLargeScreenDialog;
extern int mousex;
extern int mousey;

1
src/client/Client.cpp
View File

@ -110,6 +110,7 @@ void Client::BeginStartupRequest()
{
return;
}
serverNotifications.clear();
startupRequestError.reset();
startupRequestStatus = StartupRequestStatus::inProgress;
messageOfTheDay = "Fetching the message of the day...";