From d63ace9f6108a8fcef1a752d65189ab59b2c7dfd Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Tue, 2 Dec 2014 23:53:46 -0800 Subject: [PATCH] fix angular velocity from oculus, tweak hair --- interface/src/Hair.cpp | 4 ++-- interface/src/avatar/MyAvatar.cpp | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/interface/src/Hair.cpp b/interface/src/Hair.cpp index e14fc519d3..cb664f39ed 100644 --- a/interface/src/Hair.cpp +++ b/interface/src/Hair.cpp @@ -18,8 +18,8 @@ const float HAIR_DAMPING = 0.99f; const float CONSTRAINT_RELAXATION = 10.0f; const float HAIR_ACCELERATION_COUPLING = 0.045f; -const float HAIR_ANGULAR_VELOCITY_COUPLING = 0.020f; -const float HAIR_ANGULAR_ACCELERATION_COUPLING = 0.003f; +const float HAIR_ANGULAR_VELOCITY_COUPLING = 0.001f; +const float HAIR_ANGULAR_ACCELERATION_COUPLING = 0.001f; const float HAIR_MAX_LINEAR_ACCELERATION = 4.0f; const float HAIR_STIFFNESS = 0.00f; const glm::vec3 HAIR_COLOR1(0.98f, 0.76f, 0.075f); diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index a4fc696bc9..9f3309ece2 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1215,8 +1215,11 @@ void MyAvatar::updateOrientation(float deltaTime) { // Record the angular velocity Head* head = getHead(); - glm::vec3 angularVelocity(yaw - head->getBaseYaw(), pitch - head->getBasePitch(), roll - head->getBaseRoll()); - head->setAngularVelocity(angularVelocity); + if (deltaTime > 0.0f) { + glm::vec3 angularVelocity(pitch - head->getBasePitch(), yaw - head->getBaseYaw(), roll - head->getBaseRoll()); + angularVelocity *= 1.0f / deltaTime; + head->setAngularVelocity(angularVelocity); + } //Invert yaw and roll when in mirror mode if (Application::getInstance()->getCamera()->getMode() == CAMERA_MODE_MIRROR) {