From 221f830b5fed2abcc800f3f4ddc3aa38b744da35 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 15 Jan 2014 17:03:07 -0800 Subject: [PATCH] Uncommenting particle shift on penetration. --- libraries/particles/src/ParticleCollisionSystem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/particles/src/ParticleCollisionSystem.cpp b/libraries/particles/src/ParticleCollisionSystem.cpp index 417c1e0667..78b1402461 100644 --- a/libraries/particles/src/ParticleCollisionSystem.cpp +++ b/libraries/particles/src/ParticleCollisionSystem.cpp @@ -202,7 +202,7 @@ void ParticleCollisionSystem::applyHardCollision(Particle* particle, const glm:: const float EPSILON = 0.0f; float velocityDotPenetration = glm::dot(velocity, penetration); if (velocityDotPenetration > EPSILON) { - //position -= penetration; + position -= penetration; static float HALTING_VELOCITY = 0.2f / (float)(TREE_SCALE); // cancel out the velocity component in the direction of penetration