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

Commit for birarda - testing QSharedPointer instead; doesn't work right now

Browse source
This commit is contained in:
Zach Fox 2017-04-07 17:38:06 -07:00
parent 6ddd7a612c
commit 1ed53113a9
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,9 @@
#include "AvatarLogging.h"
#include "AvatarHashMap.h"
int avatarDataPointerMetaTypeId = qRegisterMetaType<QSharedPointer<AvatarData>>();
AvatarHashMap::AvatarHashMap() {
auto nodeList = DependencyManager::get<NodeList>();
@ -35,9 +38,9 @@ AvatarData* AvatarHashMap::getAvatar(QUuid avatarID) {
return getAvatarBySessionID(avatarID).get();
}
AvatarData* AvatarHashMap::getAvatarCopy(QUuid avatarID) {
QSharedPointer<AvatarData> AvatarHashMap::getAvatarCopy(QUuid avatarID) {
AvatarData* avatarDataOriginal = getAvatarBySessionID(avatarID).get();
AvatarData* avatarDataCopy = new AvatarData();
QSharedPointer<AvatarData> avatarDataCopy{ new AvatarData };
avatarDataCopy->setSessionUUID(avatarDataOriginal->getSessionUUID());
avatarDataCopy->setSessionDisplayName(avatarDataOriginal->getSessionDisplayName());
avatarDataCopy->setPosition(avatarDataOriginal->getPosition());

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 AvatarData* getAvatarCopy(QUuid avatarID);
Q_INVOKABLE QSharedPointer<AvatarData> getAvatarCopy(QUuid avatarID);
virtual AvatarSharedPointer getAvatarBySessionID(const QUuid& sessionID) const { return findAvatar(sessionID); }
int numberOfAvatarsInRange(const glm::vec3& position, float rangeMeters);