boost lane marker hovering

TLM/TLM/UI/SubTool.cs

@@ -78,15 +78,11 @@ private Texture2D BorderlessTexture {
 
         private GUIStyle borderlessStyle_;
 
-        protected virtual ushort HoveredNodeId {
-            get => TrafficManagerTool.HoveredNodeId;
-            set => TrafficManagerTool.HoveredNodeId = value;
-        }
+        protected virtual ushort HoveredNodeId => TrafficManagerTool.HoveredNodeId;
 
-        protected virtual ushort HoveredSegmentId {
-            get => TrafficManagerTool.HoveredSegmentId;
-            set => TrafficManagerTool.HoveredSegmentId = value;
-        }
+        protected virtual ushort HoveredSegmentId => TrafficManagerTool.HoveredSegmentId;
+
+        protected virtual uint HoveredLaneId => TrafficManagerTool.HoveredLaneId;
 
         protected ushort SelectedNodeId {
             get => TrafficManagerTool.SelectedNodeId;

TLM/TLM/UI/SubTools/LaneArrowTool.cs

@@ -162,7 +162,6 @@ protected override ushort HoveredNodeId {
                 }
                 return base.HoveredNodeId;
             }
-            set => base.HoveredNodeId = value;
         }
 
         /// <summary>

TLM/TLM/UI/SubTools/LaneConnectorTool.cs

@@ -11,6 +11,7 @@ namespace TrafficManager.UI.SubTools {
     using TrafficManager.State;
     using TrafficManager.Util.Caching;
     using UnityEngine;
+    using Util.Caching;
 
     public class LaneConnectorTool : SubTool {
         private enum MarkerSelectionMode {
@@ -201,8 +202,7 @@ private void ShowOverlay(bool viewOnly, RenderManager.CameraInfo cameraInfo) {
 
                     // bounds.center = laneMarker.position;
                     // bounds.IntersectRay(mouseRay);
-                    bool markerIsHovered = IsLaneMarkerHovered(laneMarker, ref mouseRay);
-
+                    bool markerIsHovered = laneMarker.LaneId == HoveredLaneId;
                     // draw source marker in source selection mode,
                     // draw target marker (if segment turning angles are within bounds) and
                     // selected source marker in target selection mode
@@ -262,21 +262,6 @@ bool drawMarker
             } // end for node in all nodes
         }
 
-        private bool IsLaneMarkerHovered(NodeLaneMarker laneMarker, ref Ray mouseRay) {
-            Bounds bounds = new Bounds(Vector3.zero, Vector3.one) {
-                center = laneMarker.Position
-            };
-
-            if (bounds.IntersectRay(mouseRay)) {
-                return true;
-            }
-
-            bounds = new Bounds(Vector3.zero, Vector3.one) {
-                center = laneMarker.SecondaryPosition
-            };
-            return bounds.IntersectRay(mouseRay);
-        }
-
         /// <summary>
         /// Finds the first index for which node.GetSegment(index) != 0 (its possible node.m_segment0 == 0)
         /// </summary>

TLM/TLM/UI/TrafficManagerTool.cs

@@ -20,6 +20,7 @@ namespace TrafficManager.UI {
     using TrafficManager.UI.SubTools;
     using TrafficManager.Util;
     using UnityEngine;
+    using static Util.Shortcuts;
 
     [UsedImplicitly]
     public class TrafficManagerTool
@@ -31,6 +32,7 @@ public class TrafficManagerTool
 
         internal static ushort HoveredNodeId;
         internal static ushort HoveredSegmentId;
+        internal static uint HoveredLaneId;
 
         private static bool _mouseClickProcessed;
 
@@ -825,6 +827,7 @@ public bool DoRayCast(RaycastInput input, out RaycastOutput output) {
         private bool DetermineHoveredElements() {
             HoveredSegmentId = 0;
             HoveredNodeId = 0;
+            HoveredLaneId = 0;
 
             bool mouseRayValid = !UIView.IsInsideUI() && Cursor.visible &&
                                  (_activeSubTool == null || !_activeSubTool.IsCursorInPanel());
@@ -941,20 +944,23 @@ private bool DetermineHoveredElements() {
                 }
 
                 if (HoveredNodeId != 0) {
-                    HoveredSegmentId = GetHoveredSegmentFromNode();
+                    HoveredSegmentId = GetHoveredSegmentFromNode(segmentOutput.m_hitPos);
                 }
-            }
 
+                if(HoveredSegmentId != 0) {
+                    DetermineHoveredLane(segmentOutput.m_hitPos);
+                }
+            }
             return HoveredNodeId != 0 || HoveredSegmentId != 0;
         }
 
         /// <summary>
         /// returns the node segment that is closest to the mouse pointer based on angle.
         /// </summary>
-        internal ushort GetHoveredSegmentFromNode() {
+        internal ushort GetHoveredSegmentFromNode(Vector3 hitPos) {
             ushort minSegId = 0;
             NetNode node = NetManager.instance.m_nodes.m_buffer[HoveredNodeId];
-            Vector3 dir0 = m_mousePosition - node.m_position;
+            Vector3 dir0 = hitPos - node.m_position;
             float min_angle = float.MaxValue;
             Constants.ServiceFactory.NetService.IterateNodeSegments(
                 HoveredNodeId,
@@ -988,8 +994,24 @@ private static float GetAngle(Vector3 v1, Vector3 v2) {
             return ret;
         }
 
-
         /// <summary>
+        /// Determine the 
+        /// </summary>
+        /// <param name="hitPos"></param>
+        private void DetermineHoveredLane(Vector3 hitPos) {
+            NetSegment segment = GetSeg(HoveredSegmentId);
+            segment.GetClosestLanePosition(
+                hitPos,
+                NetInfo.LaneType.All,
+                VehicleInfo.VehicleType.All,
+                out Vector3 pos,
+                out uint laneID,
+                out int laneIndex,
+                out float laneOffset);
+            HoveredLaneId = laneID;
+        }
+
+         /// <summary>
         /// Displays lane ids over lanes
         /// </summary>
         private void GuiDisplayLanes(ushort segmentId,