Update pathway config SO to work with the latest pathway editor changes

treivize · treivize · commit 087f4b822137 · 2021-03-09T14:59:09.000+01:00
diff --git a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/NPCPathwayConfig.asset b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Config/NPCPathwayConfig.asset
@@ -14,12 +14,35 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _stopDuration: 0.5
   _speed: 1
+  waypoints:
+  - {x: 0, y: 0.033730388, z: 0}
+  - {x: 0, y: 0.033730388, z: 0}
+  - {x: 0, y: 0.033730388, z: 0}
+  - {x: 0, y: 0.033730388, z: 0}
+  - {x: 0, y: 0.033730388, z: 0}
+  - {x: 0, y: 0.033730388, z: 0}
+  - {x: 0, y: 0.033730388, z: 0}
+  HidePathway: 0
+  _lineColor: {r: 0, g: 0.19270587, b: 1, a: 1}
+  _textSize: 20
+  _textColor: {r: 1, g: 1, b: 1, a: 1}
+  _probeRadius: 13.2
+  DisplayProbes: 0
+  ToggledNavMeshDisplay: 0
+  RealTimeEnabled: 1
   Waypoints:
-  - {x: 3.46387, y: 0.033730388, z: 0.55213976}
-  - {x: 5.6019807, y: 0.052446984, z: 7.11369}
-  - {x: -2.8645186, y: 0.033730388, z: 8.923655}
-  - {x: -6.567141, y: 0.033730388, z: -5.250761}
-  - {x: -9.866049, y: 0.033730388, z: -5.822654}
-  - {x: -11.059804, y: 0.033730388, z: -2.8135128}
-  - {x: -2.0687637, y: 0.033730388, z: 0.8148103}
-  _pathwayEditorColor: {r: 0, g: 1, b: 1, a: 1}
+  - waypoint: {x: -8.50028, y: 0.033730388, z: 1.5602589}
+    corners:
+    - {x: -8.50028, y: 0.033730388, z: 1.5602589}
+    - {x: 2.6641674, y: 0.033730388, z: -8.3147135}
+  - waypoint: {x: 2.6641674, y: 0.033730388, z: -8.3147135}
+    corners:
+    - {x: 2.6641674, y: 0.033730388, z: -8.3147135}
+    - {x: 4, y: 0.033730388, z: -6.799999}
+    - {x: 10.939352, y: 0.15480933, z: -0.32895184}
+  - waypoint: {x: 10.939352, y: 0.15480933, z: -0.32895184}
+    corners:
+    - {x: 10.939352, y: 0.15480933, z: -0.32895184}
+    - {x: 5.6, y: 0.033730388, z: -0.8999996}
+    - {x: 4.8, y: 0.033730388, z: -0.8999996}
+    - {x: -8.50028, y: 0.033730388, z: 1.5602589}
diff --git a/UOP1_Project/Assets/Scripts/Characters/Config/PathwayConfigSO.cs b/UOP1_Project/Assets/Scripts/Characters/Config/PathwayConfigSO.cs
@@ -4,21 +4,62 @@
 [CreateAssetMenu(fileName = "PathwayConfig", menuName = "EntityConfig/Pathway Config")]
 public class PathwayConfigSO : NPCMovementConfigSO
 {
-	[HideInInspector] public List<Vector3> Waypoints;
+	[HideInInspector]
+	public Vector3[] waypoints;
 
 #if UNITY_EDITOR
 
+	public bool HidePathway;
+
+	[SerializeField]
+	private Color _lineColor = Color.black;
+
+	[SerializeField, Range(0, 100)]
+	private int _textSize = 20;
+
 	[SerializeField]
-	private Color _pathwayEditorColor = Color.cyan;
-	private int _textSize = 10;
 	private Color _textColor = Color.white;
 
+	[SerializeField, Range(0, 100)]
+	[Tooltip("This function may reduce the frame rate if a large probe radius is specified. To avoid frame rate issues," +
+				" it is recommended that you specify a max distance of twice the agent height.")]
+	private float _probeRadius = 3;
+
+	[HideInInspector]
+	public bool DisplayProbes;
+
+	[HideInInspector]
+	public bool ToggledNavMeshDisplay;
+
+	private List<Vector3> _path;
+	private List<bool> _hits;
+
 	public const string FIELD_LABEL = "Point ";
 	public const string TITLE_LABEL = "Waypoints";
 
-	public Color LineColor { get => _pathwayEditorColor; }
+	public Color LineColor { get => _lineColor; }
 	public Color TextColor { get => _textColor; }
 	public int TextSize { get => _textSize; }
+	public float ProbeRadius { get => _probeRadius; }
+	public List<Vector3> Path { get => _path; set => _path = value; }
+	public List<bool> Hits { get => _hits; set => _hits = value; }
+
+	public bool RealTimeEnabled;
+
+	[HideInInspector]
+	public List<WaypointData> Waypoints;
 
 #endif
+
 }
+
+#if UNITY_EDITOR
+
+[System.Serializable]
+public class WaypointData
+{
+	public Vector3 waypoint;
+	public List<Vector3> corners;
+}
+
+#endif
diff --git a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/MovementActions/PathwayMovementAction.cs b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/MovementActions/PathwayMovementAction.cs
@@ -6,7 +6,7 @@ public class PathwayMovementAction : NPCMovementAction
 {
 	private NavMeshAgent _agent;
 	private bool _isActiveAgent;
-	private List<Vector3> _wayppoints;
+	private List<WaypointData> _wayppoints;
 	private int _wayPointIndex;
 	private float _roamingSpeed;
 
@@ -46,7 +46,7 @@ private Vector3 GetNextDestination()
 		if (_wayppoints.Count > 0)
 		{
 			_wayPointIndex = (_wayPointIndex + 1) % _wayppoints.Count;
-			result = _wayppoints[_wayPointIndex];
+			result = _wayppoints[_wayPointIndex].waypoint;
 		}
 		return result;
 	}
diff --git a/UOP1_Project/Assets/Scripts/Editor/Pathway/PathWayNavMeshUI.cs b/UOP1_Project/Assets/Scripts/Editor/Pathway/PathWayNavMeshUI.cs
@@ -4,10 +4,10 @@
 
 public class PathWayNavMeshUI
 {
-	private Pathway _pathway;
+	private PathwayConfigSO _pathway;
 	private PathwayNavMesh _pathwayNavMesh;
 
-	public PathWayNavMeshUI(Pathway pathway)
+	public PathWayNavMeshUI(PathwayConfigSO pathway)
 	{
 		_pathway = pathway;
 		_pathwayNavMesh = new PathwayNavMesh(pathway);
diff --git a/UOP1_Project/Assets/Scripts/Editor/Pathway/PathwayEditor.cs b/UOP1_Project/Assets/Scripts/Editor/Pathway/PathwayEditor.cs
@@ -3,21 +3,22 @@
 using UnityEditorInternal;
 using System.Linq;
 
-[CustomEditor(typeof(Pathway))]
+[CustomEditor(typeof(PathwayConfigSO))]
 public class PathwayEditor : Editor
 {
 	private ReorderableList _reorderableList;
-	private Pathway _pathway;
+	private PathwayConfigSO _pathway;
 	private PathwayHandles _pathwayHandles;
 	private PathWayNavMeshUI _pathWayNavMeshUI;
 	private enum LIST_MODIFICATION { ADD, SUPP, DRAG, OTHER };
 	private LIST_MODIFICATION _currentListModification;
 	private int _indexCurrentModification;
 
-	public void OnSceneGUI()
+	public void OnSceneGUI(SceneView sceneView)
 	{
 		int index = _pathwayHandles.DisplayHandles();
 		_pathWayNavMeshUI.RealTime(index);
+		PathwayGizmos.DrawGizmosSelected(_pathway, GizmoType.Active);
 	}
 
 	public override void OnInspectorGUI()
@@ -40,10 +41,11 @@ private void OnEnable()
 		_reorderableList.onRemoveCallback += RemoveItem;
 		_reorderableList.onChangedCallback += ListModified;
 		_reorderableList.onMouseDragCallback += DragItem;
-		_pathway = (target as Pathway);
+		_pathway = (target as PathwayConfigSO);
 		_pathWayNavMeshUI = new PathWayNavMeshUI(_pathway);
 		_pathwayHandles = new PathwayHandles(_pathway);
 		_currentListModification = LIST_MODIFICATION.OTHER;
+		SceneView.duringSceneGui += this.OnSceneGUI;
 	}
 
 	private void OnDisable()
@@ -56,17 +58,18 @@ private void OnDisable()
 		_reorderableList.onChangedCallback -= ListModified;
 		_reorderableList.onMouseDragCallback -= DragItem;
 		_pathway.waypoints = _pathway.Waypoints.Select(x => x.waypoint).ToArray();
+		SceneView.duringSceneGui -= this.OnSceneGUI;
 	}
 
 	private void DrawHeader(Rect rect)
 	{
-		GUI.Label(rect, Pathway.TITLE_LABEL);
+		GUI.Label(rect, PathwayConfigSO.TITLE_LABEL);
 	}
 
 	private void DrawElement(Rect rect, int index, bool active, bool focused)
 	{
 		SerializedProperty item = _reorderableList.serializedProperty.GetArrayElementAtIndex(index).FindPropertyRelative("waypoint");
-		item.vector3Value = EditorGUI.Vector3Field(rect, Pathway.FIELD_LABEL + index, item.vector3Value);
+		item.vector3Value = EditorGUI.Vector3Field(rect, PathwayConfigSO.FIELD_LABEL + index, item.vector3Value);
 	}
 
 	private void AddItem(ReorderableList list)
@@ -83,7 +86,7 @@ private void AddItem(ReorderableList list)
 		else
 		{
 			list.serializedProperty.InsertArrayElementAtIndex(list.serializedProperty.arraySize);
-			Vector3 previous = _pathway.transform.position;
+			Vector3 previous = Vector3.zero;
 			list.serializedProperty.GetArrayElementAtIndex(list.serializedProperty.arraySize - 1).FindPropertyRelative("waypoint").vector3Value = new Vector3(previous.x + 2, previous.y, previous.z + 2);
 			_indexCurrentModification = list.serializedProperty.arraySize - 1;
 		}
diff --git a/UOP1_Project/Assets/Scripts/Editor/Pathway/PathwayGizmos.cs b/UOP1_Project/Assets/Scripts/Editor/Pathway/PathwayGizmos.cs
@@ -5,7 +5,7 @@
 public class PathwayGizmos
 {
 	[DrawGizmo(GizmoType.Selected)]
-	private static void DrawGizmosSelected(Pathway pathway, GizmoType gizmoType)
+	public static void DrawGizmosSelected(PathwayConfigSO pathway, GizmoType gizmoType)
 	{
 		if (!pathway.ToggledNavMeshDisplay)
 		{
@@ -20,7 +20,7 @@ private static void DrawGizmosSelected(Pathway pathway, GizmoType gizmoType)
 	}
 
 
-	private static void DrawLabel(Pathway pathway, Vector3 path, int index)
+	private static void DrawLabel(PathwayConfigSO pathway, Vector3 path, int index)
 	{
 		GUIStyle style = new GUIStyle();
 		Vector3 textHeight = Vector3.up;
@@ -31,7 +31,7 @@ private static void DrawLabel(Pathway pathway, Vector3 path, int index)
 		Handles.Label(path + textHeight, index.ToString(), style);
 	}
 
-	private static void DrawHandlesPath(Pathway pathway)
+	private static void DrawHandlesPath(PathwayConfigSO pathway)
 	{
 		Handles.color = pathway.LineColor;
 
@@ -55,7 +55,7 @@ private static void DrawHandlesPath(Pathway pathway)
 		}
 	}
 
-	private static void DrawNavMeshPath(Pathway pathway)
+	private static void DrawNavMeshPath(PathwayConfigSO pathway)
 	{
 		Handles.color = pathway.LineColor;
 
@@ -70,7 +70,7 @@ private static void DrawNavMeshPath(Pathway pathway)
 		}
 	}
 
-	private static void DrawHitPoints(Pathway pathway)
+	private static void DrawHitPoints(PathwayConfigSO pathway)
 	{
 		if (pathway.DisplayProbes)
 		{
@@ -80,13 +80,13 @@ private static void DrawHitPoints(Pathway pathway)
 			{
 				if (pathway.Hits[i])
 				{
-					Gizmos.color = new Color(0, 255, 0, 0.5f);
-					Gizmos.DrawSphere(pathway.Waypoints[i].waypoint, sphereRadius);
+					Handles.color = new Color(0, 255, 0, 0.1f);
+					Handles.SphereCap(0, pathway.Waypoints[i].waypoint, Quaternion.identity, sphereRadius);
 				}
 				else
 				{
-					Gizmos.color = new Color(255, 0, 0, 0.5f);
-					Gizmos.DrawSphere(pathway.Waypoints[i].waypoint, sphereRadius);
+					Handles.color = new Color(255, 0, 0, 0.1f);
+					Handles.SphereCap(0, pathway.Waypoints[i].waypoint, Quaternion.identity, sphereRadius);
 				}
 			}
 		}
diff --git a/UOP1_Project/Assets/Scripts/Editor/Pathway/PathwayHandles.cs b/UOP1_Project/Assets/Scripts/Editor/Pathway/PathwayHandles.cs
@@ -4,10 +4,10 @@
 
 public class PathwayHandles
 {
-	private Pathway _pathway;
+	private PathwayConfigSO _pathway;
 	private Vector3 _tmp;
 
-	public PathwayHandles(Pathway pathway)
+	public PathwayHandles(PathwayConfigSO pathway)
 	{
 		_pathway = pathway;
 	}
diff --git a/UOP1_Project/Assets/Scripts/Editor/Pathway/PathwayHandles.cs.meta b/UOP1_Project/Assets/Scripts/Editor/Pathway/PathwayHandles.cs.meta
diff --git a/UOP1_Project/Assets/Scripts/Editor/Pathway/PathwayNavMesh.cs b/UOP1_Project/Assets/Scripts/Editor/Pathway/PathwayNavMesh.cs
@@ -5,9 +5,9 @@
 
 public class PathwayNavMesh
 {
-	private Pathway _pathway;
+	private PathwayConfigSO _pathway;
 
-	public PathwayNavMesh(Pathway pathway)
+	public PathwayNavMesh(PathwayConfigSO pathway)
 	{
 		_pathway = pathway;
 		_pathway.Hits = new List<bool>();
diff --git a/UOP1_Project/Assets/Scripts/Pathway.meta b/UOP1_Project/Assets/Scripts/Pathway.meta
diff --git a/UOP1_Project/Assets/Scripts/Pathway/Pathway.cs b/UOP1_Project/Assets/Scripts/Pathway/Pathway.cs

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public class PathwayMovementAction : NPCMovementAction`
`6`	`6`	`{`
`7`	`7`	`private NavMeshAgent _agent;`
`8`	`8`	`private bool _isActiveAgent;`
`9`		`- private List<Vector3> _wayppoints;`
	`9`	`+ private List<WaypointData> _wayppoints;`
`10`	`10`	`private int _wayPointIndex;`
`11`	`11`	`private float _roamingSpeed;`
`12`	`12`
`@@ -46,7 +46,7 @@ private Vector3 GetNextDestination()`
`46`	`46`	`if (_wayppoints.Count > 0)`
`47`	`47`	`{`
`48`	`48`	`_wayPointIndex = (_wayPointIndex + 1) % _wayppoints.Count;`
`49`		`- result = _wayppoints[_wayPointIndex];`
	`49`	`+ result = _wayppoints[_wayPointIndex].waypoint;`
`50`	`50`	`}`
`51`	`51`	`return result;`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@`
`4`	`4`
`5`	`5`	`public class PathWayNavMeshUI`
`6`	`6`	`{`
`7`		`- private Pathway _pathway;`
	`7`	`+ private PathwayConfigSO _pathway;`
`8`	`8`	`private PathwayNavMesh _pathwayNavMesh;`
`9`	`9`
`10`		`- public PathWayNavMeshUI(Pathway pathway)`
	`10`	`+ public PathWayNavMeshUI(PathwayConfigSO pathway)`
`11`	`11`	`{`
`12`	`12`	`_pathway = pathway;`
`13`	`13`	`_pathwayNavMesh = new PathwayNavMesh(pathway);`
Original file line number	Diff line number	Diff line change
`@@ -3,21 +3,22 @@`
`3`	`3`	`using UnityEditorInternal;`
`4`	`4`	`using System.Linq;`
`5`	`5`
`6`		`-[CustomEditor(typeof(Pathway))]`
	`6`	`+[CustomEditor(typeof(PathwayConfigSO))]`
`7`	`7`	`public class PathwayEditor : Editor`
`8`	`8`	`{`
`9`	`9`	`private ReorderableList _reorderableList;`
`10`		`- private Pathway _pathway;`
	`10`	`+ private PathwayConfigSO _pathway;`
`11`	`11`	`private PathwayHandles _pathwayHandles;`
`12`	`12`	`private PathWayNavMeshUI _pathWayNavMeshUI;`
`13`	`13`	`private enum LIST_MODIFICATION { ADD, SUPP, DRAG, OTHER };`
`14`	`14`	`private LIST_MODIFICATION _currentListModification;`
`15`	`15`	`private int _indexCurrentModification;`
`16`	`16`
`17`		`- public void OnSceneGUI()`
	`17`	`+ public void OnSceneGUI(SceneView sceneView)`
`18`	`18`	`{`
`19`	`19`	`int index = _pathwayHandles.DisplayHandles();`
`20`	`20`	`_pathWayNavMeshUI.RealTime(index);`
	`21`	`+ PathwayGizmos.DrawGizmosSelected(_pathway, GizmoType.Active);`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`public override void OnInspectorGUI()`
`@@ -40,10 +41,11 @@ private void OnEnable()`
`40`	`41`	`_reorderableList.onRemoveCallback += RemoveItem;`
`41`	`42`	`_reorderableList.onChangedCallback += ListModified;`
`42`	`43`	`_reorderableList.onMouseDragCallback += DragItem;`
`43`		`- _pathway = (target as Pathway);`
	`44`	`+ _pathway = (target as PathwayConfigSO);`
`44`	`45`	`_pathWayNavMeshUI = new PathWayNavMeshUI(_pathway);`
`45`	`46`	`_pathwayHandles = new PathwayHandles(_pathway);`
`46`	`47`	`_currentListModification = LIST_MODIFICATION.OTHER;`
	`48`	`+ SceneView.duringSceneGui += this.OnSceneGUI;`
`47`	`49`	`}`
`48`	`50`
`49`	`51`	`private void OnDisable()`
`@@ -56,17 +58,18 @@ private void OnDisable()`
`56`	`58`	`_reorderableList.onChangedCallback -= ListModified;`
`57`	`59`	`_reorderableList.onMouseDragCallback -= DragItem;`
`58`	`60`	`_pathway.waypoints = _pathway.Waypoints.Select(x => x.waypoint).ToArray();`
	`61`	`+ SceneView.duringSceneGui -= this.OnSceneGUI;`
`59`	`62`	`}`
`60`	`63`
`61`	`64`	`private void DrawHeader(Rect rect)`
`62`	`65`	`{`
`63`		`- GUI.Label(rect, Pathway.TITLE_LABEL);`
	`66`	`+ GUI.Label(rect, PathwayConfigSO.TITLE_LABEL);`
`64`	`67`	`}`
`65`	`68`
`66`	`69`	`private void DrawElement(Rect rect, int index, bool active, bool focused)`
`67`	`70`	`{`
`68`	`71`	`SerializedProperty item = _reorderableList.serializedProperty.GetArrayElementAtIndex(index).FindPropertyRelative("waypoint");`
`69`		`- item.vector3Value = EditorGUI.Vector3Field(rect, Pathway.FIELD_LABEL + index, item.vector3Value);`
	`72`	`+ item.vector3Value = EditorGUI.Vector3Field(rect, PathwayConfigSO.FIELD_LABEL + index, item.vector3Value);`
`70`	`73`	`}`
`71`	`74`
`72`	`75`	`private void AddItem(ReorderableList list)`
`@@ -83,7 +86,7 @@ private void AddItem(ReorderableList list)`
`83`	`86`	`else`
`84`	`87`	`{`
`85`	`88`	`list.serializedProperty.InsertArrayElementAtIndex(list.serializedProperty.arraySize);`
`86`		`- Vector3 previous = _pathway.transform.position;`
	`89`	`+ Vector3 previous = Vector3.zero;`
`87`	`90`	`list.serializedProperty.GetArrayElementAtIndex(list.serializedProperty.arraySize - 1).FindPropertyRelative("waypoint").vector3Value = new Vector3(previous.x + 2, previous.y, previous.z + 2);`
`88`	`91`	`_indexCurrentModification = list.serializedProperty.arraySize - 1;`
`89`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`public class PathwayGizmos`
`6`	`6`	`{`
`7`	`7`	`[DrawGizmo(GizmoType.Selected)]`
`8`		`- private static void DrawGizmosSelected(Pathway pathway, GizmoType gizmoType)`
	`8`	`+ public static void DrawGizmosSelected(PathwayConfigSO pathway, GizmoType gizmoType)`
`9`	`9`	`{`
`10`	`10`	`if (!pathway.ToggledNavMeshDisplay)`
`11`	`11`	`{`
`@@ -20,7 +20,7 @@ private static void DrawGizmosSelected(Pathway pathway, GizmoType gizmoType)`
`20`	`20`	`}`
`21`	`21`
`22`	`22`
`23`		`- private static void DrawLabel(Pathway pathway, Vector3 path, int index)`
	`23`	`+ private static void DrawLabel(PathwayConfigSO pathway, Vector3 path, int index)`
`24`	`24`	`{`
`25`	`25`	`GUIStyle style = new GUIStyle();`
`26`	`26`	`Vector3 textHeight = Vector3.up;`
`@@ -31,7 +31,7 @@ private static void DrawLabel(Pathway pathway, Vector3 path, int index)`
`31`	`31`	`Handles.Label(path + textHeight, index.ToString(), style);`
`32`	`32`	`}`
`33`	`33`
`34`		`- private static void DrawHandlesPath(Pathway pathway)`
	`34`	`+ private static void DrawHandlesPath(PathwayConfigSO pathway)`
`35`	`35`	`{`
`36`	`36`	`Handles.color = pathway.LineColor;`
`37`	`37`
`@@ -55,7 +55,7 @@ private static void DrawHandlesPath(Pathway pathway)`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`- private static void DrawNavMeshPath(Pathway pathway)`
	`58`	`+ private static void DrawNavMeshPath(PathwayConfigSO pathway)`
`59`	`59`	`{`
`60`	`60`	`Handles.color = pathway.LineColor;`
`61`	`61`
`@@ -70,7 +70,7 @@ private static void DrawNavMeshPath(Pathway pathway)`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
`73`		`- private static void DrawHitPoints(Pathway pathway)`
	`73`	`+ private static void DrawHitPoints(PathwayConfigSO pathway)`
`74`	`74`	`{`
`75`	`75`	`if (pathway.DisplayProbes)`
`76`	`76`	`{`
`@@ -80,13 +80,13 @@ private static void DrawHitPoints(Pathway pathway)`
`80`	`80`	`{`
`81`	`81`	`if (pathway.Hits[i])`
`82`	`82`	`{`
`83`		`- Gizmos.color = new Color(0, 255, 0, 0.5f);`
`84`		`- Gizmos.DrawSphere(pathway.Waypoints[i].waypoint, sphereRadius);`
	`83`	`+ Handles.color = new Color(0, 255, 0, 0.1f);`
	`84`	`+ Handles.SphereCap(0, pathway.Waypoints[i].waypoint, Quaternion.identity, sphereRadius);`
`85`	`85`	`}`
`86`	`86`	`else`
`87`	`87`	`{`
`88`		`- Gizmos.color = new Color(255, 0, 0, 0.5f);`
`89`		`- Gizmos.DrawSphere(pathway.Waypoints[i].waypoint, sphereRadius);`
	`88`	`+ Handles.color = new Color(255, 0, 0, 0.1f);`
	`89`	`+ Handles.SphereCap(0, pathway.Waypoints[i].waypoint, Quaternion.identity, sphereRadius);`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@`
`4`	`4`
`5`	`5`	`public class PathwayHandles`
`6`	`6`	`{`
`7`		`- private Pathway _pathway;`
	`7`	`+ private PathwayConfigSO _pathway;`
`8`	`8`	`private Vector3 _tmp;`
`9`	`9`
`10`		`- public PathwayHandles(Pathway pathway)`
	`10`	`+ public PathwayHandles(PathwayConfigSO pathway)`
`11`	`11`	`{`
`12`	`12`	`_pathway = pathway;`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@`
`5`	`5`
`6`	`6`	`public class PathwayNavMesh`
`7`	`7`	`{`
`8`		`- private Pathway _pathway;`
	`8`	`+ private PathwayConfigSO _pathway;`
`9`	`9`
`10`		`- public PathwayNavMesh(Pathway pathway)`
	`10`	`+ public PathwayNavMesh(PathwayConfigSO pathway)`
`11`	`11`	`{`
`12`	`12`	`_pathway = pathway;`
`13`	`13`	`_pathway.Hits = new List<bool>();`