Skip to content

Commit ae660a1

Browse files
committed
Automatic merge of T1.5.1-866-gbae4730e2 and 14 pull requests
- Pull request #570 at 3539862: Experimental glTF 2.0 support with PBR lighting - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #882 at 9c456aa: Blueprint/train car operations UI window - Pull request #885 at 8f94333: feat: Add notifications to Menu - Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #897 at 42f1dd9: feat: Improved system information collection - Pull request #903 at 0d6d045: Downloading route content (Github, zip) - Pull request #907 at 9b0b04f: Bug fix for https://bugs.launchpad.net/or/+bug/2047300 Dynamic tracks disappear after long tunnel - Pull request #908 at 4b4afe3: feat: supports switching adhesion precisions - Pull request #911 at 6834af0: docs: Add refactoring as a special type of PR - Pull request #912 at 8106ea1: New Triple Valve Features Vol. 2
16 parents b5c5db2 + bae4730 + 3539862 + d00beb9 + f92de76 + 9c456aa + 8f94333 + 6c0785b + 1f5ba4c + 5866028 + 42f1dd9 + 0d6d045 + 9b0b04f + 4b4afe3 + 6834af0 + 8106ea1 commit ae660a1

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1985,7 +1985,7 @@ public override void Update(float elapsedClockSeconds)
19851985

19861986
// Cruise Control
19871987
CruiseControl?.Update(elapsedClockSeconds);
1988-
1988+
19891989
if (DynamicBrakePercent >= 0 && ThrottlePercent <= 0)
19901990
{
19911991
if (DynamicBrakeCommandStartTime == null)
@@ -2013,7 +2013,7 @@ public override void Update(float elapsedClockSeconds)
20132013
// TODO this is a wild simplification for electric and diesel electric
20142014
if (EngineType == EngineTypes.Diesel || EngineType == EngineTypes.Electric)
20152015
{
2016-
UpdateTractiveForce(elapsedClockSeconds, ThrottlePercent / 100f, AbsSpeedMpS, AbsWheelSpeedMpS);
2016+
UpdateTractiveForce(elapsedClockSeconds, ThrottlePercent / 100f, AbsSpeedMpS, AbsWheelSpeedMpS);
20172017
}
20182018

20192019
foreach (MultiPositionController mpc in MultiPositionControllers)
@@ -2798,7 +2798,7 @@ public virtual void AdvancedAdhesion(float elapsedClockSeconds)
27982798
WheelSlip = LocomotiveAxles.IsWheelSlip;
27992799
WheelSlipWarning = LocomotiveAxles.IsWheelSlipWarning;
28002800
}
2801-
2801+
28022802
WheelSpeedMpS = (float)LocomotiveAxles[0].AxleSpeedMpS;
28032803
}
28042804

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2205,13 +2205,13 @@ private void UpdateLocomotiveLoadPhysics()
22052205
MassKG = LoadEmptyMassKg + Kg.FromLb(SteamLocomotiveIdentification.BoilerMassLB) + SteamLocomotiveIdentification.FireMassKG + +(SteamLocomotiveIdentification.CurrentTrackSandBoxCapacityM3 * SteamLocomotiveIdentification.SandWeightKgpM3);
22062206
var MassUpperLimit = LoadFullMassKg * 1.02f; // Allow full load to go slightly higher so that rounding errors do not skew results
22072207
MassKG = MathHelper.Clamp(MassKG, LoadEmptyMassKg, MassUpperLimit); // Clamp Mass to between the empty and full wagon values
2208-
// Adjust drive wheel weight
2208+
// Adjust drive wheel weight
22092209
SteamLocomotiveIdentification.DrvWheelWeightKg = (MassKG / InitialMassKG) * SteamLocomotiveIdentification.InitialDrvWheelWeightKg;
22102210

22112211
// update drive wheel weight for each multiple steam engine
22122212
UpdateDriveWheelWeight(LocoIndex, MassKG, SteamLocomotiveIdentification.SteamEngines.Count);
22132213

2214-
}
2214+
}
22152215

22162216
// Update wagon physics parameters sensitive to wagon mass change
22172217
// Calculate the difference ratio, ie how full the wagon is. This value allows the relevant value to be scaled from the empty mass to the full mass of the wagon
@@ -2301,7 +2301,7 @@ private void UpdateDriveWheelWeight(int index, float masskg, int numberofengine
23012301
}
23022302
}
23032303

2304-
private void UpdateTrainBaseResistance()
2304+
private void UpdateTrainBaseResistance()
23052305
{
23062306
IsBelowMergeSpeed = AbsSpeedMpS < MergeSpeedMpS;
23072307
IsStandStill = AbsSpeedMpS < 0.1f;

0 commit comments

Comments
 (0)