Merge remote-tracking branch 'origin/master' into feature/horizons-unit-tests

This commit is contained in:
Alexander Bock
2022-06-29 13:02:45 +02:00
201 changed files with 544 additions and 392 deletions
+1 -1
View File
@@ -43,7 +43,7 @@ public:
);
PlanetGeometry();
virtual ~PlanetGeometry() = default;
~PlanetGeometry() override = default;
virtual void initialize();
virtual void deinitialize();
virtual void render() = 0;
+1 -1
View File
@@ -52,7 +52,7 @@ namespace documentation { struct Documentation; }
class RenderableStars : public Renderable {
public:
explicit RenderableStars(const ghoul::Dictionary& dictionary);
~RenderableStars();
~RenderableStars() override;
void initializeGL() override;
void deinitializeGL() override;
@@ -42,7 +42,7 @@ namespace openspace::planetgeometry {
class SimpleSphereGeometry : public PlanetGeometry {
public:
SimpleSphereGeometry(const ghoul::Dictionary& dictionary);
~SimpleSphereGeometry();
~SimpleSphereGeometry() override;
void initialize() override;
void deinitialize() override;
+1 -1
View File
@@ -37,7 +37,7 @@ public:
constexpr static const char* Name = "Space";
SpaceModule();
virtual ~SpaceModule() = default;
~SpaceModule() override = default;
std::vector<documentation::Documentation> documentations() const override;
static ghoul::opengl::ProgramObjectManager ProgramObjectManager;
@@ -61,7 +61,7 @@ public:
KeplerTranslation(const ghoul::Dictionary& dictionary);
/// Default destructor
virtual ~KeplerTranslation() = default;
~KeplerTranslation() override = default;
/**
* Method returning the translation vector at a given time.