Cleaned up + Protect waypoint inputs from updated by NavMesh

Author: treivize

UOP1_Project/Assets/Scripts/Editor/Pathway/PathwayEditor.cs

@@ -31,7 +31,6 @@ private void OnEnable()
 		_reorderableList.drawElementCallback += DrawElement;
 		_reorderableList.onAddCallback += AddItem;
 		_reorderableList.onRemoveCallback += RemoveItem;
-		_reorderableList.onSelectCallback += SelectItem;
 		_reorderableList.onChangedCallback += ListModified;
 		_pathway = (target as PathwayConfigSO);
 		if (CheckNavMeshExistence())
@@ -51,7 +50,6 @@ private void OnDisable()
 		_reorderableList.drawElementCallback -= DrawElement;
 		_reorderableList.onAddCallback -= AddItem;
 		_reorderableList.onRemoveCallback -= RemoveItem;
-		_reorderableList.onSelectCallback -= SelectItem;
 		_reorderableList.onChangedCallback -= ListModified;
 		SceneView.duringSceneGui -= this.OnSceneGUI;
 	}
@@ -105,11 +103,6 @@ private void RemoveItem(ReorderableList list)
 
 	}
 
-	private void SelectItem(ReorderableList list)
-	{
-		InternalEditorUtility.RepaintAllViews();
-	}
-
 	private void ListModified(ReorderableList list)
 	{
 		list.serializedProperty.serializedObject.ApplyModifiedProperties();

UOP1_Project/Assets/Scripts/Editor/Pathway/PathwayGizmos.cs

@@ -10,11 +10,13 @@ public static void DrawHandlesPath(PathwayConfigSO pathway)
 	{
 		EditorGUI.BeginChangeCheck();
 
+		List<Vector3> pathwayEditorDisplay = new List<Vector3>();
+
 		// Snap the waypoints on the NavMesh
 		for (int i = 0; i < pathway.Waypoints.Count; i++)
 		{
 			NavMesh.SamplePosition(pathway.Waypoints[i], out NavMeshHit hit, 99.0f, NavMesh.AllAreas);
-			pathway.Waypoints[i] = hit.position;
+			pathwayEditorDisplay.Add(hit.position);
 		}
 
 		// Only one waypoint use case.
@@ -24,28 +26,29 @@ public static void DrawHandlesPath(PathwayConfigSO pathway)
 			pathway.Waypoints[0] = Handles.PositionHandle(pathway.Waypoints[0], Quaternion.identity);
 		}
 		// All the other use cases where a path exists.
-		else if (pathway.Waypoints.Count > 1)
+		for (int index = 0; index < pathway.Waypoints.Count && pathway.Waypoints.Count > 1; index++)
 		{
-			for (int index = 0; index < pathway.Waypoints.Count && pathway.Waypoints.Count > 1; index++)
+			int nextIndex = (index + 1) % pathway.Waypoints.Count;
+			DrawWaypointLabel(pathway, pathway.Waypoints, index);
+			List<Vector3> navMeshPath = new List<Vector3>();
+			NavMeshPath navPath = new NavMeshPath();
+			NavMesh.CalculatePath(pathwayEditorDisplay[index], pathwayEditorDisplay[nextIndex], NavMesh.AllAreas, navPath);
+			using (new Handles.DrawingScope(pathway.LineColor))
 			{
-				int nextIndex = (index + 1) % pathway.Waypoints.Count;
-				DrawWaypointLabel(pathway, pathway.Waypoints, index);
-				List<Vector3> navMeshPath = new List<Vector3>();
-				NavMeshPath navPath = new NavMeshPath();
-				NavMesh.CalculatePath(pathway.Waypoints[index], pathway.Waypoints[nextIndex], NavMesh.AllAreas, navPath);
-				using (new Handles.DrawingScope(pathway.LineColor))
-				{
-					for (int j = 0; j < navPath.corners.Length - 1; j++)
-					{
-						Handles.DrawDottedLine(navPath.corners[j], navPath.corners[j + 1], 2);
-					}
-				}
-				// Display handles pointing into the path forward direction (Blue handle)
-				if (navPath.corners.Length > 1)
+				for (int j = 0; j < navPath.corners.Length - 1; j++)
 				{
-					pathway.Waypoints[index] = Handles.PositionHandle(pathway.Waypoints[index], Quaternion.LookRotation(navPath.corners[1] - navPath.corners[0]));
+					Handles.DrawDottedLine(navPath.corners[j], navPath.corners[j + 1], 2);
 				}
 			}
+			// Display handles pointing into the path forward direction (Blue handle)
+			if (navPath.corners.Length > 1)
+			{
+				pathway.Waypoints[index] = Handles.PositionHandle(pathway.Waypoints[index], Quaternion.LookRotation(navPath.corners[1] - navPath.corners[0]));
+			}
+			else
+			{
+				pathway.Waypoints[index] = Handles.PositionHandle(pathway.Waypoints[index], Quaternion.identity);
+			}
 		}
 	}