Merged master into NewAtmosphere.

include/openspace/rendering/renderable.h

@@ -28,20 +28,21 @@
 #include <openspace/properties/propertyowner.h>
 
 #include <openspace/properties/scalar/boolproperty.h>
-#include <openspace/util/updatestructures.h>
 
-#include <ghoul/opengl/programobject.h>
-
-// Forward declare to minimize dependencies
 namespace ghoul {
     namespace opengl {
+        class ProgramObject;
         class Texture;
     }
     class Dictionary;
-}
+} // namespace ghoul
 
 namespace openspace {
 
+struct RenderData;
+struct UpdateData;
+struct RendererTasks;
+
 namespace documentation { struct Documentation; } 
 
 // Forward declare to minimize dependencies

include/openspace/rendering/renderengine.h

@@ -25,21 +25,13 @@
 #ifndef __OPENSPACE_CORE___RENDERENGINE___H__
 #define __OPENSPACE_CORE___RENDERENGINE___H__
 
-#include <openspace/performance/performancemanager.h>
-#include <openspace/properties/optionproperty.h>
 #include <openspace/properties/propertyowner.h>
+
+#include <openspace/properties/optionproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/intproperty.h>
 #include <openspace/properties/triggerproperty.h>
 
-#include <openspace/rendering/raycastermanager.h>
-#include <openspace/rendering/deferredcastermanager.h>
-#include <openspace/rendering/renderer.h>
-#include <openspace/rendering/screenspacerenderable.h>
-
-#include <openspace/scripting/scriptengine.h>
-
-#include <openspace/util/syncdata.h>
 
 namespace ghoul {
 namespace fontrendering {
@@ -50,17 +42,22 @@ namespace opengl {
 }
 class Dictionary;
 class SharedMemory;
-}
+} // namespace ghoul
 
 namespace openspace {
 
-// Forward declare to minimize dependencies
+namespace performance { class PerformanceManager; }
+namespace scripting { struct LuaLibrary; }
 class Camera;
-class SyncBuffer;
+class RaycasterManager;
+class DeferredcasterManager;
+class Renderer;
 class Scene;
 class SceneManager;
 class ScreenLog;
 class ScreenSpaceRenderable;
+class Syncable;
+class SyncBuffer;
 
 class RenderEngine : public properties::PropertyOwner {
 public:
@@ -77,7 +74,7 @@ public:
     };
 
     RenderEngine();
-    ~RenderEngine() = default;
+    ~RenderEngine();
     
     void initialize();
     void initializeGL();
@@ -207,6 +204,7 @@ private:
 
     //FrametimeType _frametimeType;
 
+    properties::BoolProperty _showDate;
     properties::BoolProperty _showInfo;
     properties::BoolProperty _showLog;
     
@@ -215,7 +213,7 @@ private:
     properties::BoolProperty _applyWarping;
     properties::BoolProperty _showFrameNumber;
     properties::BoolProperty _disableMasterRendering;
-    properties::BoolProperty _disableSceneOnMaster;
+    properties::BoolProperty _disableSceneTranslationOnMaster;
 
     float _globalBlackOutFactor;
     float _fadeDuration;