From 6b30d375fa1f646003d23571bbd9bbeeb84ad91d Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 6 Nov 2021 00:48:39 +0100
Subject: [PATCH] Replace detournavigator includes by forward declarations

---
 apps/openmw/engine.cpp               |  2 --
 apps/openmw/mwrender/actorspaths.cpp |  3 +++
 apps/openmw/mwrender/actorspaths.hpp |  8 ++++++--
 apps/openmw/mwrender/navmesh.cpp     |  3 +++
 apps/openmw/mwrender/navmesh.hpp     | 13 ++++++++++---
 apps/openmw/mwrender/recastmesh.cpp  |  2 ++
 apps/openmw/mwrender/recastmesh.hpp  |  7 ++++++-
 7 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 58dabd2cee..9f948de3eb 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -37,8 +37,6 @@
 
 #include <components/version/version.hpp>
 
-#include <components/detournavigator/navigator.hpp>
-
 #include <components/misc/frameratelimiter.hpp>
 
 #include <components/sceneutil/screencapture.hpp>
diff --git a/apps/openmw/mwrender/actorspaths.cpp b/apps/openmw/mwrender/actorspaths.cpp
index 4e3bfd79a6..941f37df75 100644
--- a/apps/openmw/mwrender/actorspaths.cpp
+++ b/apps/openmw/mwrender/actorspaths.cpp
@@ -9,6 +9,9 @@
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
+
+#include <algorithm>
+
 namespace MWRender
 {
     ActorsPaths::ActorsPaths(const osg::ref_ptr<osg::Group>& root, bool enabled)
diff --git a/apps/openmw/mwrender/actorspaths.hpp b/apps/openmw/mwrender/actorspaths.hpp
index 1f61834d46..12f102093b 100644
--- a/apps/openmw/mwrender/actorspaths.hpp
+++ b/apps/openmw/mwrender/actorspaths.hpp
@@ -3,18 +3,22 @@
 
 #include <apps/openmw/mwworld/ptr.hpp>
 
-#include <components/detournavigator/navigator.hpp>
-
 #include <osg/ref_ptr>
 
 #include <unordered_map>
 #include <deque>
+#include <map>
 
 namespace osg
 {
     class Group;
 }
 
+namespace DetourNavigator
+{
+    struct Settings;
+}
+
 namespace MWRender
 {
     class ActorsPaths
diff --git a/apps/openmw/mwrender/navmesh.cpp b/apps/openmw/mwrender/navmesh.cpp
index 523f7531af..548e85ad10 100644
--- a/apps/openmw/mwrender/navmesh.cpp
+++ b/apps/openmw/mwrender/navmesh.cpp
@@ -10,11 +10,14 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 
+#include <limits>
+
 namespace MWRender
 {
     NavMesh::NavMesh(const osg::ref_ptr<osg::Group>& root, bool enabled)
         : mRootNode(root)
         , mEnabled(enabled)
+        , mId(std::numeric_limits<std::size_t>::max())
         , mGeneration(0)
         , mRevision(0)
     {
diff --git a/apps/openmw/mwrender/navmesh.hpp b/apps/openmw/mwrender/navmesh.hpp
index d329b895d7..4c71dc74ec 100644
--- a/apps/openmw/mwrender/navmesh.hpp
+++ b/apps/openmw/mwrender/navmesh.hpp
@@ -1,16 +1,23 @@
 #ifndef OPENMW_MWRENDER_NAVMESH_H
 #define OPENMW_MWRENDER_NAVMESH_H
 
-#include <components/detournavigator/navigator.hpp>
-
 #include <osg/ref_ptr>
 
+#include <cstddef>
+
+class dtNavMesh;
+
 namespace osg
 {
     class Group;
     class Geometry;
 }
 
+namespace DetourNavigator
+{
+    struct Settings;
+}
+
 namespace MWRender
 {
     class NavMesh
@@ -38,7 +45,7 @@ namespace MWRender
     private:
         osg::ref_ptr<osg::Group> mRootNode;
         bool mEnabled;
-        std::size_t mId = std::numeric_limits<std::size_t>::max();
+        std::size_t mId;
         std::size_t mGeneration;
         std::size_t mRevision;
         osg::ref_ptr<osg::Group> mGroup;
diff --git a/apps/openmw/mwrender/recastmesh.cpp b/apps/openmw/mwrender/recastmesh.cpp
index 91035907e9..f108536242 100644
--- a/apps/openmw/mwrender/recastmesh.cpp
+++ b/apps/openmw/mwrender/recastmesh.cpp
@@ -3,6 +3,8 @@
 #include <components/sceneutil/recastmesh.hpp>
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
+#include <components/detournavigator/settings.hpp>
+#include <components/detournavigator/recastmesh.hpp>
 
 #include <osg/PositionAttitudeTransform>
 
diff --git a/apps/openmw/mwrender/recastmesh.hpp b/apps/openmw/mwrender/recastmesh.hpp
index 729438dbe5..194ec04a62 100644
--- a/apps/openmw/mwrender/recastmesh.hpp
+++ b/apps/openmw/mwrender/recastmesh.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_MWRENDER_RECASTMESH_H
 #define OPENMW_MWRENDER_RECASTMESH_H
 
-#include <components/detournavigator/navigator.hpp>
+#include <components/detournavigator/recastmeshtiles.hpp>
 
 #include <osg/ref_ptr>
 
@@ -13,6 +13,11 @@ namespace osg
     class Geometry;
 }
 
+namespace DetourNavigator
+{
+    struct Settings;
+}
+
 namespace MWRender
 {
     class RecastMesh