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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 = std::move(renderer); _renderer->setResolution(renderingResolution()); - _renderer->enableFXAA(true); + _renderer->enableFXAA(_enableFXAA); _renderer->setHDRExposure(_hdrExposure); _renderer->initialize(); }