Refactored opengl parts

src/render/opengl/OpenGLPart.cpp

@@ -4,7 +4,7 @@
 #include "OpenGLShaderProgram.h"
 #include "OpenGLVertexArray.h"
 
-OpenGLPart::OpenGLPart(OpenGLRenderer *renderer) : renderer(renderer) {
+OpenGLPart::OpenGLPart(OpenGLRenderer *renderer, const string &name) : renderer(renderer), name(name) {
 }
 
 OpenGLPart::~OpenGLPart() {
@@ -30,6 +30,12 @@ void OpenGLPart::destroy() {
 void OpenGLPart::interrupt() {
 }
 
+void OpenGLPart::pause() {
+}
+
+void OpenGLPart::resume() {
+}
+
 OpenGLShaderProgram *OpenGLPart::createShader(const string &name) {
     OpenGLShaderProgram *program = new OpenGLShaderProgram(name, renderer);
 

src/render/opengl/OpenGLPart.h

@@ -14,7 +14,7 @@ namespace opengl {
  */
 class OPENGLSHARED_EXPORT OpenGLPart {
   public:
-    OpenGLPart(OpenGLRenderer *renderer);
+    OpenGLPart(OpenGLRenderer *renderer, const string &name);
     virtual ~OpenGLPart();
 
     // Initialize the part rendering (create shaders, prepare static textures...)
@@ -32,8 +32,18 @@ class OPENGLSHARED_EXPORT OpenGLPart {
     // Interrupt the rendering
     virtual void interrupt();
 
+    // Temporarily pause the background working
+    virtual void pause();
+
+    // Resume the background working
+    virtual void resume();
+
     void updateScenery(bool onlyCommon = false);
 
+    inline const string &getName() const {
+        return name;
+    }
+
   protected:
     /**
      * Create a shader program.
@@ -55,6 +65,7 @@ class OPENGLSHARED_EXPORT OpenGLPart {
     OpenGLRenderer *renderer;
 
   private:
+    string name;
     map<string, OpenGLShaderProgram *> shaders;
     vector<OpenGLVertexArray *> arrays;
 };

src/render/opengl/OpenGLRenderer.cpp

@@ -38,23 +38,22 @@ OpenGLRenderer::OpenGLRenderer(Scenery *scenery) : SoftwareRenderer(scenery) {
     shared_state->set("viewDistance", 300.0);
     shared_state->set("exposure", 1.2);
 
-    skybox = new OpenGLSkybox(this);
+    parts.push_back(skybox = new OpenGLSkybox(this));
-    water = new OpenGLWater(this);
+    parts.push_back(water = new OpenGLWater(this));
-    terrain = new OpenGLTerrain(this);
+    parts.push_back(terrain = new OpenGLTerrain(this));
 }
 
 OpenGLRenderer::~OpenGLRenderer() {
-    terrain->interrupt();
+    for (auto part : parts) {
-    water->interrupt();
+        part->interrupt();
-    skybox->interrupt();
+    }
 
     delete mouse_projected;
-
     delete view_matrix;
 
-    delete skybox;
+    for (auto part : parts) {
-    delete water;
+        delete part;
-    delete terrain;
+    }
 
     delete functions;
     delete shared_state;
@@ -70,11 +69,11 @@ void OpenGLRenderer::checkForErrors(const string &domain) {
 void OpenGLRenderer::destroy() {
     shared_state->destroy(functions);
 
-    skybox->destroy();
+    for (auto part : parts) {
-    terrain->destroy();
+        part->destroy();
-    water->destroy();
+    }
 
-    checkForErrors("stopping");
+    checkForErrors("destroy");
 }
 
 void OpenGLRenderer::initialize() {
@@ -92,14 +91,10 @@ void OpenGLRenderer::initialize() {
         getLightingManager()->setSpecularity(false);
         getGodRaysSampler()->setEnabled(false);
 
-        skybox->initialize();
+        for (auto part : parts) {
-        skybox->updateScenery();
+            part->initialize();
-
+            part->updateScenery();
-        water->initialize();
+        }
-        water->updateScenery();
-
-        terrain->initialize();
-        terrain->updateScenery();
 
         cameraChangeEvent(render_camera);
 
@@ -168,14 +163,10 @@ void OpenGLRenderer::paint(bool clear) {
             functions->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
         }
 
-        skybox->render();
+        for (auto part : parts) {
-        checkForErrors("skybox");
+            part->render();
-
+            checkForErrors(part->getName());
-        terrain->render();
+        }
-        checkForErrors("terrain");
-
-        water->render();
-        checkForErrors("water");
 
         if (mouse_tracking) {
             updateMouseProjection();
@@ -193,22 +184,30 @@ bool OpenGLRenderer::stop() {
 
 void OpenGLRenderer::reset() {
     if (ready) {
-        skybox->updateScenery();
+        for (auto part : parts) {
-        water->updateScenery();
+            part->updateScenery();
-        terrain->updateScenery();
+        }
 
         cameraChangeEvent(render_camera);
     }
 }
 
 void OpenGLRenderer::pause() {
-    paused = true;
+    if (not paused) {
-    terrain->pause();
+        paused = true;
+        for (auto part : parts) {
+            part->pause();
+        }
+    }
 }
 
 void OpenGLRenderer::resume() {
-    paused = false;
+    if (paused) {
-    terrain->resume();
+        for (auto part : parts) {
+            part->resume();
+        }
+        paused = false;
+    }
 }
 
 void OpenGLRenderer::setMouseLocation(int x, int y) {

src/render/opengl/OpenGLRenderer.h

@@ -5,6 +5,8 @@
 
 #include "SoftwareRenderer.h"
 
+#include <vector>
+
 class QMatrix4x4;
 
 namespace paysages {
@@ -135,6 +137,8 @@ class OPENGLSHARED_EXPORT OpenGLRenderer : public SoftwareRenderer {
     OpenGLSkybox *skybox;
     OpenGLWater *water;
     OpenGLTerrain *terrain;
+
+    vector<OpenGLPart *> parts;
 };
 }
 }

src/render/opengl/OpenGLSkybox.cpp

@@ -11,7 +11,7 @@
 #include "AtmosphereModelBruneton.h"
 #include "FloatNode.h"
 
-OpenGLSkybox::OpenGLSkybox(OpenGLRenderer *renderer) : OpenGLPart(renderer) {
+OpenGLSkybox::OpenGLSkybox(OpenGLRenderer *renderer) : OpenGLPart(renderer, "skybox") {
     program = createShader("skybox");
     program->addVertexSource("skybox");
     program->addFragmentSource("atmosphere");

src/render/opengl/OpenGLTerrain.cpp

@@ -32,7 +32,7 @@ class ChunkMaintenanceThreads : public ParallelPool {
     OpenGLTerrain *terrain;
 };
 
-OpenGLTerrain::OpenGLTerrain(OpenGLRenderer *renderer) : OpenGLPart(renderer) {
+OpenGLTerrain::OpenGLTerrain(OpenGLRenderer *renderer) : OpenGLPart(renderer, "terrain") {
     work = new ChunkMaintenanceThreads(this);
     paused = false;
 

src/render/opengl/OpenGLTerrain.h

@@ -24,8 +24,8 @@ class OPENGLSHARED_EXPORT OpenGLTerrain : public OpenGLPart, public DefinitionWa
     virtual void interrupt() override;
     virtual void destroy() override;
 
-    void pause();
+    virtual void pause() override;
-    void resume();
+    virtual void resume() override;
     inline bool isPaused() const {
         return paused;
     }

src/render/opengl/OpenGLWater.cpp

@@ -13,7 +13,7 @@
 #include "FloatDiff.h"
 #include "IntNode.h"
 
-OpenGLWater::OpenGLWater(OpenGLRenderer *renderer) : OpenGLPart(renderer) {
+OpenGLWater::OpenGLWater(OpenGLRenderer *renderer) : OpenGLPart(renderer, "water") {
     enabled = true;
 
     program = createShader("water");

src/render/opengl/opengl_global.h

@@ -11,8 +11,8 @@
 
 namespace paysages {
 namespace opengl {
-class WidgetExplorer;
 class OpenGLRenderer;
+class OpenGLPart;
 class OpenGLShaderProgram;
 class OpenGLSharedState;
 class OpenGLVariable;