When a Custom Agent is disabled, the correspoding Hidden agent is now…

… set to inactive instead of getting destroyed. Upgraded the project to Unity version 2021.3.26f1 (LTS).
jadvrodrigues · Jun 1, 2023 · 9cd029b · 9cd029b
1 parent 4db0e25
commit 9cd029b
Show file tree

Hide file tree

Showing 13 changed files with 5,310 additions and 3,860 deletions.
diff --git a/Assets/CustomNavMesh/Scripts/CustomNavMeshAgent.cs b/Assets/CustomNavMesh/Scripts/CustomNavMeshAgent.cs
@@ -665,7 +665,7 @@ protected override void OnCustomDisable()
     {
         NavMeshAgent.enabled = false;
 
-        TryDestroyingHiddenAgent();
+        TryDisablingHiddenAgent();
     }
 
     protected override void OnCustomDestroy()
@@ -711,6 +711,18 @@ void TryCreatingHiddenAgent()
 #endif
             HiddenAgent.LinkWithCustomAgent(this);
         }
+        else if(!HiddenAgent.gameObject.activeSelf)
+        {
+            HiddenAgent.gameObject.SetActive(true);
+        }
+    }
+
+    void TryDisablingHiddenAgent()
+    {
+        if (HiddenAgent != null)
+        {
+            HiddenAgent.gameObject.SetActive(false);
+        }
     }
 
     void TryDestroyingHiddenAgent()

diff --git a/Assets/CustomNavMesh/Scripts/HiddenNavMeshAgent.cs b/Assets/CustomNavMesh/Scripts/HiddenNavMeshAgent.cs
@@ -252,7 +252,7 @@ protected override void OnCustomEnable()
         Agent.enabled = false;
     }
 
-    protected override void OnCustomDisable()
+    protected override void OnCustomDestroy()
     {
         TryUnsubscribe();
     }

diff --git a/Assets/Examples/Scenes/1_multiple_agent_avoidance_after.unity b/Assets/Examples/Scenes/1_multiple_agent_avoidance_after.unity