dw

8 files changed, 57 insertions, 27 deletions

diff --git a/draw/quad-floor.hpp b/draw/quad-floor.hpp
index f44bf7af..b289ab84 100644
--- a/draw/quad-floor.hpp
+++ b/draw/quad-floor.hpp
@@ -4,7 +4,7 @@
 #include <Magnum/Math/Vector2.h>
 #include <Magnum/Math/Vector3.h>
 #include <Magnum/GL/Mesh.h>
-#include <Corrade/Containers/ArrayView.h>
+#include <Corrade/Containers/ArrayViewStl.h>
 
 namespace floormat::wireframe {
 
diff --git a/draw/quad-wall-n.hpp b/draw/quad-wall-n.hpp
index 6993b08a..d607ffe3 100644
--- a/draw/quad-wall-n.hpp
+++ b/draw/quad-wall-n.hpp
@@ -3,7 +3,7 @@
 #include <array>
 #include <Magnum/Math/Vector3.h>
 #include <Magnum/GL/Mesh.h>
-#include <Corrade/Containers/ArrayView.h>
+#include <Corrade/Containers/ArrayViewStl.h>
 
 namespace floormat::wireframe {
 
diff --git a/draw/quad-wall-w.hpp b/draw/quad-wall-w.hpp
index b7e402a4..a96e8d83 100644
--- a/draw/quad-wall-w.hpp
+++ b/draw/quad-wall-w.hpp
@@ -3,7 +3,7 @@
 #include <array>
 #include <Magnum/Math/Vector3.h>
 #include <Magnum/GL/Mesh.h>
-#include <Corrade/Containers/ArrayView.h>
+#include <Corrade/Containers/ArrayViewStl.h>
 
 namespace floormat::wireframe {
 
diff --git a/draw/quad.hpp b/draw/quad.hpp
index 466299f7..c9345f64 100644
--- a/draw/quad.hpp
+++ b/draw/quad.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include <array>
-#include <Corrade/Containers/ArrayView.h>
+#include <Corrade/Containers/ArrayViewStl.h>
 #include <Magnum/Math/Vector3.h>
 #include <Magnum/GL/Mesh.h>
 
diff --git a/draw/wireframe-meshes.cpp b/draw/wireframe-meshes.cpp
new file mode 100644
index 00000000..7baeddf7
--- /dev/null
+++ b/draw/wireframe-meshes.cpp
@@ -0,0 +1,15 @@
+#include "wireframe-meshes.hpp"
+
+namespace floormat::wireframe {
+
+meshes::meshes() :
+    _wireframe_texture{make_constant_texture()},
+    _wireframe_quad   {_wireframe_texture},
+    _wireframe_wall_n {_wireframe_texture},
+    _wireframe_wall_w {_wireframe_texture},
+    _wireframe_box    {_wireframe_texture},
+    _wireframe_rect   {_wireframe_texture}
+{
+}
+
+} // namespace floormat::wireframe
diff --git a/draw/wireframe-meshes.hpp b/draw/wireframe-meshes.hpp
new file mode 100644
index 00000000..be9b6b79
--- /dev/null
+++ b/draw/wireframe-meshes.hpp
@@ -0,0 +1,29 @@
+#pragma once
+#include "wireframe.hpp"
+#include "compat/defs.hpp"
+#include "box.hpp"
+#include "quad-floor.hpp"
+#include "quad-wall-n.hpp"
+#include "quad-wall-w.hpp"
+#include "quad.hpp"
+#include <Corrade/Containers/ArrayViewStl.h>
+#include <Magnum/GL/Texture.h>
+
+namespace floormat::wireframe {
+
+struct meshes final
+{
+    fm_DECLARE_DELETED_COPY_ASSIGNMENT(meshes);
+    fm_DECLARE_DELETED_MOVE_ASSIGNMENT(meshes);
+
+    meshes();
+
+    GL::Texture2D _wireframe_texture;
+    wireframe_mesh<wireframe::quad_floor>  _wireframe_quad   {_wireframe_texture};
+    wireframe_mesh<wireframe::quad_wall_n> _wireframe_wall_n {_wireframe_texture};
+    wireframe_mesh<wireframe::quad_wall_w> _wireframe_wall_w {_wireframe_texture};
+    wireframe_mesh<wireframe::box>         _wireframe_box    {_wireframe_texture};
+    wireframe_mesh<wireframe::quad>        _wireframe_rect   {_wireframe_texture};
+};
+
+} // namespace floormat::wireframe
diff --git a/draw/wireframe.cpp b/draw/wireframe.cpp
index 5d041991..2ece4117 100644
--- a/draw/wireframe.cpp
+++ b/draw/wireframe.cpp
@@ -1,4 +1,3 @@
-#include "compat/defs.hpp"
 #include "wireframe.hpp"
 #include "shaders/shader.hpp"
 #include <Corrade/Containers/Array.h>
diff --git a/draw/wireframe.hpp b/draw/wireframe.hpp
index ba42bac3..7b33a7fc 100644
--- a/draw/wireframe.hpp
+++ b/draw/wireframe.hpp
@@ -1,29 +1,18 @@
 #pragma once
-
 #include "src/tile-defs.hpp"
+#include <Corrade/Containers/ArrayView.h>
 #include <Magnum/GL/Buffer.h>
 #include <Magnum/GL/Mesh.h>
 #include "Magnum/GL/Texture.h"
 
-namespace floormat {
-
-struct tile_shader;
-
-namespace wireframe {
+namespace floormat { struct tile_shader; }
 
-template<typename T>
-concept traits = requires (const T& x) {
-    {T::num_vertices} -> std::convertible_to<size_t>;
-    {T::num_indexes} -> std::convertible_to<size_t>;
-    {x.primitive} -> std::convertible_to<GL::MeshPrimitive>;
-    {x.make_vertex_array() } -> std::convertible_to<ArrayView<const void>>;
-    {T::make_index_array() } -> std::convertible_to<ArrayView<const void>>;
-    {x.on_draw()} -> std::same_as<void>;
-};
+namespace floormat::wireframe {
 
 GL::Texture2D make_constant_texture();
 
-struct mesh_base {
+struct mesh_base
+{
     static void set_line_width(float width);
 
 protected:
@@ -37,22 +26,20 @@ protected:
     void set_subdata(ArrayView<const void> array);
 };
 
-} // namespace wireframe
-
-template<wireframe::traits T>
+template<typename T>
 struct wireframe_mesh final : private wireframe::mesh_base
 {
     wireframe_mesh(GL::Texture2D& constant_texture);
     void draw(tile_shader& shader, T traits);
 };
 
-template<wireframe::traits T>
+template<typename T>
 wireframe_mesh<T>::wireframe_mesh(GL::Texture2D& constant_texture) :
     wireframe::mesh_base{T::primitive, T::make_index_array(), T::num_vertices, T::num_indexes, &constant_texture}
 {
 }
 
-template <wireframe::traits T> void wireframe_mesh<T>::draw(tile_shader& shader, T x)
+template <typename T> void wireframe_mesh<T>::draw(tile_shader& shader, T x)
 {
     //_texcoord_buffer.setData({nullptr, sizeof(Vector3) * T::num_vertices}, GL::BufferUsage::DynamicDraw); // orphan the buffer
     set_subdata(x.make_vertex_array());
@@ -60,4 +47,4 @@ template <wireframe::traits T> void wireframe_mesh<T>::draw(tile_shader& shader,
     mesh_base::draw(shader);
 }
 
-} // namespace floormat
+} // namespace floormat::wireframe