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

more repairs to face and skeleton model passing

Browse source
This commit is contained in:
Stephen Birarda 2014-02-04 15:48:31 -08:00
parent adaa36a51d
commit 092c969e75
4 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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);
}

11
interface/src/avatar/AvatarManager.cpp
View file

@ -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);
}
}
}

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

@ -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);

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

@ -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;