Misc work

More cleanup of RenderablePlanet
Added const modifier to pss method
Added faster travel method for interactionhandler
This commit is contained in:
Alexander Bock
2014-05-05 18:04:53 +02:00
parent 44a8f6dfda
commit d09a1e0b54
10 changed files with 28 additions and 33 deletions
@@ -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;
+2 -2
View File
@@ -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_;
};