Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 10:58:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi

Browse source
This commit is contained in:
Andrzej Kapolka 2014-01-28 11:14:21 -08:00
commit 30fdb595dd
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/avatar/AvatarManager.cpp
View file

@ -63,7 +63,7 @@ void AvatarManager::updateAvatars(float deltaTime) {
// simulate avatars // simulate avatars
AvatarHash::iterator avatar = _avatarHash.begin(); AvatarHash::iterator avatar = _avatarHash.begin();
if (avatar != _avatarHash.end()) { while (avatar != _avatarHash.end()) {
if (avatar->data()->getOwningAvatarMixer()) { if (avatar->data()->getOwningAvatarMixer()) {
// this avatar's mixer is still around, go ahead and simulate it // this avatar's mixer is still around, go ahead and simulate it
avatar->data()->simulate(deltaTime, NULL); avatar->data()->simulate(deltaTime, NULL);
@ -72,6 +72,7 @@ void AvatarManager::updateAvatars(float deltaTime) {
avatar->data()->setMouseRay(applicationInstance->getMouseRayOrigin(), avatar->data()->setMouseRay(applicationInstance->getMouseRayOrigin(),
applicationInstance->getMouseRayDirection()); applicationInstance->getMouseRayDirection());
avatar++;
} else { } else {
// the mixer that owned this avatar is gone, give it to the vector of fades and kill it // the mixer that owned this avatar is gone, give it to the vector of fades and kill it
avatar = removeAvatarAtHashIterator(avatar); avatar = removeAvatarAtHashIterator(avatar);
@ -230,4 +231,4 @@ void AvatarManager::clearHash() {
while (removeAvatar != _avatarHash.end()) { while (removeAvatar != _avatarHash.end()) {
removeAvatar = removeAvatarAtHashIterator(removeAvatar); removeAvatar = removeAvatarAtHashIterator(removeAvatar);
} }
} }