From a7fe6c7ba16ea16775d9324fa00cc346f07c4959 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 14 Feb 2021 01:08:14 +0100
Subject: [PATCH] Move duplicated usage patter of
 dtNavMeshQuery::findNearestPoly into a separate function

---
 .../findrandompointaroundcircle.cpp           | 10 +-------
 components/detournavigator/findsmoothpath.cpp | 13 +++++++++++
 components/detournavigator/findsmoothpath.hpp | 23 ++++---------------
 3 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/components/detournavigator/findrandompointaroundcircle.cpp b/components/detournavigator/findrandompointaroundcircle.cpp
index 444050ed7c..29d4e9da44 100644
--- a/components/detournavigator/findrandompointaroundcircle.cpp
+++ b/components/detournavigator/findrandompointaroundcircle.cpp
@@ -20,15 +20,7 @@ namespace DetourNavigator
         dtQueryFilter queryFilter;
         queryFilter.setIncludeFlags(includeFlags);
 
-        dtPolyRef startRef = 0;
-        for (int i = 0; i < 3; ++i)
-        {
-            const auto status = navMeshQuery.findNearestPoly(start.ptr(), (halfExtents * (1 << i)).ptr(), &queryFilter,
-                &startRef, nullptr);
-            if (!dtStatusFailed(status) && startRef != 0)
-                break;
-        }
-
+        dtPolyRef startRef = findNearestPolyExpanding(navMeshQuery, queryFilter, start, halfExtents);
         if (startRef == 0)
             return std::optional<osg::Vec3f>();
 
diff --git a/components/detournavigator/findsmoothpath.cpp b/components/detournavigator/findsmoothpath.cpp
index a13b83abd8..84ccf34a44 100644
--- a/components/detournavigator/findsmoothpath.cpp
+++ b/components/detournavigator/findsmoothpath.cpp
@@ -140,4 +140,17 @@ namespace DetourNavigator
 
         return result;
     }
+
+    dtPolyRef findNearestPolyExpanding(const dtNavMeshQuery& query, const dtQueryFilter& filter,
+            const osg::Vec3f& center, const osg::Vec3f& halfExtents)
+    {
+        dtPolyRef ref = 0;
+        for (int i = 0; i < 3; ++i)
+        {
+            const dtStatus status = query.findNearestPoly(center.ptr(), (halfExtents * (1 << i)).ptr(), &filter, &ref, nullptr);
+            if (!dtStatusFailed(status) && ref != 0)
+                break;
+        }
+        return ref;
+    }
 }
diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp
index f757a511f4..3dc4999740 100644
--- a/components/detournavigator/findsmoothpath.hpp
+++ b/components/detournavigator/findsmoothpath.hpp
@@ -103,6 +103,9 @@ namespace DetourNavigator
         return dtStatusSucceed(status);
     }
 
+    dtPolyRef findNearestPolyExpanding(const dtNavMeshQuery& query, const dtQueryFilter& filter,
+            const osg::Vec3f& center, const osg::Vec3f& halfExtents);
+
     struct MoveAlongSurfaceResult
     {
         osg::Vec3f mResultPos;
@@ -282,27 +285,11 @@ namespace DetourNavigator
         queryFilter.setAreaCost(AreaType_pathgrid, areaCosts.mPathgrid);
         queryFilter.setAreaCost(AreaType_ground, areaCosts.mGround);
 
-        dtPolyRef startRef = 0;
-        for (int i = 0; i < 3; ++i)
-        {
-            const auto status = navMeshQuery.findNearestPoly(start.ptr(), (halfExtents * (1 << i)).ptr(), &queryFilter,
-                &startRef, nullptr);
-            if (!dtStatusFailed(status) && startRef != 0)
-                break;
-        }
-
+        dtPolyRef startRef = findNearestPolyExpanding(navMeshQuery, queryFilter, start, halfExtents);
         if (startRef == 0)
             return Status::StartPolygonNotFound;
 
-        dtPolyRef endRef = 0;
-        for (int i = 0; i < 3; ++i)
-        {
-            const auto status = navMeshQuery.findNearestPoly(end.ptr(), (halfExtents * (1 << i)).ptr(), &queryFilter,
-                &endRef, nullptr);
-            if (!dtStatusFailed(status) && endRef != 0)
-                break;
-        }
-
+        dtPolyRef endRef = findNearestPolyExpanding(navMeshQuery, queryFilter, end, halfExtents);
         if (endRef == 0)
             return Status::EndPolygonNotFound;