diff options
| -rw-r--r-- | anim-crop-tool/main.cpp | 2 | ||||
| -rw-r--r-- | bench/bitmask.cpp | 2 | ||||
| -rw-r--r-- | bench/loader.cpp | 1 | ||||
| -rw-r--r-- | bench/raycast.cpp | 2 | ||||
| -rw-r--r-- | src/chunk-walls.cpp | 2 | ||||
| -rw-r--r-- | src/dijkstra.cpp | 2 | ||||
| -rw-r--r-- | src/raycast.cpp | 2 | ||||
| -rw-r--r-- | src/wall-atlas.cpp | 1 | ||||
| -rw-r--r-- | test/raycast.cpp | 2 |
9 files changed, 6 insertions, 10 deletions
diff --git a/anim-crop-tool/main.cpp b/anim-crop-tool/main.cpp index 07a680df..919e80d3 100644 --- a/anim-crop-tool/main.cpp +++ b/anim-crop-tool/main.cpp @@ -30,8 +30,6 @@ using namespace floormat; -using Corrade::Utility::Error; -using Corrade::Utility::Debug; using floormat::Serialize::anim_atlas_; namespace { diff --git a/bench/bitmask.cpp b/bench/bitmask.cpp index 9efa25a9..1156a9f7 100644 --- a/bench/bitmask.cpp +++ b/bench/bitmask.cpp @@ -10,7 +10,7 @@ namespace floormat { namespace { -[[maybe_unused]] void Bitmask(benchmark::State& state) +void Bitmask(benchmark::State& state) { auto img = loader.texture(loader.SCENERY_PATH, "door-close"_s); auto bitmask = anim_atlas::make_bitmask(img); diff --git a/bench/loader.cpp b/bench/loader.cpp index dcd13e4e..c96ef31c 100644 --- a/bench/loader.cpp +++ b/bench/loader.cpp @@ -5,7 +5,6 @@ #include "serialize/anim.hpp" #include <Corrade/Containers/ArrayView.h> #include <Corrade/Containers/StringIterable.h> -#include <Corrade/Utility/Path.h> #include <benchmark/benchmark.h> namespace floormat { diff --git a/bench/raycast.cpp b/bench/raycast.cpp index 7f66f920..cdcf71f7 100644 --- a/bench/raycast.cpp +++ b/bench/raycast.cpp @@ -79,7 +79,7 @@ auto run(point from, point to, world& w, bool b, float len) return true; } -[[maybe_unused]] void Raycast(benchmark::State& state) +void Raycast(benchmark::State& state) { auto w = make_world(); diff --git a/src/chunk-walls.cpp b/src/chunk-walls.cpp index 674d0a65..4efe6935 100644 --- a/src/chunk-walls.cpp +++ b/src/chunk-walls.cpp @@ -126,7 +126,7 @@ ArrayView<const Quads::indexes> make_indexes(size_t max) return indexes.prefix(max); } -constexpr auto depth_offset_for_group(Group_ G, bool is_west) +constexpr float depth_offset_for_group(Group_ G, bool is_west) { CORRADE_ASSUME(G < Group_::COUNT); float p = is_west ? tile_shader::wall_west_offset : 0; diff --git a/src/dijkstra.cpp b/src/dijkstra.cpp index 4bdb3ab7..c1dcd4d6 100644 --- a/src/dijkstra.cpp +++ b/src/dijkstra.cpp @@ -373,7 +373,7 @@ struct chunk_cache x *= i; return x; }(); - static constexpr size_t rank = sizeof(dimensions)/sizeof(dimensions[0]); + static constexpr size_t rank = arraySize(dimensions); struct index { uint32_t value = 0; }; class chunk* chunk = nullptr; diff --git a/src/raycast.cpp b/src/raycast.cpp index b6ed2158..1ca75db2 100644 --- a/src/raycast.cpp +++ b/src/raycast.cpp @@ -111,7 +111,7 @@ template bool within_chunk_bounds<int>(Math::Vector2<int> p0, Math::Vector2<int> template<bool EnableDiagnostics> raycast_result_s do_raycasting(std::conditional_t<EnableDiagnostics, raycast_diag_s&, std::nullptr_t> diag, - world& w, point from, point to, object_id self) + world& w, point from, point to, object_id self) { raycast_result_s result; fm_assert(from.chunk3().z == to.chunk3().z); diff --git a/src/wall-atlas.cpp b/src/wall-atlas.cpp index 49c7d342..60568751 100644 --- a/src/wall-atlas.cpp +++ b/src/wall-atlas.cpp @@ -2,7 +2,6 @@ #include "compat/exception.hpp" #include "src/tile-defs.hpp" #include <utility> -#include <Corrade/Containers/ArrayViewStl.h> #include <Corrade/Containers/StridedArrayView.h> #include <Magnum/ImageView.h> #include <Magnum/GL/TextureFormat.h> diff --git a/test/raycast.cpp b/test/raycast.cpp index d34f4e26..ce06dda3 100644 --- a/test/raycast.cpp +++ b/test/raycast.cpp @@ -23,4 +23,4 @@ void test_app::test_raycast() } -} // namespace floormat::test_app +} // namespace floormat |