From e2d9e37eb886046bf236b505dce227f05bc67a5f Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Mon, 30 Nov 2015 14:08:21 -0800 Subject: [PATCH] Fix for head offset for models with no eyes This was causing in correct body poses while wearing an HMD. --- libraries/animation/src/Rig.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp index 8718f605bf..c0b399ee0f 100644 --- a/libraries/animation/src/Rig.cpp +++ b/libraries/animation/src/Rig.cpp @@ -46,18 +46,11 @@ static bool isEqual(const glm::quat& p, const glm::quat& q) { } while (0) #endif -/* -const glm::vec3 DEFAULT_RIGHT_EYE_POS(-0.3f, 1.6f, 0.0f); -const glm::vec3 DEFAULT_LEFT_EYE_POS(0.3f, 1.6f, 0.0f); -const glm::vec3 DEFAULT_HEAD_POS(0.0f, 1.55f, 0.0f); -const glm::vec3 DEFAULT_NECK_POS(0.0f, 1.5f, 0.0f); -*/ - // 2 meter tall dude -const glm::vec3 DEFAULT_RIGHT_EYE_POS(-0.3f, 1.9f, 0.0f); -const glm::vec3 DEFAULT_LEFT_EYE_POS(0.3f, 1.9f, 0.0f); -const glm::vec3 DEFAULT_HEAD_POS(0.0f, 1.75f, 0.0f); -const glm::vec3 DEFAULT_NECK_POS(0.0f, 1.70f, 0.0f); +const glm::vec3 DEFAULT_RIGHT_EYE_POS(-0.3f, 0.9f, 0.0f); +const glm::vec3 DEFAULT_LEFT_EYE_POS(0.3f, 0.9f, 0.0f); +const glm::vec3 DEFAULT_HEAD_POS(0.0f, 0.75f, 0.0f); +const glm::vec3 DEFAULT_NECK_POS(0.0f, 0.70f, 0.0f); void Rig::overrideAnimation(const QString& url, float fps, bool loop, float firstFrame, float lastFrame) {