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

Checkpoint

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

3
libraries/avatars/src/AvatarData.h
View file

@ -620,7 +620,8 @@ public:
static float _avatarSortCoefficientCenter; static float _avatarSortCoefficientCenter;
static float _avatarSortCoefficientAge; static float _avatarSortCoefficientAge;
QHash<QString, int>& getJointIndices() { return _jointIndices };
void setJointIndices(QHash<QString, int>& indices) { _jointIndices = indices };
signals: signals:
void displayNameChanged(); void displayNameChanged();

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

@ -41,8 +41,10 @@ AvatarData* AvatarHashMap::getAvatarCopy(QUuid avatarID) {
avatarDataCopy->setSessionUUID(avatarDataOriginal->getSessionUUID()); avatarDataCopy->setSessionUUID(avatarDataOriginal->getSessionUUID());
avatarDataCopy->setSessionDisplayName(avatarDataOriginal->getSessionDisplayName()); avatarDataCopy->setSessionDisplayName(avatarDataOriginal->getSessionDisplayName());
avatarDataCopy->setPosition(avatarDataOriginal->getPosition()); avatarDataCopy->setPosition(avatarDataOriginal->getPosition());
avatarDataCopy->setRotation(avatarDataOriginal->getRotation());
avatarDataCopy->setAudioLoudness(avatarDataOriginal->getAudioLoudness()); avatarDataCopy->setAudioLoudness(avatarDataOriginal->getAudioLoudness());
avatarDataCopy->setAudioAverageLoudness(avatarDataOriginal->getAudioAverageLoudness()); avatarDataCopy->setAudioAverageLoudness(avatarDataOriginal->getAudioAverageLoudness());
avatarDataCopy->setSkeletonModelURL(avatarDataOriginal->getSkeletonModelURL());
return avatarDataCopy; return avatarDataCopy;
} }