From a5d5ad64ff97201e2ccf83c1d79008190906ebcd Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 9 Apr 2023 22:46:17 +0200 Subject: move scenery draw scratch buffers to central place --- draw/anim.cpp | 2 +- draw/anim.hpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'draw') diff --git a/draw/anim.cpp b/draw/anim.cpp index b99b02e3..b24dffa7 100644 --- a/draw/anim.cpp +++ b/draw/anim.cpp @@ -59,7 +59,7 @@ void anim_mesh::draw(tile_shader& shader, const Vector2i& win_size, chunk& c, st { constexpr auto quad_index_count = 6; - auto [mesh_, es, size] = c.ensure_scenery_mesh(_draw_array); + auto [mesh_, es, size] = c.ensure_scenery_mesh({ _draw_array, _draw_vertexes, _draw_indexes }); GL::MeshView mesh{mesh_}; const auto max_index = uint32_t(size*quad_index_count - 1); diff --git a/draw/anim.hpp b/draw/anim.hpp index eaa191f5..da484d6c 100644 --- a/draw/anim.hpp +++ b/draw/anim.hpp @@ -44,6 +44,9 @@ private: using quad_data = std::array; Array _draw_array; + std::vector> _draw_indexes; + std::vector> _draw_vertexes; + GL::Mesh _mesh; GL::Buffer _vertex_buffer{quad_data{}, Magnum::GL::BufferUsage::DynamicDraw}, _index_buffer{make_index_array()}; -- cgit v1.2.3