Merged master into NewAtmosphere.

include/openspace/rendering/abufferrenderer.h

@@ -82,13 +82,13 @@ public:
     void update();
     void render(float blackoutFactor, bool doPerformanceMeasurements) override;
 
-
     /**
      * Update render data
      * Responsible for calling renderEngine::setRenderData
      */
     virtual void updateRendererData() override;
     virtual void raycastersChanged(VolumeRaycaster& raycaster, bool attached) override;
+
 private:
 
     void clear();

include/openspace/rendering/framebufferrenderer.h

@@ -37,16 +37,12 @@
 #include <openspace/rendering/renderer.h>
 #include <openspace/util/updatestructures.h>
 
-namespace ghoul {
-    class Dictionary;
-    
-    namespace filesystem {
-        class File;
-    }
-    namespace opengl {
-        class ProgramObject;
-        class Texture;
-    }
+namespace ghoul { class Dictionary; }
+namespace ghoul::filesystem { class File; }
+
+namespace ghoul::opengl {
+    class ProgramObject;
+    class Texture;
 }
 
 namespace openspace {

include/openspace/rendering/raycasterlistener.h

@@ -32,8 +32,8 @@ class VolumeRaycaster;
 class RaycasterListener {
 public:
     virtual void raycastersChanged(VolumeRaycaster& raycaster, bool attached) = 0;
-}; // RaycasterListener
+};
 
-} // openspace
+} // namespace openspace
 
 #endif // __OPENSPACE_CORE___RAYCASTERLISTENER___H__

include/openspace/rendering/renderable.h

@@ -29,13 +29,11 @@
 
 #include <openspace/properties/scalar/boolproperty.h>
 
-namespace ghoul {
-    namespace opengl {
-        class ProgramObject;
-        class Texture;
-    }
-    class Dictionary;
-} // namespace ghoul
+namespace ghoul { class Dictionary; }
+namespace ghoul::opengl {
+    class ProgramObject;
+    class Texture;
+}
 
 namespace openspace {
 
@@ -76,7 +74,6 @@ public:
     void setBoundingSphere(float boundingSphere);
     float boundingSphere() const;
 
-    virtual void render(const RenderData& data);
     virtual void render(const RenderData& data, RendererTasks& rendererTask);
     virtual void update(const UpdateData& data);
     virtual SurfacePositionHandle calculateSurfacePositionHandle(

include/openspace/rendering/renderengine.h

@@ -33,22 +33,18 @@
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/triggerproperty.h>
 
-
 namespace ghoul {
-namespace fontrendering {
-    class Font;
+    class Dictionary;
+    class SharedMemory;
 }
-namespace opengl {
-    class ProgramObject;
-}
-class Dictionary;
-class SharedMemory;
-} // namespace ghoul
+namespace ghoul::fontrendering { class Font; }
+namespace ghoul::opengl { class ProgramObject; }
 
 namespace openspace {
 
 namespace performance { class PerformanceManager; }
 namespace scripting { struct LuaLibrary; }
+
 class Camera;
 class RaycasterManager;
 class DeferredcasterManager;

include/openspace/rendering/renderer.h

@@ -32,16 +32,11 @@
 #include <vector>
 #include <map>
 
-namespace ghoul {
-    class Dictionary;
-    
-    namespace filesystem {
-        class File;
-    }
-    namespace opengl {
-        class ProgramObject;
-        class Texture;
-    }
+namespace ghoul { class Dictionary; }
+namespace ghoul::filesystem { class File; }
+namespace ghoul::opengl {
+    class ProgramObject;
+    class Texture;
 }
 
 namespace openspace {
@@ -68,12 +63,12 @@ public:
     /**
     * Set raycasting uniforms on the program object, and setup raycasting.
     */
-    virtual void preRaycast(ghoul::opengl::ProgramObject& programObject) {};
+    virtual void preRaycast(ghoul::opengl::ProgramObject& /*programObject*/) {};
 
     /**
     * Tear down raycasting for the specified program object.
     */
-    virtual void postRaycast(ghoul::opengl::ProgramObject& programObject) {};
+    virtual void postRaycast(ghoul::opengl::ProgramObject& /*programObject*/) {};
 
 
     virtual void update() = 0;

include/openspace/rendering/volume.h

@@ -28,18 +28,15 @@
 #include <string>
 #include <vector>
 
-namespace ghoul {
-    namespace opengl {
-        class Texture;
-        class ProgramObject;
-    }
+namespace ghoul::opengl {
+    class Texture;
+    class ProgramObject;
 }
 
 namespace openspace {
 
 class Volume {
 public:
-
     /**
      * Constructor
      */

include/openspace/rendering/volumeraycaster.h

@@ -29,11 +29,9 @@
 #include <vector>
 #include <openspace/util/updatestructures.h>
 
-namespace ghoul {
-    namespace opengl {
-        class Texture;
-        class ProgramObject;
-    }
+namespace ghoul::opengl {
+    class Texture;
+    class ProgramObject;
 }
 
 namespace openspace {
@@ -51,30 +49,30 @@ public:
     /**
      * Render the volume's entry points (front face of the bounding geometry)
      */
-    virtual void renderEntryPoints(const RenderData& data, ghoul::opengl::ProgramObject& program) = 0;
+    virtual void renderEntryPoints(const RenderData& /*data*/, ghoul::opengl::ProgramObject& /*program*/) = 0;
 
     /**
      * Render the volume's exit points (back face of the bounding geometry)
      */
-    virtual void renderExitPoints(const RenderData& data, ghoul::opengl::ProgramObject& program) = 0;
+    virtual void renderExitPoints(const RenderData& /*data*/, ghoul::opengl::ProgramObject& /*program*/) = 0;
     
     /**
      * Prepare the volume for the ABuffer's resolve step.
      * Make sure textures are up to date, bind them to texture units, set program uniforms etc.
      */
-    virtual void preRaycast(const RaycastData& data, ghoul::opengl::ProgramObject& program) {};
+    virtual void preRaycast(const RaycastData& /*data*/, ghoul::opengl::ProgramObject& /*program*/) {};
 
     /**
      * Clean up for the volume after the ABuffer's resolve step.
      * Make sure texture units are deinitialized, etc.
      */
-    virtual void postRaycast(const RaycastData& data, ghoul::opengl::ProgramObject& program) {};
+    virtual void postRaycast(const RaycastData& /*data*/, ghoul::opengl::ProgramObject& /*program*/) {};
 
     /**
     * Return true if the camera is inside the volume.
     * Also set localPosition to the camera position in the volume's local coordainte system.
     */
-    virtual bool cameraIsInside(const RenderData& data, glm::vec3& localPosition) { return false; };
+    virtual bool cameraIsInside(const RenderData& /*data*/, glm::vec3& /*localPosition*/) { return false; };
     /**
      * Return a path the file to use as vertex shader
      *