Cleanup detournavigator includes

2 years ago · 472a36d92a
parent 2cbbdc2879
commit 472a36d92a
20 changed files with 22 additions and 25 deletions
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@ -11,8 +11,6 @@
 #include <components/loadinglistener/loadinglistener.hpp>
 #include <components/misc/thread.hpp>

-#include <BulletCollision/CollisionShapes/btBoxShape.h>
-
 #include <DetourNavMesh.h>

 #include <osg/io_utils>
--- a/components/detournavigator/asyncnavmeshupdater.hpp
+++ b/components/detournavigator/asyncnavmeshupdater.hpp
@ -14,8 +14,6 @@
 #include "tileposition.hpp"
 #include "waitconditiontype.hpp"

-#include <osg/Vec3f>
-
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
--- a/components/detournavigator/commulativeaabb.hpp
+++ b/components/detournavigator/commulativeaabb.hpp
@ -2,7 +2,6 @@
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_COMMULATIVEAABB_H

 #include <BulletCollision/Gimpact/btBoxCollision.h>
-#include <LinearMath/btTransform.h>

 #include <cstdint>

--- a/components/detournavigator/findrandompointaroundcircle.hpp
+++ b/components/detournavigator/findrandompointaroundcircle.hpp
@ -3,9 +3,10 @@

 #include "flags.hpp"

-#include <optional>
 #include <osg/Vec3f>

+#include <optional>
+
 class dtNavMeshQuery;

 namespace DetourNavigator
--- a/components/detournavigator/findsmoothpath.cpp
+++ b/components/detournavigator/findsmoothpath.cpp
@ -2,6 +2,8 @@

 #include <components/misc/convert.hpp>

+#include <DetourCommon.h>
+
 #include <algorithm>
 #include <array>

--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@ -7,7 +7,6 @@
 #include "settingsutils.hpp"
 #include "status.hpp"

-#include <DetourCommon.h>
 #include <DetourNavMesh.h>
 #include <DetourNavMeshQuery.h>

--- a/components/detournavigator/generatenavmeshtile.cpp
+++ b/components/detournavigator/generatenavmeshtile.cpp
@ -8,7 +8,6 @@

 #include <components/debug/debuglog.hpp>

-#include <osg/Vec3f>
 #include <osg/io_utils>

 #include <functional>
--- a/components/detournavigator/generatenavmeshtile.hpp
+++ b/components/detournavigator/generatenavmeshtile.hpp
@ -7,10 +7,7 @@

 #include <components/sceneutil/workqueue.hpp>

-#include <osg/Vec3f>
-
 #include <cstdint>
-#include <functional>
 #include <memory>
 #include <optional>
 #include <string_view>
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@ -19,7 +19,6 @@
 #include <DetourNavMesh.h>
 #include <DetourNavMeshBuilder.h>
 #include <Recast.h>
-#include <RecastAlloc.h>

 #include <algorithm>
 #include <array>
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@ -4,7 +4,6 @@
 #include "stats.hpp"

 #include <components/esm3/loadpgrd.hpp>
-#include <components/misc/algorithm.hpp>
 #include <components/misc/convert.hpp>
 #include <components/misc/coordinateconverter.hpp>

--- a/components/detournavigator/navigatorimpl.hpp
+++ b/components/detournavigator/navigatorimpl.hpp
@ -4,8 +4,11 @@
 #include "navigator.hpp"
 #include "navmeshmanager.hpp"

+#include <map>
 #include <memory>
-#include <set>
+#include <optional>
+#include <string_view>
+#include <unordered_map>

 namespace DetourNavigator
 {
--- a/components/detournavigator/navmeshmanager.cpp
+++ b/components/detournavigator/navmeshmanager.cpp
@ -1,6 +1,5 @@
 #include "navmeshmanager.hpp"
 #include "debug.hpp"
-#include "exceptions.hpp"
 #include "gettilespositions.hpp"
 #include "makenavmesh.hpp"
 #include "navmeshcacheitem.hpp"
@ -8,9 +7,7 @@
 #include "settingsutils.hpp"
 #include "waitconditiontype.hpp"

-#include <components/bullethelpers/heightfield.hpp>
 #include <components/debug/debuglog.hpp>
-#include <components/misc/convert.hpp>

 #include <osg/io_utils>

--- a/components/detournavigator/objectid.hpp
+++ b/components/detournavigator/objectid.hpp
@ -2,7 +2,7 @@
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_OBJECTID_H

 #include <cstddef>
-#include <unordered_map>
+#include <functional>

 namespace DetourNavigator
 {
--- a/components/detournavigator/recast.hpp
+++ b/components/detournavigator/recast.hpp
@ -2,7 +2,6 @@
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_RECAST_H

 #include <Recast.h>
-#include <RecastAlloc.h>

 #include <cstddef>
 #include <type_traits>
--- a/components/detournavigator/recastallocutils.hpp
+++ b/components/detournavigator/recastallocutils.hpp
@ -1,9 +1,7 @@
 #ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_RECASTALLOCUTILS_H
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_RECASTALLOCUTILS_H

-#include <RecastAlloc.h>
-
-#include <cstdint>
+#include <cstddef>

 namespace DetourNavigator
 {
--- a/components/detournavigator/recastglobalallocator.hpp
+++ b/components/detournavigator/recastglobalallocator.hpp
@ -3,6 +3,8 @@

 #include "recasttempallocator.hpp"

+#include <RecastAlloc.h>
+
 #include <cstdlib>

 namespace DetourNavigator
--- a/components/detournavigator/recastmesh.cpp
+++ b/components/detournavigator/recastmesh.cpp
@ -1,8 +1,6 @@
 #include "recastmesh.hpp"
 #include "exceptions.hpp"

-#include <Recast.h>
-
 namespace DetourNavigator
 {
    Mesh::Mesh(std::vector<int>&& indices, std::vector<float>&& vertices, std::vector<AreaType>&& areaTypes)
--- a/components/detournavigator/recastmeshobject.hpp
+++ b/components/detournavigator/recastmeshobject.hpp
@ -8,7 +8,6 @@

 #include <LinearMath/btTransform.h>

-#include <osg/Referenced>
 #include <osg/ref_ptr>

 #include <functional>
--- a/components/detournavigator/recasttempallocator.hpp
+++ b/components/detournavigator/recasttempallocator.hpp
@ -3,6 +3,8 @@

 #include "recastallocutils.hpp"

+#include <RecastAlloc.h>
+
 #include <cassert>
 #include <memory>
 #include <vector>
--- a/components/detournavigator/tilecachedrecastmeshmanager.hpp
+++ b/components/detournavigator/tilecachedrecastmeshmanager.hpp
@ -16,9 +16,17 @@
 #include <boost/geometry/geometries/point.hpp>
 #include <boost/geometry/index/rtree.hpp>

+#include <LinearMath/btTransform.h>
+
+#include <osg/Vec2i>
+
 #include <map>
+#include <memory>
 #include <mutex>
 #include <optional>
+#include <string>
+#include <string_view>
+#include <unordered_map>
 #include <vector>

 namespace DetourNavigator