From 100f35c5129b28c12aa776b5664a9e29f1f551bf Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 7 Sep 2023 09:05:18 +0200
Subject: chunk: add hack to prevent character feet clipping

---
 src/chunk-render.cpp | 4 +++-
 src/chunk.cpp        | 2 +-
 src/chunk.hpp        | 6 +++---
 src/world.cpp        | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/chunk-render.cpp b/src/chunk-render.cpp
index 281d7207..c163fd4d 100644
--- a/src/chunk-render.cpp
+++ b/src/chunk-render.cpp
@@ -48,6 +48,8 @@ auto chunk::ensure_ground_mesh() noexcept -> ground_mesh_tuple
                   return _ground->_ground_atlases[a] < _ground->_ground_atlases[b];
               });
 
+    float hack_offset = _coord.z == 0 ? -1 : 0;
+
     std::array<std::array<vertex, 4>, TILE_COUNT> vertexes;
     for (auto k = 0uz; k < count; k++)
     {
@@ -56,7 +58,7 @@ auto chunk::ensure_ground_mesh() noexcept -> ground_mesh_tuple
         const local_coords pos{i};
         const auto quad = atlas->floor_quad(Vector3(pos) * TILE_SIZE, TILE_SIZE2);
         const auto texcoords = atlas->texcoords_for_id(_ground->_ground_variants[i]);
-        const float depth = tile_shader::depth_value(pos, tile_shader::ground_depth_offset);
+        const float depth = tile_shader::depth_value(pos, tile_shader::ground_depth_offset + hack_offset);
         auto& v = vertexes[k];
         for (auto j = 0uz; j < 4; j++)
             v[j] = { quad[j], texcoords[j], depth };
diff --git a/src/chunk.cpp b/src/chunk.cpp
index f8b823a8..52321aa1 100644
--- a/src/chunk.cpp
+++ b/src/chunk.cpp
@@ -91,7 +91,7 @@ void chunk::mark_modified() noexcept
     mark_passability_modified();
 }
 
-chunk::chunk(struct world& w) noexcept : _world{&w}
+chunk::chunk(struct world& w, chunk_coords_ ch) noexcept : _world{&w}, _coord{ch}
 {
 }
 
diff --git a/src/chunk.hpp b/src/chunk.hpp
index 6a7e3fc9..2f537f84 100644
--- a/src/chunk.hpp
+++ b/src/chunk.hpp
@@ -3,6 +3,7 @@
 #include "tile.hpp"
 #include "local-coords.hpp"
 #include "src/RTree.h"
+#include "global-coords.hpp"
 #include <type_traits>
 #include <array>
 #include <Corrade/Containers/Pointer.h>
@@ -55,7 +56,7 @@ struct chunk final
 
     bool empty(bool force = false) const noexcept;
 
-    explicit chunk(struct world& w) noexcept;
+    explicit chunk(struct world& w, chunk_coords_ ch) noexcept;
     ~chunk() noexcept;
     chunk(const chunk&) = delete;
     chunk& operator=(const chunk&) = delete;
@@ -132,11 +133,10 @@ private:
     Pointer<ground_stuff> _ground;
     Pointer<wall_stuff> _walls;
     std::vector<std::shared_ptr<object>> _objects;
-
     struct world* _world;
     GL::Mesh ground_mesh{NoCreate}, wall_mesh{NoCreate}, scenery_mesh{NoCreate};
-
     RTree _rtree;
+    chunk_coords_ _coord;
 
     mutable bool _maybe_empty            : 1 = true,
                  _ground_modified        : 1 = true,
diff --git a/src/world.cpp b/src/world.cpp
index 97cc4702..46a65f64 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -91,7 +91,7 @@ chunk& world::operator[](chunk_coords_ coord) noexcept
     fm_debug_assert(coord.z >= chunk_z_min && coord.z <= chunk_z_max);
     auto& [c, coord2] = _last_chunk;
     if (coord != coord2)
-        c = &_chunks.try_emplace(coord, *this).first->second;
+        c = &_chunks.try_emplace(coord, *this, coord).first->second;
     coord2 = coord;
     return *c;
 }
-- 
cgit v1.2.3