Merged Master.

include/openspace/engine/configurationmanager.h

@@ -86,9 +86,10 @@ public:
 
     /// The key that stores the factory documentation values
     static constexpr const char* KeyFactoryDocumentation = "FactoryDocumentation";
-    /// The key that decides whether or not we should require incoming web socket connections
-    /// to authorize or not
-    static constexpr const char* KeyRequireSocketAuthentication = "RequireSocketAuthentication";
+    /// The key that decides whether or not we should require incoming web socket
+    /// connections to authorize or not
+    static constexpr const char* KeyRequireSocketAuthentication =
+                                                            "RequireSocketAuthentication";
 
     /// The key that stores the location of the asset file that is initially loaded
     static constexpr const char* KeyConfigAsset = "Asset";

include/openspace/engine/moduleengine.h

@@ -61,12 +61,22 @@ public:
     */
     void initialize(const ghoul::Dictionary& moduleConfigurations);
 
+    /**
+     * Calls the initializeGL functions of all registered OpenSpaceModule%s.
+     */
+    void initializeGL();
+
     /**
      * Deinitializes all of the contained OpenSpaceModule%s by calling the
      * OpenSpaceModule::deinitialize methods.
      */
     void deinitialize();
 
+    /**
+     * Calls the deinitializeGL functions of all registered OpenSpaceModule%s.
+     */
+    void deinitializeGL();
+
     /**
      * Registers the passed \p module with this ModuleEngine. The OpenSpaceModule::create
      * method will be called on the \p module in the process.

include/openspace/engine/syncengine.h

@@ -42,7 +42,7 @@ class Syncable;
  */
 class SyncEngine {
 public:
-    using IsMaster = ghoul::Boolean;
+    BooleanType(IsMaster);
 
     /**
      * Creates a new SyncEngine which a buffer size of \p syncBufferSize