From dcac3d7bd83c0cbdddae433e98598289bb1b06cd Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 8 Oct 2022 22:47:54 +0200
Subject: a

---
 src/wireframe-mesh.hpp | 37 ++++++++++++++-----------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

(limited to 'src/wireframe-mesh.hpp')

diff --git a/src/wireframe-mesh.hpp b/src/wireframe-mesh.hpp
index 28619e90..855e673a 100644
--- a/src/wireframe-mesh.hpp
+++ b/src/wireframe-mesh.hpp
@@ -14,67 +14,58 @@ namespace Magnum::Examples {
 
 struct tile_shader;
 
-namespace wireframe_traits {
+namespace wireframe
+{
 
 template<typename T>
 concept traits = requires (const T& x) {
     {T::num_vertices} -> std::convertible_to<std::size_t>;
-    {T::num_indices} -> std::convertible_to<std::size_t>;
     {x.primitive} -> std::convertible_to<GL::MeshPrimitive>;
-    {x.make_vertex_positions_array() } -> std::same_as<std::array<Vector3, T::num_vertices>>;
-    {x.make_index_array() } -> std::same_as<std::array<UnsignedShort, T::num_indices>>;
+    {x.make_vertex_array() } -> std::same_as<std::array<Vector3, T::num_vertices>>;
 };
 
 
 struct null final
 {
     static constexpr auto primitive = GL::MeshPrimitive::Triangles;
-    static constexpr std::size_t num_vertices = 0, num_indices = 0;
+    static constexpr std::size_t num_vertices = 0;
     static GL::RectangleTexture make_constant_texture();
-    static std::array<Vector3, 0> make_vertex_positions_array() { return {}; }
-    static std::array<UnsignedShort, 0> make_index_array() { return {}; }
+    static std::array<Vector3, 0> make_vertex_array() { return {}; }
 };
 
 struct quad final
 {
-    quad(Vector3 center, Vector2 size = {TILE_SIZE[0], TILE_SIZE[1]});
+    quad(Vector3 center, Vector2 size);
     constexpr quad() = default;
 
     static constexpr std::size_t num_vertices = 4;
-    static constexpr std::size_t num_indices = 0;
     static constexpr GL::MeshPrimitive primitive = GL::MeshPrimitive::LineLoop;
 
     using vertex_array = std::array<Vector3, num_vertices>;
-    using index_array = std::array<UnsignedShort, num_indices>;
-
-    vertex_array make_vertex_positions_array() const;
-    static index_array make_index_array() { return {}; }
+    vertex_array make_vertex_array() const;
 
 private:
     Vector3 center = {};
     Vector2 size = { TILE_SIZE[0], TILE_SIZE[1] };
 };
 
-} // namespace wireframe_traits
-
+} // namespace wireframe
 
-template<wireframe_traits::traits T>
+template<wireframe::traits T>
 struct wireframe_mesh final
 {
     wireframe_mesh();
     void draw(tile_shader& shader, T traits);
 
 private:
-    GL::Buffer _positions_buffer{},
-               _texcoords_buffer{std::array<Vector2, T::num_vertices>{}},
-               _index_buffer{T::num_indices == 0 ? GL::Buffer{NoCreate} : GL::Buffer{}};
-    GL::RectangleTexture _texture = wireframe_traits::null::make_constant_texture();
+    GL::Buffer _vertex_buffer{}, _texcoords_buffer{std::array<Vector2, T::num_vertices>{}};
+    GL::RectangleTexture _texture = wireframe::null::make_constant_texture();
     GL::Mesh _mesh;
 };
 
-extern template struct wireframe_mesh<wireframe_traits::null>;
-extern template struct wireframe_mesh<wireframe_traits::quad>;
+extern template struct wireframe_mesh<wireframe::null>;
+extern template struct wireframe_mesh<wireframe::quad>;
 
-using wireframe_quad_mesh = wireframe_mesh<wireframe_traits::quad>;
+using wireframe_quad_mesh = wireframe_mesh<wireframe::quad>;
 
 } // namespace Magnum::Examples
-- 
cgit v1.2.3