summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2022-10-06 15:54:10 +0200
committerStanislaw Halik <sthalik@misaki.pl>2022-10-06 15:54:10 +0200
commitded69f52906990cf975a62c0efbaca4b6cfa5e88 (patch)
treebca2790e5d9d45ccef12e9da6cf4b125912f12db /src
parent896e072d8bd94020c883e994451b86675ecdced7 (diff)
a
Diffstat (limited to 'src')
-rw-r--r--src/tile-atlas.cpp1
-rw-r--r--src/tile-atlas.hpp3
-rw-r--r--src/wall-mesh.cpp2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/tile-atlas.cpp b/src/tile-atlas.cpp
index bc573134..d086c31b 100644
--- a/src/tile-atlas.cpp
+++ b/src/tile-atlas.cpp
@@ -1,4 +1,5 @@
#include "tile-atlas.hpp"
+#include "compat/assert.hpp"
#include <Corrade/Containers/StringView.h>
#include <Magnum/ImageView.h>
#include <Magnum/GL/TextureFormat.h>
diff --git a/src/tile-atlas.hpp b/src/tile-atlas.hpp
index b32a70d8..af9e505b 100644
--- a/src/tile-atlas.hpp
+++ b/src/tile-atlas.hpp
@@ -1,10 +1,11 @@
#pragma once
-#include "compat/assert.hpp"
#include <Magnum/Magnum.h>
#include <Magnum/GL/RectangleTexture.h>
#include <array>
#include <string>
+namespace std::filesystem { class path; }
+
namespace Magnum::Examples {
struct tile_atlas final
diff --git a/src/wall-mesh.cpp b/src/wall-mesh.cpp
index ee998e63..ebbfee75 100644
--- a/src/wall-mesh.cpp
+++ b/src/wall-mesh.cpp
@@ -51,7 +51,7 @@ void wall_mesh::draw(tile_shader& shader, chunk& c)
c.foreach_tile([&](tile& x, std::size_t, local_coords pt) {
maybe_add_tile(data, textures, pos, x, pt);
});
- _vertex_buffer.setSubData(0, Containers::arrayView(data.data(), pos));
+ _vertex_buffer.setSubData(0, {data.data(), pos});
}
const GL::RectangleTexture* last_texture = nullptr;