Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 11:28:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #391 from ey6es/master

Browse source 
Disable the righting for now, as well as the flat "floor" (to prevent sliding).
This commit is contained in:
Andrzej Kapolka 2013-05-22 16:30:57 -07:00
commit 832d7f890a
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Avatar.cpp
View file

@ -350,7 +350,7 @@ void Avatar::simulate(float deltaTime, Transmitter* transmitter) {
} else { } else {
axis = glm::normalize(glm::cross(currentUp, targetUp)); 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() { void Avatar::updateCollisionWithEnvironment() {
if (_position.y < _pelvisStandingHeight) {
applyCollisionWithScene(glm::vec3(0.0f, _pelvisStandingHeight - _position.y, 0.0f));
}
float radius = _height * 0.125f; float radius = _height * 0.125f;
glm::vec3 penetration; glm::vec3 penetration;
if (Application::getInstance()->getEnvironment()->findCapsulePenetration( if (Application::getInstance()->getEnvironment()->findCapsulePenetration(