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

use shorter default URLs, set as placeholder text in prefs

Browse source
This commit is contained in:
Stephen Birarda 2014-02-10 11:28:22 -08:00
parent 712692f8bf
commit 3e90bcd523
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Menu.cpp
View file

@ -774,11 +774,13 @@ void Menu::editPreferences() {
QString faceURLString = applicationInstance->getAvatar()->getHead().getFaceModel().getURL().toString();
QLineEdit* faceURLEdit = new QLineEdit(faceURLString);
faceURLEdit->setMinimumWidth(QLINE_MINIMUM_WIDTH);
faceURLEdit->setPlaceholderText(DEFAULT_HEAD_MODEL_URL.toString());
form->addRow("Face URL:", faceURLEdit);
QString skeletonURLString = applicationInstance->getAvatar()->getSkeletonModel().getURL().toString();
QLineEdit* skeletonURLEdit = new QLineEdit(skeletonURLString);
skeletonURLEdit->setMinimumWidth(QLINE_MINIMUM_WIDTH);
skeletonURLEdit->setPlaceholderText(DEFAULT_BODY_MODEL_URL.toString());
form->addRow("Skeleton URL:", skeletonURLEdit);
QSlider* pupilDilation = new QSlider(Qt::Horizontal);

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

@ -637,7 +637,7 @@ void MyAvatar::loadData(QSettings* settings) {
Application::getInstance()->getCamera()->setScale(_scale);
setFaceModelURL(settings->value("faceModelURL").toUrl());
setSkeletonModelURL(settings->value("faceModelURL").toUrl());
setSkeletonModelURL(settings->value("skeletonModelURL").toUrl());
settings->endGroup();
}

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

@ -300,16 +300,12 @@ QByteArray AvatarData::identityByteArray() {
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) {
_faceModelURL = faceModelURL.isEmpty() ? DEFAULT_HEAD_MODEL_URL : 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) {
_skeletonModelURL = skeletonModelURL.isEmpty() ? DEFAULT_BODY_MODEL_URL : skeletonModelURL;

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

@ -52,6 +52,9 @@ static const float MIN_AVATAR_SCALE = .005f;
const float MAX_AUDIO_LOUDNESS = 1000.0; // close enough for mouth animation
const QUrl DEFAULT_HEAD_MODEL_URL = QUrl("http://public.highfidelity.io/meshes/defaultAvatar_head.fbx");
const QUrl DEFAULT_BODY_MODEL_URL = QUrl("http://public.highfidelity.io/meshes/defaultAvatar_body.fbx");
enum KeyState {
NO_KEY_DOWN = 0,
INSERT_KEY_DOWN,