long[] -> Span<long>

ikpil · May 19, 2024 · ec9ebe2 · ec9ebe2
1 parent c9a54d4
commit ec9ebe2
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 19 deletions.
diff --git a/src/DotRecast.Detour.Extras/Jumplink/NavMeshGroundSampler.cs b/src/DotRecast.Detour.Extras/Jumplink/NavMeshGroundSampler.cs
@@ -55,19 +55,15 @@ private bool GetNavMeshHeight(DtNavMeshQuery navMeshQuery, RcVec3f pt, float cs,
             RcAtomicBoolean found = new RcAtomicBoolean();
             RcAtomicFloat minHeight = new RcAtomicFloat(pt.Y);
 
-            navMeshQuery.QueryPolygons(pt, halfExtents, DtQueryNoOpFilter.Shared, new DtCallbackPolyQuery((tile, poly, refs, count) =>
+            navMeshQuery.QueryPolygons(pt, halfExtents, DtQueryNoOpFilter.Shared, new DtCallbackPolyQuery((tile, poly, refs) =>
             {
-                for (int i = 0; i < count; ++i)
+                var status = navMeshQuery.GetPolyHeight(refs, pt, out var h);
+                if (status.Succeeded())
                 {
-                    var status = navMeshQuery.GetPolyHeight(refs[i], pt, out var h);
-                    if (status.Succeeded())
+                    if (h > minHeight.Get() && h < maxHeight)
                     {
-                        if (h > minHeight.Get() && h < maxHeight)
-                        {
-                            minHeight.Exchange(h);
-                            found.Set(true);
-                            return;
-                        }
+                        minHeight.Exchange(h);
+                        found.Set(true);
                     }
                 }
             }));

diff --git a/src/DotRecast.Detour/DtCallbackPolyQuery.cs b/src/DotRecast.Detour/DtCallbackPolyQuery.cs
@@ -4,16 +4,19 @@ namespace DotRecast.Detour
 {
     public class DtCallbackPolyQuery : IDtPolyQuery
     {
-        private readonly Action<DtMeshTile, DtPoly[], long[], int> _callback;
+        private readonly Action<DtMeshTile, DtPoly, long> _callback;
 
-        public DtCallbackPolyQuery(Action<DtMeshTile, DtPoly[], long[], int> callback)
+        public DtCallbackPolyQuery(Action<DtMeshTile, DtPoly, long> callback)
         {
             _callback = callback;
         }
 
-        public void Process(DtMeshTile tile, DtPoly[] poly, long[] refs, int count)
+        public void Process(DtMeshTile tile, DtPoly[] poly, Span<long> refs, int count)
         {
-            _callback?.Invoke(tile, poly, refs, count);
+            for (int i = 0; i < count; ++i)
+            {
+                _callback?.Invoke(tile, poly[i], refs[i]);
+            }
         }
     }
 }
diff --git a/src/DotRecast.Detour/DtCollectPolysQuery.cs b/src/DotRecast.Detour/DtCollectPolysQuery.cs
@@ -1,4 +1,5 @@
-using DotRecast.Core;
+using System;
+using DotRecast.Core;
 
 namespace DotRecast.Detour
 {
@@ -25,7 +26,7 @@ public bool Overflowed()
             return m_overflow;
         }
 
-        public void Process(DtMeshTile tile, DtPoly[] poly, long[] refs, int count)
+        public void Process(DtMeshTile tile, DtPoly[] poly, Span<long> refs, int count)
         {
             int numLeft = m_maxPolys - m_numCollected;
             int toCopy = count;

diff --git a/src/DotRecast.Detour/DtFindNearestPolyQuery.cs b/src/DotRecast.Detour/DtFindNearestPolyQuery.cs
@@ -20,7 +20,7 @@ public DtFindNearestPolyQuery(DtNavMeshQuery query, RcVec3f center)
             _nearestPoint = center;
         }
 
-        public void Process(DtMeshTile tile, DtPoly[] poly, long[] refs, int count)
+        public void Process(DtMeshTile tile, DtPoly[] poly, Span<long> refs, int count)
         {
             for (int i = 0; i < count; ++i)
             {

diff --git a/src/DotRecast.Detour/DtNavMeshQuery.cs b/src/DotRecast.Detour/DtNavMeshQuery.cs
@@ -580,7 +580,7 @@ public DtStatus FindNearestPoly(RcVec3f center, RcVec3f halfExtents, IDtQueryFil
         protected void QueryPolygonsInTile(DtMeshTile tile, RcVec3f qmin, RcVec3f qmax, IDtQueryFilter filter, IDtPolyQuery query)
         {
             const int batchSize = 32;
-            long[] polyRefs = new long[batchSize];
+            Span<long> polyRefs = stackalloc long[batchSize];
             DtPoly[] polys = new DtPoly[batchSize];
             int n = 0;
 

diff --git a/src/DotRecast.Detour/IDtPolyQuery.cs b/src/DotRecast.Detour/IDtPolyQuery.cs
@@ -1,3 +1,5 @@
+using System;
+
 namespace DotRecast.Detour
 {
     /// Provides custom polygon query behavior.
@@ -7,6 +9,6 @@ public interface IDtPolyQuery
     {
         /// Called for each batch of unique polygons touched by the search area in dtNavMeshQuery::queryPolygons.
         /// This can be called multiple times for a single query.
-        void Process(DtMeshTile tile, DtPoly[] poly, long[] refs, int count);
+        void Process(DtMeshTile tile, DtPoly[] poly, Span<long> refs, int count);
     }
 }