diff options
Diffstat (limited to 'draw')
-rw-r--r-- | draw/wireframe-mesh.cpp | 4 | ||||
-rw-r--r-- | draw/wireframe-mesh.hpp | 8 | ||||
-rw-r--r-- | draw/wireframe-quad.hpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/draw/wireframe-mesh.cpp b/draw/wireframe-mesh.cpp index 1304f141..55af19a1 100644 --- a/draw/wireframe-mesh.cpp +++ b/draw/wireframe-mesh.cpp @@ -27,7 +27,7 @@ GL::Texture2D mesh_base::make_constant_texture() return tex; } -mesh_base::mesh_base(GL::MeshPrimitive primitive, Containers::ArrayView<const void> index_data, +mesh_base::mesh_base(GL::MeshPrimitive primitive, ArrayView<const void> index_data, std::size_t num_vertices, std::size_t num_indexes) : _vertex_buffer{Containers::Array<Vector3>{ValueInit, num_vertices}, GL::BufferUsage::DynamicDraw}, _texcoords_buffer{Containers::Array<Vector2>{ValueInit, num_vertices}}, @@ -47,7 +47,7 @@ void mesh_base::draw(tile_shader& shader) shader.draw(_mesh); } -void mesh_base::set_subdata(Containers::ArrayView<const void> array) +void mesh_base::set_subdata(ArrayView<const void> array) { _vertex_buffer.setSubData(0, array); } diff --git a/draw/wireframe-mesh.hpp b/draw/wireframe-mesh.hpp index f03659d3..9d736419 100644 --- a/draw/wireframe-mesh.hpp +++ b/draw/wireframe-mesh.hpp @@ -17,8 +17,8 @@ concept traits = requires (const T& x) { {T::num_vertices} -> std::convertible_to<std::size_t>; {T::num_indexes} -> std::convertible_to<std::size_t>; {x.primitive} -> std::convertible_to<GL::MeshPrimitive>; - {x.make_vertex_array() } -> std::convertible_to<Containers::ArrayView<const void>>; - {T::make_index_array() } -> std::convertible_to<Containers::ArrayView<const void>>; + {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>; }; @@ -29,10 +29,10 @@ struct mesh_base GL::Texture2D _texture = make_constant_texture(); GL::Mesh _mesh; - mesh_base(GL::MeshPrimitive primitive, Containers::ArrayView<const void> index_data, + mesh_base(GL::MeshPrimitive primitive, ArrayView<const void> index_data, std::size_t num_vertices, std::size_t num_indexes); void draw(tile_shader& shader); - void set_subdata(Containers::ArrayView<const void> array); + void set_subdata(ArrayView<const void> array); }; } // namespace wireframe diff --git a/draw/wireframe-quad.hpp b/draw/wireframe-quad.hpp index ccefa000..050eeb78 100644 --- a/draw/wireframe-quad.hpp +++ b/draw/wireframe-quad.hpp @@ -17,7 +17,7 @@ struct quad final using vertex_array = std::array<Vector3, num_vertices>; - static Containers::ArrayView<const void> make_index_array() { return {}; } + static ArrayView<const void> make_index_array() { return {}; } vertex_array make_vertex_array() const; void on_draw() const; |