Showing the changes to interface/src/Application.cpp (1 of 6 files). Show all
Unified · Split
| @@ -1853,8 +1853,6 @@ void Application::updateMouseRay() { · 1852 unmodified lines | ||
| 1853 | 1853 | } |
| 1854 | 1854 | |
| 1855 | 1855 | void Application::updateFaceshift() { |
| 1856 | − PerformanceTimer perfTimer("faceshift"); | |
| 1857 | − | |
| 1858 | 1856 | bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); |
| 1859 | 1857 | PerformanceWarning warn(showWarnings, "Application::updateFaceshift()"); |
| 1860 | 1858 | |
| @@ -1868,8 +1866,6 @@ void Application::updateFaceshift() { · 7 unmodified lines | ||
| 1868 | 1866 | } |
| 1869 | 1867 | |
| 1870 | 1868 | void Application::updateVisage() { |
| 1871 | − PerformanceTimer perfTimer("visage"); | |
| 1872 | − | |
| 1873 | 1869 | bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); |
| 1874 | 1870 | PerformanceWarning warn(showWarnings, "Application::updateVisage()"); |
| 1875 | 1871 | |
| @@ -2055,18 +2051,17 @@ void Application::update(float deltaTime) { · 179 unmodified lines | ||
| 2055 | 2051 | |
| 2056 | 2052 | updateLOD(); |
| 2057 | 2053 | updateMouseRay(); // check what's under the mouse and update the mouse voxel |
| 2058 | − updateFaceshift(); | |
| 2059 | − updateVisage(); | |
| 2060 | − | |
| 2054 | + { | |
| 2055 | + PerformanceTimer perfTimer("devices"); | |
| 2056 | + updateFaceshift(); | |
| 2057 | + updateVisage(); | |
| 2058 | + _sixenseManager.update(deltaTime); | |
| 2059 | + _joystickManager.update(); | |
| 2060 | + _prioVR.update(deltaTime); | |
| 2061 | + } | |
| 2061 | 2062 | { |
| 2062 | 2063 | PerformanceTimer perfTimer("myAvatar"); |
| 2063 | 2064 | updateMyAvatarLookAtPosition(); |
| 2064 | − { | |
| 2065 | − PerformanceTimer perfTimer("devices"); | |
| 2066 | − _sixenseManager.update(deltaTime); | |
| 2067 | − _joystickManager.update(); | |
| 2068 | − _prioVR.update(deltaTime); | |
| 2069 | − } | |
| 2070 | 2065 | updateMyAvatar(deltaTime); // Sample hardware, update view frustum if needed, and send avatar data to mixer/nodes |
| 2071 | 2066 | } |
| 2072 | 2067 | |