From 3959209bc2a1830c73d764ca0ab7e806b2bf0b3c Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 4 Feb 2014 14:49:56 -0800 Subject: [PATCH] complete movement of URLs to AvatarData for re-usability --- assignment-client/src/avatars/AvatarMixer.cpp | 2 ++ interface/src/Menu.cpp | 4 ++-- interface/src/avatar/Avatar.cpp | 6 +++--- interface/src/avatar/MyAvatar.cpp | 4 ++-- libraries/avatars/src/AvatarData.cpp | 10 +++++----- libraries/avatars/src/AvatarData.h | 6 +++--- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index e6a73c7f02..12d5bc926f 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -171,6 +171,8 @@ void AvatarMixer::processDatagram(const QByteArray& dataByteArray, const HifiSoc // this avatar changed their identity in some way and we haven't sent a packet in this keyframe QByteArray identityPacket = byteArrayWithPopluatedHeader(PacketTypeAvatarIdentity); identityPacket.append(nodeData->identityByteArray()); + + nodeData->setHasSentIdentityBetweenKeyFrames(true); nodeList->broadcastToNodes(identityPacket, NodeSet() << NodeType::Agent); } } diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 6ce4aedccf..505c799e63 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -832,7 +832,7 @@ void Menu::editPreferences() { if (faceModelURL.toString() != faceURLString) { // change the faceModelURL in the profile, it will also update this user's BlendFace - applicationInstance->getAvatar()->getHead().getFaceModel().setURL(faceModelURL); + applicationInstance->getAvatar()->setFaceModelURL(faceModelURL); shouldDispatchIdentityPacket = true; } @@ -840,7 +840,7 @@ void Menu::editPreferences() { if (skeletonModelURL.toString() != skeletonURLString) { // change the skeletonModelURL in the profile, it will also update this user's Body - applicationInstance->getAvatar()->getSkeletonModel().setURL(skeletonModelURL); + applicationInstance->getAvatar()->setSkeletonURL(skeletonModelURL); shouldDispatchIdentityPacket = true; } diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index ceb1cecca5..47bdcf017b 100644 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -339,9 +339,9 @@ void Avatar::setFaceModelURL(const QUrl &faceModelURL) { _head.getFaceModel().setURL(faceModelURL); } -void Avatar::setSkeletonURL(const QUrl &skeletonURL) { - _skeletonURL = skeletonURL; - _skeletonModel.setURL(skeletonURL); +void Avatar::setSkeletonURL(const QUrl &skeletonModelURL) { + _skeletonModelURL = skeletonModelURL; + _skeletonModel.setURL(skeletonModelURL); } int Avatar::parseData(const QByteArray& packet) { diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 30de974ab0..ef7a8e6019 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -610,7 +610,7 @@ void MyAvatar::saveData(QSettings* settings) { settings->setValue("scale", _targetScale); settings->setValue("faceModelURL", _faceModelURL); - settings->setValue("skeletonURL", _skeletonURL); + settings->setValue("skeletonModelURL", _skeletonModelURL); settings->endGroup(); } @@ -637,7 +637,7 @@ void MyAvatar::loadData(QSettings* settings) { Application::getInstance()->getCamera()->setScale(_scale); setFaceModelURL(settings->value("faceModelURL").toUrl()); - setSkeletonURL(settings->value("skeletonURL").toUrl()); + setSkeletonURL(settings->value("skeletonModelURL").toUrl()); settings->endGroup(); } diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 7f7fef9c9e..ae765f71a7 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -275,8 +275,8 @@ bool AvatarData::hasIdentityChangedAfterParsing(const QByteArray &packet) { packetStream.skipRawData(numBytesForPacketHeader(packet)); QUuid avatarUUID; - QUrl faceModelURL, skeletonURL; - packetStream >> avatarUUID >> faceModelURL >> skeletonURL; + QUrl faceModelURL, skeletonModelURL; + packetStream >> avatarUUID >> faceModelURL >> skeletonModelURL; bool hasIdentityChanged = false; @@ -285,8 +285,8 @@ bool AvatarData::hasIdentityChangedAfterParsing(const QByteArray &packet) { hasIdentityChanged = true; } - if (skeletonURL != _skeletonURL) { - setSkeletonURL(skeletonURL); + if (skeletonModelURL != _skeletonModelURL) { + setSkeletonModelURL(skeletonModelURL); hasIdentityChanged = true; } @@ -297,7 +297,7 @@ QByteArray AvatarData::identityByteArray() { QByteArray identityData; QDataStream identityStream(&identityData, QIODevice::Append); - identityStream << QUuid() << _faceModelURL << _skeletonURL; + identityStream << QUuid() << _faceModelURL << _skeletonModelURL; return identityData; } diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index 7cb5dc835f..30c1f018b5 100755 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -147,9 +147,9 @@ public: QByteArray identityByteArray(); const QUrl& getFaceModelURL() const { return _faceModelURL; } - const QUrl& getSkeletonURL() const { return _skeletonURL; } + const QUrl& getSkeletonModelURL() const { return _skeletonModelURL; } virtual void setFaceModelURL(const QUrl& faceModelURL) { _faceModelURL = faceModelURL; } - virtual void setSkeletonURL(const QUrl& skeletonURL) { _skeletonURL = skeletonURL; } + virtual void setSkeletonModelURL(const QUrl& skeletonModelURL) { _skeletonModelURL = skeletonModelURL; } protected: glm::vec3 _position; @@ -178,7 +178,7 @@ protected: HandData* _handData; QUrl _faceModelURL; - QUrl _skeletonURL; + QUrl _skeletonModelURL; private: // privatize the copy constructor and assignment operator so they cannot be called AvatarData(const AvatarData&);