From 860189e34fb24cc908c306489bf2d62e6c13f5a8 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 13 Jan 2024 03:52:43 +0100
Subject: w

---
 draw/anim.cpp        | 5 ++++-
 draw/anim.hpp        | 5 ++---
 draw/box.hpp         | 2 +-
 draw/quad-floor.hpp  | 2 +-
 draw/quad-wall-n.hpp | 2 +-
 draw/quad-wall-w.hpp | 2 +-
 draw/quad.hpp        | 2 +-
 7 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'draw')

diff --git a/draw/anim.cpp b/draw/anim.cpp
index 7feec47d..ad71611a 100644
--- a/draw/anim.cpp
+++ b/draw/anim.cpp
@@ -6,13 +6,16 @@
 #include "src/chunk-scenery.hpp"
 #include "src/scenery.hpp"
 #include <cstdio>
+#include <Corrade/Containers/ArrayViewStl.h>
 #include <Corrade/Containers/Optional.h>
 #include <Magnum/GL/MeshView.h>
 #include <Magnum/GL/Texture.h>
 
 namespace floormat {
 
-anim_mesh::anim_mesh()
+anim_mesh::anim_mesh() :
+    _vertex_buffer{quad_data{}, Magnum::GL::BufferUsage::DynamicDraw},
+    _index_buffer{make_index_array()}
 {
     _mesh.setCount(6)
         .addVertexBuffer(_vertex_buffer, 0, tile_shader::Position{}, tile_shader::TextureCoordinates{}, tile_shader::Depth{})
diff --git a/draw/anim.hpp b/draw/anim.hpp
index 18e57333..54fffd38 100644
--- a/draw/anim.hpp
+++ b/draw/anim.hpp
@@ -4,7 +4,7 @@
 #include "src/chunk.hpp"
 #include <array>
 #include <Corrade/Containers/Array.h>
-#include <Corrade/Containers/ArrayViewStl.h>
+#include <Corrade/Containers/ArrayView.h>
 #include <Magnum/Magnum.h>
 #include <Magnum/Math/Vector2.h>
 #include <Magnum/Math/Vector3.h>
@@ -49,8 +49,7 @@ private:
     Array<std::array<chunk::vertex, 4>> _draw_vertexes;
 
     GL::Mesh _mesh;
-    GL::Buffer _vertex_buffer{quad_data{}, Magnum::GL::BufferUsage::DynamicDraw},
-               _index_buffer{make_index_array()};
+    GL::Buffer _vertex_buffer, _index_buffer;
 };
 
 } // namespace floormat
diff --git a/draw/box.hpp b/draw/box.hpp
index 26e5485f..82d946d8 100644
--- a/draw/box.hpp
+++ b/draw/box.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include <array>
-#include <Corrade/Containers/ArrayViewStl.h>
+#include <Corrade/Containers/ArrayView.h>
 #include <Magnum/Math/Vector3.h>
 #include <Magnum/GL/Mesh.h>
 
diff --git a/draw/quad-floor.hpp b/draw/quad-floor.hpp
index b289ab84..f44bf7af 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/ArrayViewStl.h>
+#include <Corrade/Containers/ArrayView.h>
 
 namespace floormat::wireframe {
 
diff --git a/draw/quad-wall-n.hpp b/draw/quad-wall-n.hpp
index d607ffe3..6993b08a 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/ArrayViewStl.h>
+#include <Corrade/Containers/ArrayView.h>
 
 namespace floormat::wireframe {
 
diff --git a/draw/quad-wall-w.hpp b/draw/quad-wall-w.hpp
index a96e8d83..b7e402a4 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/ArrayViewStl.h>
+#include <Corrade/Containers/ArrayView.h>
 
 namespace floormat::wireframe {
 
diff --git a/draw/quad.hpp b/draw/quad.hpp
index c9345f64..466299f7 100644
--- a/draw/quad.hpp
+++ b/draw/quad.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include <array>
-#include <Corrade/Containers/ArrayViewStl.h>
+#include <Corrade/Containers/ArrayView.h>
 #include <Magnum/Math/Vector3.h>
 #include <Magnum/GL/Mesh.h>
 
-- 
cgit v1.2.3