drinkingtea/jasper
2
0
Fork 0
Code Issues 2 Pull Requests Actions Releases Activity

[studio,turbine] Fix Turbine sleep logic, tweak Studio default sleep values

Browse Source
This commit is contained in:
Gary Talent
2024-06-01 01:20:01 -05:00
parent 7499bd87da
commit 04bf815642
6 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
deps/nostalgia/src/olympic/turbine/include/turbine/gfx.hpp vendored
View File

@ -43,6 +43,12 @@ ox::Bounds getWindowBounds(Context &ctx) noexcept;
ox::Error setWindowBounds(Context &ctx, ox::Bounds const&bnds) noexcept;
void setConstantRefresh(Context &ctx, bool r) noexcept;
/**
* Tells Turbine to refresh the screen within the specified period of time.
* If the requested value is greater than the current value, the call has no effect.
* @param ctx - Context
* @param ms - milliseconds
*/
void setRefreshWithin(Context &ctx, int ms) noexcept;
}

3
deps/nostalgia/src/olympic/turbine/src/glfw/context.hpp vendored
View File

@ -22,8 +22,7 @@ class Context {
int uninterruptedRefreshes = 3;
ox::UPtr<BaseClipboardObject> clipboard;
struct GLFWwindow *window = nullptr;
// sets screen refresh to constant instead of only on event
bool constantRefresh = true;
int refreshWithinMs = 0;
ox::Vector<gl::Drawer*, 5> drawers;
int64_t startTime = 0;
uint64_t wakeupTime = 0;

4
deps/nostalgia/src/olympic/turbine/src/glfw/gfx.cpp vendored
View File

@ -260,8 +260,8 @@ ox::Error setWindowBounds(Context &ctx, ox::Bounds const&bnds) noexcept {
return {};
}
void setConstantRefresh(Context &ctx, bool r) noexcept {
ctx.constantRefresh = r;
void setRefreshWithin(Context &ctx, int ms) noexcept {
ctx.refreshWithinMs = ox::min(ms, ctx.refreshWithinMs);
}
}

8
deps/nostalgia/src/olympic/turbine/src/glfw/turbine.cpp vendored
View File

@ -69,6 +69,7 @@ static void tickFps(Context &ctx, uint64_t nowMs) noexcept {
ox::Error run(Context &ctx) noexcept {
int sleepTime = 0;
while (!glfwWindowShouldClose(ctx.window)) {
ctx.refreshWithinMs = 10 * 1000; // refresh within 10 seconds
glfwPollEvents();
auto const ticks = ticksMs(ctx);
if (ctx.wakeupTime <= ticks) {
@ -79,15 +80,16 @@ ox::Error run(Context &ctx) noexcept {
ctx.wakeupTime = ~uint64_t(0);
}
} else {
sleepTime = 10;
sleepTime = static_cast<int>(ctx.wakeupTime - ticks);
}
tickFps(ctx, ticks);
draw(ctx);
if (!ctx.constantRefresh) {
auto const realSleepTime = ox::min(ctx.refreshWithinMs, sleepTime);
if (realSleepTime) {
if (ctx.uninterruptedRefreshes) {
--ctx.uninterruptedRefreshes;
} else {
glfwWaitEventsTimeout(sleepTime);
glfwWaitEventsTimeout(static_cast<double>(realSleepTime) / 1000);
}
}
}