Showing the changes to interface/src/Application.cpp (1 of 11 files). Show all
Unified · Split
| @@ -1352,8 +1352,9 @@ void Application::timer() { · 1351 unmodified lines | |||
| 1352 | // ask the node list to check in with the domain server | 1352 | // ask the node list to check in with the domain server |
| 1353 | NodeList::getInstance()->sendDomainServerCheckIn(); | 1353 | NodeList::getInstance()->sendDomainServerCheckIn(); |
| 1354 | 1354 | ||
| 1355 | // give the MyAvatar object position to the Profile so it can propagate to the data-server | 1355 | // give the MyAvatar object position, orientation to the Profile so it can propagate to the data-server |
| 1356 | _profile.updatePosition(_myAvatar.getPosition()); | 1356 | _profile.updatePosition(_myAvatar.getPosition()); |
| 1357 | _profile.updateOrientation(_myAvatar.getOrientation()); | ||
| 1357 | } | 1358 | } |
| 1358 | 1359 | ||
| 1359 | static glm::vec3 getFaceVector(BoxFace face) { | 1360 | static glm::vec3 getFaceVector(BoxFace face) { |
| @@ -2133,9 +2134,12 @@ void Application::updateAvatars(float deltaTime, glm::vec3 mouseRayOrigin, glm:: · 773 unmodified lines | |||
| 2133 | for (vector<Avatar*>::iterator fade = _avatarFades.begin(); fade != _avatarFades.end(); fade++) { | 2134 | for (vector<Avatar*>::iterator fade = _avatarFades.begin(); fade != _avatarFades.end(); fade++) { |
| 2134 | Avatar* avatar = *fade; | 2135 | Avatar* avatar = *fade; |
| 2135 | const float SHRINK_RATE = 0.9f; | 2136 | const float SHRINK_RATE = 0.9f; |
| 2136 | avatar->setNewScale(avatar->getNewScale() * SHRINK_RATE); | 2137 | |
| 2137 | const float MINIMUM_SCALE = 0.001f; | 2138 | avatar->setTargetScale(avatar->getScale() * SHRINK_RATE); |
| 2138 | if (avatar->getNewScale() < MINIMUM_SCALE) { | 2139 | |
| 2140 | const float MIN_FADE_SCALE = 0.001; | ||
| 2141 | |||
| 2142 | if (avatar->getTargetScale() < MIN_FADE_SCALE) { | ||
| 2139 | delete avatar; | 2143 | delete avatar; |
| 2140 | _avatarFades.erase(fade--); | 2144 | _avatarFades.erase(fade--); |
| 2141 | 2145 | ||