Junction Lane Arrows Editor rework with preview

TLM/TLM/UI/IncompatibleModsPanel.cs

@@ -336,7 +336,11 @@ private void TryPopModal()
 
             if (blurEffect != null && UIView.ModalInputCount() == 0)
             {
-                ValueAnimator.Animate("ModalEffect", delegate (float val) { blurEffect.opacity = val; }, new AnimatedFloat(1f, 0f, 0.7f, EasingType.CubicEaseOut), delegate () { blurEffect.Hide(); });
+                ValueAnimator.Animate(
+                    "ModalEffect",
+                    val => blurEffect.opacity = val,
+                    new AnimatedFloat(1f, 0f, 0.7f, EasingType.CubicEaseOut),
+                    () => blurEffect.Hide());
             }
         }
     }

TLM/TLM/UI/SubTools/LaneArrows/LaneArrowTool.cs

@@ -107,16 +107,6 @@ private void OnEnterState_OutgoingDirections() {
             if (!Flags.applyLaneArrowFlags(SelectedLaneId)) {
                 Flags.removeLaneArrowFlags(SelectedLaneId);
             }
-
-//            var segmentBuffer = Singleton<NetManager>.instance.m_segments.m_buffer;
-//            var segment = segmentBuffer[SelectedSegmentId];
-//            var otherNodeId = SelectedNodeId == segment.m_startNode
-//                                  ? segment.m_endNode : segment.m_startNode;
-//
-//            outgoingLanes_ = new HashSet<uint>();
-//            foreach (var ln in GetIncomingLaneList(SelectedSegmentId, otherNodeId)) {
-//                outgoingLanes_.Add(ln.laneId);
-//            }
         }
 
         /// <summary>
@@ -200,11 +190,10 @@ private void Deselect() {
         }
 
         internal static IList<LanePos> GetIncomingLaneList(ushort segmentId, ushort nodeId) {
-            var segmentsBuffer = Singleton<NetManager>.instance.m_segments.m_buffer;
             return Constants.ServiceFactory.NetService.GetSortedLanes(
                 segmentId,
-                ref segmentsBuffer[segmentId],
-                segmentsBuffer[segmentId].m_startNode == nodeId,
+                ref World.SegmentRef(segmentId),
+                World.Segment(segmentId).m_startNode == nodeId,
                 LaneArrowManager.LANE_TYPES,
                 LaneArrowManager.VEHICLE_TYPES,
                 true);
@@ -227,9 +216,8 @@ private OutgoingTurnsCollection GetOutgoingTurns(ushort nodeId, ushort ignoreSeg
                 return result;
             }
 
-            var nodesBuffer = Singleton<NetManager>.instance.m_nodes.m_buffer;
-            var node = nodesBuffer[nodeId];
-            var incomingSegment = Singleton<NetManager>.instance.m_segments.m_buffer[ignoreSegmentId];
+            var node = World.Node(nodeId);
+            var incomingSegment = World.Segment(ignoreSegmentId);
             var isStartNode = nodeId == incomingSegment.m_startNode;
 
             for (var i = 0; i < MAX_NODE_SEGMENTS; ++i) {
@@ -256,8 +244,7 @@ private OutgoingTurnsCollection GetOutgoingTurns(ushort nodeId, ushort ignoreSeg
         private HashSet<uint> GetAllIncomingLanes(ushort nodeId) {
             var result = new HashSet<uint>();
 
-            var nodeBuffer = Singleton<NetManager>.instance.m_nodes.m_buffer;
-            var node = nodeBuffer[nodeId];
+            var node = World.Node(nodeId);
 
             for (var i = 0; i < MAX_NODE_SEGMENTS; ++i) {
                 var connectedSegId = node.GetSegment(i);

TLM/TLM/UI/SubTools/LaneArrows/LaneArrowTool_Render.cs

@@ -111,13 +111,12 @@ public override void RenderOverlay(RenderManager.CameraInfo cameraInfo) {
         /// </summary>
         /// <param name="cameraInfo">The camera</param>
         private void RenderOverlay_NodeSelect(RenderManager.CameraInfo cameraInfo) {
-            var nodeBuffer = Singleton<NetManager>.instance.m_nodes.m_buffer;
             RenderHoveredNode(cameraInfo);
 
             // Draw the selected node
             if (SelectedNodeId != 0) {
                 RenderNodeOverlay(cameraInfo,
-                                  ref nodeBuffer[SelectedNodeId],
+                                  ref World.NodeRef(SelectedNodeId),
                                   PALETTE_SELECTED);
             }
         }

TLM/TLM/UI/SubTools/SpeedLimitsTool.cs

@@ -114,30 +114,29 @@ private void ShowSigns(bool viewOnly) {
             Quaternion camRot = Camera.main.transform.rotation;
             Vector3 camPos = Camera.main.transform.position;
 
-            NetManager netManager = Singleton<NetManager>.instance;
             SpeedLimitManager speedLimitManager = SpeedLimitManager.Instance;
 
             if (lastCamPos == null || lastCamRot == null || !lastCamRot.Equals(camRot) || !lastCamPos.Equals(camPos)) {
                 // cache visible segments
                 currentlyVisibleSegmentIds.Clear();
 
-                for (uint segmentId = 1; segmentId < NetManager.MAX_SEGMENT_COUNT; ++segmentId) {
-                    if (!Constants.ServiceFactory.NetService.IsSegmentValid((ushort)segmentId)) {
+                for (ushort segmentId = 1; segmentId < NetManager.MAX_SEGMENT_COUNT; ++segmentId) {
+                    if (!Constants.ServiceFactory.NetService.IsSegmentValid(segmentId)) {
                         continue;
                     }
                     /*if ((netManager.m_segments.m_buffer[segmentId].m_flags & NetSegment.Flags.Untouchable) != NetSegment.Flags.None)
                             continue;*/
 
-                    if ((netManager.m_segments.m_buffer[segmentId].m_bounds.center - camPos).magnitude > TrafficManagerTool.MAX_OVERLAY_DISTANCE)
+                    if ((World.Segment((ushort)segmentId).m_bounds.center - camPos).magnitude > TrafficManagerTool.MAX_OVERLAY_DISTANCE)
                         continue; // do not draw if too distant
 
                     Vector3 screenPos;
-                    bool visible = MainTool.WorldToScreenPoint(netManager.m_segments.m_buffer[segmentId].m_bounds.center, out screenPos);
+                    bool visible = MainTool.WorldToScreenPoint(World.Segment((ushort)segmentId).m_bounds.center, out screenPos);
 
                     if (! visible)
                         continue;
 
-                    if (!speedLimitManager.MayHaveCustomSpeedLimits((ushort)segmentId, ref netManager.m_segments.m_buffer[segmentId]))
+                    if (!speedLimitManager.MayHaveCustomSpeedLimits((ushort)segmentId, ref World.SegmentRef((ushort)segmentId)))
                         continue;
 
                     currentlyVisibleSegmentIds.Add((ushort)segmentId);
@@ -150,19 +149,21 @@ private void ShowSigns(bool viewOnly) {
             bool handleHovered = false;
             foreach (ushort segmentId in currentlyVisibleSegmentIds) {
                 Vector3 screenPos;
-                bool visible = MainTool.WorldToScreenPoint(netManager.m_segments.m_buffer[segmentId].m_bounds.center, out screenPos);
+                bool visible = MainTool.WorldToScreenPoint(World.Segment(segmentId).m_bounds.center, out screenPos);
 
                 if (!visible)
                     continue;
 
-                NetInfo segmentInfo = netManager.m_segments.m_buffer[segmentId].Info;
+                NetInfo segmentInfo = World.Segment(segmentId).Info;
 
                 // draw speed limits
                 if (MainTool.GetToolMode() != ToolMode.VehicleRestrictions || segmentId != SelectedSegmentId) { // no speed limit overlay on selected segment when in vehicle restrictions mode
-                    if (drawSpeedLimitHandles((ushort)segmentId, ref netManager.m_segments.m_buffer[segmentId], viewOnly, ref camPos))
+                    if (drawSpeedLimitHandles(segmentId, ref World.SegmentRef(segmentId), viewOnly, ref camPos)) {
                         handleHovered = true;
+                    }
                 }
             }
+
             overlayHandleHovered = handleHovered;
         }
 
@@ -462,7 +463,6 @@ private bool drawSpeedLimitHandles(ushort segmentId, ref NetSegment segment, boo
             }
 
             var center = segment.m_bounds.center;
-            var netManager = Singleton<NetManager>.instance;
 
             var hovered = false;
             var speedLimitToSet = viewOnly ? -1f : currentPaletteSpeedLimit;
@@ -611,7 +611,7 @@ private bool drawSpeedLimitHandles(ushort segmentId, ref NetSegment segment, boo
                         if (Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift)) {
 
                             NetInfo.Direction normDir = e.Key;
-                            if ((netManager.m_segments.m_buffer[segmentId].m_flags & NetSegment.Flags.Invert) != NetSegment.Flags.None) {
+                            if ((World.Segment(segmentId).m_flags & NetSegment.Flags.Invert) != NetSegment.Flags.None) {
                                 normDir = NetInfo.InvertDirection(normDir);
                             }
 
@@ -622,13 +622,13 @@ private bool drawSpeedLimitHandles(ushort segmentId, ref NetSegment segment, boo
                                 bool reverse = data.segVisitData.viaStartNode == data.segVisitData.viaInitialStartNode;
 
                                 ushort otherSegmentId = data.segVisitData.curGeo.SegmentId;
-                                NetInfo otherSegmentInfo = netManager.m_segments.m_buffer[otherSegmentId].Info;
+                                NetInfo otherSegmentInfo = World.Segment(otherSegmentId).Info;
                                 uint laneId = data.curLanePos.laneId;
                                 byte laneIndex = data.curLanePos.laneIndex;
                                 NetInfo.Lane laneInfo = otherSegmentInfo.m_lanes[laneIndex];
 
                                 NetInfo.Direction otherNormDir = laneInfo.m_finalDirection;
-                                if ((netManager.m_segments.m_buffer[otherSegmentId].m_flags & NetSegment.Flags.Invert) != NetSegment.Flags.None ^
+                                if ((World.Segment(otherSegmentId).m_flags & NetSegment.Flags.Invert) != NetSegment.Flags.None ^
                                     reverse) {
                                     otherNormDir = NetInfo.InvertDirection(otherNormDir);
                                 }

TLM/TLM/Util/GenericFsm.cs

@@ -1,7 +1,6 @@
 namespace TrafficManager.Util {
     using System;
     using System.Collections.Generic;
-    using CSUtil.Commons;
 
     /// <summary>
     /// A finite state machine
@@ -18,7 +17,7 @@ public GenericFsm(TState state) {
             transitions_ = new Dictionary<TState, Dictionary<TTrigger, TState>>();
             enterStateEvents_ = new Dictionary<TState, Action>();
             State = state;
-            Log._Debug($"FSM: Created with state {state}");
+            // Log._Debug($"FSM: Created with state {state}");
         }
 
         /// <summary>
@@ -85,20 +84,19 @@ public Configurator Configure(TState state) {
         /// <returns>Whether state change succeeded</returns>
         public bool SendTrigger(TTrigger trigger) {
             if (!transitions_.ContainsKey(State)) {
-                Log._Debug($"FSM: Can't leave state {State} with {trigger} - " +
-                           "no transitions defined for it");
+                // Log._Debug($"FSM: Can't leave state {State} with {trigger} - " +
+                //           "no transitions defined for it");
                 return false;
             }
 
             var outTransitions = transitions_[State];
             if (!outTransitions.ContainsKey(trigger)) {
-                Log._Debug($"FSM: Can't leave state {State} with {trigger} - " +
-                           "the trigger is not accepted in this state");
+                // Log._Debug($"FSM: Can't leave state {State} with {trigger} - " +
+                //           "the trigger is not accepted in this state");
                 return false;
             }
 
-            // TODO: Callback on leave state
-            Log._Debug($"FSM: State changed {State} -> ({trigger}) -> {outTransitions[trigger]}");
+            // Log._Debug($"FSM: State changed {State} -> ({trigger}) -> {outTransitions[trigger]}");
             State = outTransitions[trigger];
 
             // Callback on enter state

TLM/TLM/Util/World.cs

@@ -50,6 +50,18 @@ public static NetSegment Segment(ushort index) {
             return segmentBuffer_[index];
         }
 
+        /// <summary>
+        /// Returns ref to world segment, use where `ref segments[index]` is needed.
+        /// </summary>
+        /// <param name="index">Segment index</param>
+        /// <returns>Reference to the segment</returns>
+        public static ref NetSegment SegmentRef(ushort index) {
+#if DEBUG
+            Debug.Assert(Constants.ServiceFactory.NetService.IsSegmentValid(index));
+#endif
+            return ref segmentBuffer_[index];
+        }
+
         public static NetNode Node(ushort index) {
 #if DEBUG
             Debug.Assert(Constants.ServiceFactory.NetService.IsNodeValid(index));