Change: More implementation work on pantographs

Author: leezer3

source/OpenBVE/Parsers/Train/TrainDatParser.cs

@@ -60,7 +60,7 @@ internal static void ParseTrainData(string FileName, System.Text.Encoding Encodi
 				}
 			}
 			TrainDatFormats currentFormat = TrainDatFormats.openBVE;
-			const int currentVersion = 15311;
+			const int currentVersion = 18000;
 			int myVersion = -1;
 			for (int i = 0; i < Lines.Length; i++) {
 				if (Lines[i].Length > 0) {
@@ -152,6 +152,8 @@ internal static void ParseTrainData(string FileName, System.Text.Encoding Encodi
 			Train.Handles.EmergencyBrake = new TrainManager.EmergencyHandle();
 			Train.Handles.HasLocoBrake = false;
 			double[] powerDelayUp = { }, powerDelayDown = { }, brakeDelayUp = { }, brakeDelayDown = { }, locoBrakeDelayUp = { }, locoBrakeDelayDown = { };
+			int numberOfPantographs = 1;
+			double pantographLocation = -1;
 			int powerNotches = 0, brakeNotches = 0, locoBrakeNotches = 0, powerReduceSteps = -1, locoBrakeType = 0, driverPowerNotches = 0, driverBrakeNotches = 0;
 			TrainManager.MotorSoundTable[] Tables = new TrainManager.MotorSoundTable[4];
 			for (int i = 0; i < 4; i++) {
@@ -675,6 +677,20 @@ internal static void ParseTrainData(string FileName, System.Text.Encoding Encodi
 										} else {
 											CarUnexposedFrontalArea = a;
 										} break;
+									case 11:
+										if (a <= 0.0)
+										{
+											Interface.AddMessage(MessageType.Error, false, "NumberOfPantographs is expected to be positive at line " + (i + 1).ToString(Culture) + " in " + FileName);
+										}
+										else
+										{
+											numberOfPantographs = (int)a;
+										}
+										break;
+									case 12:
+										//Do no validation here, as we don't necessarily yet know the length of a car
+										pantographLocation = a;
+										break;
 								}
 							} i++; n++;
 						} i--; break;
@@ -961,10 +977,18 @@ internal static void ParseTrainData(string FileName, System.Text.Encoding Encodi
 					MaximumAcceleration = AccelerationCurves[i].StageOneAcceleration;
 				}
 			}
+			
+			if (pantographLocation < 0 || pantographLocation > CarLength)
+			{
+				//Pantograph location is relative from the front of the car
+				//Somone will probably want to add one outside the physical model, so just warn...
+				Interface.AddMessage(MessageType.Warning, false, "A PantographLocation of " + pantographLocation.ToString(Culture) + " places it outside the bounds of the car in file " + FileName);
+			}
 			// assign motor cars
 			if (MotorCars == 1) {
 				if (FrontCarIsMotorCar | TrailerCars == 0) {
 					Train.Cars[0].Specs.IsMotorCar = true;
+					Train.Cars[0].Pantograph = new TrackFollower(Program.CurrentHost);
 				} else {
 					Train.Cars[Cars - 1].Specs.IsMotorCar = true;
 				}
@@ -1184,15 +1208,9 @@ internal static void ParseTrainData(string FileName, System.Text.Encoding Encodi
 				{
 					Train.Cars[i].Coupler = new TrainManager.Coupler(0.9 * DistanceBetweenTheCars, 1.1 * DistanceBetweenTheCars, Train.Cars[i / 2], null, Train);
 				}
-				
-				Train.Cars[i].CurrentCarSection = -1;
-				Train.Cars[i].ChangeCarSection(CarSectionType.NotVisible);
-				Train.Cars[i].FrontBogie.ChangeSection(-1);
-				Train.Cars[i].RearBogie.ChangeSection(-1);
-				Train.Cars[i].Coupler.ChangeSection(-1);
+								
 				Train.Cars[i].FrontAxle.Follower.TriggerType = i == 0 ? EventTriggerType.FrontCarFrontAxle : EventTriggerType.OtherCarFrontAxle;
 				Train.Cars[i].RearAxle.Follower.TriggerType = i == Cars - 1 ? EventTriggerType.RearCarRearAxle : EventTriggerType.OtherCarRearAxle;
-				Train.Cars[i].BeaconReceiver.TriggerType = i == 0 ? EventTriggerType.TrainFront : EventTriggerType.None;
 				Train.Cars[i].BeaconReceiverPosition = 0.5 * CarLength;
 				Train.Cars[i].FrontAxle.Follower.Car = Train.Cars[i];
 				Train.Cars[i].RearAxle.Follower.Car = Train.Cars[i];

source/OpenBVE/Simulation/TrainManager/Car/Car.Bogie.cs

@@ -44,6 +44,7 @@ internal Bogie(Train train, Car car)
 				CarSections = new CarSection[] { };
 				FrontAxle = new Axle(Program.CurrentHost, train, car);
 				RearAxle = new Axle(Program.CurrentHost, train, car);
+				ChangeSection(-1);
 			}
 
 			internal void UpdateObjects(double TimeElapsed, bool ForceUpdate)

source/OpenBVE/Simulation/TrainManager/Car/Car.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using LibRender2;
 using LibRender2.Camera;
 using LibRender2.Cameras;
@@ -52,7 +53,10 @@ internal partial class Car : AbstractCar
 			internal Coupler Coupler;
 
 			internal double BeaconReceiverPosition;
+			/// <summary>Recieves all safety system beacons</summary>
 			internal TrackFollower BeaconReceiver;
+			/// <summary>Provides current collection etc.</summary>
+			internal TrackFollower Pantograph;
 			/// <summary>Whether loading sway is enabled for this car</summary>
 			internal bool EnableLoadingSway = true;
 			/// <summary>A reference to the base train</summary>
@@ -66,6 +70,23 @@ internal partial class Car : AbstractCar
 			internal CameraAlignment InteriorCamera;
 
 			internal bool HasInteriorView = false;
+
+			public override Dictionary<PowerSupplyTypes, PowerSupply> AvailablePowerSupplies
+			{
+				get
+				{
+					if (Pantograph != null)
+					{
+						return Pantograph.AvailablePowerSupplies;
+					}
+					else
+					{
+						//Not fitted, so return empty collection
+						return new Dictionary<PowerSupplyTypes, PowerSupply>();
+					}
+					
+				}		
+			}
 
 			internal Car(Train train, int index, double CoefficientOfFriction, double CoefficientOfRollingResistance, double AerodynamicDragCoefficient)
 			{
@@ -75,13 +96,16 @@ internal Car(Train train, int index, double CoefficientOfFriction, double Coeffi
 				FrontAxle = new Axle(Program.CurrentHost, train, this, CoefficientOfFriction, CoefficientOfRollingResistance, AerodynamicDragCoefficient);
 				RearAxle = new Axle(Program.CurrentHost, train, this, CoefficientOfFriction, CoefficientOfRollingResistance, AerodynamicDragCoefficient);
 				BeaconReceiver = new TrackFollower(Program.CurrentHost, train);
+				BeaconReceiver.TriggerType = index == 0 ? EventTriggerType.TrainFront : EventTriggerType.None;
 				FrontBogie = new Bogie(train, this);
 				RearBogie = new Bogie(train, this);
 				Doors = new Door[2];
 				Doors[0].Width = 1000.0;
 				Doors[0].MaxTolerance = 0.0;
 				Doors[1].Width = 1000.0;
 				Doors[1].MaxTolerance = 0.0;
+				CurrentCarSection = -1;
+				ChangeCarSection(CarSectionType.NotVisible);
 			}
 
 			internal Car(Train train, int index)