History

remove references to PrioVR in interface code

Stephen Birarda committed 11 years ago

Commit fc2f6d41 parent 38f77196 files · +2 −326Browse files

Showing the changes to interface/src/Application.cpp (1 of 6 files). Show all

Unified · Split

interface/src/Application.cpp+0−4
@@ -771,7 +771,6 @@ void Application::paintGL() { · 770 unmodified lines
771 771
772 {772 {
773 PerformanceTimer perfTimer("renderOverlay");773 PerformanceTimer perfTimer("renderOverlay");
774 // PrioVR will only work if renderOverlay is called, calibration is connected to Application::renderingOverlay()
775 _applicationOverlay.renderOverlay(true);774 _applicationOverlay.renderOverlay(true);
776 if (Menu::getInstance()->isOptionChecked(MenuOption::UserInterface)) {775 if (Menu::getInstance()->isOptionChecked(MenuOption::UserInterface)) {
777 _applicationOverlay.displayOverlayTexture();776 _applicationOverlay.displayOverlayTexture();
@@ -2071,8 +2070,6 @@ void Application::update(float deltaTime) { · 1293 unmodified lines
2071 updateVisage();2070 updateVisage();
2072 SixenseManager::getInstance().update(deltaTime);2071 SixenseManager::getInstance().update(deltaTime);
2073 JoystickScriptingInterface::getInstance().update();2072 JoystickScriptingInterface::getInstance().update();
2074 _prioVR.update(deltaTime);
2075
2076 }2073 }
2077 2074
2078 // Dispatch input events2075 // Dispatch input events
@@ -3131,7 +3128,6 @@ void Application::resetSensors() { · 1052 unmodified lines
3131 3128
3132 OculusManager::reset();3129 OculusManager::reset();
3133 3130
3134 _prioVR.reset();
3135 //_leapmotion.reset();3131 //_leapmotion.reset();
3136 3132
3137 QScreen* currentScreen = _window->windowHandle()->screen();3133 QScreen* currentScreen = _window->windowHandle()->screen();

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t