diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2022-11-09 12:44:56 +0100 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-11-09 12:44:56 +0100 |
commit | 09605450ecc99ad1f4d50e9c143fda6c7762e702 (patch) | |
tree | 42d795d65a5c55e6748275bf6e5e9fd7ae269636 | |
parent | 4b02a2ac8a0ea0f72a2452339fbde4d1eb40c535 (diff) |
a
-rw-r--r-- | draw/floor.cpp | 8 | ||||
-rw-r--r-- | draw/floor.hpp | 8 |
2 files changed, 3 insertions, 13 deletions
diff --git a/draw/floor.cpp b/draw/floor.cpp index 9f8ed2ab..635b8d8f 100644 --- a/draw/floor.cpp +++ b/draw/floor.cpp @@ -7,16 +7,14 @@ namespace floormat { -constexpr auto quad_index_count = 6; - -floor_mesh::floor_mesh() -{ -} +floor_mesh::floor_mesh() = default; //#define FM_DEBUG_DRAW_COUNT void floor_mesh::draw(tile_shader& shader, chunk& c) { + constexpr auto quad_index_count = 6; + auto [mesh_, ids] = c.ensure_ground_mesh(); tile_atlas* last_atlas = nullptr; diff --git a/draw/floor.hpp b/draw/floor.hpp index 07e183d6..bfff7948 100644 --- a/draw/floor.hpp +++ b/draw/floor.hpp @@ -1,12 +1,4 @@ #pragma once -#include "tile-defs.hpp" -#include <array> -#include <Corrade/Containers/ArrayViewStl.h> -#include <Magnum/Magnum.h> -#include <Magnum/Math/Vector2.h> -#include <Magnum/Math/Vector3.h> -#include <Magnum/GL/Mesh.h> -#include <Magnum/GL/Buffer.h> namespace floormat { |