Reduced min distance between waypoint.

Increased min distance between exit and entry waypoint.
List of waypoints is now shuffled within waypointComponent. Experience
may vary. Random element removed from flightplan generation itself, so
aircraft with same entry-exit pair will all have same flightplan.

Author: PWDrew

ini-atc/src/seprini/controllers/components/FlightPlanComponent.java

@@ -31,7 +31,7 @@ public ArrayList<Waypoint> generate() {
 		// Initialisation of parameters required by flightPlanWaypointGenerator.
 		ArrayList<Waypoint> flightPlan = new ArrayList<Waypoint>();
 		Waypoint entryWaypoint = setStartpoint();
-		Waypoint lastWaypoint = setEndpoint(entryWaypoint, 500);
+		Waypoint lastWaypoint = setEndpoint(entryWaypoint, 600);
 		// entryWaypoint immediately added to aircrafts flightPlan.
 		flightPlan.add(entryWaypoint);
 
@@ -71,7 +71,7 @@ private ArrayList<Waypoint> flightPlanWaypointGenerator(
 			// Call selectNextWaypoint.
 			Waypoint nextWaypoint = selectNextWaypoint(currentWaypoint,
 					lastWaypoint, flightPlan, normalVectorFromCurrentToLast,
-					waypointSelectionList, 50, 300);
+					waypointSelectionList, 30, 100);
 			// Recurse with updated flightPlan and nextWaypoint.
 			return flightPlanWaypointGenerator(flightPlan, nextWaypoint,
 					lastWaypoint);
@@ -99,8 +99,6 @@ private static Waypoint selectNextWaypoint(Waypoint currentWaypoint,
 			int minDistance) {
 		Waypoint nextWaypoint = null;
 
-		Collections.shuffle(waypointSelectionList, new Random());
-
 		for (Waypoint waypoint : waypointSelectionList) {
 			// Find normal vector from current item in waypointSelectionList to
 			// lastWaypoint.

ini-atc/src/seprini/controllers/components/WaypointComponent.java

@@ -1,6 +1,8 @@
 package seprini.controllers.components;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Random;
 
 import seprini.controllers.AircraftController;
 import seprini.controllers.SidebarController;
@@ -35,11 +37,13 @@ public WaypointComponent(AircraftController controller,
 		createEntrypoint(0, 0);
 		createEntrypoint(0, 720);
 		createEntrypoint(1080, 360);
+		createEntrypoint(540, 0);
 
 		// add exit waypoints to exitList
 		createExitpoint(1080, 720);
 		createExitpoint(1080, 0);
 		createExitpoint(0, 420);
+		createExitpoint(540, 720);
 
 		// add some waypoints
 		createWaypoint(300, 200, true);
@@ -51,6 +55,8 @@ public WaypointComponent(AircraftController controller,
 		createWaypoint(700, 500, true);
 		createWaypoint(450, 100, true);
 		createWaypoint(540, 360, true);
+		
+		Collections.shuffle(permanentList, new Random());
 	}
 
 	/**