From cfb7e0167311fe383863ded96d3392564e869eea Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Fri, 2 Jul 2021 22:23:29 -0700 Subject: [PATCH] Yeah, I'm an idiot, std::min is the correct one --- Runtime/CMain.cpp | 2 +- extern/boo | 2 +- extern/imgui | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Runtime/CMain.cpp b/Runtime/CMain.cpp index be6bd36bf..c23abf78b 100644 --- a/Runtime/CMain.cpp +++ b/Runtime/CMain.cpp @@ -447,7 +447,7 @@ struct Application : boo::IApplicationCallback { using delta_duration = std::chrono::duration>; realDt = std::chrono::duration_cast(now - m_prevFrameTime).count(); if (m_cvarCommons.m_variableDt->toBoolean()) { - dt = std::max(realDt, 1 / 30.f); + dt = std::min(realDt, 1 / 30.f); } } m_prevFrameTime = now; diff --git a/extern/boo b/extern/boo index 542191fd7..f01454a6a 160000 --- a/extern/boo +++ b/extern/boo @@ -1 +1 @@ -Subproject commit 542191fd70e8835576f2d1320859291518972e8a +Subproject commit f01454a6a8d70a81a53ed86085b1f924e83d8f6d diff --git a/extern/imgui b/extern/imgui index 8877eab39..23a15834f 160000 --- a/extern/imgui +++ b/extern/imgui @@ -1 +1 @@ -Subproject commit 8877eab3933c7031e2b41f372b852618db219489 +Subproject commit 23a15834fa23226bd26a17f5142b00678617fec4