Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 21:55:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

increase debug for Avatar removal from AvatarManager

Browse source
This commit is contained in:
Stephen Birarda 2014-01-23 17:44:06 -08:00
parent b495e6251d
commit 2aac064a67
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,8 +68,7 @@ void AvatarManager::updateAvatars(float deltaTime, const glm::vec3& mouseRayOrig
avatar->data()->setMouseRay(mouseRayOrigin, mouseRayDirection);
} else {
// the mixer that owned this avatar is gone, give it to the vector of fades and kill it
_avatarFades.push_back(*avatar);
avatar = _avatarHash.erase(avatar);
avatar = removeAvatarAtHashIterator(avatar);
}
}
@ -115,7 +114,6 @@ void AvatarManager::simulateAvatarFades(float deltaTime) {
const float MIN_FADE_SCALE = 0.001f;
if (fadingAvatar->data()->getTargetScale() < MIN_FADE_SCALE) {
fadingAvatar = _avatarFades.erase(fadingAvatar);
} else {
fadingAvatar->data()->simulate(deltaTime, NULL);
@ -207,15 +205,23 @@ void AvatarManager::processKillAvatar(const QByteArray& datagram) {
NUM_BYTES_RFC4122_UUID));
// remove the avatar with that UUID from our hash, if it exists
AvatarSharedPointer removedAvatar = _avatarHash.take(nodeUUID);
if (removedAvatar) {
// add this avatar to our vector of fades
_avatarFades.push_back(removedAvatar);
AvatarHash::iterator matchedAvatar = _avatarHash.find(nodeUUID);
if (matchedAvatar != _avatarHash.end()) {
removeAvatarAtHashIterator(matchedAvatar);
}
}
AvatarHash::iterator AvatarManager::removeAvatarAtHashIterator(const AvatarHash::iterator& iterator) {
qDebug() << "Removing Avatar with UUID" << iterator.key() << "from AvatarManager hash.";
_avatarFades.push_back(iterator.value());
return _avatarHash.erase(iterator);
}
void AvatarManager::clearHash() {
// clear the AvatarManager hash - typically happens on the removal of the avatar-mixer
_avatarHash.clear();
AvatarHash::iterator removeAvatar = _avatarHash.begin();
while (removeAvatar != _avatarHash.end()) {
removeAvatar = removeAvatarAtHashIterator(removeAvatar);
}
}

2
interface/src/avatar/AvatarManager.h
View file

@ -48,6 +48,8 @@ private:
void simulateAvatarFades(float deltaTime);
void renderAvatarFades();
AvatarHash::iterator removeAvatarAtHashIterator(const AvatarHash::iterator& iterator);
QWeakPointer<Avatar> _lookAtTargetAvatar;
glm::vec3 _lookAtOtherPosition;
float _lookAtIndicatorScale;