Showing the changes to interface/src/Application.cpp (1 of 16 files). Show all
Unified · Split
| @@ -1217,10 +1217,6 @@ void Application::touchBeginEvent(QTouchEvent* event) { · 1216 unmodified lines | |||
| 1217 | return; | 1217 | return; |
| 1218 | } | 1218 | } |
| 1219 | 1219 | ||
| 1220 | // put any application specific touch behavior below here.. | ||
| 1221 | _lastTouchAvgX = _touchAvgX; | ||
| 1222 | _lastTouchAvgY = _touchAvgY; | ||
| 1223 | |||
| 1224 | } | 1220 | } |
| 1225 | 1221 | ||
| 1226 | void Application::touchEndEvent(QTouchEvent* event) { | 1222 | void Application::touchEndEvent(QTouchEvent* event) { |
| @@ -1875,34 +1871,6 @@ void Application::updateMyAvatarLookAtPosition() { · 648 unmodified lines | |||
| 1875 | _myAvatar->getHead()->setLookAtPosition(lookAtSpot); | 1871 | _myAvatar->getHead()->setLookAtPosition(lookAtSpot); |
| 1876 | } | 1872 | } |
| 1877 | 1873 | ||
| 1878 | void Application::updateHandAndTouch(float deltaTime) { | ||
| 1879 | bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); | ||
| 1880 | PerformanceWarning warn(showWarnings, "Application::updateHandAndTouch()"); | ||
| 1881 | |||
| 1882 | // Update from Touch | ||
| 1883 | if (_isTouchPressed) { | ||
| 1884 | _lastTouchAvgX = _touchAvgX; | ||
| 1885 | _lastTouchAvgY = _touchAvgY; | ||
| 1886 | } | ||
| 1887 | } | ||
| 1888 | |||
| 1889 | void Application::updateLeap(float deltaTime) { | ||
| 1890 | bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); | ||
| 1891 | PerformanceWarning warn(showWarnings, "Application::updateLeap()"); | ||
| 1892 | } | ||
| 1893 | |||
| 1894 | void Application::updateSixense(float deltaTime) { | ||
| 1895 | bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); | ||
| 1896 | PerformanceWarning warn(showWarnings, "Application::updateSixense()"); | ||
| 1897 | |||
| 1898 | _sixenseManager.update(deltaTime); | ||
| 1899 | } | ||
| 1900 | |||
| 1901 | void Application::updateSerialDevices(float deltaTime) { | ||
| 1902 | bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); | ||
| 1903 | PerformanceWarning warn(showWarnings, "Application::updateSerialDevices()"); | ||
| 1904 | } | ||
| 1905 | |||
| 1906 | void Application::updateThreads(float deltaTime) { | 1874 | void Application::updateThreads(float deltaTime) { |
| 1907 | bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); | 1875 | bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); |
| 1908 | PerformanceWarning warn(showWarnings, "Application::updateThreads()"); | 1876 | PerformanceWarning warn(showWarnings, "Application::updateThreads()"); |
| @@ -2016,11 +1984,7 @@ void Application::update(float deltaTime) { · 107 unmodified lines | |||
| 2016 | updateVisage(); | 1984 | updateVisage(); |
| 2017 | _myAvatar->updateLookAtTargetAvatar(); | 1985 | _myAvatar->updateLookAtTargetAvatar(); |
| 2018 | updateMyAvatarLookAtPosition(); | 1986 | updateMyAvatarLookAtPosition(); |
| 2019 | 1987 | _sixenseManager.update(deltaTime); | |
| 2020 | updateHandAndTouch(deltaTime); // Update state for touch sensors | ||
| 2021 | updateLeap(deltaTime); // Leap finger-sensing device | ||
| 2022 | updateSixense(deltaTime); // Razer Hydra controllers | ||
| 2023 | updateSerialDevices(deltaTime); // Read serial port interface devices | ||
| 2024 | updateMyAvatar(deltaTime); // Sample hardware, update view frustum if needed, and send avatar data to mixer/nodes | 1988 | updateMyAvatar(deltaTime); // Sample hardware, update view frustum if needed, and send avatar data to mixer/nodes |
| 2025 | updateThreads(deltaTime); // If running non-threaded, then give the threads some time to process... | 1989 | updateThreads(deltaTime); // If running non-threaded, then give the threads some time to process... |
| 2026 | _avatarManager.updateOtherAvatars(deltaTime); //loop through all the other avatars and simulate them... | 1990 | _avatarManager.updateOtherAvatars(deltaTime); //loop through all the other avatars and simulate them... |