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

Removed untested avatar bubble fade code. Made changes as requested by Andrew

Browse source
This commit is contained in:
Olivier Prat 2017-07-13 23:04:55 +02:00
parent b68ec4f933
commit b125fba2e1
6 changed files with 360 additions and 375 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -273,17 +273,11 @@ void AvatarManager::simulateAvatarFades(float deltaTime) {
return;
}
//const float SHRINK_RATE = 0.15f;
//const float MIN_FADE_SCALE = MIN_AVATAR_SCALE;
QReadLocker locker(&_hashLock);
QVector<AvatarSharedPointer>::iterator avatarItr = _avatarsToFade.begin();
const render::ScenePointer& scene = qApp->getMain3DScene();
while (avatarItr != _avatarsToFade.end()) {
auto avatar = std::static_pointer_cast<Avatar>(*avatarItr);
// avatar->setTargetScale(avatar->getUniformScale() * SHRINK_RATE);
// avatar->animateScaleChanges(deltaTime);
// if (avatar->getTargetScale() <= MIN_FADE_SCALE) {
avatar->updateFadingStatus(scene);
if (!avatar->isFading()) {
// fading to zero is such a rare event we push a unique transaction for each

4
libraries/avatars-renderer/src/avatars-renderer/Avatar.h
View file

@ -356,8 +356,8 @@ private:
bool _initialized { false };
bool _isLookAtTarget { false };
bool _isAnimatingScale { false };
bool _mustFadeIn{ false };
bool _isFading{ false };
bool _mustFadeIn { false };
bool _isFading { false };
static int _jointConesID;

9
libraries/avatars/src/AvatarHashMap.cpp
View file

@ -173,14 +173,7 @@ void AvatarHashMap::processKillAvatar(QSharedPointer<ReceivedMessage> message, S
void AvatarHashMap::removeAvatar(const QUuid& sessionUUID, KillAvatarReason removalReason) {
QWriteLocker locker(&_hashLock);
AvatarSharedPointer removedAvatar;
if (removalReason != KillAvatarReason::TheirAvatarEnteredYourBubble && removalReason != KillAvatarReason::YourAvatarEnteredTheirBubble) {
removedAvatar = _avatarHash.take(sessionUUID);
}
else {
removedAvatar = _avatarHash[sessionUUID];
}
AvatarSharedPointer removedAvatar = _avatarHash.take(sessionUUID);
if (removedAvatar) {
handleRemovedAvatar(removedAvatar, removalReason);

2
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -219,7 +219,7 @@ namespace render {
template <> uint32_t metaFetchMetaSubItems(const RenderableModelEntityItemMeta::Pointer& payload, ItemIDs& subItems) {
auto modelEntity = std::static_pointer_cast<RenderableModelEntityItem>(payload->entity);
auto model = modelEntity->getModelNotSafe();
if (modelEntity->hasModel() && model) {
if (model && modelEntity->hasModel()) {
auto& metaSubItems = model->fetchRenderItemIDs();
subItems.insert(subItems.end(), metaSubItems.begin(), metaSubItems.end());
return (uint32_t) metaSubItems.size();

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

@ -273,8 +273,7 @@ void Scene::queryTransitionItems(const Transaction::TransitionQueries& transacti
if (!TransitionStage::isIndexInvalid(transitionId)) {
auto& transition = transitionStage->getTransition(transitionId);
func(itemId, &transition);
}
else {
} else {
func(itemId, nullptr);
}
}
@ -314,8 +313,7 @@ void Scene::setItemTransition(ItemID itemId, Index transitionId) {
auto& subItem = _items[subItemId];
subItem.setTransitionId(transitionId);
}
}
else {
} else {
qWarning() << "Collecting sub items on item without payload";
}
}