mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-26 05:58:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make the aberration correction specification for targetPosition in SpiceManager explicit by including a seprate class for it

Browse Source
This commit is contained in:
Alexander Bock
2015-11-19 15:33:57 -05:00
parent 11fec9387b
commit 16897bb8d4
18 changed files with 227 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/newhorizons/rendering/renderableplaneprojection.cpp
+11 -5
View File
@@ -228,12 +228,18 @@ void RenderablePlaneProjection::updatePlane(const Image img, double currentTime)
return;
}
glm::dvec3 vecToTarget;
double lt;
psc projection[4];
SpiceManager::ref().getTargetPosition(_target.body, _spacecraft, GalacticFrame, "CN+S", currentTime, vecToTarget, lt);
// The apparent position, CN+S, makes image align best with target
glm::dvec3 vecToTarget = SpiceManager::ref().targetPosition(
_target.body,
_spacecraft,
GalacticFrame,
{ SpiceManager::AberrationCorrection::Type::ConvergedNewtonianStellar, SpiceManager::AberrationCorrection::Direction::Reception },
currentTime,
lt
);
// 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);
@@ -321,9 +327,9 @@ std::string RenderablePlaneProjection::findClosestTarget(double currentTime) {
std::string closestTarget = "";
glm::dvec3 p;
double lt;
SpiceManager::ref().getTargetPosition(_spacecraft, "SSB", GalacticFrame, "NONE", currentTime, p, lt);
glm::dvec3 p =
SpiceManager::ref().targetPosition(_spacecraft, "SSB", GalacticFrame, SpiceManager::AberrationCorrection(), currentTime, lt);
psc spacecraftPos = PowerScaledCoordinate::CreatePowerScaledCoordinate(p.x, p.y, p.z);