mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-24 04:58:59 -05:00
Misc work
More cleanup of RenderablePlanet Added const modifier to pss method Added faster travel method for interactionhandler
This commit is contained in:
@@ -39,7 +39,7 @@ public:
|
||||
|
||||
PlanetGeometry();
|
||||
virtual ~PlanetGeometry();
|
||||
virtual void initialize(RenderablePlanet* parent);
|
||||
virtual bool initialize(RenderablePlanet* parent);
|
||||
virtual void deinitialize();
|
||||
virtual void render() = 0;
|
||||
|
||||
|
||||
@@ -48,9 +48,6 @@ public:
|
||||
bool initialize() override;
|
||||
bool deinitialize() override;
|
||||
|
||||
void setProgramObject(ghoul::opengl::ProgramObject* programObject = nullptr);
|
||||
void setTexture(ghoul::opengl::Texture* texture);
|
||||
|
||||
void render(const Camera* camera, const psc& thisPosition) override;
|
||||
void update() override;
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ public:
|
||||
~SimpleSphereGeometry();
|
||||
|
||||
|
||||
void initialize(RenderablePlanet* parent) override;
|
||||
bool initialize(RenderablePlanet* parent) override;
|
||||
void deinitialize() override;
|
||||
void render() override;
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ public:
|
||||
const double * value_ptr();
|
||||
const float * value_ptrf();
|
||||
glm::dvec2 getVec2() const;
|
||||
glm::vec2 getVec2f();
|
||||
glm::vec2 getVec2f() const;
|
||||
double length() const;
|
||||
float lengthf() const;
|
||||
|
||||
@@ -81,7 +81,7 @@ private:
|
||||
glm::dvec2 vec_;
|
||||
|
||||
// float vector used when returning float values
|
||||
glm::vec2 vecf_;
|
||||
mutable glm::vec2 vecf_;
|
||||
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user