mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-28 14:59:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

More cleanup in SpiceManager

Browse Source
This commit is contained in:
Alexander Bock
2015-11-19 16:29:33 -05:00
parent 16897bb8d4
commit 12fdb23684
6 changed files with 318 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/newhorizons/rendering/renderableplaneprojection.cpp
+5 -3
View File
@@ -37,6 +37,8 @@
#include <ghoul/opengl/textureunit.h>
#include <openspace/util/time.h>
#include <glm/gtx/projection.hpp>
namespace {
const std::string _loggerCat = "RenderablePlaneProjection";
const std::string KeySpacecraft = "Spacecraft";
@@ -242,13 +244,13 @@ void RenderablePlaneProjection::updatePlane(const Image img, double currentTime)
// The apparent position, CN+S, makes image align best with target
for (int j = 0; j < bounds.size(); ++j) {
openspace::SpiceManager::ref().frameConversion(bounds[j], frame, GalacticFrame, currentTime);
glm::dvec3 cornerPosition = openspace::SpiceManager::ref().orthogonalProjection(vecToTarget, bounds[j]);
bounds[j] = SpiceManager::ref().frameTransformationMatrix(frame, GalacticFrame, currentTime) * bounds[j];
glm::dvec3 cornerPosition = glm::proj(vecToTarget, bounds[j]);
if (!_moving) {
cornerPosition -= vecToTarget;
}
openspace::SpiceManager::ref().frameConversion(cornerPosition, GalacticFrame, _target.frame, currentTime);
cornerPosition = SpiceManager::ref().frameTransformationMatrix(GalacticFrame, _target.frame, currentTime) * cornerPosition;
projection[j] = PowerScaledCoordinate::CreatePowerScaledCoordinate(cornerPosition[0], cornerPosition[1], cornerPosition[2]);
projection[j][3] += 3;