From c57285c34f070091fbea20467fd7614fda902714 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Sat, 14 Feb 2015 10:52:17 +0100 Subject: [PATCH] Fix of RenderableTrail --- src/engine/openspaceengine.cpp | 2 +- src/rendering/renderabletrail.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp index 96da7b8313..b715913f5e 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -497,7 +497,7 @@ void OpenSpaceEngine::preSynchronization() { _interactionHandler.update(dt); _interactionHandler.lockControls(); - //Time::ref().advanceTime(dt); + Time::ref().advanceTime(dt); } } diff --git a/src/rendering/renderabletrail.cpp b/src/rendering/renderabletrail.cpp index bc792a9259..7aee375e5b 100644 --- a/src/rendering/renderabletrail.cpp +++ b/src/rendering/renderabletrail.cpp @@ -166,7 +166,9 @@ void RenderableTrail::update(const UpdateData& data) { int nValues = floor(deltaTime / _increment); // Update the floating current time - SpiceManager::ref().getTargetState(_target, _observer, _frame, "NONE", data.time, pscPos, pscVel, lightTime); + // Is 'CN+S' correct? It has to be chosen to be the same as in SpiceEphemeris, but + // unsure if it is correct ---abock + SpiceManager::ref().getTargetState(_target, _observer, _frame, "CN+S", data.time, pscPos, pscVel, lightTime); pscPos[3] += 3; // KM to M _vertexArray[0] = { pscPos[0], pscPos[1], pscPos[2], pscPos[3] }; @@ -181,7 +183,7 @@ void RenderableTrail::update(const UpdateData& data) { for (int i = nValues; i > 0; --i) { double et = _oldTime + i * _increment; - SpiceManager::ref().getTargetState(_target, _observer, _frame, "NONE", et, pscPos, pscVel, lightTime); + SpiceManager::ref().getTargetState(_target, _observer, _frame, "CN+S", et, pscPos, pscVel, lightTime); pscPos[3] += 3; _vertexArray[i] = { pscPos[0], pscPos[1], pscPos[2], pscPos[3] }; } @@ -217,7 +219,7 @@ void RenderableTrail::fullYearSweep(double time) { psc pscPos, pscVel; _vertexArray.resize(segments+2); for (int i = 0; i < segments+2; i++){ - SpiceManager::ref().getTargetState(_target, _observer, _frame, "NONE", time, pscPos, pscVel, lightTime); + SpiceManager::ref().getTargetState(_target, _observer, _frame, "CN+S", time, pscPos, pscVel, lightTime); pscPos[3] += 3; _vertexArray[i] = {pscPos[0], pscPos[1], pscPos[2], pscPos[3]};