Fixes for URP

Author: keithbradner

Assets/SteamVR/InteractionSystem/Core/Scripts/Hand.cs

@@ -888,6 +888,24 @@ protected virtual void UpdateHovering()
             hoveringInteractable = closestInteractable;
         }
 
+        public Vector3 GetHoverPosition()
+        {
+            if (useControllerHoverComponent && mainRenderModel != null && mainRenderModel.IsControllerVisibile())
+            {
+                return mainRenderModel.GetControllerPosition(controllerHoverComponent);
+            }
+            else if (useHoverSphere)
+            {
+                return hoverSphereTransform.position;
+            }
+            else if (useFingerJointHover && mainRenderModel != null && mainRenderModel.IsHandVisibile())
+            {
+                return mainRenderModel.GetBonePosition((int)fingerJointHover);
+            }
+
+            return this.transform.position;
+        }
+
         protected virtual bool CheckHoveringForTransform(Vector3 hoverPosition, float hoverRadius, ref float closestDistance, ref Interactable closestInteractable, Color debugColor)
         {
             bool foundCloser = false;

Assets/SteamVR/InteractionSystem/Core/Scripts/InputModule.cs

@@ -7,7 +7,10 @@
 using UnityEngine;
 using System.Collections;
 using UnityEngine.EventSystems;
+
+#if ENABLE_INPUT_SYSTEM
 using UnityEngine.InputSystem.UI;
+#endif
 
 namespace Valve.VR.InteractionSystem
 {

Assets/SteamVR/InteractionSystem/Core/Scripts/Interactable.cs

@@ -93,6 +93,9 @@ public Hand hoveringHand
         public bool wasHovering { get; protected set; }
 
 
+        private bool hasWaveOrigin = false;
+        private int waveOriginID = int.MinValue;
+
         private void Awake()
         {
             skeletonPoser = GetComponent<SteamVR_Skeleton_Poser>();
@@ -101,11 +104,8 @@ private void Awake()
         protected virtual void Start()
         {
             if (highlightMat == null)
-#if UNITY_URP
-                highlightMat = (Material)Resources.Load("SteamVR_HoverHighlight_URP", typeof(Material));
-#else
                 highlightMat = (Material)Resources.Load("SteamVR_HoverHighlight", typeof(Material));
-#endif
+            hasWaveOrigin = highlightMat.HasProperty(waveOriginID);
 
             if (highlightMat == null)
                 Debug.LogError("<b>[SteamVR Interaction]</b> Hover Highlight Material is missing. Please create a material named 'SteamVR_HoverHighlight' and place it in a Resources folder", this);
@@ -261,6 +261,31 @@ protected virtual void OnHandHoverBegin(Hand hand)
         }
 
 
+        protected virtual void HandHoverUpdate(Hand hand)
+        {
+            if (hasWaveOrigin)
+            {
+                Vector3 hoverPosition = hand.GetHoverPosition();
+
+                for (int rendererIndex = 0; rendererIndex < highlightRenderers.Length; rendererIndex++)
+                {
+                    for (int materialIndex = 0; materialIndex < highlightRenderers[rendererIndex].sharedMaterials.Length; materialIndex++)
+                    {
+                        highlightRenderers[rendererIndex].sharedMaterials[materialIndex].SetVector(waveOriginID, hoverPosition);
+                    }
+                }
+
+                for (int rendererIndex = 0; rendererIndex < highlightSkinnedRenderers.Length; rendererIndex++)
+                {
+                    for (int materialIndex = 0; materialIndex < highlightSkinnedRenderers[rendererIndex].sharedMaterials.Length; materialIndex++)
+                    {
+                        highlightSkinnedRenderers[rendererIndex].sharedMaterials[materialIndex].SetVector(waveOriginID, hoverPosition);
+                    }
+                }
+            }
+        }
+
+
         /// <summary>
         /// Called when a Hand stops hovering over this object
         /// </summary>