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

move skeleton model URL emit to AvatarData

Browse source
This commit is contained in:
Stephen Birarda 2018-08-08 13:53:35 -07:00
parent be7eb57205
commit a0df68f32f
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/avatars/ScriptableAvatar.cpp
View file

@ -1,6 +1,6 @@
// //
// ScriptableAvatar.cpp // ScriptableAvatar.cpp
// // assignment-client/src/avatars
// //
// Created by Clement on 7/22/14. // Created by Clement on 7/22/14.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.

2
assignment-client/src/avatars/ScriptableAvatar.h
View file

@ -1,6 +1,6 @@
// //
// ScriptableAvatar.h // ScriptableAvatar.h
// // assignment-client/src/avatars
// //
// Created by Clement on 7/22/14. // Created by Clement on 7/22/14.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.

4
interface/src/avatar/MyAvatar.cpp
View file

@ -1699,9 +1699,9 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
} }
QObject::disconnect(*skeletonConnection); QObject::disconnect(*skeletonConnection);
}); });
saveAvatarUrl(); saveAvatarUrl();
emit skeletonChanged(); emit skeletonChanged();
emit skeletonModelURLChanged();
if (previousSkeletonModelURL != _skeletonModelURL) { if (previousSkeletonModelURL != _skeletonModelURL) {
_clientTraitsHandler.markTraitChanged(AvatarTraits::SkeletonModelURL); _clientTraitsHandler.markTraitChanged(AvatarTraits::SkeletonModelURL);
@ -1776,8 +1776,6 @@ void MyAvatar::useFullAvatarURL(const QUrl& fullAvatarURL, const QString& modelN
setSkeletonModelURL(fullAvatarURL); setSkeletonModelURL(fullAvatarURL);
UserActivityLogger::getInstance().changedModel("skeleton", urlString); UserActivityLogger::getInstance().changedModel("skeleton", urlString);
} }
markIdentityDataChanged();
} }
glm::vec3 MyAvatar::getSkeletonPosition() const { glm::vec3 MyAvatar::getSkeletonPosition() const {

4
libraries/avatars/src/AvatarData.cpp
View file

@ -1891,11 +1891,13 @@ void AvatarData::setSkeletonModelURL(const QUrl& skeletonModelURL) {
if (expanded == _skeletonModelURL) { if (expanded == _skeletonModelURL) {
return; return;
} }
_skeletonModelURL = expanded; _skeletonModelURL = expanded;
qCDebug(avatars) << "Changing skeleton model for avatar" << getSessionUUID() << "to" << _skeletonModelURL.toString(); qCDebug(avatars) << "Changing skeleton model for avatar" << getSessionUUID() << "to" << _skeletonModelURL.toString();
updateJointMappings(); updateJointMappings();
markIdentityDataChanged();
emit skeletonModelURLChanged();
} }
void AvatarData::setDisplayName(const QString& displayName) { void AvatarData::setDisplayName(const QString& displayName) {