summaryrefslogtreecommitdiffhomepage
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/draw.cpp2
-rw-r--r--main/main-impl.hpp4
-rw-r--r--main/setup.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/main/draw.cpp b/main/draw.cpp
index 98fd861e..4de42473 100644
--- a/main/draw.cpp
+++ b/main/draw.cpp
@@ -178,7 +178,7 @@ void main_impl::draw_world() noexcept
const with_shifted_camera_offset o{_shader, ch, {minx, miny}, {maxx, maxy}};
if (check_chunk_visible(_shader.camera_offset(), sz))
{
- _floor_mesh.draw(_shader, c);
+ _ground_mesh.draw(_shader, c);
_wall_mesh.draw(_shader, c);
}
}
diff --git a/main/main-impl.hpp b/main/main-impl.hpp
index f66b0248..8aaf6312 100644
--- a/main/main-impl.hpp
+++ b/main/main-impl.hpp
@@ -2,7 +2,7 @@
#include "floormat/main.hpp"
#include "floormat/settings.hpp"
#include "src/world.hpp"
-#include "draw/floor.hpp"
+#include "draw/ground.hpp"
#include "draw/wall.hpp"
#include "draw/anim.hpp"
#include "shaders/texture-unit-cache.hpp"
@@ -111,7 +111,7 @@ private:
struct world _world{};
Magnum::Timeline timeline;
uint32_t _mouse_cursor = (uint32_t)-1;
- floor_mesh _floor_mesh;
+ ground_mesh _ground_mesh;
wall_mesh _wall_mesh;
anim_mesh _anim_mesh;
#ifdef FM_USE_DEPTH32
diff --git a/main/setup.cpp b/main/setup.cpp
index 15b34b2b..45f941cb 100644
--- a/main/setup.cpp
+++ b/main/setup.cpp
@@ -100,7 +100,7 @@ void main_impl::update_window_state()
auto main_impl::meshes() noexcept -> struct meshes
{
- return { _floor_mesh, _wall_mesh, _anim_mesh, };
+ return { _ground_mesh, _wall_mesh, _anim_mesh, };
};
struct world& main_impl::reset_world() noexcept