diff --git a/include/openspace/scene/scene.h b/include/openspace/scene/scene.h index a0d53a53a1..2b45a9c8d8 100644 --- a/include/openspace/scene/scene.h +++ b/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 root); /** - * Set the root node of the scene + * Set the camera of the scene */ void setCamera(std::unique_ptr camera); diff --git a/include/openspace/scene/sceneloader.h b/include/openspace/scene/sceneloader.h index f939b5d2dc..4a84b7d6bf 100644 --- a/include/openspace/scene/sceneloader.h +++ b/include/openspace/scene/sceneloader.h @@ -45,13 +45,12 @@ public: const std::string& nodeName, const std::string& parentName, const std::vector& deps, - std::unique_ptr n) - { - name = nodeName; - parent = parentName; - dependencies = deps; - node = std::move(n); - } + std::unique_ptr 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 c) - { - parent = parentName; - camera = std::move(c); - } + std::unique_ptr c + ) + : parent(parentName) + , camera(std::move(c)) {} std::string parent; std::unique_ptr camera; }; diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp index 012d01b6c5..9b950e9b1f 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -106,7 +106,7 @@ namespace { namespace openspace { namespace properties { -class Property; + class Property; } class Scene; diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp index 2ea7e44c88..85c5c1f58a 100644 --- a/src/scene/scenegraphnode.cpp +++ b/src/scene/scenegraphnode.cpp @@ -488,7 +488,6 @@ void SceneGraphNode::setDependencies(const std::vector& depende } } - const std::vector& SceneGraphNode::dependencies() const { return _dependencies; }