1 files changed, 20 insertions, 3 deletions

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 6c94490..4fa481e 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -16,10 +16,16 @@ void Player::update(const Time& time, GFX::Window& window, GFX::Camera& camera,
     auto rotation_speed = 0.1f;
 
     auto direction = m_transform.right() * x + Vec3(0, y, 0) + m_transform.forward() * z;
-    auto position = m_transform.position() + direction * move_speed;
+    auto destination = m_transform.position() + direction * move_speed;
 
-    auto collisions = colliding_terrain(position, world);
-    if (collisions.empty()) move_to(position);
+    auto collisions = colliding_terrain(destination, world);
+    if (!collisions.empty()) {
+        for (auto collision : collisions) {
+            destination = collision_reposition(m_transform.position(), destination, collision);
+        }
+    }
+
+    move_to(destination);
     rotate({r.y() * rotation_speed, r.x() * rotation_speed, 0.0f});
 
     update_camera_position(camera);
@@ -84,4 +90,15 @@ AABB Player::bounding_box_for_position(Position::World position) {
     return s_bounds.offset(box_start);
 }
 
+Position::World Player::position_for_bounding_box(AABB box) {
+    auto center = box.center();
+    return {center.x(), box.min.y(), center.z()};
+}
+
+Position::World Player::collision_reposition(Position::World from, Position::World to, AABB colliding) {
+    if (from == to) return from;
+    auto resulting_bounding_box = bounding_box_for_position(from).cast_box(to - from, colliding);
+    return position_for_bounding_box(resulting_bounding_box); // Ugly, we convert to AABB and back.
+}
+
 }