push latest

This commit is contained in:
Jonathan Fransson
2019-03-29 09:39:46 -06:00
parent 565612e973
commit 2d918315da
3 changed files with 21 additions and 11 deletions

View File

@@ -28,6 +28,7 @@
#include <modules/space/rendering/renderablesatellites.h>
#include <modules/space/translation/keplertranslation.h>
#include <modules/space/translation/TLEtranslation.h>
#include <modules/space/spacemodule.h>
@@ -550,11 +551,25 @@ void RenderableSatellites::readTLEFile(const std::string& filename, int lineNum)
// Converting the mean motion (revolutions per day) to period (seconds per revolution)
using namespace std::chrono;
double period = seconds(hours(24)).count() / keplerElements.meanMotion;
double period = seconds(hours(24)).count() / keplerElements.meanMotion;
//TODO: fix obv
size_t i = 0;
_orbits[i++] = KeplerTranslation::KeplerOrbit{
keplerElements.eccentricity,
keplerElements.semiMajorAxis,
keplerElements.inclination,
keplerElements.ascendingNode,
keplerElements.argumentOfPeriapsis,
keplerElements.meanAnomaly,
period,
keplerElements.epoch
};
/*
setKeplerElements(
KeplerTranslation setKeplerElements(
keplerElements.eccentricity,
keplerElements.semiMajorAxis,
keplerElements.inclination,

View File

@@ -26,6 +26,8 @@
#include <modules/base/rendering/renderabletrail.h>
#include <modules/space/translation/keplertranslation.h>
#include <modules/space/translation/TLEtranslation.h>
// #include <openspace/util/circlegeometry.h>
#include <openspace/properties/stringproperty.h>
@@ -53,12 +55,6 @@ public:
void render(const RenderData& data, RendererTasks& rendererTask) override;
void update(const UpdateData& data) override;
/*
void setKeplerElements(double eccentricity, double semiMajorAxis, double inclination,
double ascendingNode, double argumentOfPeriapsis, double meanAnomalyAtEpoch,
double orbitalPeriod, double epoch);
*/
static documentation::Documentation Documentation();
@@ -86,7 +82,6 @@ private:
std::vector<KeplerTranslation::KeplerOrbit> _orbits;
ghoul::opengl::ProgramObject* _programObject;
//ghoul::ObjectManager* _objectManager;
properties::StringProperty _path;
properties::UIntProperty _nSegments;