diff options
| -rw-r--r-- | shaders/tile.cpp | 6 | ||||
| -rw-r--r-- | src/tile-defs.hpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/shaders/tile.cpp b/shaders/tile.cpp index 54c524fc..82b5357a 100644 --- a/shaders/tile.cpp +++ b/shaders/tile.cpp @@ -79,10 +79,10 @@ float tile_shader::depth_value(const local_coords& xy, float offset) noexcept } const Vector2s tile_shader::max_screen_tiles = {8, 8}; -const float tile_shader::character_depth_offset = 1 + 4./64; -const float tile_shader::scenery_depth_offset = 1 + 4./64; // TODO make walls higher so that offset can be lowered to 1./64 +const float tile_shader::character_depth_offset = 1 + 2./64; +const float tile_shader::scenery_depth_offset = 1 + 2./64; const float tile_shader::wall_depth_offset = 1; -const float tile_shader::z_depth_offset = 1./64; +const float tile_shader::z_depth_offset = 1 + 1./64; const float tile_shader::depth_tile_size = 1/(double)(TILE_MAX_DIM * 2 * max_screen_tiles.product()); } // namespace floormat diff --git a/src/tile-defs.hpp b/src/tile-defs.hpp index 072935a8..ab8ef86b 100644 --- a/src/tile-defs.hpp +++ b/src/tile-defs.hpp @@ -8,7 +8,7 @@ constexpr inline unsigned char TILE_MAX_DIM = 16; constexpr inline size_t TILE_COUNT = size_t{TILE_MAX_DIM}*size_t{TILE_MAX_DIM}; constexpr inline auto TILE_MAX_DIM20d = Magnum::Math::Vector3<double> { TILE_MAX_DIM, TILE_MAX_DIM, 0 }; -constexpr inline auto iTILE_SIZE = Magnum::Math::Vector3<Int> { 64, 64, 64 }; +constexpr inline auto iTILE_SIZE = Magnum::Math::Vector3<Int> { 64, 64, 128 }; constexpr inline auto uiTILE_SIZE = Magnum::Math::Vector3<UnsignedInt> { iTILE_SIZE }; constexpr inline auto bTILE_SIZE = Magnum::Math::Vector3<Byte> { iTILE_SIZE }; constexpr inline auto iTILE_SIZE2 = Magnum::Math::Vector2<Int> { iTILE_SIZE[0], iTILE_SIZE[1] }; |