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

Merge pull request #8141 from sethalves/unwedge-hydras-on-linux

Browse source 
workaround to allow models and files to be loaded on linux
This commit is contained in:
Andrew Meadows 2016-06-27 09:49:08 -07:00 committed by GitHub
commit 53af5db77b
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/hifiSixense/src/SixenseManager.cpp
View file

@ -77,6 +77,7 @@ bool SixenseManager::activate() {
InputPlugin::activate(); InputPlugin::activate();
#ifdef HAVE_SIXENSE #ifdef HAVE_SIXENSE
#if !defined(Q_OS_LINUX)
_container->addMenu(MENU_PATH); _container->addMenu(MENU_PATH);
_container->addMenuItem(PluginType::INPUT_PLUGIN, MENU_PATH, TOGGLE_SMOOTH, _container->addMenuItem(PluginType::INPUT_PLUGIN, MENU_PATH, TOGGLE_SMOOTH,
[this] (bool clicked) { setSixenseFilter(clicked); }, [this] (bool clicked) { setSixenseFilter(clicked); },
@ -89,6 +90,7 @@ bool SixenseManager::activate() {
_container->addMenuItem(PluginType::INPUT_PLUGIN, MENU_PATH, SHOW_DEBUG_CALIBRATED, _container->addMenuItem(PluginType::INPUT_PLUGIN, MENU_PATH, SHOW_DEBUG_CALIBRATED,
[this] (bool clicked) { _inputDevice->setDebugDrawCalibrated(clicked); }, [this] (bool clicked) { _inputDevice->setDebugDrawCalibrated(clicked); },
true, false); true, false);
#endif
auto userInputMapper = DependencyManager::get<controller::UserInputMapper>(); auto userInputMapper = DependencyManager::get<controller::UserInputMapper>();
userInputMapper->registerDevice(_inputDevice); userInputMapper->registerDevice(_inputDevice);
@ -106,8 +108,10 @@ void SixenseManager::deactivate() {
InputPlugin::deactivate(); InputPlugin::deactivate();
#ifdef HAVE_SIXENSE #ifdef HAVE_SIXENSE
#if !defined(Q_OS_LINUX)
_container->removeMenuItem(MENU_NAME, TOGGLE_SMOOTH); _container->removeMenuItem(MENU_NAME, TOGGLE_SMOOTH);
_container->removeMenu(MENU_PATH); _container->removeMenu(MENU_PATH);
#endif
_inputDevice->_poseStateMap.clear(); _inputDevice->_poseStateMap.clear();