push latest

This commit is contained in:
Jonathan Fransson
2019-03-29 09:39:46 -06:00
committed by ElonOlsson
parent 8447714f97
commit 2ae6fdd7a2
2 changed files with 543 additions and 533 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -24,8 +24,10 @@
// #include <openspace/rendering/renderable.h>
// #include <modules/base/rendering/renderabletrail.h>
// #include <modules/space/translation/keplertranslation.h>
#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>
@@ -51,14 +53,8 @@
// bool isReady() const override;
// 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);
// */
void render(const RenderData& data, RendererTasks& rendererTask) override;
void update(const UpdateData& data) override;
// static documentation::Documentation Documentation();
@@ -86,7 +82,6 @@
// std::vector<KeplerTranslation::KeplerOrbit> _orbits;
// ghoul::opengl::ProgramObject* _programObject;
//ghoul::ObjectManager* _objectManager;
// properties::StringProperty _path;
// properties::UIntProperty _nSegments;