From 092c969e75b50e79b9c942fea505ec3d913deffb Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 4 Feb 2014 15:48:31 -0800
Subject: [PATCH] more repairs to face and skeleton model passing

---
 interface/src/avatar/Avatar.cpp        |  4 ++--
 interface/src/avatar/AvatarManager.cpp | 11 ++---------
 libraries/avatars/src/AvatarData.cpp   | 12 ++++++++++--
 libraries/avatars/src/AvatarData.h     |  4 ++--
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index 47bdcf017b..37acde2b93 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -335,12 +335,12 @@ bool Avatar::findSphereCollision(const glm::vec3& sphereCenter, float sphereRadi
 }
 
 void Avatar::setFaceModelURL(const QUrl &faceModelURL) {
-    _faceModelURL = faceModelURL;
+    AvatarData::setFaceModelURL(faceModelURL);
     _head.getFaceModel().setURL(faceModelURL);
 }
 
 void Avatar::setSkeletonURL(const QUrl &skeletonModelURL) {
-    _skeletonModelURL = skeletonModelURL;
+    AvatarData::setSkeletonModelURL(skeletonModelURL);
     _skeletonModel.setURL(skeletonModelURL);
 }
 
diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index 71255427f8..fb4ba9c10f 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -179,7 +179,6 @@ void AvatarManager::processAvatarDataPacket(const QByteArray &datagram, const QW
 }
 
 void AvatarManager::processAvatarIdentityPacket(const QByteArray &packet) {
-    qDebug() << "Processing an avatar identity packet";
     // setup a data stream to parse the packet
     QDataStream identityStream(packet);
     identityStream.skipRawData(numBytesForPacketHeader(packet));
@@ -197,17 +196,11 @@ void AvatarManager::processAvatarIdentityPacket(const QByteArray &packet) {
             Avatar* avatar = static_cast<Avatar*>(matchingAvatar.data());
             
             if (avatar->getFaceModelURL() != faceMeshURL) {
-                qDebug() << "Changing mesh to" << faceMeshURL.toString() << "for avatar with UUID"
-                    << uuidStringWithoutCurlyBraces(nodeUUID);
-                
                 avatar->setFaceModelURL(faceMeshURL);
             }
             
-            if (avatar->getFaceModelURL() != skeletonURL) {
-                qDebug() << "Changing skeleton to" << skeletonURL << "for avatar with UUID"
-                    << uuidStringWithoutCurlyBraces(nodeUUID);
-                
-                avatar->setFaceModelURL(skeletonURL);
+            if (avatar->getSkeletonModelURL() != skeletonURL) {
+                avatar->setSkeletonModelURL(skeletonURL);
             }
         }
     }
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 90e3cd7149..ca57fff587 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -280,8 +280,6 @@ bool AvatarData::hasIdentityChangedAfterParsing(const QByteArray &packet) {
     
     bool hasIdentityChanged = false;
     
-    qDebug() << faceModelURL;
-    
     if (faceModelURL != _faceModelURL) {
         setFaceModelURL(faceModelURL);
         hasIdentityChanged = true;
@@ -304,6 +302,16 @@ QByteArray AvatarData::identityByteArray() {
     return identityData;
 }
 
+void AvatarData::setFaceModelURL(const QUrl& faceModelURL) {
+    qDebug() << "Changing face model for avatar to" << faceModelURL.toString();
+    _faceModelURL = faceModelURL;
+}
+
+void AvatarData::setSkeletonModelURL(const QUrl& skeletonModelURL) {
+    qDebug() << "Changing skeleton model for avatar to" << skeletonModelURL.toString();
+    _skeletonModelURL = skeletonModelURL;
+}
+
 void AvatarData::setClampedTargetScale(float targetScale) {
     
     targetScale =  glm::clamp(targetScale, MIN_AVATAR_SCALE, MAX_AVATAR_SCALE);
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 30c1f018b5..5e4f7acb2c 100755
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -148,8 +148,8 @@ public:
     
     const QUrl& getFaceModelURL() const { return _faceModelURL; }
     const QUrl& getSkeletonModelURL() const { return _skeletonModelURL; }
-    virtual void setFaceModelURL(const QUrl& faceModelURL) { _faceModelURL = faceModelURL; }
-    virtual void setSkeletonModelURL(const QUrl& skeletonModelURL) { _skeletonModelURL = skeletonModelURL; }
+    virtual void setFaceModelURL(const QUrl& faceModelURL);
+    virtual void setSkeletonModelURL(const QUrl& skeletonModelURL);
     
 protected:
     glm::vec3 _position;