Misc coding style cleanups

This commit is contained in:
Alexander Bock
2018-11-06 12:02:56 -05:00
parent d1fa145e0a
commit 7a3a8a5cf6
33 changed files with 399 additions and 311 deletions
+10 -9
View File
@@ -110,7 +110,7 @@ datamessagestructures::CameraKeyframe ExternInteraction::generateCameraKeyframe(
if (!focusNode) {
return kf;
}
//kf._position = global::navigationHandler.camera()->positionVec3();
kf._position = global::navigationHandler.focusNodeToCameraVector();
@@ -123,30 +123,32 @@ datamessagestructures::CameraKeyframe ExternInteraction::generateCameraKeyframe(
else {
kf._rotation = global::navigationHandler.camera()->rotationQuaternion();
}
kf._focusNode = focusNode->identifier();
kf._scale = global::navigationHandler.camera()->scaling();
// Timestamp as current runtime of OpenSpace instance
kf._timestamp = global::windowDelegate.applicationTime();
return kf;
}
datamessagestructures::TimeKeyframe ExternInteraction::generateTimeKeyframe() {
datamessagestructures::TimeKeyframe kf;
const Time& time = global::timeManager.time();
kf._dt = global::timeManager.deltaTime();
kf._paused = global::timeManager.isPaused();
kf._time = time.j2000Seconds();
// Timestamp as current runtime of OpenSpace instance
kf._timestamp = global::windowDelegate.applicationTime();
return kf;
}
datamessagestructures::ScriptMessage ExternInteraction::generateScriptMessage(std::string script) {
datamessagestructures::ScriptMessage ExternInteraction::generateScriptMessage(
std::string script)
{
datamessagestructures::ScriptMessage sm;
sm._script = std::move(script);
// Timestamp as current runtime of OpenSpace instance
@@ -154,5 +156,4 @@ datamessagestructures::ScriptMessage ExternInteraction::generateScriptMessage(st
return sm;
}
} // namespace openspace