Merge branch 'master' into feature/model-animation

* Resolve conflicts

include/openspace/documentation/verifier.h

@@ -156,7 +156,17 @@ struct IntVerifier : public TemplateVerifier<int> {
  * <code>std::string</code>. No implicit conversion is considered in this testing.
  */
 struct StringVerifier : public TemplateVerifier<std::string> {
+    StringVerifier(bool mustBeNotEmpty = false);
+
+    TestResult operator()(const ghoul::Dictionary& dictionary,
+        const std::string& key) const override;
+
     std::string type() const override;
+
+    bool mustBeNotEmpty() const;
+
+private:
+    bool _mustBeNotEmpty = false;
 };
 
 /**

include/openspace/engine/configuration.h

@@ -43,7 +43,6 @@ struct Configuration {
     Configuration& operator=(Configuration&&) = default;
 
     std::string windowConfiguration = "${CONFIG}/single.xml";
-    std::string sgctConfigNameInitialized;
     std::string asset;
     std::string profile;
     std::vector<std::string> readOnlyProfiles;
@@ -93,7 +92,6 @@ struct Configuration {
     glm::dvec3 screenSpaceRotation = glm::dvec3(0.0);
     glm::dvec3 masterRotation = glm::dvec3(0.0);
     bool isConsoleDisabled = false;
-    bool usingProfile = false;
     bool bypassLauncher = false;
 
     std::map<std::string, ghoul::Dictionary> moduleConfigurations;
@@ -123,6 +121,9 @@ struct Configuration {
     };
     HTTPProxy httpProxy;
 
+    // Values not read from the openspace.cfg file
+    bool usingProfile = false;
+    std::string sgctConfigNameInitialized;
 
     static documentation::Documentation Documentation;
     ghoul::lua::LuaState state;
@@ -130,9 +131,8 @@ struct Configuration {
 
 std::string findConfiguration(const std::string& filename = "openspace.cfg");
 
-Configuration loadConfigurationFromFile(const std::string& filename);
-
-void parseLuaState(Configuration& configuration);
+Configuration loadConfigurationFromFile(const std::string& filename,
+    const std::string& overrideScript);
 
 } // namespace openspace::configuration
 

include/openspace/engine/openspaceengine.h

@@ -144,7 +144,7 @@ private:
 // Lua functions - exposed for testing
 namespace openspace::luascriptfunctions {
 
-int createSingeColorImage(lua_State* L);
+int createSingleColorImage(lua_State* L);
 
 } // openspace::luascriptfunctions
 

include/openspace/rendering/dashboarditem.h

@@ -28,12 +28,9 @@
 #include <openspace/properties/propertyowner.h>
 
 #include <openspace/properties/scalar/boolproperty.h>
-#include <openspace/properties/scalar/floatproperty.h>
-#include <openspace/properties/stringproperty.h>
 #include <ghoul/glm.h>
 
 namespace ghoul { class Dictionary; }
-namespace ghoul::fontrendering { class Font; }
 
 namespace openspace {
 
@@ -58,22 +55,6 @@ protected:
     properties::BoolProperty _isEnabled;
 };
 
-
-
-class DashboardTextItem : public DashboardItem {
-public:
-    static documentation::Documentation Documentation();
-
-    DashboardTextItem(const ghoul::Dictionary& dictionary, float fontSize = 10.f,
-        const std::string& fontName = "Mono");
-
-protected:
-    properties::StringProperty _fontName;
-    properties::FloatProperty _fontSize;
-
-    std::shared_ptr<ghoul::fontrendering::Font> _font;
-};
-
 } // openspace
 
 #endif // __OPENSPACE_CORE___DASHBOARDITEM___H__

include/openspace/rendering/dashboardtextitem.h

@@ -0,0 +1,56 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2021                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_CORE___DASHBOARDTEXTITEM___H__
+#define __OPENSPACE_CORE___DASHBOARDTEXTITEM___H__
+
+#include <openspace/rendering/dashboarditem.h>
+
+#include <openspace/properties/scalar/floatproperty.h>
+#include <openspace/properties/stringproperty.h>
+
+namespace ghoul { class Dictionary; }
+namespace ghoul::fontrendering { class Font; }
+
+namespace openspace {
+
+namespace documentation { struct Documentation; }
+
+class DashboardTextItem : public DashboardItem {
+public:
+    static documentation::Documentation Documentation();
+
+    DashboardTextItem(const ghoul::Dictionary& dictionary, float fontSize = 10.f,
+        const std::string& fontName = "Mono");
+
+protected:
+    properties::StringProperty _fontName;
+    properties::FloatProperty _fontSize;
+
+    std::shared_ptr<ghoul::fontrendering::Font> _font;
+};
+
+} // openspace
+
+#endif // __OPENSPACE_CORE___DASHBOARDITEM___H__

include/openspace/rendering/renderengine.h

@@ -201,6 +201,7 @@ private:
     properties::BoolProperty _showCameraInfo;
 
     properties::BoolProperty _applyWarping;
+    properties::BoolProperty _screenshotUseDate;
     properties::BoolProperty _showFrameInformation;
     properties::BoolProperty _disableMasterRendering;