From d30921ac0b361639c10ae9d337cbf16cc3b7d359 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 9 Feb 2024 17:54:35 +0100 Subject: let's try adding aliases to Corrade/Magnum headers --- CMakeLists.txt | 1 + include/cr/Algorithms.h | 2 ++ include/cr/AnyReference.h | 2 ++ include/cr/Array.h | 2 ++ include/cr/ArrayTuple.h | 2 ++ include/cr/ArrayView.h | 2 ++ include/cr/ArrayViewStl.h | 2 ++ include/cr/ArrayViewStlSpan.h | 2 ++ include/cr/BigEnumSet.h | 2 ++ include/cr/BitArray.h | 2 ++ include/cr/BitArrayView.h | 2 ++ include/cr/Containers.h | 2 ++ include/cr/Debug.h | 2 ++ include/cr/EnumSet.h | 2 ++ include/cr/GrowableArray.h | 2 ++ include/cr/Iterable.h | 2 ++ include/cr/LinkedList.h | 2 ++ include/cr/Move.h | 2 ++ include/cr/MoveReference.h | 2 ++ include/cr/Optional.h | 2 ++ include/cr/OptionalStl.h | 2 ++ include/cr/Pair.h | 2 ++ include/cr/PairStl.h | 2 ++ include/cr/Path.h | 2 ++ include/cr/Pointer.h | 2 ++ include/cr/PointerStl.h | 2 ++ include/cr/Reference.h | 2 ++ include/cr/ReferenceStl.h | 2 ++ include/cr/ScopeGuard.h | 2 ++ include/cr/StaticArray.h | 2 ++ include/cr/StridedArrayView.h | 2 ++ include/cr/StridedArrayViewStl.h | 2 ++ include/cr/StridedBitArrayView.h | 2 ++ include/cr/StridedDimensions.h | 2 ++ include/cr/String.h | 2 ++ include/cr/StringIterable.h | 2 ++ include/cr/StringStl.h | 2 ++ include/cr/StringStlHash.h | 2 ++ include/cr/StringStlView.h | 2 ++ include/cr/StringView.h | 2 ++ include/cr/StructuredBindings.h | 2 ++ include/cr/Triple.h | 2 ++ include/cr/TripleStl.h | 2 ++ include/cr/Utility.h | 2 ++ include/cr/iterableHelpers.h | 2 ++ include/mg/Buffer.h | 2 ++ include/mg/Color.h | 2 ++ include/mg/Context.h | 2 ++ include/mg/ImageData.h | 2 ++ include/mg/ImageFormat.h | 2 ++ include/mg/ImageView.h | 2 ++ include/mg/Math.h | 2 ++ include/mg/Mesh.h | 2 ++ include/mg/PixelFormat.h | 2 ++ include/mg/Texture.h | 2 ++ include/mg/TextureFormat.h | 2 ++ include/mg/Timeline.h | 2 ++ include/mg/Vector.h | 2 ++ include/mg/Vector2.h | 2 ++ include/mg/Vector3.h | 2 ++ include/mg/Vector4.h | 2 ++ loader/ground-atlas.hpp | 7 ------- loader/wall-atlas.hpp | 7 ------- 63 files changed, 121 insertions(+), 14 deletions(-) create mode 100644 include/cr/Algorithms.h create mode 100644 include/cr/AnyReference.h create mode 100644 include/cr/Array.h create mode 100644 include/cr/ArrayTuple.h create mode 100644 include/cr/ArrayView.h create mode 100644 include/cr/ArrayViewStl.h create mode 100644 include/cr/ArrayViewStlSpan.h create mode 100644 include/cr/BigEnumSet.h create mode 100644 include/cr/BitArray.h create mode 100644 include/cr/BitArrayView.h create mode 100644 include/cr/Containers.h create mode 100644 include/cr/Debug.h create mode 100644 include/cr/EnumSet.h create mode 100644 include/cr/GrowableArray.h create mode 100644 include/cr/Iterable.h create mode 100644 include/cr/LinkedList.h create mode 100644 include/cr/Move.h create mode 100644 include/cr/MoveReference.h create mode 100644 include/cr/Optional.h create mode 100644 include/cr/OptionalStl.h create mode 100644 include/cr/Pair.h create mode 100644 include/cr/PairStl.h create mode 100644 include/cr/Path.h create mode 100644 include/cr/Pointer.h create mode 100644 include/cr/PointerStl.h create mode 100644 include/cr/Reference.h create mode 100644 include/cr/ReferenceStl.h create mode 100644 include/cr/ScopeGuard.h create mode 100644 include/cr/StaticArray.h create mode 100644 include/cr/StridedArrayView.h create mode 100644 include/cr/StridedArrayViewStl.h create mode 100644 include/cr/StridedBitArrayView.h create mode 100644 include/cr/StridedDimensions.h create mode 100644 include/cr/String.h create mode 100644 include/cr/StringIterable.h create mode 100644 include/cr/StringStl.h create mode 100644 include/cr/StringStlHash.h create mode 100644 include/cr/StringStlView.h create mode 100644 include/cr/StringView.h create mode 100644 include/cr/StructuredBindings.h create mode 100644 include/cr/Triple.h create mode 100644 include/cr/TripleStl.h create mode 100644 include/cr/Utility.h create mode 100644 include/cr/iterableHelpers.h create mode 100644 include/mg/Buffer.h create mode 100644 include/mg/Color.h create mode 100644 include/mg/Context.h create mode 100644 include/mg/ImageData.h create mode 100644 include/mg/ImageFormat.h create mode 100644 include/mg/ImageView.h create mode 100644 include/mg/Math.h create mode 100644 include/mg/Mesh.h create mode 100644 include/mg/PixelFormat.h create mode 100644 include/mg/Texture.h create mode 100644 include/mg/TextureFormat.h create mode 100644 include/mg/Timeline.h create mode 100644 include/mg/Vector.h create mode 100644 include/mg/Vector2.h create mode 100644 include/mg/Vector3.h create mode 100644 include/mg/Vector4.h delete mode 100644 loader/ground-atlas.hpp delete mode 100644 loader/wall-atlas.hpp 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 -- cgit v1.2.3