Showing the changes to interface/src/Application.cpp (1 of 6 files). Show all
Unified · Split
| @@ -2127,9 +2127,12 @@ void Application::updateAvatars(float deltaTime, glm::vec3 mouseRayOrigin, glm:: · 2126 unmodified lines | ||
| 2127 | 2127 | for (vector<Avatar*>::iterator fade = _avatarFades.begin(); fade != _avatarFades.end(); fade++) { |
| 2128 | 2128 | Avatar* avatar = *fade; |
| 2129 | 2129 | const float SHRINK_RATE = 0.9f; |
| 2130 | − avatar->setNewScale(avatar->getNewScale() * SHRINK_RATE); | |
| 2131 | − | |
| 2132 | − if (avatar->getNewScale() < MIN_AVATAR_SCALE) { | |
| 2130 | + | |
| 2131 | + avatar->setTargetScale(avatar->getScale() * SHRINK_RATE); | |
| 2132 | + | |
| 2133 | + const float MIN_FADE_SCALE = 0.001; | |
| 2134 | + | |
| 2135 | + if (avatar->getTargetScale() < MIN_FADE_SCALE) { | |
| 2133 | 2136 | delete avatar; |
| 2134 | 2137 | _avatarFades.erase(fade--); |
| 2135 | 2138 | |