Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

include/openspace/engine/configurationmanager.h

@@ -69,8 +69,8 @@ public:
     static const std::string KeyFactoryDocumentation;
     /// The key that stores the location of the asset file that is initially loaded
     static const std::string KeyConfigAsset;
-    /// The key that stores the location of the tasks file that is initially loaded
-    static const std::string KeyConfigTask;
+    /// The key that stores the location of the scene file that is initially loaded
+    static const std::string KeyConfigTasksRoot;
     /// The key that stores the subdirectory containing a list of all startup scripts to
     /// be executed on application start before the scene file is loaded
     static const std::string KeyStartupScript;

include/openspace/rendering/framebufferrenderer.h

@@ -46,7 +46,6 @@ namespace ghoul::opengl {
 
 namespace openspace {
 
-class RenderableVolume;
 class Camera;
 class Scene;
     

include/openspace/rendering/screenspacerenderable.h

@@ -55,13 +55,14 @@ public:
         const ghoul::Dictionary& dictionary);
 
     ScreenSpaceRenderable(const ghoul::Dictionary& dictionary);
-    virtual ~ScreenSpaceRenderable();
+    virtual ~ScreenSpaceRenderable() = default;
 
-    virtual void render() = 0;
-    virtual bool initialize() = 0;
-    virtual bool deinitialize() = 0;
+    virtual void render();
+    
+    virtual bool initialize();
+    virtual bool deinitialize();
     virtual void update() = 0;
-    virtual bool isReady() const = 0;
+    virtual bool isReady() const;
     bool isEnabled() const;
     
     glm::vec3 euclideanPosition() const;

include/openspace/util/timemanager.h

@@ -42,8 +42,12 @@ public:
     void removeKeyframesBefore(double timestamp);
     void removeKeyframesAfter(double timestamp);
     void clearKeyframes();
+    void setTimeNextFrame(Time t);
     size_t nKeyframes() const;
+
 private:
+    bool _shouldSetTime = false;
+    Time _timeNextFrame;
     Timeline<Time> _timeline;
     SyncData<Time> _currentTime;
     void consumeKeyframes(double dt);