From 6c84170a598bca71627b3f9abfc19db47fdc4064 Mon Sep 17 00:00:00 2001
From: Micah Acinapura <micahnyc@gmail.com>
Date: Fri, 23 Aug 2019 13:47:27 -0400
Subject: [PATCH] readded globebrowsing cusomization asset;temp disabled fxaa
 on mac; temp not unsetting directories on deinit of webgui; added
 single_fisheye_gui.xml;

---
 config/single_fisheye_gui.xml  | 54 ++++++++++++++++++++++++++++++++++
 data/assets/base.asset         |  2 +-
 data/assets/util/webgui.asset  |  8 +++--
 src/rendering/renderengine.cpp |  8 ++++-
 4 files changed, 68 insertions(+), 4 deletions(-)
 create mode 100644 config/single_fisheye_gui.xml

diff --git a/config/single_fisheye_gui.xml b/config/single_fisheye_gui.xml
new file mode 100644
index 0000000000..81019e8401
--- /dev/null
+++ b/config/single_fisheye_gui.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" ?>
+<Cluster masterAddress="localhost">
+<!--    <Scene>
+        <Orientation yaw="0.0" pitch="-27.0" roll="0.0" />
+        <Offset x="0.0" y="0.0" z="0.0" />
+        <Scale value="1.0" />
+    </Scene> -->
+    <Node address="localhost" port="20401">
+        <Window fullScreen="false" numberOfSamples="4" name="OpenSpace">
+            <Stereo type="none" />
+            <!-- 16:9 aspect ratio -->
+            <Size x="1024" y="1024" />
+            <!-- Frame buffer resolution
+            <Res x="4096" y="4096" /> -->
+            <!--
+                quality options (cubemap size):
+                    - low (256)
+                    - medium (512)
+                    - high/1k (1024)
+                    - 2k (2048)
+                    - 4k (4096)
+                    - 8k (8192)
+                tilt specifies the dome tilt angle in degrees from the horizontal
+            -->
+            <Viewport name="fisheye">
+                <Pos x="0.0" y="0.0" />
+                <Size x="1.0" y="1.0" />
+                <FisheyeProjection fov="180" quality="1k"  tilt="27.0">
+                    <Background r="0.1" g="0.1" b="0.1" a="1.0" />
+                </FisheyeProjection>
+            </Viewport>
+        </Window>
+
+
+    <Window fullScreen="false" msaa="1" name="GUI" tags="GUI">
+        <Stereo type="none" />
+        <Size x="1280" y="720" />
+        <Res x="2048" y="2048" />
+        <Pos x="50" y="50" />
+        <Viewport>
+            <Pos x="0.0" y="0.0" />
+            <Size x="1.0" y="1.0" />
+            <PlanarProjection>
+                <FOV down="25.267007923362" left="40.0" right="40.0" up="25.267007923362" />
+                <Orientation heading="0.0" pitch="0.0" roll="0.0" />
+            </PlanarProjection>
+        </Viewport>
+    </Window>
+
+    </Node>
+    <User eyeSeparation="0.06">
+        <Pos x="0.0" y="0.0" z="0.0" />
+    </User>
+</Cluster>
diff --git a/data/assets/base.asset b/data/assets/base.asset
index 3ab8f33d97..791c43aa69 100644
--- a/data/assets/base.asset
+++ b/data/assets/base.asset
@@ -27,7 +27,7 @@ asset.require('util/default_joystick')
 -- Load web gui
 asset.require('util/webgui')
 
-asset.request('customization/volumes')
+asset.request('customization/globebrowsing')
 
 -- Keybindings that are specific for this scene
 local Keybindings = {
diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index 9ecd45606a..25c60c242a 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -60,7 +60,8 @@ asset.onDeinitialize(function ()
     local directories = openspace.getPropertyValue("Modules.WebGui.Directories")
     local newDirectories = {};
 
-    openspace.setPropertyValueSingle("Modules.WebGui.DefaultEndpoint", "")
+    -- @TODO(maci, 2019-08-23) see message below
+    --openspace.setPropertyValueSingle("Modules.WebGui.DefaultEndpoint", "")
 
     for i = 0, #directories, 2 do
         -- @TODO(abock, 2019-08-20) The explicit check for directories[i] is a workaround
@@ -70,5 +71,8 @@ asset.onDeinitialize(function ()
             newDirectories[#newDirectories + 1] = directories[i + 1]
         end
     end
-    openspace.setPropertyValueSingle("Modules.WebGui.Directories", newDirectories)
+    -- @TODO(maci, 2019-08-23) setting this value on exit was causing the server to restart
+    -- on macos, which in turn, stopped the application from exiting. 
+    -- need to address in webguimodule.cpp
+    --openspace.setPropertyValueSingle("Modules.WebGui.Directories", newDirectories)
 end)
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 49981a7a1a..ba0c38c71c 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -309,6 +309,12 @@ RenderEngine::RenderEngine()
     addProperty(_showVersionInfo);
     addProperty(_showCameraInfo);
 
+    // @TODO (maci 2019-08-23) disabling FXAA on
+    // MacOS for now until we have fix or MSAA option.
+#ifdef __APPLE__
+    _enableFXAA = false;
+#endif
+
     _enableFXAA.onChange([this]() {
         if (_renderer) {
             _renderer->enableFXAA(_enableFXAA);
@@ -1083,7 +1089,7 @@ void RenderEngine::setRenderer(std::unique_ptr<Renderer> renderer) {
 
     _renderer = std::move(renderer);
     _renderer->setResolution(renderingResolution());
-    _renderer->enableFXAA(true);
+    _renderer->enableFXAA(_enableFXAA);
     _renderer->setHDRExposure(_hdrExposure);
     _renderer->initialize();
 }