Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-06 01:13:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing remaining issues

Browse source
This commit is contained in:
danteruiz 2019-03-28 11:43:53 -07:00
parent d9b522d10c
commit 04d9858f02
4 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -542,15 +542,11 @@ void AvatarManager::handleRemovedAvatar(const AvatarSharedPointer& removedAvatar
auto scene = qApp->getMain3DScene(); auto scene = qApp->getMain3DScene();
avatar->fadeOut(scene, removalReason); avatar->fadeOut(scene, removalReason);
std::weak_ptr<AvatarData> avatarDataWeakPtr = removedAvatar; transaction.transitionFinishedOperator(avatar->getRenderItemID(), [avatar]() {
transaction.transitionFinishedOperator(avatar->getRenderItemID(), [avatarDataWeakPtr]() { avatar->setIsFading(false);
auto avatarDataPtr = avatarDataWeakPtr.lock();
if (avatarDataPtr) {
auto avatar = std::static_pointer_cast<Avatar>(avatarDataPtr);
avatar->setIsFading(false);
}
}); });
scene->enqueueTransaction(transaction);
} }
_avatarsToFadeOut.push_back(removedAvatar); _avatarsToFadeOut.push_back(removedAvatar);

1
interface/src/avatar/OtherAvatar.cpp
View file

@ -50,7 +50,6 @@ OtherAvatar::OtherAvatar(QThread* thread) : Avatar(thread) {
} }
OtherAvatar::~OtherAvatar() { OtherAvatar::~OtherAvatar() {
qDebug() << "-------->";
removeOrb(); removeOrb();
} }

1
libraries/avatars/src/AvatarData.cpp
View file

@ -132,7 +132,6 @@ AvatarData::AvatarData() :
} }
AvatarData::~AvatarData() { AvatarData::~AvatarData() {
qDebug() << "AvatarData::~AvatarData()";
delete _headData; delete _headData;
} }

2
libraries/render/src/render/Scene.cpp
View file

@ -408,7 +408,7 @@ void Scene::transitionItems(const Transaction::TransitionAdds& transactions) {
// Only remove if: // Only remove if:
// transitioning to something other than none or we're transitioning to none from ELEMENT_LEAVE_DOMAIN or USER_LEAVE_DOMAIN // transitioning to something other than none or we're transitioning to none from ELEMENT_LEAVE_DOMAIN or USER_LEAVE_DOMAIN
const auto& oldTransitionType = transitionStage->getTransition(transitionId).eventType; const auto& oldTransitionType = transitionStage->getTransition(transitionId).eventType;
if (transitionType != Transition::NONE || !(oldTransitionType == Transition::ELEMENT_LEAVE_DOMAIN || oldTransitionType == Transition::USER_LEAVE_DOMAIN)) { if (transitionType == Transition::NONE && oldTransitionType != Transition::NONE) {
resetItemTransition(itemId); resetItemTransition(itemId);
} }
} }