h8man#130 added option to call non-async versions of rebuild (also re…

…named async one to include suffix async, so breaking change there...)
mikaelhogstrom · Mar 23, 2023 · 87bcfa1 · 87bcfa1
1 parent c7ea1f1
commit 87bcfa1
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/NavMeshComponents/Editor/NavMeshAssetManager.cs b/NavMeshComponents/Editor/NavMeshAssetManager.cs
@@ -124,7 +124,7 @@ public void StartBakingSurfaces(UnityEngine.Object[] surfaces)
                 var oper = new AsyncBakeOperation();
 
                 oper.bakeData = InitializeBakeData(surf);
-                oper.bakeOperation = surf.UpdateNavMesh(oper.bakeData);
+                oper.bakeOperation = surf.UpdateNavMeshAsync(oper.bakeData);
                 oper.surface = surf;
 
                 m_BakeOperations.Add(oper);

diff --git a/NavMeshComponents/Scripts/NavMeshSurface.cs b/NavMeshComponents/Scripts/NavMeshSurface.cs
@@ -211,10 +211,36 @@ public AsyncOperation BuildNavMeshAsync()
                 AddData();
             }
 
-            return UpdateNavMesh(m_NavMeshData);
+            return UpdateNavMeshAsync(m_NavMeshData);
         }
 
-        public AsyncOperation UpdateNavMesh(NavMeshData data)
+        public void UpdateNavMesh()
+        {
+            UpdateNavMesh(navMeshData);
+        }
+
+        public void UpdateNavMesh(NavMeshData data)
+        {
+            using var builderState = new NavMeshBuilderState() { };
+
+            var sources = CollectSources(builderState);
+
+            // Use unscaled bounds - this differs in behaviour from e.g. collider components.
+            // But is similar to reflection probe - and since navmesh data has no scaling support - it is the right choice here.
+            var sourcesBounds = new Bounds(m_Center, Abs(m_Size));
+            if (m_CollectObjects == CollectObjects.All || m_CollectObjects == CollectObjects.Children)
+            {
+                sourcesBounds = CalculateWorldBounds(sources);
+            }
+            builderState.worldBounds = sourcesBounds;
+            for (int i = 0; i < NevMeshExtensions.Count; ++i)
+            {
+                NevMeshExtensions[i].PostCollectSources(this, sources, builderState);
+            }
+            NavMeshBuilder.UpdateNavMeshData(data, GetBuildSettings(), sources, sourcesBounds);
+        }
+
+        public AsyncOperation UpdateNavMeshAsync(NavMeshData data)
         {
             using var builderState = new NavMeshBuilderState() { };