diff options
| -rw-r--r-- | editor/inspect-draw.cpp | 1 | ||||
| -rw-r--r-- | loader/texture.cpp | 2 | ||||
| -rw-r--r-- | src/anim-atlas.cpp | 2 | ||||
| -rw-r--r-- | src/search-astar.cpp | 6 | ||||
| -rw-r--r-- | src/wall-atlas.hpp | 2 | ||||
| -rw-r--r-- | test/app.cpp | 3 | ||||
| -rw-r--r-- | test/bitmask.cpp | 3 |
7 files changed, 8 insertions, 11 deletions
diff --git a/editor/inspect-draw.cpp b/editor/inspect-draw.cpp index 128e619f..e495e7ad 100644 --- a/editor/inspect-draw.cpp +++ b/editor/inspect-draw.cpp @@ -1,7 +1,6 @@ #include "app.hpp" #include "compat/format.hpp" #include "inspect.hpp" -#include "main/clickable.hpp" #include "floormat/main.hpp" #include "src/world.hpp" #include "src/object.hpp" diff --git a/loader/texture.cpp b/loader/texture.cpp index 0da6f1e7..fc180bc3 100644 --- a/loader/texture.cpp +++ b/loader/texture.cpp @@ -1,7 +1,7 @@ #include "impl.hpp" #include "compat/assert.hpp" -#include "compat/exception.hpp" #include "compat/defs.hpp" +#include "compat/exception.hpp" #include "compat/strerror.hpp" #include <cstring> //#include <cstdio> diff --git a/src/anim-atlas.cpp b/src/anim-atlas.cpp index 355ddeac..6509a494 100644 --- a/src/anim-atlas.cpp +++ b/src/anim-atlas.cpp @@ -1,6 +1,6 @@ #include "anim-atlas.hpp" -#include "compat/assert.hpp" #include "shaders/shader.hpp" +#include "compat/assert.hpp" #include "compat/exception.hpp" #include <Corrade/Containers/BitArrayView.h> #include <Corrade/Containers/StridedArrayView.h> diff --git a/src/search-astar.cpp b/src/search-astar.cpp index 77239669..af82ce90 100644 --- a/src/search-astar.cpp +++ b/src/search-astar.cpp @@ -3,12 +3,12 @@ #include "search-constants.hpp" #include "search-cache.hpp" #include "search-result.hpp" -#include "compat/format.hpp" -#include "compat/vector-wrapper.hpp" -#include "compat/heap.hpp" #include "object.hpp" #include "world.hpp" #include "point.inl" +#include "compat/format.hpp" +#include "compat/vector-wrapper.hpp" +#include "compat/heap.hpp" #include <cstdio> #include <Corrade/Containers/GrowableArray.h> #include <Corrade/Containers/StaticArray.h> // todo remove diff --git a/src/wall-atlas.hpp b/src/wall-atlas.hpp index 9891791d..afd75f37 100644 --- a/src/wall-atlas.hpp +++ b/src/wall-atlas.hpp @@ -1,8 +1,8 @@ #pragma once -#include "compat/defs.hpp" #include "src/rotation.hpp" #include "src/pass-mode.hpp" #include "wall-defs.hpp" +#include "compat/defs.hpp" #include <array> #include <Corrade/Containers/Array.h> #include <Corrade/Containers/String.h> diff --git a/test/app.cpp b/test/app.cpp index 4082211e..4a80cb20 100644 --- a/test/app.cpp +++ b/test/app.cpp @@ -1,13 +1,12 @@ #include "app.hpp" -#include "compat/headless.hpp" #include "loader/loader.hpp" +#include "compat/headless.hpp" #include <stdlib.h> // NOLINT(*-deprecated-headers) #include <cstdio> #include <Corrade/Containers/StringView.h> #include <Magnum/Math/Functions.h> #include <Magnum/Timeline.h> #include <Magnum/GL/Context.h> -#include <Magnum/Magnum.h> namespace floormat::Test { diff --git a/test/bitmask.cpp b/test/bitmask.cpp index 369c1e54..3e04f737 100644 --- a/test/bitmask.cpp +++ b/test/bitmask.cpp @@ -1,8 +1,7 @@ #include "app.hpp" -#include "compat/assert.hpp" #include "src/anim-atlas.hpp" #include "loader/loader.hpp" -#include <Corrade/Containers/ArrayView.h> +#include "compat/assert.hpp" #include <mg/Functions.h> #include <mg/ImageData.h> |