mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-27 06:19:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into thesis/2019/camera-paths

Browse Source 
# Conflicts:
#	src/rendering/abufferrenderer.cpp
This commit is contained in:
Emma Broman
2021-08-09 15:21:08 +02:00
parent 30f408e090 c5b71d13a5
commit bfe25c311b
102 changed files with 1825 additions and 3457 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/interaction/sessionrecording.cpp
+9 -2
View File
@@ -474,6 +474,8 @@ void SessionRecording::initializePlayback_time(double now) {
_timestampPlaybackStarted_simulation = global::timeManager->time().j2000Seconds();
_timestampApplicationStarted_simulation = _timestampPlaybackStarted_simulation - now;
_saveRenderingCurrentRecordedTime_interpolation = steady_clock::now();
_saveRenderingCurrentApplicationTime_interpolation =
global::windowDelegate->applicationTime();
_saveRenderingClockInterpolation_countsPerSec =
system_clock::duration::period::den / system_clock::duration::period::num;
_playbackPauseOffset = 0.0;
@@ -1178,11 +1180,14 @@ double SessionRecording::fixedDeltaTimeDuringFrameOutput() const {
}
std::chrono::steady_clock::time_point
SessionRecording::currentPlaybackInterpolationTime() const
{
SessionRecording::currentPlaybackInterpolationTime() const {
return _saveRenderingCurrentRecordedTime_interpolation;
}
double SessionRecording::currentApplicationInterpolationTime() const {
return _saveRenderingCurrentApplicationTime_interpolation;
}
bool SessionRecording::playbackCamera() {
Timestamps times;
datamessagestructures::CameraKeyframe kf;
@@ -1800,6 +1805,8 @@ void SessionRecording::moveAheadInTime() {
_saveRenderingCurrentRecordedTime_interpolation +=
_saveRenderingDeltaTime_interpolation_usec;
_saveRenderingCurrentRecordedTime += _saveRenderingDeltaTime;
_saveRenderingCurrentApplicationTime_interpolation +=
_saveRenderingDeltaTime;
global::renderEngine->takeScreenshot();
}
}