sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/Application: Fix updater elapsed time

This commit is contained in:
SirLynix 2023-05-06 15:44:52 +02:00
parent 5e5a740f24
commit 9aeaaa9495
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Core/ApplicationBase.inl
View File

@ -21,7 +21,7 @@ namespace Nz
inline void ApplicationBase::AddUpdater(std::unique_ptr<ApplicationUpdater>&& functor) inline void ApplicationBase::AddUpdater(std::unique_ptr<ApplicationUpdater>&& functor)
{ {
auto& updaterEntry = m_updaters.emplace_back(); auto& updaterEntry = m_updaters.emplace_back();
updaterEntry.lastUpdate = Time::Zero(); updaterEntry.lastUpdate = -Time::Nanosecond();
updaterEntry.nextUpdate = Time::Zero(); updaterEntry.nextUpdate = Time::Zero();
updaterEntry.updater = std::move(functor); updaterEntry.updater = std::move(functor);
} }

2
src/Nazara/Core/ApplicationBase.cpp
View File

@ -65,7 +65,7 @@ namespace Nz
Time timeSinceLastUpdate = m_currentTime - updaterEntry.lastUpdate; Time timeSinceLastUpdate = m_currentTime - updaterEntry.lastUpdate;
if NAZARA_UNLIKELY(updaterEntry.nextUpdate == updaterEntry.lastUpdate) if NAZARA_UNLIKELY(updaterEntry.lastUpdate < Time::Zero())
{ {
// First call // First call
timeSinceLastUpdate = Time::Zero(); timeSinceLastUpdate = Time::Zero();

14
tests/UnitTests/Engine/Core/ApplicationTest.cpp
View File

@ -16,15 +16,16 @@ SCENARIO("Application", "[CORE][ABSTRACTHASH]")
INFO("First update should have elapsed time as zero"); INFO("First update should have elapsed time as zero");
CHECK(elapsedTime == Nz::Time::Zero()); CHECK(elapsedTime == Nz::Time::Zero());
} }
else
CHECK(elapsedTime == Nz::Time::Milliseconds(10));
triggerCount++; triggerCount++;
}); });
app.Update(Nz::Time::Milliseconds(10)); for (std::size_t i = 0; i < 10; ++i)
app.Update(Nz::Time::Milliseconds(10));
app.Update(Nz::Time::Milliseconds(10)); app.Update(Nz::Time::Milliseconds(10));
CHECK(triggerCount == 3); CHECK(triggerCount == 10);
} }
WHEN("Using interval") WHEN("Using interval")
@ -40,7 +41,11 @@ SCENARIO("Application", "[CORE][ABSTRACTHASH]")
CHECK(elapsedTime == Nz::Time::Zero()); CHECK(elapsedTime == Nz::Time::Zero());
} }
else else
{
INFO("Following update should have elapsed time >= interval");
CHECK(elapsedTime >= Nz::Time::Milliseconds(100));
CHECK(elapsedTime < Nz::Time::Milliseconds(200)); CHECK(elapsedTime < Nz::Time::Milliseconds(200));
}
triggerCount++; triggerCount++;
}); });
@ -57,6 +62,9 @@ SCENARIO("Application", "[CORE][ABSTRACTHASH]")
CHECK(triggerCount == 3); CHECK(triggerCount == 3);
app.Update(Nz::Time::Milliseconds(100)); app.Update(Nz::Time::Milliseconds(100));
CHECK(triggerCount == 4); CHECK(triggerCount == 4);
for (std::size_t i = 0; i < 10; ++i)
app.Update(Nz::Time::Milliseconds(10));
CHECK(triggerCount == 5);
} }
WHEN("Using fixed-time interval") WHEN("Using fixed-time interval")