Skip to content

Commit e613a9d

Browse files
committed
Automatic merge of T1.5.1-1806-g5522fc5fa and 11 pull requests
- Pull request #570 at 362e4e7: glTF 2.0 support with PBR lighting - Pull request #1062 at ef2b07b: Train Forces popup Window. - Pull request #1064 at 1be1fc4: Add Train Info tab to Help window (F1) - Pull request #1067 at 5bf4677: Traction and dynamic brake retardation - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #1074 at e9a66c1: Gradient - commit 2024-16-12 - Pull request #1076 at 3bbd537: Allow depart early - Pull request #1085 at 37e2817: updates key commands for Train Operations window and also Daylight Offset - Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification
13 parents 33f8112 + 5522fc5 + 362e4e7 + ef2b07b + 1be1fc4 + 5bf4677 + 1f5ba4c + e9a66c1 + 3bbd537 + 37e2817 + e10390b + 5845a1a + 689494b commit e613a9d

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3492,7 +3492,7 @@ public LatLonDirection GetLatLonDirection()
34923492
public int GetWagonNumAxles() { return WagonNumAxles; }
34933493

34943494
public float GetGravitationalAccelerationMpS2() { return GravitationalAccelerationMpS2; }
3495-
3495+
34963496
/// <summary>
34973497
/// Update the gravity force and % gradient of this train car at the current position
34983498
/// </summary>

Source/RunActivity/Viewer3D/Popups/TrainForcesWindow.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -417,11 +417,9 @@ private void UpdateBrakeForceImage(TrainCar car, int carPosition)
417417
bool isDynamicBrakes = false;
418418

419419
var absForceN = Math.Abs(car.BrakeForceN); // using Math.Abs() for safety and consistency
420-
if (car.WagonType == TrainCar.WagonTypes.Engine && Math.Abs(car.DynamicBrakeForceN) > absForceN)
421-
{
422-
absForceN = Math.Abs(car.DynamicBrakeForceN);
423-
isDynamicBrakes = true;
424-
}
420+
var absDynForceN = Math.Abs(car.DynamicBrakeForceN);
421+
if (absDynForceN > absForceN) { isDynamicBrakes = true; }
422+
absForceN += absDynForceN;
425423

426424
if (absForceN > 1000f && BrakeForceScaleN > 1000f) // exclude improbabl values
427425
{

0 commit comments

Comments
 (0)