summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt1
-rw-r--r--include/cr/Algorithms.h2
-rw-r--r--include/cr/AnyReference.h2
-rw-r--r--include/cr/Array.h2
-rw-r--r--include/cr/ArrayTuple.h2
-rw-r--r--include/cr/ArrayView.h2
-rw-r--r--include/cr/ArrayViewStl.h2
-rw-r--r--include/cr/ArrayViewStlSpan.h2
-rw-r--r--include/cr/BigEnumSet.h2
-rw-r--r--include/cr/BitArray.h2
-rw-r--r--include/cr/BitArrayView.h2
-rw-r--r--include/cr/Containers.h2
-rw-r--r--include/cr/Debug.h2
-rw-r--r--include/cr/EnumSet.h2
-rw-r--r--include/cr/GrowableArray.h2
-rw-r--r--include/cr/Iterable.h2
-rw-r--r--include/cr/LinkedList.h2
-rw-r--r--include/cr/Move.h2
-rw-r--r--include/cr/MoveReference.h2
-rw-r--r--include/cr/Optional.h2
-rw-r--r--include/cr/OptionalStl.h2
-rw-r--r--include/cr/Pair.h2
-rw-r--r--include/cr/PairStl.h2
-rw-r--r--include/cr/Path.h2
-rw-r--r--include/cr/Pointer.h2
-rw-r--r--include/cr/PointerStl.h2
-rw-r--r--include/cr/Reference.h2
-rw-r--r--include/cr/ReferenceStl.h2
-rw-r--r--include/cr/ScopeGuard.h2
-rw-r--r--include/cr/StaticArray.h2
-rw-r--r--include/cr/StridedArrayView.h2
-rw-r--r--include/cr/StridedArrayViewStl.h2
-rw-r--r--include/cr/StridedBitArrayView.h2
-rw-r--r--include/cr/StridedDimensions.h2
-rw-r--r--include/cr/String.h2
-rw-r--r--include/cr/StringIterable.h2
-rw-r--r--include/cr/StringStl.h2
-rw-r--r--include/cr/StringStlHash.h2
-rw-r--r--include/cr/StringStlView.h2
-rw-r--r--include/cr/StringView.h2
-rw-r--r--include/cr/StructuredBindings.h2
-rw-r--r--include/cr/Triple.h2
-rw-r--r--include/cr/TripleStl.h2
-rw-r--r--include/cr/Utility.h2
-rw-r--r--include/cr/iterableHelpers.h2
-rw-r--r--include/mg/Buffer.h2
-rw-r--r--include/mg/Color.h2
-rw-r--r--include/mg/Context.h2
-rw-r--r--include/mg/ImageData.h2
-rw-r--r--include/mg/ImageFormat.h2
-rw-r--r--include/mg/ImageView.h2
-rw-r--r--include/mg/Math.h2
-rw-r--r--include/mg/Mesh.h2
-rw-r--r--include/mg/PixelFormat.h2
-rw-r--r--include/mg/Texture.h2
-rw-r--r--include/mg/TextureFormat.h2
-rw-r--r--include/mg/Timeline.h2
-rw-r--r--include/mg/Vector.h2
-rw-r--r--include/mg/Vector2.h2
-rw-r--r--include/mg/Vector3.h2
-rw-r--r--include/mg/Vector4.h2
-rw-r--r--loader/ground-atlas.hpp7
-rw-r--r--loader/wall-atlas.hpp7
63 files changed, 121 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae6ad761..4de40998 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -199,6 +199,7 @@ else()
endif()
include_directories(.)
+include_directories(include)
#get_property(_fm-sdl2-include-dirs TARGET SDL2::SDL2 PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
get_property(_fm-json-include-dirs TARGET nlohmann_json::nlohmann_json PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
diff --git a/include/cr/Algorithms.h b/include/cr/Algorithms.h
new file mode 100644
index 00000000..e5e049af
--- /dev/null
+++ b/include/cr/Algorithms.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Utility/Algorithms.h>
diff --git a/include/cr/AnyReference.h b/include/cr/AnyReference.h
new file mode 100644
index 00000000..7d28e99c
--- /dev/null
+++ b/include/cr/AnyReference.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/AnyReference.h>
diff --git a/include/cr/Array.h b/include/cr/Array.h
new file mode 100644
index 00000000..60193c3e
--- /dev/null
+++ b/include/cr/Array.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/Array.h>
diff --git a/include/cr/ArrayTuple.h b/include/cr/ArrayTuple.h
new file mode 100644
index 00000000..3491790d
--- /dev/null
+++ b/include/cr/ArrayTuple.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/ArrayTuple.h>
diff --git a/include/cr/ArrayView.h b/include/cr/ArrayView.h
new file mode 100644
index 00000000..4e7626b6
--- /dev/null
+++ b/include/cr/ArrayView.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/ArrayView.h>
diff --git a/include/cr/ArrayViewStl.h b/include/cr/ArrayViewStl.h
new file mode 100644
index 00000000..fa858154
--- /dev/null
+++ b/include/cr/ArrayViewStl.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/ArrayViewStl.h>
diff --git a/include/cr/ArrayViewStlSpan.h b/include/cr/ArrayViewStlSpan.h
new file mode 100644
index 00000000..d6438e09
--- /dev/null
+++ b/include/cr/ArrayViewStlSpan.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/ArrayViewStlSpan.h>
diff --git a/include/cr/BigEnumSet.h b/include/cr/BigEnumSet.h
new file mode 100644
index 00000000..4ec2602d
--- /dev/null
+++ b/include/cr/BigEnumSet.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/BigEnumSet.h>
diff --git a/include/cr/BitArray.h b/include/cr/BitArray.h
new file mode 100644
index 00000000..280abe34
--- /dev/null
+++ b/include/cr/BitArray.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/BitArray.h>
diff --git a/include/cr/BitArrayView.h b/include/cr/BitArrayView.h
new file mode 100644
index 00000000..ddff31ba
--- /dev/null
+++ b/include/cr/BitArrayView.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/BitArrayView.h>
diff --git a/include/cr/Containers.h b/include/cr/Containers.h
new file mode 100644
index 00000000..6feb6cf7
--- /dev/null
+++ b/include/cr/Containers.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/Containers.h>
diff --git a/include/cr/Debug.h b/include/cr/Debug.h
new file mode 100644
index 00000000..ed7dc499
--- /dev/null
+++ b/include/cr/Debug.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Utility/Debug.h>
diff --git a/include/cr/EnumSet.h b/include/cr/EnumSet.h
new file mode 100644
index 00000000..04adebf8
--- /dev/null
+++ b/include/cr/EnumSet.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/EnumSet.h>
diff --git a/include/cr/GrowableArray.h b/include/cr/GrowableArray.h
new file mode 100644
index 00000000..8c526814
--- /dev/null
+++ b/include/cr/GrowableArray.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/GrowableArray.h>
diff --git a/include/cr/Iterable.h b/include/cr/Iterable.h
new file mode 100644
index 00000000..e8aa2c50
--- /dev/null
+++ b/include/cr/Iterable.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/Iterable.h>
diff --git a/include/cr/LinkedList.h b/include/cr/LinkedList.h
new file mode 100644
index 00000000..643db2f0
--- /dev/null
+++ b/include/cr/LinkedList.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/LinkedList.h>
diff --git a/include/cr/Move.h b/include/cr/Move.h
new file mode 100644
index 00000000..47194929
--- /dev/null
+++ b/include/cr/Move.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Utility/Move.h>
diff --git a/include/cr/MoveReference.h b/include/cr/MoveReference.h
new file mode 100644
index 00000000..d32d582e
--- /dev/null
+++ b/include/cr/MoveReference.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/MoveReference.h>
diff --git a/include/cr/Optional.h b/include/cr/Optional.h
new file mode 100644
index 00000000..487f6c28
--- /dev/null
+++ b/include/cr/Optional.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/Optional.h>
diff --git a/include/cr/OptionalStl.h b/include/cr/OptionalStl.h
new file mode 100644
index 00000000..cac4c869
--- /dev/null
+++ b/include/cr/OptionalStl.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/OptionalStl.h>
diff --git a/include/cr/Pair.h b/include/cr/Pair.h
new file mode 100644
index 00000000..0d70ae9e
--- /dev/null
+++ b/include/cr/Pair.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/Pair.h>
diff --git a/include/cr/PairStl.h b/include/cr/PairStl.h
new file mode 100644
index 00000000..4e028b74
--- /dev/null
+++ b/include/cr/PairStl.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/PairStl.h>
diff --git a/include/cr/Path.h b/include/cr/Path.h
new file mode 100644
index 00000000..858d17e4
--- /dev/null
+++ b/include/cr/Path.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Utility/Path.h>
diff --git a/include/cr/Pointer.h b/include/cr/Pointer.h
new file mode 100644
index 00000000..2582242e
--- /dev/null
+++ b/include/cr/Pointer.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/Pointer.h>
diff --git a/include/cr/PointerStl.h b/include/cr/PointerStl.h
new file mode 100644
index 00000000..ab0d0422
--- /dev/null
+++ b/include/cr/PointerStl.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/PointerStl.h>
diff --git a/include/cr/Reference.h b/include/cr/Reference.h
new file mode 100644
index 00000000..556e553f
--- /dev/null
+++ b/include/cr/Reference.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/Reference.h>
diff --git a/include/cr/ReferenceStl.h b/include/cr/ReferenceStl.h
new file mode 100644
index 00000000..1aa49a77
--- /dev/null
+++ b/include/cr/ReferenceStl.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/ReferenceStl.h>
diff --git a/include/cr/ScopeGuard.h b/include/cr/ScopeGuard.h
new file mode 100644
index 00000000..1ac76ba5
--- /dev/null
+++ b/include/cr/ScopeGuard.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/ScopeGuard.h>
diff --git a/include/cr/StaticArray.h b/include/cr/StaticArray.h
new file mode 100644
index 00000000..538deddf
--- /dev/null
+++ b/include/cr/StaticArray.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/StaticArray.h>
diff --git a/include/cr/StridedArrayView.h b/include/cr/StridedArrayView.h
new file mode 100644
index 00000000..ede62bf8
--- /dev/null
+++ b/include/cr/StridedArrayView.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/StridedArrayView.h>
diff --git a/include/cr/StridedArrayViewStl.h b/include/cr/StridedArrayViewStl.h
new file mode 100644
index 00000000..6bce04d2
--- /dev/null
+++ b/include/cr/StridedArrayViewStl.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/StridedArrayViewStl.h>
diff --git a/include/cr/StridedBitArrayView.h b/include/cr/StridedBitArrayView.h
new file mode 100644
index 00000000..e6746c1b
--- /dev/null
+++ b/include/cr/StridedBitArrayView.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/StridedBitArrayView.h>
diff --git a/include/cr/StridedDimensions.h b/include/cr/StridedDimensions.h
new file mode 100644
index 00000000..16b1d9f2
--- /dev/null
+++ b/include/cr/StridedDimensions.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/StridedDimensions.h>
diff --git a/include/cr/String.h b/include/cr/String.h
new file mode 100644
index 00000000..e7734ff0
--- /dev/null
+++ b/include/cr/String.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/String.h>
diff --git a/include/cr/StringIterable.h b/include/cr/StringIterable.h
new file mode 100644
index 00000000..e3939641
--- /dev/null
+++ b/include/cr/StringIterable.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/StringIterable.h>
diff --git a/include/cr/StringStl.h b/include/cr/StringStl.h
new file mode 100644
index 00000000..5a560606
--- /dev/null
+++ b/include/cr/StringStl.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/StringStl.h>
diff --git a/include/cr/StringStlHash.h b/include/cr/StringStlHash.h
new file mode 100644
index 00000000..1a4bbc7b
--- /dev/null
+++ b/include/cr/StringStlHash.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/StringStlHash.h>
diff --git a/include/cr/StringStlView.h b/include/cr/StringStlView.h
new file mode 100644
index 00000000..eb339db6
--- /dev/null
+++ b/include/cr/StringStlView.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/StringStlView.h>
diff --git a/include/cr/StringView.h b/include/cr/StringView.h
new file mode 100644
index 00000000..8bdb73f8
--- /dev/null
+++ b/include/cr/StringView.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/StringView.h>
diff --git a/include/cr/StructuredBindings.h b/include/cr/StructuredBindings.h
new file mode 100644
index 00000000..6a7973b9
--- /dev/null
+++ b/include/cr/StructuredBindings.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/StructuredBindings.h>
diff --git a/include/cr/Triple.h b/include/cr/Triple.h
new file mode 100644
index 00000000..03c5ed41
--- /dev/null
+++ b/include/cr/Triple.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/Triple.h>
diff --git a/include/cr/TripleStl.h b/include/cr/TripleStl.h
new file mode 100644
index 00000000..3c1bbb6a
--- /dev/null
+++ b/include/cr/TripleStl.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/TripleStl.h>
diff --git a/include/cr/Utility.h b/include/cr/Utility.h
new file mode 100644
index 00000000..4ac9aad6
--- /dev/null
+++ b/include/cr/Utility.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Utility/Utility.h>
diff --git a/include/cr/iterableHelpers.h b/include/cr/iterableHelpers.h
new file mode 100644
index 00000000..7e00c369
--- /dev/null
+++ b/include/cr/iterableHelpers.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Corrade/Containers/iterableHelpers.h>
diff --git a/include/mg/Buffer.h b/include/mg/Buffer.h
new file mode 100644
index 00000000..34a7825f
--- /dev/null
+++ b/include/mg/Buffer.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Magnum/GL/Buffer.h>
diff --git a/include/mg/Color.h b/include/mg/Color.h
new file mode 100644
index 00000000..0bc180ab
--- /dev/null
+++ b/include/mg/Color.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Magnum/Math/Color.h>
diff --git a/include/mg/Context.h b/include/mg/Context.h
new file mode 100644
index 00000000..e684869d
--- /dev/null
+++ b/include/mg/Context.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Magnum/GL/Context.h>
diff --git a/include/mg/ImageData.h b/include/mg/ImageData.h
new file mode 100644
index 00000000..9eaa2579
--- /dev/null
+++ b/include/mg/ImageData.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Magnum/Trade/ImageData.h>
diff --git a/include/mg/ImageFormat.h b/include/mg/ImageFormat.h
new file mode 100644
index 00000000..c44fd9d9
--- /dev/null
+++ b/include/mg/ImageFormat.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Magnum/GL/ImageFormat.h>
diff --git a/include/mg/ImageView.h b/include/mg/ImageView.h
new file mode 100644
index 00000000..bd97fed9
--- /dev/null
+++ b/include/mg/ImageView.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Magnum/ImageView.h>
diff --git a/include/mg/Math.h b/include/mg/Math.h
new file mode 100644
index 00000000..a70d392b
--- /dev/null
+++ b/include/mg/Math.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Magnum/Math/Functions.h>
diff --git a/include/mg/Mesh.h b/include/mg/Mesh.h
new file mode 100644
index 00000000..3b2f5c38
--- /dev/null
+++ b/include/mg/Mesh.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Magnum/GL/Mesh.h>
diff --git a/include/mg/PixelFormat.h b/include/mg/PixelFormat.h
new file mode 100644
index 00000000..316ce48a
--- /dev/null
+++ b/include/mg/PixelFormat.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Magnum/GL/PixelFormat.h>
diff --git a/include/mg/Texture.h b/include/mg/Texture.h
new file mode 100644
index 00000000..edfcd44d
--- /dev/null
+++ b/include/mg/Texture.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Magnum/GL/Texture.h>
diff --git a/include/mg/TextureFormat.h b/include/mg/TextureFormat.h
new file mode 100644
index 00000000..4baa6de9
--- /dev/null
+++ b/include/mg/TextureFormat.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Magnum/GL/TextureFormat.h>
diff --git a/include/mg/Timeline.h b/include/mg/Timeline.h
new file mode 100644
index 00000000..388284bd
--- /dev/null
+++ b/include/mg/Timeline.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Magnum/Timeline.h>
diff --git a/include/mg/Vector.h b/include/mg/Vector.h
new file mode 100644
index 00000000..4b8d0c55
--- /dev/null
+++ b/include/mg/Vector.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Magnum/Math/Vector.h>
diff --git a/include/mg/Vector2.h b/include/mg/Vector2.h
new file mode 100644
index 00000000..84ff903b
--- /dev/null
+++ b/include/mg/Vector2.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Magnum/Math/Vector2.h>
diff --git a/include/mg/Vector3.h b/include/mg/Vector3.h
new file mode 100644
index 00000000..e0e8de98
--- /dev/null
+++ b/include/mg/Vector3.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Magnum/Math/Vector3.h>
diff --git a/include/mg/Vector4.h b/include/mg/Vector4.h
new file mode 100644
index 00000000..c12fe4f6
--- /dev/null
+++ b/include/mg/Vector4.h
@@ -0,0 +1,2 @@
+#pragma once
+#include <Magnum/Math/Vector4.h>
diff --git a/loader/ground-atlas.hpp b/loader/ground-atlas.hpp
deleted file mode 100644
index b388f543..00000000
--- a/loader/ground-atlas.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-namespace floormat::loader_detail {
-
-
-
-} // namespace floormat::loader_detail
diff --git a/loader/wall-atlas.hpp b/loader/wall-atlas.hpp
deleted file mode 100644
index b388f543..00000000
--- a/loader/wall-atlas.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-namespace floormat::loader_detail {
-
-
-
-} // namespace floormat::loader_detail