Merge pull request Unity-Technologies#10 from unity/mars-volume-queries

MARS Volume Queries

.gitmodules

@@ -2,6 +2,3 @@
 	path = Runtime/libs/input-prototype
 	url=https://github.com/Unity-Technologies/input-prototype.git
 	branch = editorvr/main
-[submodule "Runtime/libs/UnityOctree"]
-	path = Runtime/libs/UnityOctree
-	url=https://github.com/Unity-Technologies/UnityOctree.git

Runtime/Actions/Duplicate.cs

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

Runtime/Actions/Paste.cs

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

Runtime/Scripts/Core/EditorXRDirectSelectionModule.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Unity.Labs.EditorXR.Extensions;
 using Unity.Labs.EditorXR.Interfaces;
 using Unity.Labs.EditorXR.Modules;
 using Unity.Labs.EditorXR.Proxies;
 using Unity.Labs.ModuleLoader;
+using Unity.Labs.Utils;
 using UnityEngine;
 
 namespace Unity.Labs.EditorXR.Core

Runtime/Scripts/Core/EditorXRMiniWorldModule.cs

@@ -1,22 +1,22 @@
 using System.Collections.Generic;
 using System.Linq;
-using Unity.Labs.EditorXR.Extensions;
 using Unity.Labs.EditorXR.Interfaces;
 using Unity.Labs.EditorXR.Modules;
 using Unity.Labs.EditorXR.Proxies;
 using Unity.Labs.EditorXR.Utilities;
 using Unity.Labs.EditorXR.Workspaces;
 using Unity.Labs.ModuleLoader;
+using Unity.Labs.SpatialHash;
 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
         {
@@ -177,7 +177,6 @@ public void UpdatePreview()
         EditorXRToolModule m_ToolModule;
         EditorXRDirectSelectionModule m_DirectSelectionModule;
         EditorXRRayModule m_RayModule;
-        SpatialHashModule m_SpatialHashModule;
         HighlightModule m_HighlightModule;
         IntersectionModule m_IntersectionModule;
 
@@ -216,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;
@@ -559,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/EditorXRRayModule.cs

@@ -8,6 +8,7 @@
 using Unity.Labs.EditorXR.Proxies;
 using Unity.Labs.EditorXR.Utilities;
 using Unity.Labs.ModuleLoader;
+using Unity.Labs.SpatialHash;
 using Unity.Labs.Utils;
 using UnityEditor;
 using UnityEngine;
@@ -92,8 +93,10 @@ public void LoadModule()
             m_DirectSelectionModule = moduleLoaderCore.GetModule<EditorXRDirectSelectionModule>();
             m_SerializedPreferences = moduleLoaderCore.GetModule<SerializedPreferencesModule>();
             m_IntersectionModule = moduleLoaderCore.GetModule<IntersectionModule>();
-            if (m_IntersectionModule != null)
-                ignoreList = m_IntersectionModule.standardIgnoreList;
+
+            var selectionModule = moduleLoaderCore.GetModule<SelectionModule>();
+            if (selectionModule != null)
+                ignoreList = selectionModule.standardIgnoreList;
 
             m_ModuleParent = moduleLoaderCore.GetModuleParent().transform;
         }

Runtime/Scripts/Core/EditorXRViewerModule.cs

@@ -5,18 +5,19 @@
 using Unity.Labs.EditorXR.Interfaces;
 using Unity.Labs.EditorXR.Modules;
 using Unity.Labs.EditorXR.Utilities;
+using Unity.Labs.ModuleLoader;
+using Unity.Labs.SpatialHash;
 using Unity.Labs.Utils;
 using UnityEngine;
 using UnityEngine.XR;
-using Unity.Labs.ModuleLoader;
 
 namespace Unity.Labs.EditorXR.Core
 {
     class EditorXRViewerModule : ScriptableSettings<EditorXRViewerModule>,
         IModuleDependency<EditorXRDirectSelectionModule>, IInterfaceConnector,
         ISerializePreferences, IUsesConnectInterfaces, IDelayedInitializationModule, IModuleBehaviorCallbacks,
         IUsesFunctionalityInjection, IProvidesViewerScale, IProvidesViewerBody, IProvidesMoveCameraRig,
-        IProvidesGetVRPlayerObjects
+        IProvidesGetVRPlayerObjects, IUsesSpatialHash
     {
         [Serializable]
         class Preferences
@@ -100,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)
@@ -241,20 +243,18 @@ void AddPlayerModel()
         {
             m_PlayerBody = EditorXRUtils.Instantiate(m_PlayerModelPrefab, CameraUtils.GetMainCamera().transform, false).GetComponent<PlayerBody>();
             this.InjectFunctionalitySingle(m_PlayerBody);
-            var renderer = m_PlayerBody.GetComponent<Renderer>();
-            var spatialHashModule = ModuleLoaderCore.instance.GetModule<SpatialHashModule>();
-            if (spatialHashModule != null)
-                spatialHashModule.spatialHash.AddObject(renderer, renderer.bounds);
+            if (this.HasProvider<IProvidesSpatialHash>())
+                this.AddRendererToSpatialHash(m_PlayerBody.GetComponent<Renderer>());
 
             var playerObjects = m_PlayerBody.GetComponentsInChildren<Renderer>(true);
             foreach (var playerObject in playerObjects)
             {
                 m_VRPlayerObjects.Add(playerObject.gameObject);
             }
 
-            var intersectionModule = ModuleLoaderCore.instance.GetModule<IntersectionModule>();
-            if (intersectionModule != null)
-                intersectionModule.standardIgnoreList.AddRange(m_VRPlayerObjects);
+            var selectionModule = ModuleLoaderCore.instance.GetModule<SelectionModule>();
+            if (selectionModule != null)
+                selectionModule.standardIgnoreList.AddRange(m_VRPlayerObjects);
         }
 
         public bool IsOverShoulder(Transform rayOrigin)