Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 18:41:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR feedback

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-07-28 15:15:33 -07:00
parent 22619a66ba
commit 74a3835a1e
1 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -839,34 +839,22 @@ void ScriptEngine::run() {
// calculate a sleepUntil to be the time from our start time until the original target // calculate a sleepUntil to be the time from our start time until the original target
// sleepUntil for this frame. // sleepUntil for this frame.
const std::chrono::microseconds FRAME_DURATION(USECS_PER_SECOND / SCRIPT_FPS + 1); const std::chrono::microseconds FRAME_DURATION(USECS_PER_SECOND / SCRIPT_FPS + 1);
clock::time_point sleepUntil(startTime + thisFrame++ * FRAME_DURATION); clock::time_point targetSleepUntil(startTime + thisFrame++ * FRAME_DURATION);
// However, if our sleepUntil is not at least our average update time into the future // However, if our sleepUntil is not at least our average update time into the future
// it means our script is taking too long in it's updates, and we want to punish the // it means our script is taking too long in it's updates, and we want to punish the
// script a little bit. So we will force the sleepUntil to be at least our averageUpdate // script a little bit. So we will force the sleepUntil to be at least our averageUpdate
// time into the future. // time into the future.
auto wouldSleep = (sleepUntil - beforeSleep); auto averageUpdate = totalUpdates / thisFrame;
auto avgerageUpdate = totalUpdates / thisFrame; auto sleepUntil = std::max(targetSleepUntil, beforeSleep + averageUpdate);
if (wouldSleep < avgerageUpdate) {
sleepUntil = beforeSleep + avgerageUpdate;
}
// We don't want to actually sleep for too long, because it causes our scripts to hang // We don't want to actually sleep for too long, because it causes our scripts to hang
// on shutdown and stop... so we want to loop and sleep until we've spent our time in // on shutdown and stop... so we want to loop and sleep until we've spent our time in
// purgatory, constantly checking to see if our script was asked to end // purgatory, constantly checking to see if our script was asked to end
bool firstTime = true;
while (!_isFinished && clock::now() < sleepUntil) { while (!_isFinished && clock::now() < sleepUntil) {
if (!firstTime) { QCoreApplication::processEvents(); // before we sleep again, give events a chance to process
QCoreApplication::processEvents(); // before we sleep again, give events a chance to process auto thisSleepUntil = std::min(sleepUntil, clock::now() + FRAME_DURATION);
}
auto wouldSleepSlice = (sleepUntil - clock::now());
auto thisSleepUntil = sleepUntil;
if (wouldSleepSlice > FRAME_DURATION) {
thisSleepUntil = clock::now() + FRAME_DURATION;
}
std::this_thread::sleep_until(thisSleepUntil); std::this_thread::sleep_until(thisSleepUntil);
firstTime = false;
} }
#ifdef SCRIPT_DELAY_DEBUG #ifdef SCRIPT_DELAY_DEBUG
@ -880,7 +868,7 @@ void ScriptEngine::run() {
qCDebug(scriptengine) << qCDebug(scriptengine) <<
"Frame:" << thisFrame << "Frame:" << thisFrame <<
"Slept (us):" << std::chrono::duration_cast<std::chrono::microseconds>(actuallySleptUntil - beforeSleep).count() << "Slept (us):" << std::chrono::duration_cast<std::chrono::microseconds>(actuallySleptUntil - beforeSleep).count() <<
"Avg Updates (us):" << avgerageUpdate.count() << "Avg Updates (us):" << averageUpdate.count() <<
"FPS:" << fps; "FPS:" << fps;
} }
} }