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/Game.cpp | |
parent | cc2a07f13d5f6613dabcd454790b088c9c273cbf (diff) | |
download | zoom++-9d152e2773f28d4fb7066010d2ae9099873cb6fd.tar zoom++-9d152e2773f28d4fb7066010d2ae9099873cb6fd.zip |
Corrected edge & vertex collision
Diffstat (limited to 'src/Game.cpp')
-rw-r--r-- | src/Game.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Game.cpp b/src/Game.cpp index f583312..aea829f 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -131,10 +131,10 @@ void Game::run(int delta) { vmml::vec3f origMove = playerMove; - bool ok = false; + bool collision = true; - while(!ok) { - ok = true; + while(collision) { + collision = false; MathUtil::Plane nearestPlane; float nearestDistance; @@ -150,8 +150,8 @@ void Game::run(int delta) { vmml::vec3f intersection = p.intersection(MathUtil::Ray(playerPos, playerMove)); float distance = intersection.squared_distance(playerPos); - if(ok || distance < nearestDistance) { - ok = false; + if(!collision || distance < nearestDistance) { + collision = true; nearestPlane = p; nearestDistance = distance; @@ -164,7 +164,7 @@ void Game::run(int delta) { } } - if(!ok) { + if(collision) { vmml::vec3f move; if(playerMove.dot(nearestPlane.getNormal()) == 0) |