Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 08:49:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Re-disable HMD preview on OSX

Browse source
This commit is contained in:
Bradley Austin Davis 2016-08-07 23:22:30 -07:00 committed by Brad Davis
parent c303e1118a
commit f65b636a09
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
View file

@ -38,7 +38,9 @@ static const QString DISABLE_PREVIEW = "Disable Preview";
static const QString FRAMERATE = DisplayPlugin::MENU_PATH() + ">Framerate"; static const QString FRAMERATE = DisplayPlugin::MENU_PATH() + ">Framerate";
static const QString DEVELOPER_MENU_PATH = "Developer>" + DisplayPlugin::MENU_PATH(); static const QString DEVELOPER_MENU_PATH = "Developer>" + DisplayPlugin::MENU_PATH();
static const bool DEFAULT_MONO_VIEW = true; static const bool DEFAULT_MONO_VIEW = true;
#if !defined(Q_OS_MAC)
static const bool DEFAULT_DISABLE_PREVIEW = false; static const bool DEFAULT_DISABLE_PREVIEW = false;
#endif
static const glm::mat4 IDENTITY_MATRIX; static const glm::mat4 IDENTITY_MATRIX;
static const size_t NUMBER_OF_HANDS = 2; static const size_t NUMBER_OF_HANDS = 2;
@ -69,7 +71,9 @@ bool HmdDisplayPlugin::internalActivate() {
_monoPreview = clicked; _monoPreview = clicked;
_container->setBoolSetting("monoPreview", _monoPreview); _container->setBoolSetting("monoPreview", _monoPreview);
}, true, _monoPreview); }, true, _monoPreview);
#if defined(Q_OS_MAC)
_disablePreview = true;
#else
_disablePreview = _container->getBoolSetting("disableHmdPreview", DEFAULT_DISABLE_PREVIEW || !_vsyncSupported); _disablePreview = _container->getBoolSetting("disableHmdPreview", DEFAULT_DISABLE_PREVIEW || !_vsyncSupported);
if (_vsyncSupported) { if (_vsyncSupported) {
_container->addMenuItem(PluginType::DISPLAY_PLUGIN, MENU_PATH(), DISABLE_PREVIEW, _container->addMenuItem(PluginType::DISPLAY_PLUGIN, MENU_PATH(), DISABLE_PREVIEW,
@ -81,6 +85,7 @@ bool HmdDisplayPlugin::internalActivate() {
} }
}, true, _disablePreview); }, true, _disablePreview);
} }
#endif
_container->removeMenu(FRAMERATE); _container->removeMenu(FRAMERATE);
for_each_eye([&](Eye eye) { for_each_eye([&](Eye eye) {