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

add fallback default URLs for head and body models

Browse source
This commit is contained in:
Stephen Birarda 2014-02-10 11:15:35 -08:00
parent 230caf5b27
commit 712692f8bf
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -338,12 +338,12 @@ bool Avatar::findSphereCollision(const glm::vec3& sphereCenter, float sphereRadi
void Avatar::setFaceModelURL(const QUrl &faceModelURL) { void Avatar::setFaceModelURL(const QUrl &faceModelURL) {
AvatarData::setFaceModelURL(faceModelURL); AvatarData::setFaceModelURL(faceModelURL);
_head.getFaceModel().setURL(faceModelURL); _head.getFaceModel().setURL(_faceModelURL);
} }
void Avatar::setSkeletonModelURL(const QUrl &skeletonModelURL) { void Avatar::setSkeletonModelURL(const QUrl &skeletonModelURL) {
AvatarData::setSkeletonModelURL(skeletonModelURL); AvatarData::setSkeletonModelURL(skeletonModelURL);
_skeletonModel.setURL(skeletonModelURL); _skeletonModel.setURL(_skeletonModelURL);
} }
int Avatar::parseData(const QByteArray& packet) { int Avatar::parseData(const QByteArray& packet) {

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

@ -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());
setSkeletonModelURL(settings->value("skeletonModelURL").toUrl()); setSkeletonModelURL(settings->value("faceModelURL").toUrl());
settings->endGroup(); settings->endGroup();
} }

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

@ -300,14 +300,20 @@ QByteArray AvatarData::identityByteArray() {
return identityData; return identityData;
} }
const QUrl DEFAULT_HEAD_MODEL_URL = QUrl("https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/defaultAvatar_head.fbx");
void AvatarData::setFaceModelURL(const QUrl& faceModelURL) { void AvatarData::setFaceModelURL(const QUrl& faceModelURL) {
qDebug() << "Changing face model for avatar to" << faceModelURL.toString(); _faceModelURL = faceModelURL.isEmpty() ? DEFAULT_HEAD_MODEL_URL : faceModelURL;
_faceModelURL = faceModelURL;
qDebug() << "Changing face model for avatar to" << _faceModelURL.toString();
} }
const QUrl DEFAULT_BODY_MODEL_URL = QUrl("https://s3-us-west-1.amazonaws.com/highfidelity-public/meshes/defaultAvatar_body.fbx");
void AvatarData::setSkeletonModelURL(const QUrl& skeletonModelURL) { void AvatarData::setSkeletonModelURL(const QUrl& skeletonModelURL) {
qDebug() << "Changing skeleton model for avatar to" << skeletonModelURL.toString(); _skeletonModelURL = skeletonModelURL.isEmpty() ? DEFAULT_BODY_MODEL_URL : skeletonModelURL;
_skeletonModelURL = skeletonModelURL;
qDebug() << "Changing skeleton model for avatar to" << _skeletonModelURL.toString();
} }
void AvatarData::setClampedTargetScale(float targetScale) { void AvatarData::setClampedTargetScale(float targetScale) {