Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 12:33:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions

Browse source 
Conflicts:
	interface/src/avatar/AvatarManager.cpp
This commit is contained in:
Andrew Meadows 2014-01-28 14:30:59 -08:00
commit f972bfd024
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -83,13 +83,13 @@ void AvatarManager::updateAvatars(float deltaTime) {
// simulate avatars
AvatarHash::iterator avatarIterator = _avatarHash.begin();
while (avatarIterator != _avatarHash.end()) {
if (MY_AVATAR_KEY == avatarIterator.key()) {
Avatar* avatar = static_cast<Avatar*>(avatarIterator.value().data());
if (avatar == static_cast<Avatar*>(_myAvatar)) {
// for now skip updates to _myAvatar because it is done explicitly in Application
// TODO: update _myAvatar in this context
++avatarIterator;
continue;
}
Avatar* avatar = static_cast<Avatar*>(avatarIterator.value().data());
if (avatar->getOwningAvatarMixer()) {
// this avatar's mixer is still around, go ahead and simulate it
avatar->simulate(deltaTime, NULL);
@ -271,4 +271,3 @@ void AvatarManager::clearHash() {
removeAvatar = erase(removeAvatar);
}
}