From 9d152e2773f28d4fb7066010d2ae9099873cb6fd Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Mon, 4 Jan 2010 01:02:33 +0100
Subject: Corrected edge & vertex collision

---
 src/Collision.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/Collision.cpp')

diff --git a/src/Collision.cpp b/src/Collision.cpp
index ea69b39..e552643 100644
--- a/src/Collision.cpp
+++ b/src/Collision.cpp
@@ -118,6 +118,7 @@ bool Collision::test(const Triangle &t, const vmml::vec3f &m, float r, const vmm
   for(int i = 0; i < 3; ++i) {
     if(testEdge(t.getVertex(i), t.getVertex((i+1)%3), m, r, move, &d)) {
       if(!collision || d < minDistance) {
+        collision = true;
         minDistance = d;
       }
     }
@@ -134,6 +135,7 @@ bool Collision::test(const Triangle &t, const vmml::vec3f &m, float r, const vmm
   for(int i = 0; i < 3; ++i) {
     if(testVertex(t.getVertex(i), m, r, move, &d)) {
       if(!collision || d < minDistance) {
+        collision = true;
         minDistance = d;
       }
     }
-- 
cgit v1.2.3