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

Does this work?

Browse source
This commit is contained in:
Zach Fox 2017-04-10 10:17:49 -07:00
parent 4ed22ad7ac
commit 177445c371
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,14 +35,14 @@ AvatarData* AvatarHashMap::getAvatar(QUuid avatarID) {
return getAvatarBySessionID(avatarID).get();
}
QSharedPointer<AvatarData> AvatarHashMap::getAvatarCopy(QUuid avatarID) {
AvatarData* AvatarHashMap::getAvatarCopy(QUuid avatarID) {
AvatarData* avatarDataOriginal = getAvatarBySessionID(avatarID).get();
QSharedPointer<AvatarData> avatarDataCopy{ new AvatarData };
AvatarData* avatarDataCopy { new AvatarData };
avatarDataCopy->setSessionUUID(avatarDataOriginal->getSessionUUID());
avatarDataCopy->setSessionDisplayName(avatarDataOriginal->getSessionDisplayName());
avatarDataCopy->setPosition(avatarDataOriginal->getPosition());
//avatarDataCopy->setAudioLoudness(avatarDataOriginal->getAudioLoudness());
//avatarDataCopy->setAudioAverageLoudness(avatarDataOriginal->getAudioAverageLoudness());
avatarDataCopy->setAudioLoudness(avatarDataOriginal->getAudioLoudness());
avatarDataCopy->setAudioAverageLoudness(avatarDataOriginal->getAudioAverageLoudness());
return avatarDataCopy;
}

2
libraries/avatars/src/AvatarHashMap.h
View file

@ -38,7 +38,7 @@ public:
// Currently, your own avatar will be included as the null avatar id.
Q_INVOKABLE QVector<QUuid> getAvatarIdentifiers();
Q_INVOKABLE AvatarData* getAvatar(QUuid avatarID);
Q_INVOKABLE QSharedPointer<AvatarData> getAvatarCopy(QUuid avatarID);
Q_INVOKABLE AvatarData* getAvatarCopy(QUuid avatarID);
virtual AvatarSharedPointer getAvatarBySessionID(const QUuid& sessionID) const { return findAvatar(sessionID); }
int numberOfAvatarsInRange(const glm::vec3& position, float rangeMeters);