From 52d8ece38abdd30f3a3f40ee1f5547d512f90b5e Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Wed, 17 Jul 2013 15:03:56 -0700 Subject: [PATCH] remove old pre-movement of avatar in gravity --- interface/src/Avatar.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp index 950108a65d..c723bb3b8d 100755 --- a/interface/src/Avatar.cpp +++ b/interface/src/Avatar.cpp @@ -542,10 +542,9 @@ void Avatar::simulate(float deltaTime, Transmitter* transmitter) { // For gravity, always move the avatar by the amount driven by gravity, so that the collision // routines will detect it and collide every frame when pulled by gravity to a surface // - const float MIN_DISTANCE_AFTER_COLLISION_FOR_GRAVITY = 0.01f; + const float MIN_DISTANCE_AFTER_COLLISION_FOR_GRAVITY = 0.02f; if (glm::length(_position - _lastCollisionPosition) > MIN_DISTANCE_AFTER_COLLISION_FOR_GRAVITY) { _velocity += _scale * _gravity * (GRAVITY_EARTH * deltaTime); - _position += _scale * _gravity * (GRAVITY_EARTH * deltaTime) * deltaTime; } } updateCollisionWithEnvironment(deltaTime);