mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-28 07:59:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Separated writing of time keyframes into separate read & parse steps

Browse Source
This commit is contained in:
GPayne
2019-10-28 15:56:27 -06:00
parent 915eefbf11
commit ae5da23b04
2 changed files with 81 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
include/openspace/interaction/sessionrecording.h
View File

@@ -303,7 +303,7 @@ public:
* \param kf reference to a camera keyframe which contains the camera details
* \param kfBuffer a buffer temporarily used for preparing data to be written
* \param idx index into the temporary buffer
* \param file an ofstream reference to the playback file being written-to
* \param file an ofstream reference to the recording file being written-to
*/
static void SessionRecording::saveCameraKeyframeBinary(timestamps times,
datamessagestructures::CameraKeyframe& kf, unsigned char* kfBuffer, size_t& idx,
@@ -314,11 +314,34 @@ public:
*
* \param times reference to a timestamps structure which contains recorded times
* \param kf reference to a camera keyframe which contains the camera details
* \param file an ofstream reference to the playback file being written-to
* \param file an ofstream reference to the recording file being written-to
*/
static void SessionRecording::saveCameraKeyframeAscii(timestamps times,
datamessagestructures::CameraKeyframe& kf, std::ofstream& file);
/**
* Writes a time keyframe to a binary format recording file using a TimeKeyframe
*
* \param times reference to a timestamps structure which contains recorded times
* \param kf reference to a time keyframe which contains the time details
* \param kfBuffer a buffer temporarily used for preparing data to be written
* \param idx index into the temporary buffer
* \param file an ofstream reference to the recording file being written-to
*/
static void SessionRecording::saveTimeKeyframeBinary(timestamps times,
datamessagestructures::TimeKeyframe& kf, unsigned char* kfBuffer, size_t& idx,
std::ofstream& file);
/**
* Writes a time keyframe to an ascii format recording file using a TimeKeyframe
*
* \param times reference to a timestamps structure which contains recorded times
* \param kf reference to a time keyframe which contains the time details
* \param file an ofstream reference to the recording file being written-to
*/
static void SessionRecording::saveTimeKeyframeAscii(timestamps times,
datamessagestructures::TimeKeyframe& kf, std::ofstream& file);
private:
enum class RecordedType {
Camera = 0,

91
src/interaction/sessionrecording.cpp
View File

@@ -513,11 +513,13 @@ static void SessionRecording::saveCameraKeyframeAscii(timestamps times,
keyframeLine << times.timeRec << ' ';
keyframeLine << std::fixed << std::setprecision(3) << times.timeSim << ' ';
// Add camera position
keyframeLine << std::fixed << std::setprecision(7) << kf._position.x << ' '
keyframeLine
<< std::fixed << std::setprecision(7) << kf._position.x << ' '
<< std::fixed << std::setprecision(7) << kf._position.y << ' '
<< std::fixed << std::setprecision(7) << kf._position.z << ' ';
// Add camera rotation
keyframeLine << std::fixed << std::setprecision(7) << kf._rotation.x << ' '
keyframeLine
<< std::fixed << std::setprecision(7) << kf._rotation.x << ' '
<< std::fixed << std::setprecision(7) << kf._rotation.y << ' '
<< std::fixed << std::setprecision(7) << kf._rotation.z << ' '
<< std::fixed << std::setprecision(7) << kf._rotation.w << ' ';
@@ -541,44 +543,63 @@ void SessionRecording::saveTimeKeyframe() {
//Create a time keyframe, then call to populate it with current time props
datamessagestructures::TimeKeyframe kf = _externInteract.generateTimeKeyframe();
timestamps times = {
kf._timestamp,
kf._timestamp - _timestampRecordStarted,
global::timeManager.time().j2000Seconds()
};
if (_recordingDataMode == RecordedDataMode::Binary) {
_bufferIndex = 0;
_keyframeBuffer[_bufferIndex++] = 't';
writeToFileBuffer(_keyframeBuffer, _bufferIndex, kf._timestamp);
writeToFileBuffer(_keyframeBuffer, _bufferIndex, kf._timestamp
- _timestampRecordStarted);
writeToFileBuffer(_keyframeBuffer, _bufferIndex, kf._time);
writeToFileBuffer(_keyframeBuffer, _bufferIndex, kf._dt);
writeToFileBuffer(_keyframeBuffer, _bufferIndex, kf._paused);
writeToFileBuffer(_keyframeBuffer, _bufferIndex, kf._requiresTimeJump);
saveKeyframeToFileBinary(_keyframeBuffer, _bufferIndex, _recordFile);
saveTimeKeyframeBinary(times, kf, _keyframeBuffer, _bufferIndex, _recordFile);
} else {
std::stringstream keyframeLine = std::stringstream();
//Add simulation timestamp, timestamp relative, simulation time to recording start
keyframeLine << "time ";
keyframeLine << kf._timestamp << ' ';
keyframeLine << (kf._timestamp - _timestampRecordStarted) << ' ';
keyframeLine << std::fixed << std::setprecision(3) << kf._time;
keyframeLine << ' ' << kf._dt;
if (kf._paused) {
keyframeLine << " P";
}
else {
keyframeLine << " R";
}
if (kf._requiresTimeJump) {
keyframeLine << " J";
}
else {
keyframeLine << " -";
}
saveKeyframeToFile(keyframeLine.str(), _recordFile);
saveTimeKeyframeAscii(times, kf, _recordFile);
}
}
static void SessionRecording::saveTimeKeyframeBinary(timestamps times,
datamessagestructures::TimeKeyframe& kf,
unsigned char* kfBuffer,
size_t& idx,
std::ofstream& file)
{
idx = 0;
kfBuffer[idx++] = 't';
writeToFileBuffer(kfBuffer, idx, times.timeOs);
writeToFileBuffer(kfBuffer, idx, times.timeRec);
writeToFileBuffer(kfBuffer, idx, times.timeSim);
std::vector<char> writeBuffer;
kf.serialize(writeBuffer);
writeToFileBuffer(kfBuffer, idx, writeBuffer);
saveKeyframeToFileBinary(kfBuffer, idx, file);
}
static void SessionRecording::saveTimeKeyframeAscii(timestamps times,
datamessagestructures::CameraKeyframe& kf,
std::ofstream& file)
{
std::stringstream keyframeLine = std::stringstream();
//Add simulation timestamp, timestamp relative, simulation time to recording start
keyframeLine << "time ";
keyframeLine << times.timeOs << ' ';
keyframeLine << times.timeRec << ' ';
keyframeLine << std::fixed << std::setprecision(3) << times.timeSim << ' ';
keyframeLine << ' ' << kf._dt;
if (kf._paused) {
keyframeLine << " P";
}
else {
keyframeLine << " R";
}
if (kf._requiresTimeJump) {
keyframeLine << " J";
}
else {
keyframeLine << " -";
}
saveKeyframeToFile(keyframeLine.str(), _recordFile);
}
void SessionRecording::saveScriptKeyframe(std::string scriptToSave) {
if (_state != SessionState::Recording) {
return;