Clean up scene loading

include/openspace/scene/scene.h

@@ -69,7 +69,8 @@ public:
     void initialize();
 
     /**
-     * Load the scenegraph from the provided folder
+     * Clear the scene graph,
+     * i.e. set the root node to nullptr and deallocate all scene graph nodes.
      */
     void clear();
 
@@ -79,7 +80,7 @@ public:
     void setRoot(std::unique_ptr<SceneGraphNode> root);
 
     /**
-     * Set the root node of the scene
+     * Set the camera of the scene
      */
     void setCamera(std::unique_ptr<Camera> camera);
 

include/openspace/scene/sceneloader.h

@@ -45,13 +45,12 @@ public:
             const std::string& nodeName,
             const std::string& parentName,
             const std::vector<std::string>& deps,
-            std::unique_ptr<SceneGraphNode> n)
-        {
-            name = nodeName;
-            parent = parentName;
-            dependencies = deps;
-            node = std::move(n);
-        }
+            std::unique_ptr<SceneGraphNode> n
+        )
+            : name(nodeName)
+            , parent(parentName)
+            , dependencies(deps)
+            , node(std::move(n)) {}
 
         std::string name;
         std::string parent;
@@ -62,11 +61,10 @@ public:
     struct LoadedCamera {
         LoadedCamera(
             const std::string& parentName,
-            std::unique_ptr<Camera> c)
-        {
-            parent = parentName;
-            camera = std::move(c);
-        }
+            std::unique_ptr<Camera> c
+        )
+            : parent(parentName)
+            , camera(std::move(c)) {}
         std::string parent;
         std::unique_ptr<Camera> camera;
     };

src/engine/openspaceengine.cpp

@@ -106,7 +106,7 @@ namespace {
 namespace openspace {
 
 namespace properties {
-class Property;
+    class Property;
 }
 
 class Scene;

src/scene/scenegraphnode.cpp

@@ -488,7 +488,6 @@ void SceneGraphNode::setDependencies(const std::vector<SceneGraphNode*>& depende
     }
 }
 
-
 const std::vector<SceneGraphNode*>& SceneGraphNode::dependencies() const {
     return _dependencies;
 }