From bc75ff44622063eb480ff9d3407f7db3dd2880f5 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Mon, 10 Apr 2017 11:20:38 -0700 Subject: [PATCH] Checkpoint --- libraries/avatars/src/AvatarData.h | 3 ++- libraries/avatars/src/AvatarHashMap.cpp | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index 5ade0c448e..ff552ffc23 100644 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -620,7 +620,8 @@ public: static float _avatarSortCoefficientCenter; static float _avatarSortCoefficientAge; - + QHash& getJointIndices() { return _jointIndices }; + void setJointIndices(QHash& indices) { _jointIndices = indices }; signals: void displayNameChanged(); diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp index 37139331aa..e436dcd3be 100644 --- a/libraries/avatars/src/AvatarHashMap.cpp +++ b/libraries/avatars/src/AvatarHashMap.cpp @@ -41,8 +41,10 @@ AvatarData* AvatarHashMap::getAvatarCopy(QUuid avatarID) { avatarDataCopy->setSessionUUID(avatarDataOriginal->getSessionUUID()); avatarDataCopy->setSessionDisplayName(avatarDataOriginal->getSessionDisplayName()); avatarDataCopy->setPosition(avatarDataOriginal->getPosition()); + avatarDataCopy->setRotation(avatarDataOriginal->getRotation()); avatarDataCopy->setAudioLoudness(avatarDataOriginal->getAudioLoudness()); avatarDataCopy->setAudioAverageLoudness(avatarDataOriginal->getAudioAverageLoudness()); + avatarDataCopy->setSkeletonModelURL(avatarDataOriginal->getSkeletonModelURL()); return avatarDataCopy; }