From 079f3aa5f99125f76d39cd7c08fc1a388981089d Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Wed, 28 Feb 2024 16:51:45 +0100
Subject: use Corrade/Magnum header wrappers in some files

---
 bench/dijkstra.cpp            | 4 ++--
 bench/raycast.cpp             | 2 +-
 editor/tests-private.hpp      | 4 ++--
 editor/tests/path-test.cpp    | 4 ++--
 editor/tests/raycast-test.cpp | 2 +-
 editor/tests/region-test.cpp  | 2 +-
 external/magnum               | 2 +-
 src/chunk-region.cpp          | 7 ++++---
 test/raycast.cpp              | 2 +-
 9 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/bench/dijkstra.cpp b/bench/dijkstra.cpp
index fa998d56..5e74c75d 100644
--- a/bench/dijkstra.cpp
+++ b/bench/dijkstra.cpp
@@ -4,8 +4,8 @@
 #include "src/world.hpp"
 #include "loader/loader.hpp"
 #include <benchmark/benchmark.h>
-#include <Corrade/Containers/Optional.h>
-#include <Magnum/Math/Functions.h>
+#include <cr/Optional.h>
+#include <mg/Math.h>
 
 namespace floormat {
 
diff --git a/bench/raycast.cpp b/bench/raycast.cpp
index d77bee85..1885c05c 100644
--- a/bench/raycast.cpp
+++ b/bench/raycast.cpp
@@ -4,7 +4,7 @@
 #include "src/wall-atlas.hpp"
 #include "loader/loader.hpp"
 #include <benchmark/benchmark.h>
-#include <Magnum/Math/Functions.h>
+#include <mg/Math.h>
 
 namespace floormat {
 
diff --git a/editor/tests-private.hpp b/editor/tests-private.hpp
index 4a9cf07a..9a39d07d 100644
--- a/editor/tests-private.hpp
+++ b/editor/tests-private.hpp
@@ -4,8 +4,8 @@
 #include "src/point.hpp"
 #include "src/object-id.hpp"
 #include "floormat/events.hpp"
-#include <Corrade/Containers/StringView.h>
-#include <Corrade/Containers/Pointer.h>
+#include <cr/StringView.h>
+#include <cr/Pointer.h>
 
 namespace floormat { struct app; }
 
diff --git a/editor/tests/path-test.cpp b/editor/tests/path-test.cpp
index bdaeaae0..68c7fee9 100644
--- a/editor/tests/path-test.cpp
+++ b/editor/tests/path-test.cpp
@@ -8,8 +8,8 @@
 #include "src/critter.hpp"
 #include "shaders/shader.hpp"
 #include "../imgui-raii.hpp"
-#include <Magnum/Math/Functions.h>
-#include <Magnum/Math/Color.h>
+#include <mg/Math.h>
+#include <mg/Color.h>
 
 namespace floormat::tests {
 
diff --git a/editor/tests/raycast-test.cpp b/editor/tests/raycast-test.cpp
index 88e21f1d..a1f9aa94 100644
--- a/editor/tests/raycast-test.cpp
+++ b/editor/tests/raycast-test.cpp
@@ -9,7 +9,7 @@
 #include <cinttypes>
 #include <array>
 #include <vector>
-#include <Magnum/Math/Color.h>
+#include <mg/Color.h>
 
 namespace floormat::tests {
 
diff --git a/editor/tests/region-test.cpp b/editor/tests/region-test.cpp
index 9b027636..c3770e64 100644
--- a/editor/tests/region-test.cpp
+++ b/editor/tests/region-test.cpp
@@ -7,7 +7,7 @@
 #include "../imgui-raii.hpp"
 #include "floormat/main.hpp"
 #include <bitset>
-#include <Magnum/Math/Vector2.h>
+#include <mg/Vector2.h>
 
 namespace floormat::tests {
 
diff --git a/external/magnum b/external/magnum
index d96df9c2..09336bc1 160000
--- a/external/magnum
+++ b/external/magnum
@@ -1 +1 @@
-Subproject commit d96df9c24dec1dca50c1e9e8eca7b76f04163e0c
+Subproject commit 09336bc1d845ea55c39ae10f55f1dd18e1f085a9
diff --git a/src/chunk-region.cpp b/src/chunk-region.cpp
index a6968866..8bf73231 100644
--- a/src/chunk-region.cpp
+++ b/src/chunk-region.cpp
@@ -7,9 +7,10 @@
 #include "compat/function2.hpp"
 #include <bit>
 #include <array>
-#include <Corrade/Containers/GrowableArray.h>
-#include <Magnum/Math/Functions.h>
-#include <Magnum/Timeline.h>
+#include <cr/GrowableArray.h>
+#include <cr/String.h>
+#include <mg/Math.h>
+#include <mg/Timeline.h>
 
 namespace floormat {
 
diff --git a/test/raycast.cpp b/test/raycast.cpp
index c5ba7cfb..fffaae0f 100644
--- a/test/raycast.cpp
+++ b/test/raycast.cpp
@@ -4,7 +4,7 @@
 #include "src/world.hpp"
 #include "loader/loader.hpp"
 #include "loader/wall-cell.hpp"
-#include <Magnum/Math/Functions.h>
+#include <mg/Math.h>
 
 namespace floormat {
 
-- 
cgit v1.2.3