Automatic merge of T1.5.1-372-g5db5c7824 and 9 pull requests

- Pull request #570 at de7a14f: Experimental glTF 2.0 support with PBR lighting
- Pull request #732 at 22f66dc: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #799 at dc03850: Consolidated wind simulation
- Pull request #803 at 7157e08: Various adjustments to steam adhesion
- Pull request #813 at 244875d: Refactored garbage generators
- Pull request #815 at a5cc165: chore: Add GitHub automatic release notes configuration
- Pull request #816 at eae646d: Bug fix for https://bugs.launchpad.net/or/+bug/2014992 EOT can't be dismounted after train reversal
- Pull request #818 at 18fd051: Allow independent drive axles for locomotives

Author: openrails-bot

Source/Orts.Simulation/Simulation/AIs/AITrain.cs

@@ -129,6 +129,8 @@ public enum AI_START_MOVEMENT
         public static float minStopDistanceM = 3.0f;           // minimum clear distance for stopping at signal in station
         public static float signalApproachDistanceM = 20.0f;   // final approach to signal
 
+        private readonly List<ObjectItemInfo> processedList = new List<ObjectItemInfo>(); // internal processing list for CheckSignalObjects()
+
 #if WITH_PATH_DEBUG
         //  Only for EnhancedActCompatibility
         public string currentAIState = "";
@@ -1164,10 +1166,12 @@ public void CheckSignalObjects()
             }
 
             float validSpeed = AllowedMaxSpeedMpS;
-            List<ObjectItemInfo> processedList = new List<ObjectItemInfo>();
+            processedList.Clear();
 
-            foreach (ObjectItemInfo thisInfo in SignalObjectItems.Where(item => !item.speed_isWarning))
+            foreach (ObjectItemInfo thisInfo in SignalObjectItems)
             {
+                if (thisInfo.speed_isWarning)
+                    continue;
 
                 // check speedlimit
                 if (CheckTrain)

Source/Orts.Simulation/Simulation/Physics/Train.cs

@@ -96,6 +96,7 @@ public TrainCar LastCar
         }
         public Traveller RearTDBTraveller;               // positioned at the back of the last car in the train
         public Traveller FrontTDBTraveller;              // positioned at the front of the train by CalculatePositionOfCars
+        Traveller CalculatorTraveller;            // CalculatePositionOfCars uses it for the calculations
         public float Length;                             // length of train from FrontTDBTraveller to RearTDBTraveller
         public float MassKg;                             // weight of the train
         public float SpeedMpS;                           // meters per second +ve forward, -ve when backing
@@ -420,6 +421,8 @@ public enum END_AUTHORITY
 
         public bool nextRouteReady = false;                             // indication to activity.cs that a reversal has taken place
 
+        readonly List<int[]> sectionList = new List<int[]>(); // internally used in UpdateSectionState()
+
         // Deadlock Info : 
         // list of sections where deadlock begins
         // per section : list with trainno and end section
@@ -4383,7 +4386,9 @@ public void CalculatePositionOfCars(float elapsedTime, float distance)
 
             // TODO : check if train moved back into previous section
 
-            var traveller = new Traveller(RearTDBTraveller);
+            CalculatorTraveller = CalculatorTraveller ?? new Traveller(RearTDBTraveller);
+            var traveller = CalculatorTraveller;
+            traveller.Copy(RearTDBTraveller);
             // The traveller location represents the back of the train.
             var length = 0f;
 
@@ -4458,7 +4463,7 @@ public void CalculatePositionOfCars(float elapsedTime, float distance)
                 car.UpdateFreightAnimationDiscretePositions();
             }
 
-            FrontTDBTraveller = traveller;
+            (FrontTDBTraveller, CalculatorTraveller) = (CalculatorTraveller, FrontTDBTraveller);
             Length = length;
             travelled += distance;
         } // CalculatePositionOfCars
@@ -6526,7 +6531,7 @@ public void ObtainRequiredActions(int backward)
         public void UpdateSectionState(int backward)
         {
 
-            List<int[]> sectionList = new List<int[]>();
+            sectionList.Clear();
 
             int lastIndex = PreviousPosition[0].RouteListIndex;
             int presentIndex = PresentPosition[0].RouteListIndex;
@@ -20030,6 +20035,7 @@ public RoughReversalInfo(int subPathIndex, float reverseReversalOffset, int reve
 
         public class DistanceTravelledActions : LinkedList<DistanceTravelledItem>
         {
+            readonly List<DistanceTravelledItem> itemList = new List<DistanceTravelledItem>();
 
             //================================================================================================//
             //
@@ -20116,7 +20122,7 @@ public void InsertClearSection(float distance, int sectionIndex)
 
             public List<DistanceTravelledItem> GetActions(float distance)
             {
-                List<DistanceTravelledItem> itemList = new List<DistanceTravelledItem>();
+                itemList.Clear();
 
                 bool itemsCollected = false;
                 LinkedListNode<DistanceTravelledItem> nextNode = this.First;
@@ -20141,7 +20147,7 @@ public List<DistanceTravelledItem> GetActions(float distance)
 
             public List<DistanceTravelledItem> GetAuxActions(Train thisTrain, float distance)
             {
-                List<DistanceTravelledItem> itemList = new List<DistanceTravelledItem>();
+                itemList.Clear();
                 LinkedListNode<DistanceTravelledItem> nextNode = this.First;
 
                 while (nextNode != null)
@@ -20164,7 +20170,7 @@ public List<DistanceTravelledItem> GetAuxActions(Train thisTrain, float distance
 
             public List<DistanceTravelledItem> GetActions(float distance, Type reqType)
             {
-                List<DistanceTravelledItem> itemList = new List<DistanceTravelledItem>();
+                itemList.Clear();
 
                 bool itemsCollected = false;
                 LinkedListNode<DistanceTravelledItem> nextNode = this.First;

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

@@ -2007,22 +2007,18 @@ public override void Update(float elapsedClockSeconds)
                     if (RemoteControlGroup != -1)
                     {
                         if (!LocomotivePowerSupply.MainPowerSupplyOn)
-                        {
                             Train.SignalEvent(PowerSupplyEvent.RaisePantograph, 1);
 
-                            if (this is MSTSDieselLocomotive)
+                        if (this is MSTSDieselLocomotive dieselLocomotive)
+                            {
+                            for (var i = 0; i < dieselLocomotive.DieselEngines.Count; i++)
                             {
-                                foreach (DieselEngine de in (this as MSTSDieselLocomotive).DieselEngines)
+                                var de = dieselLocomotive.DieselEngines[i];
+                                if (!LocomotivePowerSupply.MainPowerSupplyOn)
                                 {
                                     if (de.State != DieselEngineState.Running)
                                         de.Initialize();
                                 }
-                            }
-                        }
-                        if (this is MSTSDieselLocomotive)
-                        {
-                            foreach (DieselEngine de in (this as MSTSDieselLocomotive).DieselEngines)
-                            {
                                  if (de.GearBox != null)
                                     de.GearBox.GearBoxOperation = GearBoxOperation.Automatic;
                             }

Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs

@@ -1864,7 +1864,7 @@ public override void Update(float elapsedClockSeconds)
 
                 AuxWagonType = "AuxiliaryTender";
             }
-            else
+            else if (AuxWagonType == "")
             {
                 AuxWagonType = WagonType.ToString();
             }

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/LocomotivePowerSupply.cs

@@ -55,11 +55,15 @@ public float ElectricTrainSupplyPowerW
         {
             get
             {
-                return Train.Cars.OfType<MSTSWagon>()
-                    .Where(wagon => wagon.PassengerCarPowerSupply != null)
-                    .Where(wagon => wagon.PassengerCarPowerSupply.ElectricTrainSupplyConnectedLocomotives.Contains(Locomotive))
-                    .Select(wagon => wagon.PassengerCarPowerSupply.ElectricTrainSupplyPowerW / wagon.PassengerCarPowerSupply.ElectricTrainSupplyConnectedLocomotives.Count())
-                    .Sum();
+                float result = 0;
+                foreach (var car in Train.Cars)
+                {
+                    if (car == null) continue;
+                    if (!(car is MSTSWagon wagon)) continue;
+                    if (!(wagon.PassengerCarPowerSupply?.ElectricTrainSupplyConnectedLocomotives.Contains(Locomotive) ?? false)) continue;
+                    result += wagon.PassengerCarPowerSupply.ElectricTrainSupplyPowerW / wagon.PassengerCarPowerSupply.ElectricTrainSupplyConnectedLocomotives.Count();
+                }
+                return result;
             }
         }
 

Source/Orts.Simulation/Simulation/Signalling/SignalObject.cs

@@ -138,8 +138,11 @@ public enum Permission
 
         public bool CallOnEnabled = false;      // set if signal script file uses CallOn functionality
 
+        private readonly List<int> passedSections = new List<int>();
         private readonly List<int> SectionsWithAlternativePath = new List<int>();
         private readonly List<int> SectionsWithAltPathSet = new List<int>();
+        private readonly static List<int> sectionsInRoute = new List<int>();
+        private static readonly ObjectSpeedInfo DefaultSpeedInfo = new ObjectSpeedInfo(-1, -1, false, false, 0, false);
 
         public bool enabled
         {
@@ -906,11 +909,11 @@ public MstsSignalAspect this_sig_lr(SignalFunction function, ref bool sigfound)
         public ObjectSpeedInfo this_sig_speed(SignalFunction function)
         {
             var sigAsp = MstsSignalAspect.STOP;
-            var set_speed = new ObjectSpeedInfo(-1, -1, false, false, 0, false);
+            var set_speed = DefaultSpeedInfo;
 
-            foreach (SignalHead sigHead in SignalHeads.Where(sigHead => sigHead.Function == function))
+            foreach (SignalHead sigHead in SignalHeads)
             {
-                if (sigHead.state >= sigAsp && sigHead.CurrentSpeedInfo != null)
+                if (sigHead.Function == function && sigHead.state >= sigAsp && sigHead.CurrentSpeedInfo != null)
                 {
                     sigAsp = sigHead.state;
                     set_speed = sigHead.CurrentSpeedInfo;
@@ -1292,7 +1295,7 @@ public bool route_set(int req_mainnode, uint req_jnnode)
                 int sectionIndex = -1;
                 bool passedTrackJn = false;
 
-                List<int> passedSections = new List<int>();
+                passedSections.Clear();
                 passedSections.Add(thisSection.Index);
 
                 routeset = req_mainnode == thisSection.OriginalIndex;
@@ -2157,7 +2160,7 @@ public bool requestClearSignal(Train.TCSubpathRoute RoutePart, Train.TrainRouted
             // copy sections upto next normal signal
             // check for loop
 
-            List<int> sectionsInRoute = new List<int>();
+            sectionsInRoute.Clear();
 
             for (int iNode = foundFirstSection; iNode < RoutePart.Count && foundLastSection < 0; iNode++)
             {

Source/Orts.Simulation/Simulation/Signalling/TrackCircuitState.cs

@@ -36,6 +36,8 @@ public class TrackCircuitState
         public int RemoteReserved;                                 // remote reserved (number only) //
         public bool Forced;                                        // forced by human dispatcher    //
 
+        List<Train.TrainRouted> TrainOccupyList;                   // used for allocation-free returning of the TrainOccuping() result //
+
         public TrackCircuitState()
         {
             TrainOccupy = new TrainOccupyState();
@@ -253,12 +255,13 @@ public void Save(BinaryWriter outf)
         /// </summary>
         public List<Train.TrainRouted> TrainsOccupying()
         {
-            List<Train.TrainRouted> reqList = new List<Train.TrainRouted>();
+            TrainOccupyList = TrainOccupyList ?? new List<Train.TrainRouted>();
+            TrainOccupyList.Clear();
             foreach (KeyValuePair<Train.TrainRouted, int> thisTCT in TrainOccupy)
             {
-                reqList.Add(thisTCT.Key);
+                TrainOccupyList.Add(thisTCT.Key);
             }
-            return (reqList);
+            return (TrainOccupyList);
         }
 
         /// <summary>
@@ -267,15 +270,16 @@ public void Save(BinaryWriter outf)
         /// </summary>
         public List<Train.TrainRouted> TrainsOccupying(int reqDirection)
         {
-            List<Train.TrainRouted> reqList = new List<Train.TrainRouted>();
+            TrainOccupyList = TrainOccupyList ?? new List<Train.TrainRouted>();
+            TrainOccupyList.Clear();
             foreach (KeyValuePair<Train.TrainRouted, int> thisTCT in TrainOccupy)
             {
                 if (thisTCT.Value == reqDirection)
                 {
-                    reqList.Add(thisTCT.Key);
+                    TrainOccupyList.Add(thisTCT.Key);
                 }
             }
-            return (reqList);
+            return (TrainOccupyList);
         }
 
         /// <summary>

Source/Orts.Simulation/Simulation/Traveller.cs

@@ -47,8 +47,8 @@ public enum TravellerDirection : byte
         // experimentally to match MSTS's 'capture range'.
         const float MaximumCenterlineOffset = 2.5f;
 
-        readonly TrackSectionsFile TSectionDat;
-        readonly TrackNode[] TrackNodes;
+        TrackSectionsFile TSectionDat;
+        TrackNode[] TrackNodes;
         TravellerDirection direction = TravellerDirection.Forward;
         float trackOffset; // Offset into track (vector) section; meters for straight sections, radians for curved sections.
         TrackNode trackNode;
@@ -333,8 +333,6 @@ public Traveller(TrackSectionsFile tSectionDat, TrackNode[] trackNodes, TrackNod
         public Traveller(Traveller copy)
         {
             if (copy == null) throw new ArgumentNullException("copy");
-            TSectionDat = copy.TSectionDat;
-            TrackNodes = copy.TrackNodes;
             Copy(copy);
         }
 
@@ -600,8 +598,10 @@ private static bool InitTrackSectionSucceeded(Traveller traveller, WorldLocation
 
 
 
-        void Copy(Traveller copy)
+        public void Copy(Traveller copy)
         {
+            TSectionDat = copy.TSectionDat;
+            TrackNodes = copy.TrackNodes;
             locationSet = copy.locationSet;
             location.TileX = copy.location.TileX;
             location.TileZ = copy.location.TileZ;