diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp index 50cff6049d..f371f2e322 100644 --- a/interface/src/Avatar.cpp +++ b/interface/src/Avatar.cpp @@ -350,7 +350,7 @@ void Avatar::simulate(float deltaTime, Transmitter* transmitter) { } else { axis = glm::normalize(glm::cross(currentUp, targetUp)); } - _righting = glm::angleAxis(min(deltaTime * ANGULAR_RIGHTING_SPEED, angle), axis) * _righting; + //_righting = glm::angleAxis(min(deltaTime * ANGULAR_RIGHTING_SPEED, angle), axis) * _righting; } } @@ -602,10 +602,6 @@ void Avatar::updateCollisionWithSphere(glm::vec3 position, float radius, float d } void Avatar::updateCollisionWithEnvironment() { - if (_position.y < _pelvisStandingHeight) { - applyCollisionWithScene(glm::vec3(0.0f, _pelvisStandingHeight - _position.y, 0.0f)); - } - float radius = _height * 0.125f; glm::vec3 penetration; if (Application::getInstance()->getEnvironment()->findCapsulePenetration(