mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-31 08:29:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

cleanup, comment and renaming variables and functions

Browse Source
This commit is contained in:
Lovisa Hassler
2018-11-29 16:59:09 -05:00
parent 443c061512
commit cd769952dc
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/dsn/translation/radectranslation.cpp
View File

@@ -110,15 +110,16 @@ glm::dvec3 RadecTranslation::convertRaDecRangeToCartesian(double ra, double dec,
return raDecPos;
}
glm::dvec3 RadecTranslation::transformCartesianCoordinates(glm::vec3 pos) const {
glm::dvec3 RadecTranslation::radecToCartesianCoordinates(glm::vec3 pos) const {
// get the Earth relative cartesian coordinates
// expressed in the equatorial sphere coordinate system
glm::dvec3 cartesianPos = convertRaDecRangeToCartesian(pos.x, pos.y, pos.z);
// get Earth and make sure it has been placed in OpenSpace
glm::dvec3 earthPos = global::renderEngine.scene()->sceneGraphNode("Earth")->worldPosition();
glm::dmat4 translationMatrixEarth = glm::translate( glm::dmat4(1.0), glm::dvec3(earthPos) );
glm::dvec4 newPos = { cartesianPos, 1.0 };
glm::dvec4 nodePos = translationMatrixEarth * _rotEquatorialSphere * newPos;
// calculate the cartesian world coordinates
glm::dvec4 nodePos = translationMatrixEarth * _rotEquatorialSphere * glm::vec4{ cartesianPos, 1.0 };
glm::dvec3 worldposition = { nodePos.x, nodePos.y, nodePos.z };
return worldposition;
@@ -126,15 +127,14 @@ glm::dvec3 RadecTranslation::transformCartesianCoordinates(glm::vec3 pos) const
glm::dvec3 RadecTranslation::position(const UpdateData& data) const {
double endTime = 3600;
//if true -> time is within file interval
const bool isTimeInFileInterval = (data.time.j2000Seconds() >= radecManager._checkFileTime) &&
(data.time.j2000Seconds() < radecManager._checkFileTime + endTime); //if true -> time is within file interval
(data.time.j2000Seconds() < radecManager._checkFileTime + endTime);
if (!isTimeInFileInterval) {
// The time in open space is is not in the file interval, we need to update the positions
glm::vec3 pos = radecManager.getPosForTime(data.time.j2000Seconds());
_pos = transformCartesianCoordinates(pos);
_pos = radecToCartesianCoordinates(pos);
}
return _pos;
}

2
modules/dsn/translation/radectranslation.h
View File

@@ -54,7 +54,7 @@ private:
/* Converts the Ra Dec range coordinates into cartesian coordinates*/
glm::dvec3 convertRaDecRangeToCartesian(double ra, double dec, double range) const;
/*Transforms the cartesian coordinates with a rotation and a translation*/
glm::dvec3 transformCartesianCoordinates(glm::vec3 pos) const;
glm::dvec3 radecToCartesianCoordinates(glm::vec3 pos) const;
RadecManager radecManager;
mutable glm::vec3 _pos;