w

27 files changed, 28 insertions, 42 deletions

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>
 
diff --git a/editor/ground-editor.cpp b/editor/ground-editor.cpp
index f88bc25a..4253575c 100644
--- a/editor/ground-editor.cpp
+++ b/editor/ground-editor.cpp
@@ -6,7 +6,6 @@
 #include "keys.hpp"
 #include "loader/loader.hpp"
 #include "compat/exception.hpp"
-#include <Corrade/Containers/PairStl.h>
 #include <Corrade/Utility/Path.h>
 
 namespace floormat {
diff --git a/editor/inspect-types.cpp b/editor/inspect-types.cpp
index 7690d91d..a6c30ed4 100644
--- a/editor/inspect-types.cpp
+++ b/editor/inspect-types.cpp
@@ -9,7 +9,7 @@
 #include "src/critter.hpp"
 
 #include "src/light.hpp"
-#include <Corrade/Containers/ArrayViewStl.h>
+#include <Corrade/Containers/ArrayView.h>
 #include <imgui.h>
 
 namespace floormat::entities {
diff --git a/loader/atlas.cpp b/loader/atlas.cpp
index 6ad91c56..f61502fe 100644
--- a/loader/atlas.cpp
+++ b/loader/atlas.cpp
@@ -5,10 +5,10 @@
 #include "src/anim-atlas.hpp"
 #include <cstdio>
 #include <algorithm>
-#include <Corrade/Containers/ArrayViewStl.h>
+#include <Corrade/Containers/ArrayView.h>
 #include <Corrade/Containers/Pair.h>
 #include <Corrade/Containers/StridedArrayView.h>
-#include <Corrade/Containers/StringStlView.h>
+#include <Corrade/Containers/String.h>
 #include <Corrade/Utility/Path.h>
 #include <Magnum/Trade/ImageData.h>
 
@@ -51,7 +51,7 @@ ArrayView<const String> loader_impl::anim_atlas_list()
     if (anim_atlases.empty())
         get_anim_atlas_list();
     fm_assert(!anim_atlases.empty());
-    return anim_atlases;
+    return { anim_atlases.data(), anim_atlases.size() };
 }
 
 std::shared_ptr<anim_atlas> loader_impl::anim_atlas(StringView name, StringView dir) noexcept(false)
diff --git a/loader/json.cpp b/loader/json.cpp
index 31777aa2..7b12b784 100644
--- a/loader/json.cpp
+++ b/loader/json.cpp
@@ -7,7 +7,6 @@
 #include "serialize/scenery.hpp"
 #include "loader/scenery.hpp"
 #include <Corrade/Containers/ArrayViewStl.h>
-#include <Corrade/Containers/StringStlView.h>
 #include <Corrade/Utility/Path.h>
 
 namespace floormat::loader_detail {
diff --git a/loader/texture.cpp b/loader/texture.cpp
index a68a6337..8ac9e793 100644
--- a/loader/texture.cpp
+++ b/loader/texture.cpp
@@ -5,7 +5,6 @@
 #include "compat/strerror.hpp"
 #include <cstring>
 #include <cstdio>
-#include <Corrade/Containers/StringStlView.h>
 #include <Corrade/Utility/Path.h>
 #include <Magnum/Trade/ImageData.h>
 
diff --git a/loader/vobj.cpp b/loader/vobj.cpp
index 66aef1cd..db277410 100644
--- a/loader/vobj.cpp
+++ b/loader/vobj.cpp
@@ -18,12 +18,6 @@ struct vobj {
 
 using floormat::loader_detail::vobj;
 
-template<>
-struct nlohmann::adl_serializer<vobj> {
-    static void to_json(json& j, const vobj& val);
-    static void from_json(const json& j, vobj& val);
-};
-
 void nlohmann::adl_serializer<vobj>::to_json(json& j, const vobj& val)
 {
     j["name"] = val.name;
diff --git a/serialize/corrade-string.cpp b/serialize/corrade-string.cpp
index 7b772d4c..9820e37a 100644
--- a/serialize/corrade-string.cpp
+++ b/serialize/corrade-string.cpp
@@ -1,6 +1,6 @@
 #include "corrade-string.hpp"
+#include <Corrade/Containers/StringStlView.h>
 #include <nlohmann/json.hpp>
-#include <string_view>
 
 using namespace floormat;
 
diff --git a/serialize/json-helper.cpp b/serialize/json-helper.cpp
index b9853794..315dec2d 100644
--- a/serialize/json-helper.cpp
+++ b/serialize/json-helper.cpp
@@ -3,7 +3,7 @@
 #include "compat/strerror.hpp"
 #include <concepts>
 #include <fstream>
-#include <Corrade/Containers/StringStlView.h>
+#include <Corrade/Containers/StringView.h>
 
 namespace floormat {
 
diff --git a/serialize/packbits.hpp b/serialize/packbits.hpp
index 41e15177..954f86b5 100644
--- a/serialize/packbits.hpp
+++ b/serialize/packbits.hpp
@@ -94,6 +94,4 @@ struct Bits_ final
     static constexpr auto bits = N;
 };
 
-
-
 } // namespace floormat::Pack
diff --git a/serialize/pass-mode.cpp b/serialize/pass-mode.cpp
index e06bf99d..c784855a 100644
--- a/serialize/pass-mode.cpp
+++ b/serialize/pass-mode.cpp
@@ -2,7 +2,7 @@
 #include "compat/exception.hpp"
 #include "serialize/corrade-string.hpp"
 #include <nlohmann/json.hpp>
-#include <Corrade/Containers/StringStlView.h>
+#include <Corrade/Containers/String.h>
 
 namespace nlohmann {
 
diff --git a/serialize/scenery.cpp b/serialize/scenery.cpp
index c3e6bda8..41b99218 100644
--- a/serialize/scenery.cpp
+++ b/serialize/scenery.cpp
@@ -7,7 +7,7 @@
 #include "loader/scenery.hpp"
 #include "serialize/pass-mode.hpp"
 #include "serialize/magnum-vector.hpp"
-#include <Corrade/Containers/StringStlView.h>
+#include <Corrade/Containers/String.h>
 #include <nlohmann/json.hpp>
 
 namespace {
diff --git a/shaders/lightmap.cpp b/shaders/lightmap.cpp
index f1d0e088..004a4ace 100644
--- a/shaders/lightmap.cpp
+++ b/shaders/lightmap.cpp
@@ -10,11 +10,12 @@
 #include "loader/loader.hpp"
 #include <utility>
 #include <Corrade/Containers/StructuredBindings.h>
+#include <Corrade/Containers/ArrayViewStl.h>
 #include <Corrade/Containers/Pair.h>
 #include <Corrade/Containers/Iterable.h>
-#include <Corrade/Containers/ArrayViewStl.h>
 #include <Magnum/Math/Functions.h>
 #include <Magnum/GL/Context.h>
+#include <Magnum/GL/Buffer.h>
 #include <Magnum/GL/MeshView.h>
 #include <Magnum/GL/Shader.h>
 #include <Magnum/GL/Version.h>
diff --git a/shaders/shader.cpp b/shaders/shader.cpp
index a4ec9dad..8ceb5c44 100644
--- a/shaders/shader.cpp
+++ b/shaders/shader.cpp
@@ -1,10 +1,9 @@
-#include "shaders/shader.hpp"
+#include "shader.hpp"
 #include "loader/loader.hpp"
 #include "compat/assert.hpp"
 #include "src/local-coords.hpp"
 #include <cmath>
 #include <Corrade/Containers/Iterable.h>
-#include <Corrade/Containers/StringStl.h>
 #include <Magnum/Math/Vector4.h>
 #include <Magnum/GL/Context.h>
 #include <Magnum/GL/Shader.h>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f8d3e032..6f1e78cd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,3 +10,5 @@ target_link_libraries(
     fmt::fmt
     tsl::robin_map
 )
+
+#target_precompile_headers(${self} PUBLIC precomp.hpp)
diff --git a/src/anim.hpp b/src/anim.hpp
index e505f29f..3b4d70a9 100644
--- a/src/anim.hpp
+++ b/src/anim.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <vector>
+#include <vector> // todo use <Corrade/Containers/GrowableArray.h>
 #include <Corrade/Containers/String.h>
 #include <Magnum/Magnum.h>
 #include <Magnum/Math/Vector2.h>
diff --git a/src/chunk-render.cpp b/src/chunk-render.cpp
index ffaa33ec..459f51b7 100644
--- a/src/chunk-render.cpp
+++ b/src/chunk-render.cpp
@@ -2,7 +2,6 @@
 #include "ground-atlas.hpp"
 #include "quads.hpp"
 #include "shaders/shader.hpp"
-#include "compat/defs.hpp"
 #include <algorithm>
 #include <Corrade/Containers/ArrayViewStl.h>
 #include <Magnum/GL/Buffer.h>
diff --git a/src/chunk-scenery.cpp b/src/chunk-scenery.cpp
index 807b1d70..50840453 100644
--- a/src/chunk-scenery.cpp
+++ b/src/chunk-scenery.cpp
@@ -5,7 +5,7 @@
 #include "scenery.hpp"
 #include "quads.hpp"
 #include <bit>
-#include <Corrade/Containers/ArrayViewStl.h>
+#include <Corrade/Containers/ArrayView.h>
 #include <Magnum/GL/Buffer.h>
 
 namespace floormat {
diff --git a/src/path-search.cpp b/src/path-search.cpp
index 2f799f73..94da7f10 100644
--- a/src/path-search.cpp
+++ b/src/path-search.cpp
@@ -4,10 +4,6 @@
 #include "pass-mode.hpp"
 #include "RTree-search.hpp"
 #include "compat/function2.hpp"
-#include <Corrade/Containers/PairStl.h>
-#include <Magnum/Math/Functions.h>
-#include <Magnum/Math/Range.h>
-#include <Magnum/Math/BitVector.h>
 
 namespace floormat {
 
diff --git a/test/wall-atlas.cpp b/test/wall-atlas.cpp
index 0790d38a..14046a09 100644
--- a/test/wall-atlas.cpp
+++ b/test/wall-atlas.cpp
@@ -4,7 +4,7 @@
 #include "serialize/json-helper.hpp"
 #include "loader/loader.hpp"
 #include "compat/exception.hpp"
-#include <Corrade/Containers/StringStl.h>
+#include <Corrade/Containers/String.h>
 #include <Corrade/Utility/Path.h>
 
 namespace floormat::Wall::detail {
diff --git a/wall-tileset-tool/main.cpp b/wall-tileset-tool/main.cpp
index c23b3464..f233941f 100644
--- a/wall-tileset-tool/main.cpp
+++ b/wall-tileset-tool/main.cpp
@@ -12,11 +12,9 @@
 #include <utility>
 #include <tuple>
 #include <Corrade/Containers/StringView.h>
-#include <Corrade/Containers/StringStl.h>
+#include <Corrade/Containers/String.h>
 #include <Corrade/Containers/StringIterable.h>
-#include <Corrade/Containers/TripleStl.h>
 #include <Corrade/Utility/Path.h>
-#include <Corrade/Containers/StringIterable.h>
 #include <Corrade/Utility/DebugStl.h>
 #include <Corrade/Utility/Arguments.h>
 #include <Magnum/Math/Functions.h>