depth buffer fixes

2 files changed, 5 insertions, 4 deletions

diff --git a/shaders/tile.cpp b/shaders/tile.cpp
index d5f6b7d3..d774ddf0 100644
--- a/shaders/tile.cpp
+++ b/shaders/tile.cpp
@@ -2,6 +2,7 @@
 #include "loader/loader.hpp"
 #include "compat/assert.hpp"
 #include "local-coords.hpp"
+#include <cmath>
 #include <Corrade/Containers/Iterable.h>
 #include <Corrade/Containers/StringStl.h>
 #include <Magnum/Math/Vector4.h>
@@ -74,7 +75,7 @@ void tile_shader::_draw()
 
 float tile_shader::depth_value(const local_coords& xy, float offset) noexcept
 {
-    return depth_tile_size + (xy.to_index() + offset)*depth_tile_size;
+    return (float)((xy.to_index() + (double)offset) * depth_tile_size);
 }
 
 } // namespace floormat
diff --git a/shaders/tile.hpp b/shaders/tile.hpp
index fd3788f3..8415d836 100644
--- a/shaders/tile.hpp
+++ b/shaders/tile.hpp
@@ -37,9 +37,9 @@ struct tile_shader : GL::AbstractShaderProgram
     template<typename T, typename... Xs>
     decltype(auto) draw(T&& mesh, Xs&&... xs);
 
-    static constexpr float depth_tile_size = 3.56e-15; // 1 - nextafter(1, 0) * TILE_MAX_DIM / 2
-    static constexpr float depth_start = -1 + depth_tile_size;
-    static constexpr float scenery_depth_offset = .5f, character_depth_offset = .5f;
+    static constexpr double depth_tile_size = 1/(double)(TILE_COUNT * 16 * 16);
+    static constexpr double depth_chunk_size = 1/(double)(16 * 16);
+    static constexpr float scenery_depth_offset = 0.5f, character_depth_offset = 0.5f, wall_depth_offset = 0.25f;
 
 private:
     void _draw();