From acdace16824b741948b02da0bcc7d0d059c7f683 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 9 Oct 2022 03:11:56 +0200 Subject: a --- src/wireframe-mesh.hpp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'src/wireframe-mesh.hpp') diff --git a/src/wireframe-mesh.hpp b/src/wireframe-mesh.hpp index 2a7cf10c..26dfb9ec 100644 --- a/src/wireframe-mesh.hpp +++ b/src/wireframe-mesh.hpp @@ -19,38 +19,32 @@ namespace wireframe template concept traits = requires (const T& x) { {T::num_vertices} -> std::convertible_to; - {T::num_indexes} -> std::convertible_to; {x.primitive} -> std::convertible_to; {x.make_vertex_array() } -> std::same_as>; - {x.make_index_array() } -> std::same_as>; }; struct null final { static constexpr auto primitive = GL::MeshPrimitive::Triangles; - static constexpr std::size_t num_vertices = 0, num_indexes = 0; + static constexpr std::size_t num_vertices = 0; static GL::RectangleTexture make_constant_texture(); static std::array make_vertex_array() { return {}; } - static std::array make_index_array() { return {}; } }; struct quad final { quad(Vector3 center, Vector2 size); - constexpr quad() = default; - static constexpr std::size_t num_vertices = 4, num_indexes = 6; - static constexpr GL::MeshPrimitive primitive = GL::MeshPrimitive::Triangles; + static constexpr std::size_t num_vertices = 4; + static constexpr GL::MeshPrimitive primitive = GL::MeshPrimitive::LineLoop; using vertex_array = std::array; - using index_array = std::array; vertex_array make_vertex_array() const; - static index_array make_index_array() ; private: - Vector3 center = {}; - Vector2 size = { TILE_SIZE[0], TILE_SIZE[1] }; + Vector3 center; + Vector2 size; }; } // namespace wireframe @@ -63,8 +57,7 @@ struct wireframe_mesh final private: GL::Buffer _vertex_buffer{std::array{}, GL::BufferUsage::DynamicDraw}, - _texcoords_buffer{std::array{}, GL::BufferUsage::DynamicDraw}, - _index_buffer{std::array{}, GL::BufferUsage::DynamicDraw}; + _texcoords_buffer{std::array{}, GL::BufferUsage::DynamicDraw}; GL::RectangleTexture _texture = wireframe::null::make_constant_texture(); GL::Mesh _mesh; }; -- cgit v1.2.3