Improve inspector of interactables editors

ovi-lab · Jan 16, 2024 · e9e949c · e9e949c
1 parent a708064
commit e9e949c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 9 deletions.
diff --git a/Editor/HPUIBaseInteractableEditor.cs b/Editor/HPUIBaseInteractableEditor.cs
@@ -5,6 +5,7 @@
 
 namespace ubco.ovilab.HPUI.Editor
 {
+    [CanEditMultipleObjects]
     [CustomEditor(typeof(HPUIBaseInteractable), true)]
     public class HPUIBaseInteractableEditor: XRBaseInteractableEditor
     {
@@ -55,8 +56,11 @@ protected override List<string> GetDerivedSerializedPropertyNames()
             return props;
         }
 
+        // Selection mode and distance calculation mode are programatically set.
         /// <inheritdoc />
-        protected override void DrawSelectionConfiguration()
-        {}
+        protected override void DrawSelectionConfiguration() { }
+
+        /// <inheritdoc />
+        protected override void DrawDistanceCalculationMode() { }
     }
 }
diff --git a/Editor/HPUIContinuousInteractableEditor.cs b/Editor/HPUIContinuousInteractableEditor.cs
@@ -6,11 +6,16 @@
 
 namespace ubco.ovilab.HPUI.Editor
 {
+    [CanEditMultipleObjects]
     [CustomEditor(typeof(HPUIContinuousInteractable), true)]
     public class HPUIContinuousInteractableEditor: HPUIBaseInteractableEditor
     {
         private HPUIContinuousInteractable t;
-        protected override List<string> EventPropertyNames => base.EventPropertyNames.Union(new List<string>() { "continuousSurfaceCreatedEvent" }).ToList();
+        protected override List<string> EventPropertyNames => base.EventPropertyNames.Union(new List<string>()
+        {
+            "continuousSurfaceCreatedEvent",
+            "boundsCollider" // NOTE: this is not relevant to the HPUIContinuousInteractable.
+        }).ToList();
 
         protected override void OnEnable()
         {
@@ -24,7 +29,10 @@ public override void OnInspectorGUI()
             GUI.enabled = EditorApplication.isPlaying;
             if (GUILayout.Button("Run calibration"))
             {
-                t.Configure();
+                foreach (Object t in targets)
+                {
+                    (t as HPUIContinuousInteractable)?.Configure();
+                }
             }
             GUI.enabled = true;
         }

diff --git a/Editor/HPUIInteractorEditor.cs b/Editor/HPUIInteractorEditor.cs
@@ -5,6 +5,7 @@
 
 namespace ubco.ovilab.HPUI.Editor
 {
+    [CanEditMultipleObjects]
     [CustomEditor(typeof(HPUIInteractor), true)]
     public class HPUIInteractorEditor: XRBaseInteractorEditor
     {

diff --git a/Runtime/Interaction/HPUIBaseInteractable.cs b/Runtime/Interaction/HPUIBaseInteractable.cs
@@ -23,7 +23,14 @@ public Handedness Handedness
             set => handedness = value;
         }
 
-        public Collider boundsCollider;
+        [SerializeField]
+        private Collider boundsCollider;
+
+        /// <summary>
+        /// The collider used to compute the bounds of the interactable.
+        /// /// <seealso cref="ComputeInteractorPostion"/>
+        /// </summary>
+        public Collider BoundsCollider { get => boundsCollider; set => boundsCollider = value; }
 
         [SerializeField]
         private int _zOrder;
@@ -76,13 +83,13 @@ protected override void OnEnable()
         /// </summary>
         protected virtual void ComputeSurfaceBounds()
         {
-            if (boundsCollider == null)
+            if (BoundsCollider == null)
             {
-                boundsCollider = colliders[0];
-                Debug.LogWarning($"boundsCollider is not set. Using {boundsCollider.name}'s collider.");
+                BoundsCollider = colliders[0];
+                Debug.LogWarning($"boundsCollider is not set. Using {BoundsCollider.name}'s collider.");
             }
 
-            Bounds colliderBounds = boundsCollider.bounds;
+            Bounds colliderBounds = BoundsCollider.bounds;
             Transform interactableTransform = GetAttachTransform(null);
             boundsMax = ComputeTargetPointOnInteractablePlane(colliderBounds.max, interactableTransform);
             boundsMin = ComputeTargetPointOnInteractablePlane(colliderBounds.min, interactableTransform);