Cleanup in Renderers

include/openspace/rendering/abufferrenderer.h

@@ -45,7 +45,7 @@ namespace ghoul::filesystem { class File; }
 namespace ghoul::opengl {
     class ProgramObject;
     class Texture;
-} // namespace opengl
+} // namespace ghoul::opengl
 
 namespace openspace {
 
@@ -61,8 +61,6 @@ public:
     void initialize() override;
     void deinitialize() override;
 
-    void setCamera(Camera* camera) override;
-    void setScene(Scene* scene) override;
     void setResolution(glm::ivec2 res) override;
     void setNAaSamples(int nAaSamples) override;
     void setHDRExposure(float hdrExposure) override;
@@ -79,7 +77,8 @@ public:
     void postRaycast(const RaycasterTask& raycasterTask);
 
     void update() override;
-    void render(float blackoutFactor, bool doPerformanceMeasurements) override;
+    void render(Scene* scene, Camera* camera, float blackoutFactor,
+        bool doPerformanceMeasurements) override;
 
     /**
      * Update render data
@@ -97,8 +96,6 @@ private:
     void saveTextureToMemory(const GLenum color_buffer_attachment,
         const int width, const int height, std::vector<double> & memory) const;
 
-    Camera* _camera;
-    Scene* _scene;
     glm::ivec2 _resolution;
 
     bool _dirtyResolution;

include/openspace/rendering/framebufferrenderer.h

@@ -44,7 +44,7 @@ namespace ghoul::filesystem { class File; }
 namespace ghoul::opengl {
     class ProgramObject;
     class Texture;
-}
+} // namespace ghoul::opengl
 
 namespace openspace {
 
@@ -67,8 +67,6 @@ public:
     void updateHDRData();
     void updateMSAASamplingPattern();
 
-    void setCamera(Camera* camera) override;
-    void setScene(Scene* scene) override;
     void setResolution(glm::ivec2 res) override;
     void setNAaSamples(int nAaSamples) override;
     void setHDRExposure(float hdrExposure) override;
@@ -81,7 +79,8 @@ public:
     std::vector<double> mSSAPattern() const override;
 
     void update() override;
-    void render(float blackoutFactor, bool doPerformanceMeasurements) override;
+    void render(Scene* scene, Camera* camera, float blackoutFactor,
+        bool doPerformanceMeasurements) override;
 
     /**
      * Update render data
@@ -132,8 +131,6 @@ private:
     bool _dirtyRaycastData;
     bool _dirtyResolution;
 
-    Camera* _camera;
-    Scene* _scene;
     glm::vec2 _resolution;
     int _nAaSamples;
     float _hdrExposure;

include/openspace/rendering/renderer.h

@@ -52,8 +52,6 @@ public:
     virtual void initialize() = 0;
     virtual void deinitialize() = 0;
 
-    virtual void setCamera(Camera* camera) = 0;
-    virtual void setScene(Scene* scene) = 0;
     virtual void setResolution(glm::ivec2 res) = 0;
     virtual void setNAaSamples(int nAaSamples) = 0;
     virtual void setHDRExposure(float hdrExposure) = 0;
@@ -77,7 +75,8 @@ public:
 
     virtual void update() = 0;
 
-    virtual void render(float blackoutFactor, bool doPerformanceMeasurements) = 0;
+    virtual void render(Scene* scene, Camera* camera, float blackoutFactor,
+        bool doPerformanceMeasurements) = 0;
     /**
      * Update render data
      * Responsible for calling renderEngine::setRenderData