Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-10 00:53:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix angular velocity from oculus, tweak hair

Browse source
This commit is contained in:
Philip Rosedale 2014-12-02 23:53:46 -08:00
parent 57e2f71bb7
commit d63ace9f61
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Hair.cpp
View file

@ -18,8 +18,8 @@
const float HAIR_DAMPING = 0.99f; const float HAIR_DAMPING = 0.99f;
const float CONSTRAINT_RELAXATION = 10.0f; const float CONSTRAINT_RELAXATION = 10.0f;
const float HAIR_ACCELERATION_COUPLING = 0.045f; const float HAIR_ACCELERATION_COUPLING = 0.045f;
const float HAIR_ANGULAR_VELOCITY_COUPLING = 0.020f; const float HAIR_ANGULAR_VELOCITY_COUPLING = 0.001f;
const float HAIR_ANGULAR_ACCELERATION_COUPLING = 0.003f; const float HAIR_ANGULAR_ACCELERATION_COUPLING = 0.001f;
const float HAIR_MAX_LINEAR_ACCELERATION = 4.0f; const float HAIR_MAX_LINEAR_ACCELERATION = 4.0f;
const float HAIR_STIFFNESS = 0.00f; const float HAIR_STIFFNESS = 0.00f;
const glm::vec3 HAIR_COLOR1(0.98f, 0.76f, 0.075f); const glm::vec3 HAIR_COLOR1(0.98f, 0.76f, 0.075f);

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

@ -1215,8 +1215,11 @@ void MyAvatar::updateOrientation(float deltaTime) {
// Record the angular velocity // Record the angular velocity
Head* head = getHead(); Head* head = getHead();
glm::vec3 angularVelocity(yaw - head->getBaseYaw(), pitch - head->getBasePitch(), roll - head->getBaseRoll()); if (deltaTime > 0.0f) {
head->setAngularVelocity(angularVelocity); 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 //Invert yaw and roll when in mirror mode
if (Application::getInstance()->getCamera()->getMode() == CAMERA_MODE_MIRROR) { if (Application::getInstance()->getCamera()->getMode() == CAMERA_MODE_MIRROR) {