Work in progress

Author: andybak

Assets/Scripts/model/util/BurstSpatial.cs

@@ -14,54 +14,70 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using com.google.apps.peltzer.client.model.core;
 using com.google.apps.peltzer.client.model.util;
 using NativeTrees;
+using Unity.Collections;
 using UnityEngine;
 
 /// <summary>
 /// Class wrapping NativeTrees functions which implement our collision system.
 /// </summary>
 public static class BurstSpatialFunction
 {
-    private static List<NativeOctree<int>> _indices = new();
+    private static List<NativeOctree<int>> _octrees = new();
 
     public static int AllocSpatialPartitioner()
     {
         var octree = new NativeOctree<int>();
-        _indices.Add(octree);
-        return _indices.Count - 1;
+        _octrees.Add(octree);
+        return _octrees.Count - 1;
     }
 
     public static void SpatialPartitionerAddItem(int idx, int itemId, Vector3 center, Vector3 extents)
     {
-        _indices[idx].InsertPoint(itemId, center);
+        _octrees[idx].InsertPoint(itemId, center);
     }
 
     public static void SpatialPartitionerUpdateAll(int idx, object itemIds)
     {
         var octree = new NativeOctree<int>();
-        _indices[idx] = _indices[idx];
+        octree = _octrees[idx];
+        jgtuu
     }
 
-    public static void SpatialPartitionerRemoveItem(int idx, int itemId)
+    public static int SpatialPartitionerIntersectedBy(int idx, Vector3 testCenter, Vector3 testExtents, int[] returnArray, int returnArrayMaxSize)
     {
-        throw new NotImplementedException();
+        AABB range = new AABB(testCenter, testExtents);
+        var results = new NativeParallelHashSet<int>(returnArrayMaxSize, Allocator.TempJob);
+        RangeAABBUnique(_octrees[idx], range, results);
+        returnArray = results.ToArray();
     }
 
-    public static int SpatialPartitionerContainedBy(int idx, Vector3 testCenter, Vector3 testExtents, int[] returnArray, int returnArrayMaxSize)
+    public static void RangeAABBUnique<T>(this NativeOctree<T> octree, AABB range, NativeParallelHashSet<T> results)
+        where T : unmanaged, IEquatable<T>
     {
-        throw new NotImplementedException();
-    }
+        var vistor = new RangeAABBUniqueVisitor<T>()
+        {
+            results = results
+        };
 
-    public static int SpatialPartitionerIntersectedBy(int idx, Vector3 testCenter, Vector3 testExtents, int[] returnArray, int returnArrayMaxSize)
-    {
-        throw new NotImplementedException();
+        octree.Range(range, ref vistor);
     }
 
-    public static int HasItem(int idx, int itemHandle)
+    struct RangeAABBUniqueVisitor<T> : IOctreeRangeVisitor<T> where T : unmanaged, IEquatable<T>
     {
-        throw new NotImplementedException();
+        public NativeParallelHashSet<T> results;
+
+        public bool OnVisit(T obj, AABB objBounds, AABB queryRange)
+        {
+            // check if our object's AABB overlaps with the query AABB
+            if (objBounds.Overlaps(queryRange))
+                results.Add(obj);
+
+            return true; // always keep iterating, we want to catch all objects
+        }
     }
 }
 
@@ -97,19 +113,6 @@ public void Add(T item, Bounds bounds)
         itemBounds[item] = bounds;
         BurstSpatialFunction.SpatialPartitionerAddItem(spatialPartitionId, id, bounds.center, bounds.extents);
     }
-    public void UpdateItemBounds(T item, Bounds bounds)
-    {
-        throw new NotImplementedException();
-    }
-
-    /// <summary>
-    /// Updates the bounding box of an item already in the collision system.
-    /// </summary>
-    // public void UpdateItemBounds(T item, Bounds bounds)
-    // {
-    //     itemIds[item].b
-    //     BurstSpatialFunction.SpatialPartitionerUpdateAll(spatialPartitionId, itemIds);
-    // }
 
     /// <summary>
     /// Remove an item from the system.
@@ -126,29 +129,6 @@ public void Remove(T item)
         BurstSpatialFunction.SpatialPartitionerUpdateAll(spatialPartitionId, itemIds);
     }
 
-    /// <summary>
-    ///   Find items contained entirely within the given bounds.
-    ///   This method will create a set when the number of items
-    ///   is greater than zero.
-    /// </summary>
-    /// <param name="bounds">Containing bounds.</param>
-    /// <param name="items">Set of items found.  Null when this
-    /// method returns false.</param>
-    /// <param name="limit">Maximum number of items to find.</param>
-    /// <returns>true if any items are found.</returns>
-    public bool ContainedBy(Bounds bounds, out HashSet<T> items,
-      int limit = SpatialIndex.MAX_INTERSECT_RESULTS)
-    {
-        int numResults = BurstSpatialFunction.SpatialPartitionerContainedBy(spatialPartitionId, bounds.center,
-          bounds.extents, results, limit);
-        items = new HashSet<T>();
-        for (int i = 0; i < numResults; i++)
-        {
-            items.Add(idsToItems[results[i]]);
-        }
-        return items.Count > 0;
-    }
-
     /// <summary>
     /// Returns whether the item is tracked in this system.
     /// </summary>

Assets/Scripts/model/util/CollisionSystem.cs

@@ -36,16 +36,6 @@ public interface CollisionSystem<T>
         ///  Thrown when bounds is not contained by the CollisionSystem's bounds.</exception>
         void Add(T item, Bounds bounds);
 
-        /// <summary>
-        ///   Update the bounds of an item.  The item must already exist
-        ///   in the index.
-        /// </summary>
-        /// <param name="item">The item to update.</param>
-        /// <param name="bounds">The item's updated bounds.</param>
-        /// <exception cref="System.Exception">
-        ///  Thrown when the item isn't in the tree.</exception>
-        void UpdateItemBounds(T item, Bounds bounds);
-
         /// <summary>
         ///   Remove an item from the index.
         /// </summary>
@@ -54,19 +44,6 @@ public interface CollisionSystem<T>
         ///  Thrown when the item isn't in the tree.</exception>
         void Remove(T item);
 
-        /// <summary>
-        ///   Find items contained entirely within the given bounds.
-        ///   This method will create a set when the number of items
-        ///   is greater than zero.
-        /// </summary>
-        /// <param name="bounds">Containing bounds.</param>
-        /// <param name="items">Set of items found.  Null when this
-        /// method returns false.</param>
-        /// <param name="limit">Maximum number of items to find.</param>
-        /// <returns>true if any items are found.</returns>
-        bool ContainedBy(Bounds bounds, out HashSet<T> items,
-          int limit = SpatialIndex.MAX_INTERSECT_RESULTS);
-
         /// <summary>
         ///   Find items that intersect the given bounds.
         ///   This method will create a Set when the number of items

Assets/Scripts/model/util/OctreeImpl.cs

@@ -66,22 +66,6 @@ public void Add(T item, Bounds bounds)
             itemNode[item] = node;
         }
 
-        /// <summary>
-        ///   Update the bounds of an item.  The item must already exist
-        ///   in the index.
-        /// </summary>
-        /// <param name="item">The item to update.</param>
-        /// <param name="bounds">The item's updated bounds.</param>
-        /// <exception cref="System.Exception">
-        ///  Thrown when the item isn't in the tree.</exception>
-        public void UpdateItemBounds(T item, Bounds bounds)
-        {
-            OTNode oldNode = itemNode[item];
-            oldNode.Remove(item);
-            itemBounds[item] = bounds;
-            itemNode[item] = root.Add(item, bounds);
-        }
-
         /// <summary>
         ///   Remove an item from the index.
         /// </summary>