From d74df1b763979d281f76f3f30543aee8d8a638b7 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 11 Jan 2024 14:29:53 +0100
Subject: rename floor -> ground

---
 draw/floor.cpp  | 49 -------------------------------------------------
 draw/floor.hpp  | 15 ---------------
 draw/ground.cpp | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 draw/ground.hpp | 15 +++++++++++++++
 4 files changed, 64 insertions(+), 64 deletions(-)
 delete mode 100644 draw/floor.cpp
 delete mode 100644 draw/floor.hpp
 create mode 100644 draw/ground.cpp
 create mode 100644 draw/ground.hpp

(limited to 'draw')

diff --git a/draw/floor.cpp b/draw/floor.cpp
deleted file mode 100644
index a073f39f..00000000
--- a/draw/floor.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#include "floor.hpp"
-#include "shaders/shader.hpp"
-#include "src/chunk.hpp"
-#include "src/ground-atlas.hpp"
-#include "compat/assert.hpp"
-#include <Magnum/GL/MeshView.h>
-
-namespace floormat {
-
-floor_mesh::floor_mesh() = default;
-
-void floor_mesh::draw(tile_shader& shader, chunk& c)
-{
-    constexpr int quad_index_count = 6;
-    const auto [mesh_, ids, size] = c.ensure_ground_mesh();
-    struct {
-        ground_atlas* atlas = nullptr; size_t pos = 0; } last;
-    GL::MeshView mesh{mesh_};
-
-    [[maybe_unused]] size_t draw_count = 0;
-    fm_debug_assert(size_t(mesh_.count()) == size*quad_index_count);
-
-    const auto do_draw = [&](size_t i, ground_atlas* atlas, uint32_t max_index) {
-        if (atlas == last.atlas)
-            return;
-        if (auto len = i - last.pos; last.atlas && len > 0)
-        {
-            mesh.setCount((int)(quad_index_count * len));
-            mesh.setIndexOffset((int)(last.pos*quad_index_count), 0, max_index);
-            shader.draw(last.atlas->texture(), mesh);
-            draw_count++;
-        }
-        last = { atlas, i };
-    };
-
-    const auto max_index = uint32_t(size*quad_index_count - 1);
-    size_t k;
-    for (k = 0; k < size; k++)
-        do_draw(k, c.ground_atlas_at(ids[k]), max_index);
-    do_draw(size, nullptr, max_index);
-
-//#define FM_DEBUG_DRAW_COUNT
-#ifdef FM_DEBUG_DRAW_COUNT
-    if (draw_count)
-        fm_debug("floor draws: %zu", draw_count);
-#endif
-}
-
-} // namespace floormat
diff --git a/draw/floor.hpp b/draw/floor.hpp
deleted file mode 100644
index 74547857..00000000
--- a/draw/floor.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-namespace floormat {
-
-struct tile_shader;
-struct chunk;
-
-struct floor_mesh final
-{
-    floor_mesh();
-
-    void draw(tile_shader& shader, chunk& c);
-};
-
-} // namespace floormat
diff --git a/draw/ground.cpp b/draw/ground.cpp
new file mode 100644
index 00000000..515729b1
--- /dev/null
+++ b/draw/ground.cpp
@@ -0,0 +1,49 @@
+#include "ground.hpp"
+#include "shaders/shader.hpp"
+#include "src/chunk.hpp"
+#include "src/ground-atlas.hpp"
+#include "compat/assert.hpp"
+#include <Magnum/GL/MeshView.h>
+
+namespace floormat {
+
+ground_mesh::ground_mesh() = default;
+
+void ground_mesh::draw(tile_shader& shader, chunk& c)
+{
+    constexpr int quad_index_count = 6;
+    const auto [mesh_, ids, size] = c.ensure_ground_mesh();
+    struct {
+        ground_atlas* atlas = nullptr; size_t pos = 0; } last;
+    GL::MeshView mesh{mesh_};
+
+    [[maybe_unused]] size_t draw_count = 0;
+    fm_debug_assert(size_t(mesh_.count()) == size*quad_index_count);
+
+    const auto do_draw = [&](size_t i, ground_atlas* atlas, uint32_t max_index) {
+        if (atlas == last.atlas)
+            return;
+        if (auto len = i - last.pos; last.atlas && len > 0)
+        {
+            mesh.setCount((int)(quad_index_count * len));
+            mesh.setIndexOffset((int)(last.pos*quad_index_count), 0, max_index);
+            shader.draw(last.atlas->texture(), mesh);
+            draw_count++;
+        }
+        last = { atlas, i };
+    };
+
+    const auto max_index = uint32_t(size*quad_index_count - 1);
+    size_t k;
+    for (k = 0; k < size; k++)
+        do_draw(k, c.ground_atlas_at(ids[k]), max_index);
+    do_draw(size, nullptr, max_index);
+
+//#define FM_DEBUG_DRAW_COUNT
+#ifdef FM_DEBUG_DRAW_COUNT
+    if (draw_count)
+        fm_debug("ground draws: %zu", draw_count);
+#endif
+}
+
+} // namespace floormat
diff --git a/draw/ground.hpp b/draw/ground.hpp
new file mode 100644
index 00000000..b960e8b1
--- /dev/null
+++ b/draw/ground.hpp
@@ -0,0 +1,15 @@
+#pragma once
+
+namespace floormat {
+
+struct tile_shader;
+struct chunk;
+
+struct ground_mesh final
+{
+    ground_mesh();
+
+    void draw(tile_shader& shader, chunk& c);
+};
+
+} // namespace floormat
-- 
cgit v1.2.3