mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-24 05:49:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

More cleaning of SpiceManager

Browse Source
This commit is contained in:
Alexander Bock
2015-11-19 23:35:09 -05:00
parent 12fdb23684
commit 2c84368b0b
18 changed files with 588 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/base/rendering/renderablemodel.cpp
View File

@@ -184,7 +184,7 @@ void RenderableModel::render(const RenderData& data) {
_alpha = 1.0f;
glm::dvec3 p =
SpiceManager::ref().targetPosition(_target, "SUN", "GALACTIC", SpiceManager::AberrationCorrection(), time, lt);
SpiceManager::ref().targetPosition(_target, "SUN", "GALACTIC", {}, time, lt);
psc tmppos = PowerScaledCoordinate::CreatePowerScaledCoordinate(p.x, p.y, p.z);
glm::vec3 cam_dir = glm::normalize(data.camera.position().vec3() - tmppos.vec3());
_programObject->setUniform("cam_dir", cam_dir);
@@ -242,12 +242,13 @@ void RenderableModel::update(const UpdateData& data) {
//}
// set spice-orientation in accordance to timestamp
if (!_source.empty())
openspace::SpiceManager::ref().getPositionTransformMatrix(_source, _destination, _time, _stateMatrix);
if (!_source.empty()) {
_stateMatrix = SpiceManager::ref().getPositionTransformMatrix(_source, _destination, _time);
}
double lt;
glm::dvec3 p =
openspace::SpiceManager::ref().targetPosition("SUN", _target, "GALACTIC", SpiceManager::AberrationCorrection(), _time, lt);
openspace::SpiceManager::ref().targetPosition("SUN", _target, "GALACTIC", {}, _time, lt);
_sunPosition = PowerScaledCoordinate::CreatePowerScaledCoordinate(p.x, p.y, p.z);
}