Merged master into NewAtmosphere

include/openspace/rendering/loadingscreen.h

@@ -41,7 +41,7 @@ namespace ghoul::fontrendering {
 
 namespace ghoul::opengl {
     class ProgramObject;
-    class Texture; 
+    class Texture;
 } // namespace ghoul::opengl
 
 namespace openspace {

include/openspace/rendering/renderengine.h

@@ -110,9 +110,9 @@ public:
     float globalBlackOutFactor();
     void setGlobalBlackOutFactor(float factor);
 
-    void registerScreenSpaceRenderable(std::shared_ptr<ScreenSpaceRenderable> s);
-    void unregisterScreenSpaceRenderable(std::shared_ptr<ScreenSpaceRenderable> s);
-    void unregisterScreenSpaceRenderable(const std::string& name);
+    void addScreenSpaceRenderable(std::shared_ptr<ScreenSpaceRenderable> s);
+    void removeScreenSpaceRenderable(std::shared_ptr<ScreenSpaceRenderable> s);
+    void removeScreenSpaceRenderable(const std::string& name);
     std::shared_ptr<ScreenSpaceRenderable> screenSpaceRenderable(const std::string& name);
     std::vector<ScreenSpaceRenderable*> screenSpaceRenderables() const;
 

include/openspace/scene/scene.h

@@ -73,7 +73,7 @@ public:
      * Initalizes the SceneGraph
      */
     void initialize();
-    
+
     /**
      * Initializes the OpenGL part of the SceneGraph
      */

include/openspace/util/blockplaneintersectiongeometry.h

@@ -35,7 +35,8 @@ namespace openspace {
 class BlockPlaneIntersectionGeometry {
 public:
     // initializers
-    BlockPlaneIntersectionGeometry(glm::vec3 blockSize, glm::vec3 planeNormal, float planeDistance);
+    BlockPlaneIntersectionGeometry(glm::vec3 blockSize, glm::vec3 planeNormal,
+        float planeDistance);
     ~BlockPlaneIntersectionGeometry();
 
     bool initialize();

include/openspace/util/powerscaledcoordinate.h

@@ -48,10 +48,11 @@ public:
     // Sets the power scaled coordinates with w = 0
     PowerScaledCoordinate(glm::vec3 v);
 
-    static PowerScaledCoordinate CreatePowerScaledCoordinate(double d1, double d2, double d3);
+    static PowerScaledCoordinate CreatePowerScaledCoordinate(double d1, double d2,
+        double d3);
 
     // get functions
-    // return the full, unmodified PSC 
+    // return the full, unmodified PSC
     const glm::vec4& vec4() const;
 
     // returns the rescaled, "normal" coordinates

include/openspace/util/powerscaledsphere.h

@@ -35,7 +35,7 @@ namespace openspace {
 class PowerScaledSphere {
 public:
     // initializers
-    PowerScaledSphere(const PowerScaledScalar& radius, 
+    PowerScaledSphere(const PowerScaledScalar& radius,
         int segments = 8);
 
     PowerScaledSphere(glm::vec3 radius, int segments);