From 779f5f76145dd6ff573368e5955de2cadbd59cc8 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Fri, 14 Nov 2014 13:02:02 -0800 Subject: [PATCH] Default avatar fixes. --- interface/resources/meshes/defaultAvatar_body.fst | 2 +- interface/resources/meshes/defaultAvatar_head.fst | 2 +- libraries/avatars/src/AvatarData.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/resources/meshes/defaultAvatar_body.fst b/interface/resources/meshes/defaultAvatar_body.fst index 5874c206db..f061a87726 100644 --- a/interface/resources/meshes/defaultAvatar_body.fst +++ b/interface/resources/meshes/defaultAvatar_body.fst @@ -1,6 +1,6 @@ filename=defaultAvatar/body.fbx texdir=defaultAvatar -scale=130 +scale=8.666 joint = jointRoot = jointRoot joint = jointLean = jointSpine joint = jointNeck = jointNeck diff --git a/interface/resources/meshes/defaultAvatar_head.fst b/interface/resources/meshes/defaultAvatar_head.fst index 34cf44f0e4..c2478ce7d9 100644 --- a/interface/resources/meshes/defaultAvatar_head.fst +++ b/interface/resources/meshes/defaultAvatar_head.fst @@ -2,7 +2,7 @@ name= defaultAvatar_head filename=defaultAvatar/head.fbx texdir=defaultAvatar -scale=80 +scale=5.333 rx=0 ry=0 rz=0 diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index 6b882a1389..c8e5e61d49 100644 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -91,8 +91,8 @@ const float MAX_AUDIO_LOUDNESS = 1000.0; // close enough for mouth animation const int AVATAR_IDENTITY_PACKET_SEND_INTERVAL_MSECS = 1000; const int AVATAR_BILLBOARD_PACKET_SEND_INTERVAL_MSECS = 5000; -const QUrl DEFAULT_HEAD_MODEL_URL = QUrl("http://public.highfidelity.io/meshes/defaultAvatar_head.fst"); -const QUrl DEFAULT_BODY_MODEL_URL = QUrl("http://public.highfidelity.io/meshes/defaultAvatar_body.fst"); +const QUrl DEFAULT_HEAD_MODEL_URL = QUrl("http://public.highfidelity.io/models/heads/defaultAvatar_head.fst"); +const QUrl DEFAULT_BODY_MODEL_URL = QUrl("http://public.highfidelity.io/models/skeletons/defaultAvatar_body.fst"); enum KeyState { NO_KEY_DOWN = 0,