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

complete movement of URLs to AvatarData for re-usability

Browse source
This commit is contained in:
Stephen Birarda 2014-02-04 14:49:56 -08:00
parent 2b80a5fbb8
commit 3959209bc2
6 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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 // this avatar changed their identity in some way and we haven't sent a packet in this keyframe
QByteArray identityPacket = byteArrayWithPopluatedHeader(PacketTypeAvatarIdentity); QByteArray identityPacket = byteArrayWithPopluatedHeader(PacketTypeAvatarIdentity);
identityPacket.append(nodeData->identityByteArray()); identityPacket.append(nodeData->identityByteArray());
nodeData->setHasSentIdentityBetweenKeyFrames(true);
nodeList->broadcastToNodes(identityPacket, NodeSet() << NodeType::Agent); nodeList->broadcastToNodes(identityPacket, NodeSet() << NodeType::Agent);
} }
} }

4
interface/src/Menu.cpp
View file

@ -832,7 +832,7 @@ void Menu::editPreferences() {
if (faceModelURL.toString() != faceURLString) { if (faceModelURL.toString() != faceURLString) {
// change the faceModelURL in the profile, it will also update this user's BlendFace // 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; shouldDispatchIdentityPacket = true;
} }
@ -840,7 +840,7 @@ void Menu::editPreferences() {
if (skeletonModelURL.toString() != skeletonURLString) { if (skeletonModelURL.toString() != skeletonURLString) {
// change the skeletonModelURL in the profile, it will also update this user's Body // 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; shouldDispatchIdentityPacket = true;
} }

6
interface/src/avatar/Avatar.cpp
View file

@ -339,9 +339,9 @@ void Avatar::setFaceModelURL(const QUrl &faceModelURL) {
_head.getFaceModel().setURL(faceModelURL); _head.getFaceModel().setURL(faceModelURL);
} }
void Avatar::setSkeletonURL(const QUrl &skeletonURL) { void Avatar::setSkeletonURL(const QUrl &skeletonModelURL) {
_skeletonURL = skeletonURL; _skeletonModelURL = skeletonModelURL;
_skeletonModel.setURL(skeletonURL); _skeletonModel.setURL(skeletonModelURL);
} }
int Avatar::parseData(const QByteArray& packet) { int Avatar::parseData(const QByteArray& packet) {

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

@ -610,7 +610,7 @@ void MyAvatar::saveData(QSettings* settings) {
settings->setValue("scale", _targetScale); settings->setValue("scale", _targetScale);
settings->setValue("faceModelURL", _faceModelURL); settings->setValue("faceModelURL", _faceModelURL);
settings->setValue("skeletonURL", _skeletonURL); settings->setValue("skeletonModelURL", _skeletonModelURL);
settings->endGroup(); settings->endGroup();
} }
@ -637,7 +637,7 @@ void MyAvatar::loadData(QSettings* settings) {
Application::getInstance()->getCamera()->setScale(_scale); Application::getInstance()->getCamera()->setScale(_scale);
setFaceModelURL(settings->value("faceModelURL").toUrl()); setFaceModelURL(settings->value("faceModelURL").toUrl());
setSkeletonURL(settings->value("skeletonURL").toUrl()); setSkeletonURL(settings->value("skeletonModelURL").toUrl());
settings->endGroup(); settings->endGroup();
} }

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

@ -275,8 +275,8 @@ bool AvatarData::hasIdentityChangedAfterParsing(const QByteArray &packet) {
packetStream.skipRawData(numBytesForPacketHeader(packet)); packetStream.skipRawData(numBytesForPacketHeader(packet));
QUuid avatarUUID; QUuid avatarUUID;
QUrl faceModelURL, skeletonURL; QUrl faceModelURL, skeletonModelURL;
packetStream >> avatarUUID >> faceModelURL >> skeletonURL; packetStream >> avatarUUID >> faceModelURL >> skeletonModelURL;
bool hasIdentityChanged = false; bool hasIdentityChanged = false;
@ -285,8 +285,8 @@ bool AvatarData::hasIdentityChangedAfterParsing(const QByteArray &packet) {
hasIdentityChanged = true; hasIdentityChanged = true;
} }
if (skeletonURL != _skeletonURL) { if (skeletonModelURL != _skeletonModelURL) {
setSkeletonURL(skeletonURL); setSkeletonModelURL(skeletonModelURL);
hasIdentityChanged = true; hasIdentityChanged = true;
} }
@ -297,7 +297,7 @@ QByteArray AvatarData::identityByteArray() {
QByteArray identityData; QByteArray identityData;
QDataStream identityStream(&identityData, QIODevice::Append); QDataStream identityStream(&identityData, QIODevice::Append);
identityStream << QUuid() << _faceModelURL << _skeletonURL; identityStream << QUuid() << _faceModelURL << _skeletonModelURL;
return identityData; return identityData;
} }

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

@ -147,9 +147,9 @@ public:
QByteArray identityByteArray(); QByteArray identityByteArray();
const QUrl& getFaceModelURL() const { return _faceModelURL; } 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 setFaceModelURL(const QUrl& faceModelURL) { _faceModelURL = faceModelURL; }
virtual void setSkeletonURL(const QUrl& skeletonURL) { _skeletonURL = skeletonURL; } virtual void setSkeletonModelURL(const QUrl& skeletonModelURL) { _skeletonModelURL = skeletonModelURL; }
protected: protected:
glm::vec3 _position; glm::vec3 _position;
@ -178,7 +178,7 @@ protected:
HandData* _handData; HandData* _handData;
QUrl _faceModelURL; QUrl _faceModelURL;
QUrl _skeletonURL; QUrl _skeletonModelURL;
private: private:
// privatize the copy constructor and assignment operator so they cannot be called // privatize the copy constructor and assignment operator so they cannot be called
AvatarData(const AvatarData&); AvatarData(const AvatarData&);