mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-16 17:00:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Undo on recently-added changes that restricted time manipulation during playback.

Browse Source
This commit is contained in:
GPayne
2019-09-05 12:42:01 -06:00
parent 1e426f3c46
commit b375205c1a
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/timemanager.cpp
View File

@@ -103,10 +103,6 @@ TimeManager::TimeManager()
}
void TimeManager::interpolateTime(double targetTime, double durationSeconds) {
if (_playbackModeEnabled) {
return;
}
ghoul_precondition(durationSeconds > 0.f, "durationSeconds must be positive");
const double now = global::windowDelegate.applicationTime();
@@ -279,7 +275,7 @@ void TimeManager::progressTime(double dt) {
// and time is not paused, just advance time.
_deltaTime = _targetDeltaTime;
_currentTime.data().advanceTime(dt * _deltaTime);
}
}
if (hasPastKeyframes) {
_latestConsumedTimestamp = lastPastKeyframe->timestamp;
@@ -527,7 +523,7 @@ double TimeManager::targetDeltaTime() const {
void TimeManager::interpolateDeltaTime(double newDeltaTime, double interpolationDuration)
{
if (newDeltaTime == _targetDeltaTime || _playbackModeEnabled) {
if (newDeltaTime == _targetDeltaTime) {
return;
}