Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-25 01:23:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disable the righting for now, as well as the "floor" (whose presence makes us

Browse source 
slide, since the gravity vector isn't pointing straight down).
This commit is contained in:
Andrzej Kapolka 2013-05-22 16:29:13 -07:00
parent e48aebdd9e
commit b6e78064d8
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 {
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(