diff options
author | Matthias Schiffer <matthias@gamezock.de> | 2010-01-04 01:02:33 +0100 |
---|---|---|
committer | Matthias Schiffer <matthias@gamezock.de> | 2010-01-04 01:02:33 +0100 |
commit | 9d152e2773f28d4fb7066010d2ae9099873cb6fd (patch) | |
tree | 40f2b8faca60228934dbbd07c7c435424fd98221 /src/Collision.cpp | |
parent | cc2a07f13d5f6613dabcd454790b088c9c273cbf (diff) | |
download | zoom++-9d152e2773f28d4fb7066010d2ae9099873cb6fd.tar zoom++-9d152e2773f28d4fb7066010d2ae9099873cb6fd.zip |
Corrected edge & vertex collision
Diffstat (limited to 'src/Collision.cpp')
-rw-r--r-- | src/Collision.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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; } } |