path-finding rework started

VictorPhilipp · May 2, 2017 · 77598e4 · 77598e4
1 parent 94d1a12
commit 77598e4
Show file tree

Hide file tree

Showing 37 changed files with 4,778 additions and 1,151 deletions.
diff --git a/TLM/TLM/Custom/AI/CustomRoadAI.cs b/TLM/TLM/Custom/AI/CustomRoadAI.cs
@@ -120,6 +120,14 @@ private static void GetCustomTrafficLightState(ushort vehicleId, ref Vehicle veh
 			// get responsible traffic light
 			//Log._Debug($"GetTrafficLightState: Getting custom light for vehicle {vehicleId} @ node {nodeId}, segment {fromSegmentId}, lane {fromLaneIndex}.");
 			SegmentGeometry geometry = SegmentGeometry.Get(fromSegmentId);
+			if (geometry == null) {
+				pedestrianLightState = TrafficLightState.Green;
+				Log.Error($"GetTrafficLightState: No geometry information @ node {nodeId}, segment {fromSegmentId}.");
+				vehicleLightState = TrafficLightState.Green;
+				pedestrianLightState = TrafficLightState.Green;
+				return;
+			}
+
 			// determine node position at `fromSegment` (start/end)
 			bool isStartNode = geometry.StartNodeId() == nodeId;
 

diff --git a/TLM/TLM/Custom/Manager/CustomNetManager.cs b/TLM/TLM/Custom/Manager/CustomNetManager.cs
@@ -40,7 +40,7 @@ public void CustomFinalizeSegment(ushort segment, ref NetSegment data) {
 				if (GlobalConfig.Instance.DebugSwitches[5])
 					Log.Warning($"CustomNetManager: CustomFinalizeSegment {segment}");
 #endif
-				SegmentGeometry.Get(segment)?.Recalculate(GeometryCalculationMode.Propagate);
+				SegmentGeometry.Get(segment, true).StartRecalculation(GeometryCalculationMode.Propagate);
 			} catch (Exception e) {
 				Log.Error($"Error occured in CustomNetManager.CustomFinalizeSegment @ seg. {segment}: " + e.ToString());
 			}
@@ -67,7 +67,7 @@ public void CustomUpdateSegment(ushort segment, ushort fromNode, int level) {
 				if (GlobalConfig.Instance.DebugSwitches[5])
 					Log.Warning($"CustomNetManager: CustomUpdateSegment {segment}");
 #endif
-				SegmentGeometry.Get(segment)?.Recalculate(GeometryCalculationMode.Propagate);
+				SegmentGeometry.Get(segment, true).StartRecalculation(GeometryCalculationMode.Propagate);
 			} catch (Exception e) {
 				Log.Error($"Error occured in CustomNetManager.CustomUpdateSegment @ seg. {segment}: " + e.ToString());
 			}

diff --git a/TLM/TLM/Custom/PathFinding/CustomPathFind.cs b/TLM/TLM/Custom/PathFinding/CustomPathFind.cs