Merging master into session recording changes for issue 1366

include/openspace/documentation/documentationgenerator.h

@@ -102,6 +102,16 @@ private:
  */
 std::string escapedJson(const std::string& text);
 
+
+/**
+ * This function takes a \p list of text and escapes all necessary characters () that JSON
+ * does not want in its strings.
+ * \param text The list text that is to be escaped
+ * \return The same text will all required characteres escaped
+ */
+std::string escapedJson(const std::vector<std::string>& list);
+
+
 } // namespace openspace
 
 #endif // __OPENSPACE_CORE___DOCUMENTATIONGENERATOR___H__

include/openspace/engine/globals.h

@@ -69,81 +69,42 @@ class Profile;
 
 namespace global {
 
-namespace detail {
-
-ghoul::fontrendering::FontManager& gFontManager();
-Dashboard& gDashboard();
-DeferredcasterManager& gDeferredcasterManager();
-DownloadManager& gDownloadManager();
-LuaConsole& gLuaConsole();
-MemoryManager& gMemoryManager();
-MissionManager& gMissionManager();
-ModuleEngine& gModuleEngine();
-OpenSpaceEngine& gOpenSpaceEngine();
-ParallelPeer& gParallelPeer();
-RaycasterManager& gRaycasterManager();
-RenderEngine& gRenderEngine();
-std::vector<std::unique_ptr<ScreenSpaceRenderable>>& gScreenspaceRenderables();
-SyncEngine& gSyncEngine();
-TimeManager& gTimeManager();
-VersionChecker& gVersionChecker();
-VirtualPropertyManager& gVirtualPropertyManager();
-WindowDelegate& gWindowDelegate();
-configuration::Configuration& gConfiguration();
-interaction::InteractionMonitor& gInteractionMonitor();
-interaction::JoystickInputStates& gJoystickInputStates();
-interaction::WebsocketInputStates& gWebsocketInputStates();
-interaction::KeybindingManager& gKeybindingManager();
-interaction::NavigationHandler& gNavigationHandler();
-interaction::SessionRecording& gSessionRecording();
-interaction::ShortcutManager& gShortcutManager();
-properties::PropertyOwner& gRootPropertyOwner();
-properties::PropertyOwner& gScreenSpaceRootPropertyOwner();
-scripting::ScriptEngine& gScriptEngine();
-scripting::ScriptScheduler& gScriptScheduler();
-Profile& gProfile();
-
-} // namespace detail
-
-static ghoul::fontrendering::FontManager& fontManager = detail::gFontManager();
-static Dashboard& dashboard = detail::gDashboard();
-static DeferredcasterManager& deferredcasterManager = detail::gDeferredcasterManager();
-static DownloadManager& downloadManager = detail::gDownloadManager();
-static LuaConsole& luaConsole = detail::gLuaConsole();
-static MemoryManager& memoryManager = detail::gMemoryManager();
-static MissionManager& missionManager = detail::gMissionManager();
-static ModuleEngine& moduleEngine = detail::gModuleEngine();
-static OpenSpaceEngine& openSpaceEngine = detail::gOpenSpaceEngine();
-static ParallelPeer& parallelPeer = detail::gParallelPeer();
-static RaycasterManager& raycasterManager = detail::gRaycasterManager();
-static RenderEngine& renderEngine = detail::gRenderEngine();
-static std::vector<std::unique_ptr<ScreenSpaceRenderable>>& screenSpaceRenderables =
-    detail::gScreenspaceRenderables();
-static SyncEngine& syncEngine = detail::gSyncEngine();
-static TimeManager& timeManager = detail::gTimeManager();
-static VersionChecker& versionChecker = detail::gVersionChecker();
-static VirtualPropertyManager& virtualPropertyManager = detail::gVirtualPropertyManager();
-static WindowDelegate& windowDelegate = detail::gWindowDelegate();
-static configuration::Configuration& configuration = detail::gConfiguration();
-static interaction::InteractionMonitor& interactionMonitor =
-    detail::gInteractionMonitor();
-static interaction::JoystickInputStates& joystickInputStates =
-    detail::gJoystickInputStates();
-static interaction::WebsocketInputStates& websocketInputStates =
-    detail::gWebsocketInputStates();
-static interaction::KeybindingManager& keybindingManager = detail::gKeybindingManager();
-static interaction::NavigationHandler& navigationHandler = detail::gNavigationHandler();
-static interaction::SessionRecording& sessionRecording = detail::gSessionRecording();
-static interaction::ShortcutManager& shortcutManager = detail::gShortcutManager();
-static properties::PropertyOwner& rootPropertyOwner = detail::gRootPropertyOwner();
-static properties::PropertyOwner& screenSpaceRootPropertyOwner =
-    detail::gScreenSpaceRootPropertyOwner();
-static scripting::ScriptEngine& scriptEngine = detail::gScriptEngine();
-static scripting::ScriptScheduler& scriptScheduler = detail::gScriptScheduler();
-static Profile& profile = detail::gProfile();
+inline ghoul::fontrendering::FontManager* fontManager;
+inline Dashboard* dashboard;
+inline DeferredcasterManager* deferredcasterManager;
+inline DownloadManager* downloadManager;
+inline LuaConsole* luaConsole;
+inline MemoryManager* memoryManager;
+inline MissionManager* missionManager;
+inline ModuleEngine* moduleEngine;
+inline OpenSpaceEngine* openSpaceEngine;
+inline ParallelPeer* parallelPeer;
+inline RaycasterManager* raycasterManager;
+inline RenderEngine* renderEngine;
+inline std::vector<std::unique_ptr<ScreenSpaceRenderable>>* screenSpaceRenderables;
+inline SyncEngine* syncEngine;
+inline TimeManager* timeManager;
+inline VersionChecker* versionChecker;
+inline VirtualPropertyManager* virtualPropertyManager;
+inline WindowDelegate* windowDelegate;
+inline configuration::Configuration* configuration;
+inline interaction::InteractionMonitor* interactionMonitor;
+inline interaction::JoystickInputStates* joystickInputStates;
+inline interaction::WebsocketInputStates* websocketInputStates;
+inline interaction::KeybindingManager* keybindingManager;
+inline interaction::NavigationHandler* navigationHandler;
+inline interaction::SessionRecording* sessionRecording;
+inline interaction::ShortcutManager* shortcutManager;
+inline properties::PropertyOwner* rootPropertyOwner;
+inline properties::PropertyOwner* screenSpaceRootPropertyOwner;
+inline scripting::ScriptEngine* scriptEngine;
+inline scripting::ScriptScheduler* scriptScheduler;
+inline Profile* profile;
 
+void create();
 void initialize();
 void initializeGL();
+void destroy();
 void deinitialize();
 void deinitializeGL();
 

include/openspace/engine/windowdelegate.h

@@ -100,6 +100,8 @@ struct WindowDelegate {
     Frustum (*frustumMode)() = []() { return Frustum::Mono; };
 
     uint64_t (*swapGroupFrameNumber)() = []() { return uint64_t(0); };
+
+    void (*setScreenshotFolder)(std::string) = [](std::string) {};
 };
 
 } // namespace openspace

include/openspace/interaction/navigationhandler.h

@@ -166,7 +166,8 @@ private:
 
     std::optional<NavigationState> _pendingNavigationState;
 
-    properties::BoolProperty _disableInputs;
+    properties::BoolProperty _disableMouseInputs;
+    properties::BoolProperty _disableJoystickInputs;
     properties::BoolProperty _useKeyFrameInteraction;
 };
 

include/openspace/interaction/orbitalnavigator.h

@@ -268,7 +268,7 @@ private:
     */
     glm::dvec3 moveCameraAlongVector(const glm::dvec3& camPos,
         double distFromCameraToFocus, const glm::dvec3& camPosToCenterPosDiff,
-        double destination) const;
+        double destination, double deltaTime) const;
 
     /*
      * Adds rotation to the camera position so that it follows the rotation of the anchor

include/openspace/rendering/renderengine.h

@@ -33,6 +33,7 @@
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/vector/vec3property.h>
 #include <openspace/properties/triggerproperty.h>
+#include <chrono>
 
 namespace ghoul {
     namespace fontrendering { class Font; }
@@ -229,6 +230,8 @@ private:
     properties::FloatProperty _saturation;
     properties::FloatProperty _value;
 
+    properties::IntProperty _framerateLimit;
+    std::chrono::high_resolution_clock::time_point _lastFrameTime;
     properties::FloatProperty _horizFieldOfView;
 
     properties::Vec3Property _globalRotation;

include/openspace/scene/asset.h

@@ -56,7 +56,7 @@ public:
         std::string author;
         std::string url;
         std::string license;
-        std::string identifiers;
+        std::vector<std::string> identifiers;
     };
 
     /**