summaryrefslogtreecommitdiffstats
path: root/src/Game.cpp
diff options
context:
space:
mode:
authorMatthias Schiffer <matthias@gamezock.de>2010-01-03 08:19:56 +0100
committerMatthias Schiffer <matthias@gamezock.de>2010-01-03 08:19:56 +0100
commitc85a39bb0ffabf11752329c73f502ef74ec1ef76 (patch)
tree412af009b67e3ecefee824f24b4a3a75d040d244 /src/Game.cpp
parentf945e21bbd225d9a2beb0f8e623bf5b9a66fc846 (diff)
downloadzoom++-c85a39bb0ffabf11752329c73f502ef74ec1ef76.tar
zoom++-c85a39bb0ffabf11752329c73f502ef74ec1ef76.zip
Added correct edge collision
Diffstat (limited to 'src/Game.cpp')
-rw-r--r--src/Game.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Game.cpp b/src/Game.cpp
index e3aa72f..f583312 100644
--- a/src/Game.cpp
+++ b/src/Game.cpp
@@ -30,7 +30,7 @@
namespace Zoom {
-const float Game::PLAYER_SPEED = 10;
+const float Game::PLAYER_SPEED = 3;
const float Game::PLAYER_RADIUS = 0.3;
Game::Game() : playerPos(vmml::vec3f::ZERO), playerRotY(vmml::mat4f::IDENTITY), playerRotX(0),
@@ -157,6 +157,10 @@ void Game::run(int delta) {
nearestDistance = distance;
}
}
+ else {
+ // TODO Edge collision
+
+ }
}
}