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

Added back "floor," "bounce."

Browse source
This commit is contained in:
Andrzej Kapolka 2013-05-22 11:08:04 -07:00
parent 8152416d6f
commit ada32f1a8b
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Avatar.cpp
View file

@ -584,6 +584,10 @@ void Avatar::updateCollisionWithSphere(glm::vec3 position, float radius, float d
} }
void Avatar::updateCollisionWithEnvironment(float deltaTime) { void Avatar::updateCollisionWithEnvironment(float deltaTime) {
if (_position.y < _pelvisStandingHeight) {
applyCollisionWithScene(glm::vec3(0.0f, _pelvisStandingHeight - _position.y, 0.0f), deltaTime);
}
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(
@ -608,7 +612,7 @@ void Avatar::applyCollisionWithScene(const glm::vec3& penetration, float deltaTi
// reflect the velocity component in the direction of penetration // reflect the velocity component in the direction of penetration
glm::vec3 direction = glm::normalize(penetration); glm::vec3 direction = glm::normalize(penetration);
//_velocity -= 2.0f * glm::dot(_velocity, direction) * direction * BOUNCE; _velocity -= 2.0f * glm::dot(_velocity, direction) * direction * BOUNCE;
} }
void Avatar::updateAvatarCollisions(float deltaTime) { void Avatar::updateAvatarCollisions(float deltaTime) {