From 64fb700ae91ec98ee39a47dca4ecf3d9235190a3 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 18 Apr 2021 17:31:21 +0200
Subject: [PATCH] Remove unnecessary relation between updateCompoundObject and
 RecastMeshObject

---
 .../detournavigator/recastmeshobject.cpp      | 29 ++++++++++---------
 .../detournavigator/recastmeshobject.hpp      |  3 --
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/components/detournavigator/recastmeshobject.cpp b/components/detournavigator/recastmeshobject.cpp
index aac0b4c3c..3f3546278 100644
--- a/components/detournavigator/recastmeshobject.cpp
+++ b/components/detournavigator/recastmeshobject.cpp
@@ -8,6 +8,22 @@
 
 namespace DetourNavigator
 {
+    namespace
+    {
+        bool updateCompoundObject(const btCompoundShape& shape, const AreaType areaType,
+            std::vector<RecastMeshObject>& children)
+        {
+            assert(static_cast<std::size_t>(shape.getNumChildShapes()) == children.size());
+            bool result = false;
+            for (int i = 0, num = shape.getNumChildShapes(); i < num; ++i)
+            {
+                assert(shape.getChildShape(i) == std::addressof(children[static_cast<std::size_t>(i)].getShape()));
+                result = children[static_cast<std::size_t>(i)].update(shape.getChildTransform(i), areaType) || result;
+            }
+            return result;
+        }
+    }
+
     RecastMeshObject::RecastMeshObject(const btCollisionShape& shape, const btTransform& transform,
             const AreaType areaType)
         : mShape(shape)
@@ -42,19 +58,6 @@ namespace DetourNavigator
         return result;
     }
 
-    bool RecastMeshObject::updateCompoundObject(const btCompoundShape& shape,
-        const AreaType areaType, std::vector<RecastMeshObject>& children)
-    {
-        assert(static_cast<std::size_t>(shape.getNumChildShapes()) == children.size());
-        bool result = false;
-        for (int i = 0, num = shape.getNumChildShapes(); i < num; ++i)
-        {
-            assert(shape.getChildShape(i) == std::addressof(children[static_cast<std::size_t>(i)].mShape.get()));
-            result = children[static_cast<std::size_t>(i)].update(shape.getChildTransform(i), areaType) || result;
-        }
-        return result;
-    }
-
     std::vector<RecastMeshObject> makeChildrenObjects(const btCollisionShape& shape, const AreaType areaType)
     {
         if (shape.isCompound())
diff --git a/components/detournavigator/recastmeshobject.hpp b/components/detournavigator/recastmeshobject.hpp
index f25647ae5..e659300e6 100644
--- a/components/detournavigator/recastmeshobject.hpp
+++ b/components/detournavigator/recastmeshobject.hpp
@@ -41,9 +41,6 @@ namespace DetourNavigator
             AreaType mAreaType;
             btVector3 mLocalScaling;
             std::vector<RecastMeshObject> mChildren;
-
-            static bool updateCompoundObject(const btCompoundShape& shape, const AreaType areaType,
-                std::vector<RecastMeshObject>& children);
     };
 
     std::vector<RecastMeshObject> makeChildrenObjects(const btCollisionShape& shape, const AreaType areaType);