Remove return values from initialize and deinitialize functions

modules/space/rendering/renderableconstellationbounds.cpp

@@ -164,7 +164,7 @@ RenderableConstellationBounds::RenderableConstellationBounds(
     );
 }
 
-bool RenderableConstellationBounds::initialize() {
+void RenderableConstellationBounds::initialize() {
     _program = OsEng.renderEngine().buildRenderProgram(
         "ConstellationBounds",
         "${MODULE_SPACE}/shaders/constellationbounds_vs.glsl",
@@ -189,11 +189,9 @@ bool RenderableConstellationBounds::initialize() {
     glVertexAttribPointer(positionAttrib, 3, GL_FLOAT, GL_FALSE, 0, 0);
 
     glBindVertexArray(0);
-
-    return true;
 }
 
-bool RenderableConstellationBounds::deinitialize() {
+void RenderableConstellationBounds::deinitialize() {
     glDeleteBuffers(1, &_vbo);
     _vbo = 0;
     glDeleteVertexArrays(1, &_vao);
@@ -203,8 +201,6 @@ bool RenderableConstellationBounds::deinitialize() {
         OsEng.renderEngine().removeRenderProgram(_program);
         _program = nullptr;
     }
-
-    return true;
 }
 
 bool RenderableConstellationBounds::isReady() const {

modules/space/rendering/renderableconstellationbounds.h

@@ -50,8 +50,8 @@ class RenderableConstellationBounds : public Renderable {
 public:
     RenderableConstellationBounds(const ghoul::Dictionary& dictionary);
 
-    bool initialize() override;
-    bool deinitialize() override;
+    void initialize() override;
+    void deinitialize() override;
 
     bool isReady() const override;
 

modules/space/rendering/renderableplanet.cpp

@@ -339,7 +339,7 @@ RenderablePlanet::RenderablePlanet(const ghoul::Dictionary& dictionary)
     }
 }
 
-bool RenderablePlanet::initialize() {
+void RenderablePlanet::initialize() {
     RenderEngine& renderEngine = OsEng.renderEngine();
 
     if (_programObject == nullptr && _shadowEnabled && _hasNightTexture) {
@@ -379,11 +379,9 @@ bool RenderablePlanet::initialize() {
     _programObject->deactivate();
 
     loadTexture();
-
-    return isReady();
 }
 
-bool RenderablePlanet::deinitialize() {
+void RenderablePlanet::deinitialize() {
     if (_geometry) {
         _geometry->deinitialize();
         _geometry = nullptr;
@@ -398,8 +396,6 @@ bool RenderablePlanet::deinitialize() {
     _geometry = nullptr;
     _texture = nullptr;
     _nightTexture = nullptr;
-
-    return true;
 }
 
 bool RenderablePlanet::isReady() const {

modules/space/rendering/renderableplanet.h

@@ -68,8 +68,8 @@ public:
 public:
     RenderablePlanet(const ghoul::Dictionary& dictionary);
 
-    bool initialize() override;
-    bool deinitialize() override;
+    void initialize() override;
+    void deinitialize() override;
     bool isReady() const override;
 
     void render(const RenderData& data, RendererTasks& rendererTask) override;

modules/space/rendering/renderablerings.cpp

@@ -184,7 +184,7 @@ bool RenderableRings::isReady() const {
     return _shader && _texture;
 }
 
-bool RenderableRings::initialize() {
+void RenderableRings::initialize() {
     if (!_shader) {
         RenderEngine& renderEngine = OsEng.renderEngine();
         _shader = renderEngine.buildRenderProgram("RingProgram",
@@ -200,11 +200,9 @@ bool RenderableRings::initialize() {
     glGenBuffers(1, &_vertexPositionBuffer);
     createPlane();
     loadTexture();
-
-    return isReady();
 }
 
-bool RenderableRings::deinitialize() {
+void RenderableRings::deinitialize() {
     glDeleteVertexArrays(1, &_quad);
     _quad = 0;
 
@@ -216,8 +214,6 @@ bool RenderableRings::deinitialize() {
 
     OsEng.renderEngine().removeRenderProgram(_shader);
     _shader = nullptr;
-
-    return true;
 }
 
 void RenderableRings::render(const RenderData& data, RendererTasks&) {

modules/space/rendering/renderablerings.h

@@ -46,8 +46,8 @@ class RenderableRings : public Renderable {
 public:
     RenderableRings(const ghoul::Dictionary& dictionary);
 
-    bool initialize() override;
-    bool deinitialize() override;
+    void initialize() override;
+    void deinitialize() override;
 
     bool isReady() const override;
 

modules/space/rendering/renderablestars.cpp

@@ -288,25 +288,20 @@ bool RenderableStars::isReady() const {
     return (_program != nullptr) && (!_fullData.empty());
 }
 
-bool RenderableStars::initialize() {
-    bool completeSuccess = true;
-
+void RenderableStars::initialize() {
     RenderEngine& renderEngine = OsEng.renderEngine();
     _program = renderEngine.buildRenderProgram("Star",
         "${MODULE_SPACE}/shaders/star_vs.glsl",
         "${MODULE_SPACE}/shaders/star_fs.glsl",
         "${MODULE_SPACE}/shaders/star_ge.glsl");
 
-    if (!_program) {
-        return false;
+    bool success = loadData();
+    if (!success) {
+        throw ghoul::RuntimeError("Error loading data");
     }
-    completeSuccess &= loadData();
-    completeSuccess &= (_pointSpreadFunctionTexture != nullptr);
-
-    return completeSuccess;
 }
 
-bool RenderableStars::deinitialize() {
+void RenderableStars::deinitialize() {
     glDeleteBuffers(1, &_vbo);
     _vbo = 0;
     glDeleteVertexArrays(1, &_vao);
@@ -320,7 +315,6 @@ bool RenderableStars::deinitialize() {
         renderEngine.removeRenderProgram(_program);
         _program = nullptr;
     }
-    return true;
 }
 
 void RenderableStars::render(const RenderData& data, RendererTasks&) {

modules/space/rendering/renderablestars.h

@@ -48,8 +48,8 @@ public:
     explicit RenderableStars(const ghoul::Dictionary& dictionary);
     ~RenderableStars();
 
-    bool initialize() override;
-    bool deinitialize() override;
+    void initialize() override;
+    void deinitialize() override;
 
     bool isReady() const override;