From 63d607281a79735d641f80da418f8165535043c4 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@me.com>
Date: Tue, 9 May 2017 10:30:35 +0100
Subject: [PATCH] Update SGCT repository Add property to toggle date rendering
 independent from rendering statistics

---
 ext/sgct                                   |  2 +-
 include/openspace/rendering/renderengine.h |  3 ++-
 src/rendering/renderengine.cpp             | 21 +++++++++++++++------
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ext/sgct b/ext/sgct
index d73ac8eac4..9a1a7ab821 160000
--- a/ext/sgct
+++ b/ext/sgct
@@ -1 +1 @@
-Subproject commit d73ac8eac4babc24b3953d9faa1a3a2aa677fac8
+Subproject commit 9a1a7ab8219a1ffc728f8f883ab0c2dfa8bbf2ab
diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h
index bbd88093b8..cb5cdb8382 100644
--- a/include/openspace/rendering/renderengine.h
+++ b/include/openspace/rendering/renderengine.h
@@ -204,6 +204,7 @@ private:
 
     //FrametimeType _frametimeType;
 
+    properties::BoolProperty _showDate;
     properties::BoolProperty _showInfo;
     properties::BoolProperty _showLog;
     
@@ -212,7 +213,7 @@ private:
     properties::BoolProperty _applyWarping;
     properties::BoolProperty _showFrameNumber;
     properties::BoolProperty _disableMasterRendering;
-    properties::BoolProperty _disableSceneOnMaster;
+    properties::BoolProperty _disableSceneTranslationOnMaster;
 
     float _globalBlackOutFactor;
     float _fadeDuration;
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index a3add880e3..7f34cbedd1 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -105,6 +105,7 @@ RenderEngine::RenderEngine()
         "Type of the frametime display",
         properties::OptionProperty::DisplayType::Dropdown
     )
+    , _showDate("showDate", "Show Date Information", true)
     , _showInfo("showInfo", "Show Render Information", true)
     , _showLog("showLog", "Show the OnScreen log", true)
     , _takeScreenshot("takeScreenshot", "Take Screenshot")
@@ -112,7 +113,11 @@ RenderEngine::RenderEngine()
     , _applyWarping("applyWarpingScreenshot", "Apply Warping to Screenshots", false)
     , _showFrameNumber("showFrameNumber", "Show Frame Number", false)
     , _disableMasterRendering("disableMasterRendering", "Disable Master Rendering", false)
-    , _disableSceneOnMaster("disableSceneOnMaster", "Disable Scene on Master", false)
+    , _disableSceneTranslationOnMaster(
+        "disableSceneTranslationOnMaster",
+        "Disable Scene Translation on Master",
+        false
+    )
     , _globalBlackOutFactor(1.f)
     , _fadeDuration(2.f)
     , _currentFadeTime(0.f)
@@ -147,6 +152,7 @@ RenderEngine::RenderEngine()
     );
     addProperty(_frametimeType);
     
+    addProperty(_showDate);
     addProperty(_showInfo);
     addProperty(_showLog);
     
@@ -165,8 +171,8 @@ RenderEngine::RenderEngine()
     
     addProperty(_showFrameNumber);
     
+    addProperty(_disableSceneTranslationOnMaster);
     addProperty(_disableMasterRendering);
-    addProperty(_disableSceneOnMaster);
 }
 
 void RenderEngine::setRendererFromString(const std::string& renderingMethod) {
@@ -214,7 +220,7 @@ void RenderEngine::initialize() {
     }
 
     if (confManager.hasKey(ConfigurationManager::KeyDisableSceneOnMaster)) {
-        _disableSceneOnMaster = confManager.value<bool>(
+        _disableSceneTranslationOnMaster = confManager.value<bool>(
             ConfigurationManager::KeyDisableSceneOnMaster
         );
     }
@@ -395,7 +401,7 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
     LTRACE("RenderEngine::render(begin)");
     WindowWrapper& wrapper = OsEng.windowWrapper();
 
-    if (_disableSceneOnMaster && wrapper.isMaster()) {
+    if (_disableSceneTranslationOnMaster && wrapper.isMaster()) {
         _camera->sgctInternal.setViewMatrix(viewMatrix);
     }
     else {
@@ -805,9 +811,9 @@ void RenderEngine::renderInformation() {
             fontResolution().y
             //OsEng.windowWrapper().viewportPixelCoordinates().w
         );
-        penPosition.y -= _fontDate->height();
 
-        if (_showInfo && _fontDate) {
+        if (_showDate && _fontDate) {
+            penPosition.y -= _fontDate->height();
             RenderFontCr(
                 *_fontDate,
                 penPosition,
@@ -815,6 +821,9 @@ void RenderEngine::renderInformation() {
                 Time::ref().UTC().c_str()
             );
         }
+        else {
+            penPosition.y -= _fontInfo->height();
+        }
         if (_showInfo && _fontInfo) {
             RenderFontCr(
                 *_fontInfo,