Showing the changes to interface/src/Application.cpp (1 of 101 files). Show all
Unified · Split
| @@ -262,8 +262,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 261 unmodified lines | ||
| 262 | 262 | connect(nodeList, SIGNAL(nodeKilled(SharedNodePointer)), SLOT(nodeKilled(SharedNodePointer))); |
| 263 | 263 | connect(nodeList, SIGNAL(nodeAdded(SharedNodePointer)), &_voxels, SLOT(nodeAdded(SharedNodePointer))); |
| 264 | 264 | connect(nodeList, SIGNAL(nodeKilled(SharedNodePointer)), &_voxels, SLOT(nodeKilled(SharedNodePointer))); |
| 265 | − connect(nodeList, &NodeList::uuidChanged, this, &Application::updateWindowTitle); | |
| 266 | − connect(nodeList, SIGNAL(uuidChanged(const QUuid&)), _myAvatar, SLOT(setSessionUUID(const QUuid&))); | |
| 265 | + connect(nodeList, &NodeList::uuidChanged, _myAvatar, &MyAvatar::setSessionUUID); | |
| 267 | 266 | connect(nodeList, &NodeList::limitOfSilentDomainCheckInsReached, nodeList, &NodeList::reset); |
| 268 | 267 | |
| 269 | 268 | // connect to appropriate slots on AccountManager |
| @@ -1503,10 +1502,11 @@ glm::vec3 Application::getMouseVoxelWorldCoordinates(const VoxelDetail& mouseVox · 1233 unmodified lines | ||
| 1503 | 1502 | } |
| 1504 | 1503 | |
| 1505 | 1504 | FaceTracker* Application::getActiveFaceTracker() { |
| 1506 | − return _cara.isActive() ? static_cast<FaceTracker*>(&_cara) : | |
| 1507 | − (_faceshift.isActive() ? static_cast<FaceTracker*>(&_faceshift) : | |
| 1508 | − (_faceplus.isActive() ? static_cast<FaceTracker*>(&_faceplus) : | |
| 1509 | − (_visage.isActive() ? static_cast<FaceTracker*>(&_visage) : NULL))); | |
| 1505 | + return (_dde.isActive() ? static_cast<FaceTracker*>(&_dde) : | |
| 1506 | + (_cara.isActive() ? static_cast<FaceTracker*>(&_cara) : | |
| 1507 | + (_faceshift.isActive() ? static_cast<FaceTracker*>(&_faceshift) : | |
| 1508 | + (_faceplus.isActive() ? static_cast<FaceTracker*>(&_faceplus) : | |
| 1509 | + (_visage.isActive() ? static_cast<FaceTracker*>(&_visage) : NULL))))); | |
| 1510 | 1510 | } |
| 1511 | 1511 | |
| 1512 | 1512 | struct SendVoxelsOperationArgs { |
| @@ -1938,13 +1938,21 @@ void Application::updateVisage() { · 425 unmodified lines | ||
| 1938 | 1938 | _visage.update(); |
| 1939 | 1939 | } |
| 1940 | 1940 | |
| 1941 | +void Application::updateDDE() { | |
| 1942 | + bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); | |
| 1943 | + PerformanceWarning warn(showWarnings, "Application::updateDDE()"); | |
| 1944 | + | |
| 1945 | + // Update Cara | |
| 1946 | + _dde.update(); | |
| 1947 | +} | |
| 1948 | + | |
| 1941 | 1949 | void Application::updateCara() { |
| 1942 | 1950 | bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); |
| 1943 | 1951 | PerformanceWarning warn(showWarnings, "Application::updateCara()"); |
| 1944 | − | |
| 1952 | + | |
| 1945 | 1953 | // Update Cara |
| 1946 | 1954 | _cara.update(); |
| 1947 | − | |
| 1955 | + | |
| 1948 | 1956 | // Copy angular velocity if measured by cara, to the head |
| 1949 | 1957 | if (_cara.isActive()) { |
| 1950 | 1958 | _myAvatar->getHead()->setAngularVelocity(_cara.getHeadAngularVelocity()); |
| @@ -2131,12 +2139,6 @@ void Application::update(float deltaTime) { · 180 unmodified lines | ||
| 2131 | 2139 | _prioVR.update(deltaTime); |
| 2132 | 2140 | |
| 2133 | 2141 | } |
| 2134 | − { | |
| 2135 | − PerformanceTimer perfTimer("myAvatar"); | |
| 2136 | − updateMyAvatarLookAtPosition(); | |
| 2137 | − updateMyAvatar(deltaTime); // Sample hardware, update view frustum if needed, and send avatar data to mixer/nodes | |
| 2138 | − } | |
| 2139 | − | |
| 2140 | 2142 | |
| 2141 | 2143 | // Dispatch input events |
| 2142 | 2144 | _controllerScriptingInterface.updateInputControllers(); |
| @@ -2168,6 +2170,12 @@ void Application::update(float deltaTime) { · 25 unmodified lines | ||
| 2168 | 2170 | PerformanceTimer perfTimer("overlays"); |
| 2169 | 2171 | _overlays.update(deltaTime); |
| 2170 | 2172 | } |
| 2173 | + | |
| 2174 | + { | |
| 2175 | + PerformanceTimer perfTimer("myAvatar"); | |
| 2176 | + updateMyAvatarLookAtPosition(); | |
| 2177 | + updateMyAvatar(deltaTime); // Sample hardware, update view frustum if needed, and send avatar data to mixer/nodes | |
| 2178 | + } | |
| 2171 | 2179 | |
| 2172 | 2180 | { |
| 2173 | 2181 | PerformanceTimer perfTimer("emitSimulating"); |
| @@ -3266,6 +3274,7 @@ void Application::resetSensors() { · 1092 unmodified lines | ||
| 3266 | 3274 | _faceplus.reset(); |
| 3267 | 3275 | _faceshift.reset(); |
| 3268 | 3276 | _visage.reset(); |
| 3277 | + _dde.reset(); | |
| 3269 | 3278 | |
| 3270 | 3279 | OculusManager::reset(); |
| 3271 | 3280 | |