Showing the changes to interface/src/Application.cpp (1 of 8 files). Show all
Unified · Split
| @@ -182,7 +182,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 181 unmodified lines | ||
| 182 | 182 | _lastNackTime(usecTimestampNow()), |
| 183 | 183 | _lastSendDownstreamAudioStats(usecTimestampNow()) |
| 184 | 184 | { |
| 185 | − | |
| 186 | 185 | // read the ApplicationInfo.ini file for Name/Version/Domain information |
| 187 | 186 | QSettings applicationInfo(Application::resourcesPath() + "info/ApplicationInfo.ini", QSettings::IniFormat); |
| 188 | 187 | |
| @@ -381,12 +380,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 192 unmodified lines | ||
| 381 | 380 | _particleEditSender.setPacketsPerSecond(3000); // super high!! |
| 382 | 381 | _entityEditSender.setPacketsPerSecond(3000); // super high!! |
| 383 | 382 | |
| 384 | − // Set the sixense filtering | |
| 385 | − _sixenseManager.setFilter(Menu::getInstance()->isOptionChecked(MenuOption::FilterSixense)); | |
| 386 | − | |
| 387 | − // Set hand controller velocity filtering | |
| 388 | − _sixenseManager.setLowVelocityFilter(Menu::getInstance()->isOptionChecked(MenuOption::LowVelocityFilter)); | |
| 389 | − | |
| 390 | 383 | checkVersion(); |
| 391 | 384 | |
| 392 | 385 | _overlays.init(_glWidget); // do this before scripts load |
| @@ -1484,7 +1477,7 @@ void Application::setRenderVoxels(bool voxelRender) { · 1091 unmodified lines | ||
| 1484 | 1477 | } |
| 1485 | 1478 | |
| 1486 | 1479 | void Application::setLowVelocityFilter(bool lowVelocityFilter) { |
| 1487 | − getSixenseManager()->setLowVelocityFilter(lowVelocityFilter); | |
| 1480 | + SixenseManager::getInstance().setLowVelocityFilter(lowVelocityFilter); | |
| 1488 | 1481 | } |
| 1489 | 1482 | |
| 1490 | 1483 | void Application::doKillLocalVoxels() { |
| @@ -1798,6 +1791,17 @@ void Application::init() { · 307 unmodified lines | ||
| 1798 | 1791 | _audio.setReceivedAudioStreamSettings(Menu::getInstance()->getReceivedAudioStreamSettings()); |
| 1799 | 1792 | |
| 1800 | 1793 | qDebug("Loaded settings"); |
| 1794 | + | |
| 1795 | +#ifdef __APPLE__ | |
| 1796 | + if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseEnabled)) { | |
| 1797 | + // on OS X we only setup sixense if the user wants it on - this allows running without the hid_init crash | |
| 1798 | + // if hydra support is temporarily not required | |
| 1799 | + Menu::getInstance()->toggleSixense(true); | |
| 1800 | + } | |
| 1801 | +#else | |
| 1802 | + // setup sixense | |
| 1803 | + Menu::getInstance()->toggleSixense(true); | |
| 1804 | +#endif | |
| 1801 | 1805 | |
| 1802 | 1806 | // initialize our face trackers after loading the menu settings |
| 1803 | 1807 | _faceshift.init(); |
| @@ -2174,7 +2178,7 @@ void Application::update(float deltaTime) { · 370 unmodified lines | ||
| 2174 | 2178 | DeviceTracker::updateAll(); |
| 2175 | 2179 | updateFaceshift(); |
| 2176 | 2180 | updateVisage(); |
| 2177 | − _sixenseManager.update(deltaTime); | |
| 2181 | + SixenseManager::getInstance().update(deltaTime); | |
| 2178 | 2182 | JoystickScriptingInterface::getInstance().update(); |
| 2179 | 2183 | _prioVR.update(deltaTime); |
| 2180 | 2184 | |