From 16be0ca70c233c5728dee14c6c76890339f1d36f Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Mon, 10 Apr 2017 16:18:48 -0700 Subject: [PATCH] Birarda's CR changes --- libraries/avatars/src/AvatarHashMap.cpp | 5 ----- libraries/avatars/src/AvatarHashMap.h | 3 ++- libraries/script-engine/src/ScriptAvatarData.cpp | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp index 608518ba63..7cb867905b 100644 --- a/libraries/avatars/src/AvatarHashMap.cpp +++ b/libraries/avatars/src/AvatarHashMap.cpp @@ -30,11 +30,6 @@ QVector AvatarHashMap::getAvatarIdentifiers() { return _avatarHash.keys().toVector(); } -AvatarSharedPointer AvatarHashMap::getAvatar(QUuid avatarID) { - // Null/Default-constructed QUuids will return MyAvatar - return AvatarSharedPointer(getAvatarBySessionID(avatarID)); -} - bool AvatarHashMap::isAvatarInRange(const glm::vec3& position, const float range) { auto hashCopy = getHashCopy(); foreach(const AvatarSharedPointer& sharedAvatar, hashCopy) { diff --git a/libraries/avatars/src/AvatarHashMap.h b/libraries/avatars/src/AvatarHashMap.h index 5174f30dd4..d35b23bc64 100644 --- a/libraries/avatars/src/AvatarHashMap.h +++ b/libraries/avatars/src/AvatarHashMap.h @@ -37,7 +37,8 @@ public: // Currently, your own avatar will be included as the null avatar id. Q_INVOKABLE QVector getAvatarIdentifiers(); - Q_INVOKABLE AvatarSharedPointer getAvatar(QUuid avatarID); + // Null/Default-constructed QUuids will return MyAvatar + Q_INVOKABLE AvatarSharedPointer getAvatar(QUuid avatarID) { return getAvatarBySessionID(avatarID); } virtual AvatarSharedPointer getAvatarBySessionID(const QUuid& sessionID) const { return findAvatar(sessionID); } int numberOfAvatarsInRange(const glm::vec3& position, float rangeMeters); diff --git a/libraries/script-engine/src/ScriptAvatarData.cpp b/libraries/script-engine/src/ScriptAvatarData.cpp index 22b4e06c21..9e4dd93710 100644 --- a/libraries/script-engine/src/ScriptAvatarData.cpp +++ b/libraries/script-engine/src/ScriptAvatarData.cpp @@ -17,7 +17,7 @@ QScriptValue avatarDataToScriptValue(QScriptEngine* engine, const AvatarSharedPo } void avatarDataFromScriptValue(const QScriptValue& object, AvatarSharedPointer& out) { - // Not implemented - this should never happen (yet) + // This is not implemented because there are no slots/properties that take expect an AvatarSharedPointer from a script assert(false); out = AvatarSharedPointer(nullptr); }