Add z order for HPUI Interactables

ovi-lab · Jan 8, 2024 · 61f23c1 · 61f23c1
1 parent 26a2b13
commit 61f23c1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/Editor/HPUIBaseInteractableEditor.cs b/Editor/HPUIBaseInteractableEditor.cs
@@ -54,5 +54,9 @@ protected override List<string> GetDerivedSerializedPropertyNames()
             props.AddRange(EventPropertyNames);
             return props;
         }
+
+        /// <inheritdoc />
+        protected override void DrawSelectionConfiguration()
+        {}
     }
 }
diff --git a/Runtime/Interaction/HPUIBaseInteractable.cs b/Runtime/Interaction/HPUIBaseInteractable.cs
@@ -24,6 +24,12 @@ public Handedness Handedness
 
         public Collider boundsCollider;
 
+        [SerializeField]
+        private int _zOrder;
+
+        /// <inheritdoc />
+        public int zOrder { get => _zOrder; set => _zOrder = value; }
+
         [SerializeField]
         private HPUITapEvent tapEvent = new HPUITapEvent();
 
@@ -48,6 +54,7 @@ protected override void Awake()
         {
             base.Awake();
             getDistanceOverride = GetDistanceOverride;
+            selectMode = InteractableSelectMode.Single;
         }
 
         /// <inheritdoc />

diff --git a/Runtime/Interaction/HPUIInteractor.cs b/Runtime/Interaction/HPUIInteractor.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.Pool;
 using UnityEngine.XR.Hands;
@@ -14,7 +15,7 @@ namespace ubco.ovilab.HPUI.Interaction
     [DisallowMultipleComponent]
     public class HPUIInteractor: XRPokeInteractor, IHPUIInteractor
     {
-        public Handedness handedness;
+        public new Handedness handedness;
 
         // TODO move these to an asset?
         [SerializeField]
@@ -87,16 +88,21 @@ public override void GetValidTargets(List<IXRInteractable> targets)
             List<IXRInteractable> recievedTargets = ListPool<IXRInteractable>.Get();
             recievedTargets.AddRange(targets);
 
-            foreach(IXRInteractable target in recievedTargets)
+            targets.Clear();
+            foreach(IXRInteractable target in recievedTargets.Select(t => t as IHPUIInteractable).Where(ht => ht != null).OrderBy(ht => ht.zOrder))
             {
-                if (!(target is HPUIBaseInteractable hpuiTarget) || hpuiTarget.Handedness != handedness)
-                {
-                    targets.Remove(target);
-                }
+                targets.Add(target);
             }
             ListPool<IXRInteractable>.Release(recievedTargets);
         }
 
+        /// <inheritdoc />
+        public override bool CanSelect(IXRSelectInteractable interactable)
+        {
+            return ProcessSelectFilters(interactable);
+        }
+
+
         #region IHPUIInteractor interface
         /// <inheritdoc />
         public void OnTap(HPUITapEventArgs args)

diff --git a/Runtime/Interaction/IHPUIInteractable.cs b/Runtime/Interaction/IHPUIInteractable.cs
@@ -5,6 +5,11 @@ namespace ubco.ovilab.HPUI.Interaction
 {
     public interface IHPUIInteractable : IXRInteractable, IXRSelectInteractable
     {
+        /// <summary>
+        /// Lower z order will get higher priority.
+        /// </summary>
+        int zOrder { get; set; }
+
         /// <summary>
         /// Get the projection of the interactors position on the xz plane of this interactable, normalized.
         /// the returned Vector2 - (x, z) on the xz-plane.