Update to latest Spatial Hash Module package

Runtime/Actions/Duplicate.cs

@@ -1,7 +1,7 @@
 using Unity.Labs.EditorXR.Interfaces;
 using Unity.Labs.EditorXR.Utilities;
 using Unity.Labs.ModuleLoader;
-using Unity.Labs.SpatialHash.Interfaces;
+using Unity.Labs.SpatialHash;
 using Unity.Labs.Utils;
 using UnityEditor;
 using UnityEngine;

Runtime/Actions/Paste.cs

@@ -2,7 +2,7 @@
 using Unity.Labs.EditorXR.Interfaces;
 using Unity.Labs.EditorXR.Utilities;
 using Unity.Labs.ModuleLoader;
-using Unity.Labs.SpatialHash.Interfaces;
+using Unity.Labs.SpatialHash;
 using Unity.Labs.Utils;
 using UnityEditor;
 using UnityEngine;

Runtime/Scripts/Core/EditorXRMiniWorldModule.cs

@@ -7,17 +7,16 @@
 using Unity.Labs.EditorXR.Workspaces;
 using Unity.Labs.ModuleLoader;
 using Unity.Labs.SpatialHash;
-using Unity.Labs.SpatialHash.Interfaces;
 using Unity.Labs.Utils;
 using UnityEditor;
 using UnityEngine;
 
 namespace Unity.Labs.EditorXR.Core
 {
     class EditorXRMiniWorldModule : IModuleDependency<EditorXRToolModule>, IModuleDependency<EditorXRDirectSelectionModule>,
-        IModuleDependency<SpatialHashModule>, IModuleDependency<HighlightModule>, IModuleDependency<IntersectionModule>,
-        IModuleDependency<WorkspaceModule>, IModuleDependency<EditorXRRayModule>, IUsesPlaceSceneObjects, IUsesViewerScale,
-        IUsesSpatialHash, IUsesRayVisibilitySettings, IProvidesIsInMiniWorld
+        IModuleDependency<HighlightModule>, IModuleDependency<IntersectionModule>, IModuleDependency<WorkspaceModule>,
+        IModuleDependency<EditorXRRayModule>, IUsesPlaceSceneObjects, IUsesViewerScale, IUsesSpatialHash,
+        IUsesRayVisibilitySettings, IProvidesIsInMiniWorld
     {
         internal class MiniWorldRay
         {
@@ -178,7 +177,6 @@ public void UpdatePreview()
         EditorXRToolModule m_ToolModule;
         EditorXRDirectSelectionModule m_DirectSelectionModule;
         EditorXRRayModule m_RayModule;
-        SpatialHashModule m_SpatialHashModule;
         HighlightModule m_HighlightModule;
         IntersectionModule m_IntersectionModule;
 
@@ -217,11 +215,6 @@ public void ConnectDependency(EditorXRRayModule dependency)
             m_RayModule = dependency;
         }
 
-        public void ConnectDependency(SpatialHashModule dependency)
-        {
-            m_SpatialHashModule = dependency;
-        }
-
         public void ConnectDependency(HighlightModule dependency)
         {
             m_HighlightModule = dependency;
@@ -560,11 +553,11 @@ void UpdateRayContainment(DeviceData data)
         internal void OnWorkspaceCreated(IWorkspace workspace)
         {
             var miniWorldWorkspace = workspace as MiniWorldWorkspace;
-            if (!miniWorldWorkspace)
+            if (miniWorldWorkspace == null)
                 return;
 
-            miniWorldWorkspace.zoomSliderMax = m_SpatialHashModule.GetMaxBounds().size.MaxComponent()
-                / miniWorldWorkspace.contentBounds.size.MaxComponent();
+            var maxBounds = this.HasProvider<IProvidesSpatialHash>() ? this.GetAggregateBounds().size.MaxComponent() : 10f;
+            miniWorldWorkspace.zoomSliderMax = maxBounds / miniWorldWorkspace.contentBounds.size.MaxComponent();
 
             var miniWorld = miniWorldWorkspace.miniWorld;
             var worldID = m_Worlds.Count;

Runtime/Scripts/Core/EditorXRViewerModule.cs

@@ -17,7 +17,7 @@ class EditorXRViewerModule : ScriptableSettings<EditorXRViewerModule>,
         IModuleDependency<EditorXRDirectSelectionModule>, IInterfaceConnector,
         ISerializePreferences, IUsesConnectInterfaces, IDelayedInitializationModule, IModuleBehaviorCallbacks,
         IUsesFunctionalityInjection, IProvidesViewerScale, IProvidesViewerBody, IProvidesMoveCameraRig,
-        IProvidesGetVRPlayerObjects
+        IProvidesGetVRPlayerObjects, IUsesSpatialHash
     {
         [Serializable]
         class Preferences
@@ -101,6 +101,7 @@ public float cameraRigScale
 #if !FI_AUTOFILL
         IProvidesFunctionalityInjection IFunctionalitySubscriber<IProvidesFunctionalityInjection>.provider { get; set; }
         IProvidesConnectInterfaces IFunctionalitySubscriber<IProvidesConnectInterfaces>.provider { get; set; }
+        IProvidesSpatialHash IFunctionalitySubscriber<IProvidesSpatialHash>.provider { get; set; }
 #endif
 
         public void ConnectDependency(EditorXRDirectSelectionModule dependency)
@@ -242,9 +243,8 @@ void AddPlayerModel()
         {
             m_PlayerBody = EditorXRUtils.Instantiate(m_PlayerModelPrefab, CameraUtils.GetMainCamera().transform, false).GetComponent<PlayerBody>();
             this.InjectFunctionalitySingle(m_PlayerBody);
-            var spatialHashModule = ModuleLoaderCore.instance.GetModule<SpatialHashModule>();
-            if (spatialHashModule != null)
-                spatialHashModule.AddRenderer(m_PlayerBody.GetComponent<Renderer>());
+            if (this.HasProvider<IProvidesSpatialHash>())
+                this.AddRendererToSpatialHash(m_PlayerBody.GetComponent<Renderer>());
 
             var playerObjects = m_PlayerBody.GetComponentsInChildren<Renderer>(true);
             foreach (var playerObject in playerObjects)

Runtime/Scripts/Modules/IntersectionModule/IntersectionModule.cs

@@ -12,7 +12,7 @@ namespace Unity.Labs.EditorXR.Modules
 {
     sealed class IntersectionModule : ScriptableSettings<IntersectionModule>, IDelayedInitializationModule, IModuleBehaviorCallbacks,
         IUsesGameObjectLocking, IUsesGetVRPlayerObjects, IProvidesSceneRaycast, IProvidesControlInputIntersection,
-        IProvidesContainsVRPlayerCompletely, IProvidesCheckSphere, IProvidesCheckBounds
+        IProvidesContainsVRPlayerCompletely, IProvidesCheckSphere, IProvidesCheckBounds, IUsesSpatialHash
     {
         class RayIntersection
         {
@@ -45,11 +45,10 @@ class DirectIntersection
         public int initializationOrder { get { return -3; } }
         public int shutdownOrder { get { return 0; } }
 
-        SpatialHashModule m_SpatialHashModule;
-
 #if !FI_AUTOFILL
         IProvidesGameObjectLocking IFunctionalitySubscriber<IProvidesGameObjectLocking>.provider { get; set; }
         IProvidesGetVRPlayerObjects IFunctionalitySubscriber<IProvidesGetVRPlayerObjects>.provider { get; set; }
+        IProvidesSpatialHash IFunctionalitySubscriber<IProvidesSpatialHash>.provider { get; set; }
 #endif
 
         // Local method use only -- created here to reduce garbage collection. Collections must be cleared before use
@@ -66,7 +65,6 @@ struct SortableRenderer
         public void LoadModule()
         {
             IntersectionUtils.BakedMesh = new Mesh(); // Create a new Mesh in LoadModule because it is destroyed on scene load
-            m_SpatialHashModule = ModuleLoaderCore.instance.GetModule<SpatialHashModule>();
         }
 
         public void UnloadModule() { }
@@ -78,10 +76,10 @@ public void Initialize()
             collisionTesterObject.transform.SetParent(moduleParent.transform, false);
             m_CollisionTester = collisionTesterObject.AddComponent<MeshCollider>();
 
-            if (m_SpatialHashModule != null)
+            if (this.HasProvider<IProvidesSpatialHash>())
             {
-                m_SpatialHashModule.Clear();
-                m_SpatialHashContainer = m_SpatialHashModule.GetOrCreateContainer<Renderer>();
+                this.ClearSpatialHash();
+                m_SpatialHashContainer = this.GetOrCreateSpatialHashContainer<Renderer>();
             }
 
             m_IntersectedObjects.Clear();
@@ -124,7 +122,7 @@ void SetupObjects()
                 }
             }
 
-            m_SpatialHashModule.AddRenderers(k_Renderers);
+            this.AddRenderersToSpatialHash(k_Renderers);
         }
 
         IEnumerator UpdateDynamicObjects()
@@ -150,8 +148,7 @@ IEnumerator UpdateDynamicObjects()
                     }
                 }
 
-                m_SpatialHashModule.RemoveObjects(k_ChangedObjects);
-                m_SpatialHashModule.AddRenderers(k_ChangedObjects);
+                this.UpdateRenderersInSpatialHash(k_ChangedObjects);
                 m_SpatialHashContainer.Trim();
 
                 yield return null;
@@ -161,8 +158,8 @@ IEnumerator UpdateDynamicObjects()
         public void Shutdown()
         {
             EditorMonoBehaviour.instance.StopCoroutine(m_UpdateCoroutine);
-            if (m_SpatialHashModule != null)
-                m_SpatialHashModule.Clear();
+            if (this.HasProvider<IProvidesSpatialHash>())
+                this.ClearSpatialHash();
 
             if (m_CollisionTester != null)
                 UnityObjectUtils.Destroy(m_CollisionTester.gameObject);

Runtime/Scripts/Modules/SceneObjectModule.cs

@@ -3,7 +3,7 @@
 using Unity.Labs.EditorXR.Interfaces;
 using Unity.Labs.EditorXR.Utilities;
 using Unity.Labs.ModuleLoader;
-using Unity.Labs.SpatialHash.Interfaces;
+using Unity.Labs.SpatialHash;
 using Unity.Labs.Utils;
 using UnityEditor;
 using UnityEngine;

Runtime/Tools/AnnotationTool/AnnotationTool.cs

@@ -9,7 +9,7 @@
 using Unity.Labs.EditorXR.Proxies;
 using Unity.Labs.EditorXR.Utilities;
 using Unity.Labs.ModuleLoader;
-using Unity.Labs.SpatialHash.Interfaces;
+using Unity.Labs.SpatialHash;
 using Unity.Labs.Utils;
 using UnityEditor;
 using UnityEngine;

Runtime/Tools/CreatePrimitiveTool/CreatePrimitiveTool.cs

@@ -2,7 +2,7 @@
 using Unity.Labs.EditorXR.Proxies;
 using Unity.Labs.EditorXR.Utilities;
 using Unity.Labs.ModuleLoader;
-using Unity.Labs.SpatialHash.Interfaces;
+using Unity.Labs.SpatialHash;
 using Unity.Labs.Utils;
 using UnityEditor;
 using UnityEngine;

Runtime/Unity.Labs.EditorXR.asmdef

@@ -12,11 +12,15 @@
         "Unity.Labs.ModuleLoader",
         "Unity.Labs.EditorXR.Interfaces",
         "UnityEngine.SpatialTracking",
-        "Unity.Labs.SpatialHash.Interfaces",
-        "Unity.Labs.SpatialHash"
+        "Unity.Labs.SpatialHash.Public"
     ],
     "optionalUnityReferences": [],
     "includePlatforms": [],
     "excludePlatforms": [],
-    "allowUnsafeCode": false
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": []
 }

Runtime/Workspaces/PolyWorkspace/Scripts/PolyGridItem.cs

@@ -9,7 +9,7 @@
 using Unity.Labs.EditorXR.Proxies;
 using Unity.Labs.EditorXR.Utilities;
 using Unity.Labs.ModuleLoader;
-using Unity.Labs.SpatialHash.Interfaces;
+using Unity.Labs.SpatialHash;
 using Unity.Labs.Utils;
 using UnityEngine;
 using UnityEngine.InputNew;

Runtime/Workspaces/ProjectWorkspace/Scripts/AssetGridItem.cs

@@ -11,7 +11,7 @@
 using Unity.Labs.EditorXR.Proxies;
 using Unity.Labs.EditorXR.Utilities;
 using Unity.Labs.ModuleLoader;
-using Unity.Labs.SpatialHash.Interfaces;
+using Unity.Labs.SpatialHash;
 using Unity.Labs.Utils;
 using UnityEditor;
 using UnityEngine;