diff options
| -rw-r--r-- | editor/camera.cpp | 1 | ||||
| -rw-r--r-- | editor/editor.cpp | 2 | ||||
| -rw-r--r-- | editor/precomp.hpp | 11 | ||||
| -rw-r--r-- | main/precomp.hpp | 4 | ||||
| -rw-r--r-- | src/loader.hpp | 5 | ||||
| -rw-r--r-- | src/precomp.hpp | 24 | ||||
| -rw-r--r-- | test/main.cpp | 6 |
7 files changed, 19 insertions, 34 deletions
diff --git a/editor/camera.cpp b/editor/camera.cpp index a41e62d9..2d46cba6 100644 --- a/editor/camera.cpp +++ b/editor/camera.cpp @@ -2,7 +2,6 @@ #include "src/global-coords.hpp" #include "shaders/tile.hpp" #include "floormat/main.hpp" -#include <Magnum/GL/DefaultFramebuffer.h> namespace floormat { diff --git a/editor/editor.cpp b/editor/editor.cpp index defc1476..dca7cfe0 100644 --- a/editor/editor.cpp +++ b/editor/editor.cpp @@ -7,7 +7,7 @@ #include "compat/unreachable.hpp" #include "src/tile-defs.hpp" #include "src/world.hpp" -#include <Corrade/Containers/StringStlView.h> +#include <Corrade/Containers/StringView.h> #include <filesystem> #include <vector> diff --git a/editor/precomp.hpp b/editor/precomp.hpp index fcc422b6..b1652eaf 100644 --- a/editor/precomp.hpp +++ b/editor/precomp.hpp @@ -1,21 +1,12 @@ #pragma once #include "src/precomp.hpp" - -#include <memory> -#include <optional> -#include <filesystem> -#include <vector> - -#include <Corrade/Containers/Pointer.h> -#include <Corrade/Containers/StringStlView.h> +#include <cstdlib> #include <Corrade/Utility/Arguments.h> #include <Magnum/Math/Color.h> #include <Magnum/GL/DebugOutput.h> -#include <Magnum/GL/DefaultFramebuffer.h> #include <Magnum/GL/Renderer.h> #include <Magnum/Platform/Sdl2Application.h> #include <Magnum/ImGuiIntegration/Context.h> -#include <SDL_video.h> diff --git a/main/precomp.hpp b/main/precomp.hpp index cff156e7..3d4db648 100644 --- a/main/precomp.hpp +++ b/main/precomp.hpp @@ -1,9 +1,7 @@ #pragma once - #include "src/precomp.hpp" #include <Corrade/Utility/DebugStl.h> -#include <Corrade/Containers/String.h> #include <Magnum/Math/Vector2.h> #include <Magnum/Timeline.h> @@ -17,5 +15,3 @@ #include <SDL_keycode.h> #include <SDL_mouse.h> #include <SDL_events.h> - -#include <cstdlib> diff --git a/src/loader.hpp b/src/loader.hpp index a521cf2d..9dae4b11 100644 --- a/src/loader.hpp +++ b/src/loader.hpp @@ -1,12 +1,9 @@ #pragma once +#include <memory> #include <Corrade/Containers/StringView.h> #include <Magnum/Trade/ImageData.h> -#include <string> -#include <optional> -#include <memory> - #define IMAGE_PATH "share/floormat/images/" namespace floormat { diff --git a/src/precomp.hpp b/src/precomp.hpp index de7a10e6..624692b1 100644 --- a/src/precomp.hpp +++ b/src/precomp.hpp @@ -3,27 +3,35 @@ #include "compat/integer-types.hpp" #include "compat/defs.hpp" #include "compat/assert.hpp" +#include "compat/alloca.hpp" +#include <bit> #include <cstddef> #include <cstdint> +#include <cstdio> #include <cmath> -#include <cstdlib> + #include <concepts> -#include <type_traits> #include <limits> +#include <memory> +#include <type_traits> + +#include <algorithm> +#include <utility> +#include <filesystem> #include <tuple> #include <array> #include <optional> #include <vector> -#include <memory> -#include <utility> -#include <algorithm> -#include <filesystem> +#include <unordered_map> +#include <string> // TODO #include <Corrade/Containers/Array.h> -#include <Corrade/Containers/ArrayViewStl.h> -#include <Corrade/Containers/StringStlView.h> +#include <Corrade/Containers/ArrayViewStl.h> // TODO maybe remove stl +#include <Corrade/Containers/StringStlView.h> // TODO remove stl +#include <Corrade/Containers/String.h> +#include <Corrade/Containers/Pointer.h> #include <Corrade/Utility/DebugStl.h> #include <Magnum/Magnum.h> diff --git a/test/main.cpp b/test/main.cpp index 38127c05..f09768a9 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -1,11 +1,5 @@ #include "app.hpp" -#include "compat/assert.hpp" #include "loader.hpp" -#include <filesystem> -#include <Corrade/Containers/Pair.h> -#include <Corrade/Containers/StringStlView.h> -#include <Corrade/Utility/Path.h> -#include <Magnum/Magnum.h> namespace floormat { |