- {{key}}
+ {{key}} {{#if remoteScripting}}Remote scripting{{else}}Local scripting{{/if}}
{{script}}
diff --git a/data/web/keybindings/script.js b/data/web/keybindings/script.js
index 149cba1892..6b4bdd444e 100644
--- a/data/web/keybindings/script.js
+++ b/data/web/keybindings/script.js
@@ -18,6 +18,10 @@ window.onload = function () {
return identifier;
});
+ keybindings.sort(function (a, b) {
+ return a.key < b.key ? -1 : (a.key > b.key ? 1 : 0);
+ });
+
var data = {
keybindings: keybindings,
version: version,
diff --git a/data/web/luascripting/script.js b/data/web/luascripting/script.js
index b43af6f884..6d43a33b07 100644
--- a/data/web/luascripting/script.js
+++ b/data/web/luascripting/script.js
@@ -18,6 +18,10 @@ window.onload = function () {
return identifier;
});
+ scripting.sort(function (a, b) {
+ return a.library < b.library ? -1 : (a.library > b.library ? 1 : 0);
+ });
+
var data = {
scripting: scripting,
version: version
diff --git a/data/web/properties/script.js b/data/web/properties/script.js
index 70f303f15f..f7302a5e0b 100644
--- a/data/web/properties/script.js
+++ b/data/web/properties/script.js
@@ -46,6 +46,10 @@ window.onload = function () {
return identifier;
});
+ propertyOwners.sort(function (a, b) {
+ return a.name < b.name ? -1 : (a.name > b.name ? 1 : 0);
+ });
+
var data = {
propertyOwners: propertyOwners,
version: version,
diff --git a/ext/ghoul b/ext/ghoul
index f9e1207470..e37387fbd5 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit f9e12074702627b1feef9a09670270fed511ff5a
+Subproject commit e37387fbd595babfaeb0ce31eb389cb2a70bd5cb
diff --git a/ext/sgct b/ext/sgct
index fb95dc335b..c7f321dd50 160000
--- a/ext/sgct
+++ b/ext/sgct
@@ -1 +1 @@
-Subproject commit fb95dc335ba7d396723fbfeca64aa3b7451376c8
+Subproject commit c7f321dd504c184e6ac65d26b33aec2f7699c476
diff --git a/include/openspace/documentation/verifier.h b/include/openspace/documentation/verifier.h
index 1adcc9b140..bc8dd451b7 100644
--- a/include/openspace/documentation/verifier.h
+++ b/include/openspace/documentation/verifier.h
@@ -199,6 +199,19 @@ struct TableVerifier : public TemplateVerifier
{
Exhaustive exhaustive;
};
+/**
+ * A Verifier that checks whether all values contained in a Table are of type \c string.
+ */
+struct StringListVerifier : public TableVerifier {
+ /**
+ * Constructor for a StringListVerifier.
+ * \param elementDocumentation The documentation for each string in the list
+ */
+ StringListVerifier(std::string elementDocumentation = "");
+
+ std::string type() const override;
+};
+
//----------------------------------------------------------------------------------------
// Vector verifiers
//----------------------------------------------------------------------------------------
@@ -235,6 +248,100 @@ struct Vector4Verifier : public TemplateVerifier>, public VectorVe
std::string type() const override;
};
+//----------------------------------------------------------------------------------------
+// Matrix verifiers
+//----------------------------------------------------------------------------------------
+
+/**
+* This struct is the base class for all Verifier%s that check for \c glm matrix types.
+* The template parameter for the subclasses is the containing type, not the full matrix
+* type. For example to check for glm::dmat4x3, one would create a
+* Matrix4x3Verifier.
+*/
+struct MatrixVerifier {};
+
+/**
+* This Verifier checks whether the value is of type glm::mat2x2
+*/
+template
+struct Matrix2x2Verifier :
+ public TemplateVerifier>, public MatrixVerifier
+{
+ std::string type() const override;
+};
+
+/**
+* This Verifier checks whether the value is of type glm::mat2x3
+*/
+template
+struct Matrix2x3Verifier :
+ public TemplateVerifier>, public MatrixVerifier {
+ std::string type() const override;
+};
+
+/**
+* This Verifier checks whether the value is of type glm::mat2x4
+*/
+template
+struct Matrix2x4Verifier :
+ public TemplateVerifier>, public MatrixVerifier {
+ std::string type() const override;
+};
+
+/**
+* This Verifier checks whether the value is of type glm::mat3x2
+*/
+template
+struct Matrix3x2Verifier :
+ public TemplateVerifier>, public MatrixVerifier {
+ std::string type() const override;
+};
+
+/**
+* This Verifier checks whether the value is of type glm::mat3x3
+*/
+template
+struct Matrix3x3Verifier :
+ public TemplateVerifier>, public MatrixVerifier {
+ std::string type() const override;
+};
+
+/**
+* This Verifier checks whether the value is of type glm::mat3x4
+*/
+template
+struct Matrix3x4Verifier :
+ public TemplateVerifier>, public MatrixVerifier {
+ std::string type() const override;
+};
+
+/**
+* This Verifier checks whether the value is of type glm::mat4x2
+*/
+template
+struct Matrix4x2Verifier :
+ public TemplateVerifier>, public MatrixVerifier {
+ std::string type() const override;
+};
+
+/**
+* This Verifier checks whether the value is of type glm::mat4x3
+*/
+template
+struct Matrix4x3Verifier :
+ public TemplateVerifier>, public MatrixVerifier {
+ std::string type() const override;
+};
+
+/**
+* This Verifier checks whether the value is of type glm::mat4x4
+*/
+template
+struct Matrix4x4Verifier :
+ public TemplateVerifier>, public MatrixVerifier {
+ std::string type() const override;
+};
+
//----------------------------------------------------------------------------------------
// Operator verifiers
//----------------------------------------------------------------------------------------
@@ -840,6 +947,28 @@ using IntVector4Verifier = Vector4Verifier;
/// A short-hand definition for a Verifier checking for glm::dvec4
using DoubleVector4Verifier = Vector4Verifier;
+/// A short-hand definition for a Verifier checking for glm::dmat2x2
+using DoubleMatrix2x2Verifier = Matrix2x2Verifier;
+using DoubleMatrix2Verifier = DoubleMatrix2x2Verifier;
+/// A short-hand definition for a Verifier checking for glm::dmat2x3
+using DoubleMatrix2x3Verifier = Matrix2x3Verifier;
+/// A short-hand definition for a Verifier checking for glm::dmat2x4
+using DoubleMatrix2x4Verifier = Matrix2x4Verifier;
+/// A short-hand definition for a Verifier checking for glm::dmat3x2
+using DoubleMatrix3x2Verifier = Matrix3x2Verifier;
+/// A short-hand definition for a Verifier checking for glm::dmat3x3
+using DoubleMatrix3x3Verifier = Matrix3x3Verifier;
+using DoubleMatrix3Verifier = DoubleMatrix3x3Verifier;
+/// A short-hand definition for a Verifier checking for glm::dmat3x4
+using DoubleMatrix3x4Verifier = Matrix3x4Verifier;
+/// A short-hand definition for a Verifier checking for glm::dmat4x2
+using DoubleMatrix4x2Verifier = Matrix4x2Verifier;
+/// A short-hand definition for a Verifier checking for glm::dmat4x3
+using DoubleMatrix4x3Verifier = Matrix4x3Verifier;
+/// A short-hand definition for a Verifier checking for glm::dmat4x4
+using DoubleMatrix4x4Verifier = Matrix4x4Verifier;
+using DoubleMatrix4Verifier = DoubleMatrix4x4Verifier;
+
/// A short-hand definition for a LessVerifier with a type check for \c int
using IntLessVerifier = LessVerifier;
/// A short-hand definition for a LessVerifier with a type check for \c double
@@ -936,6 +1065,16 @@ extern template struct Vector4Verifier;
extern template struct Vector4Verifier;
extern template struct Vector4Verifier;
+extern template struct Matrix2x2Verifier;
+extern template struct Matrix2x3Verifier;
+extern template struct Matrix2x4Verifier;
+extern template struct Matrix3x2Verifier;
+extern template struct Matrix3x3Verifier;
+extern template struct Matrix3x4Verifier;
+extern template struct Matrix4x2Verifier;
+extern template struct Matrix4x3Verifier;
+extern template struct Matrix4x4Verifier;
+
extern template struct LessVerifier;
extern template struct LessVerifier;
extern template struct LessEqualVerifier;
diff --git a/include/openspace/documentation/verifier.inl b/include/openspace/documentation/verifier.inl
index deaa984b3d..8df5f6e3f6 100644
--- a/include/openspace/documentation/verifier.inl
+++ b/include/openspace/documentation/verifier.inl
@@ -74,6 +74,69 @@ std::string Vector4Verifier::type() const {
return "Vector4<"s + typeid(T).name() + ">";
}
+template
+std::string Matrix2x2Verifier::type() const {
+ using namespace std::string_literals;
+
+ return "Matrix2x2<"s + typeid(T).name() + ">";
+}
+
+template
+std::string Matrix2x3Verifier::type() const {
+ using namespace std::string_literals;
+
+ return "Matrix2x3<"s + typeid(T).name() + ">";
+}
+
+template
+std::string Matrix2x4Verifier::type() const {
+ using namespace std::string_literals;
+
+ return "Matrix2x4<"s + typeid(T).name() + ">";
+}
+
+template
+std::string Matrix3x2Verifier::type() const {
+ using namespace std::string_literals;
+
+ return "Matrix3x2<"s + typeid(T).name() + ">";
+}
+
+template
+std::string Matrix3x3Verifier::type() const {
+ using namespace std::string_literals;
+
+ return "Matrix3x3<"s + typeid(T).name() + ">";
+}
+
+template
+std::string Matrix3x4Verifier::type() const {
+ using namespace std::string_literals;
+
+ return "Matrix3x4<"s + typeid(T).name() + ">";
+}
+
+template
+std::string Matrix4x2Verifier::type() const {
+ using namespace std::string_literals;
+
+ return "Matrix4x2<"s + typeid(T).name() + ">";
+}
+
+template
+std::string Matrix4x3Verifier::type() const {
+ using namespace std::string_literals;
+
+ return "Matrix4x3<"s + typeid(T).name() + ">";
+}
+
+template
+std::string Matrix4x4Verifier::type() const {
+ using namespace std::string_literals;
+
+ return "Matrix4x4<"s + typeid(T).name() + ">";
+}
+
template
OperatorVerifier::OperatorVerifier(typename T::Type value)
: value(std::move(value))
diff --git a/include/openspace/engine/configurationmanager.h b/include/openspace/engine/configurationmanager.h
index 3f57aa59d9..f63649a8b6 100644
--- a/include/openspace/engine/configurationmanager.h
+++ b/include/openspace/engine/configurationmanager.h
@@ -109,6 +109,8 @@ public:
/// The key that stores the switch for enabling/disabling the rendering on a master
/// computer
static const std::string KeyRenderingMethod;
+ /// The key that determines whether a new cache folder is used for each scene file
+ static const std::string KeyPerSceneCache;
/// The key that stores the http proxy settings for the downloadmanager
static const std::string KeyHttpProxy;
/// The key that stores the address of the http proxy
diff --git a/include/openspace/engine/moduleengine.h b/include/openspace/engine/moduleengine.h
index 6075ebe125..2e06a4f930 100644
--- a/include/openspace/engine/moduleengine.h
+++ b/include/openspace/engine/moduleengine.h
@@ -75,6 +75,14 @@ public:
*/
std::vector modules() const;
+ /**
+ * Returns the combined minimum OpenGL version. The return value is the maximum
+ * version of all registered modules' OpenGL versions.
+ * \return The combined minimum OpenGL version
+ */
+ ghoul::systemcapabilities::OpenGLCapabilitiesComponent::Version
+ requiredOpenGLVersion() const;
+
/**
* Returns the Lua library that contains all Lua functions available to affect the
* modules.
diff --git a/include/openspace/engine/wrapper/sgctwindowwrapper.h b/include/openspace/engine/wrapper/sgctwindowwrapper.h
index a9c4778005..678e2fe25e 100644
--- a/include/openspace/engine/wrapper/sgctwindowwrapper.h
+++ b/include/openspace/engine/wrapper/sgctwindowwrapper.h
@@ -49,6 +49,7 @@ public:
glm::ivec2 currentWindowSize() const override;
glm::ivec2 currentWindowResolution() const override;
glm::ivec2 currentDrawBufferResolution() const override;
+ glm::vec2 dpiScaling() const override;
int currentNumberOfAaSamples() const override;
bool isRegularRendering() const override;
diff --git a/include/openspace/engine/wrapper/windowwrapper.h b/include/openspace/engine/wrapper/windowwrapper.h
index af26f105b4..75924841bc 100644
--- a/include/openspace/engine/wrapper/windowwrapper.h
+++ b/include/openspace/engine/wrapper/windowwrapper.h
@@ -138,6 +138,13 @@ public:
* \return The resolution of the currently active window in pixel coordinates
*/
virtual glm::ivec2 currentDrawBufferResolution() const;
+
+ /**
+ * Returns the DPI scaling factor for the current window. This is normally 1 on all
+ * regular monitors and 2 on Retina screens.
+ * \return The DPI scaling factor for the current window
+ */
+ virtual glm::vec2 dpiScaling() const;
/**
* Returns the number of anti-aliasing samples used in the current window.
diff --git a/include/openspace/interaction/interactionhandler.h b/include/openspace/interaction/interactionhandler.h
index 3efacae9fe..1018f37068 100644
--- a/include/openspace/interaction/interactionhandler.h
+++ b/include/openspace/interaction/interactionhandler.h
@@ -34,6 +34,7 @@
#include
#include
+#include
#include
@@ -70,8 +71,18 @@ public:
void addKeyframe(const datamessagestructures::CameraKeyframe &kf);
void clearKeyframes();
- void bindKeyLocal(Key key, KeyModifier modifier, std::string lua);
- void bindKey(Key key, KeyModifier modifier, std::string lua);
+ void bindKeyLocal(
+ Key key,
+ KeyModifier modifier,
+ std::string luaCommand,
+ std::string documentation = ""
+ );
+ void bindKey(
+ Key key,
+ KeyModifier modifier,
+ std::string luaCommand,
+ std::string documentation = ""
+ );
void lockControls();
void unlockControls();
@@ -105,11 +116,19 @@ public:
void writeKeyboardDocumentation(const std::string& type, const std::string& file);
private:
+ using Synchronized = ghoul::Boolean;
+
+ struct KeyInformation {
+ std::string command;
+ Synchronized synchronization;
+ std::string documentation;
+ };
+
void setInteractionMode(std::shared_ptr interactionMode);
bool _cameraUpdatedFromScript = false;
- std::multimap> _keyLua;
+ std::multimap _keyLua;
std::unique_ptr _inputState;
Camera* _camera;
diff --git a/include/openspace/interaction/interactionmode.h b/include/openspace/interaction/interactionmode.h
index 06fcf97796..4a5f418db9 100644
--- a/include/openspace/interaction/interactionmode.h
+++ b/include/openspace/interaction/interactionmode.h
@@ -31,10 +31,6 @@
#include
#include
-#ifdef OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
-#include
-#include
-#endif
#include
@@ -42,7 +38,10 @@ namespace openspace {
class Camera;
class SceneGraphNode;
-class RenderableGlobe;
+
+namespace globebrowsing {
+ class RenderableGlobe;
+}
namespace interaction {
diff --git a/include/openspace/network/parallelconnection.h b/include/openspace/network/parallelconnection.h
index e372d75001..6b77861e4d 100644
--- a/include/openspace/network/parallelconnection.h
+++ b/include/openspace/network/parallelconnection.h
@@ -44,14 +44,7 @@
#include