Skip to content

Commit d28c1b9

Browse files
committed
Automatic merge of T1.5.1-801-g8ef12d34f and 15 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 b554363: 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 #899 at a0a37ac: Duplex steam engines - Booster Engine addition - 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
17 parents adca237 + 8ef12d3 + 3539862 + d00beb9 + f92de76 + b554363 + 8f94333 + 6c0785b + 1f5ba4c + 5866028 + 42f1dd9 + a0a37ac + 0d6d045 + 9b0b04f + 4b4afe3 + 6834af0 + 8106ea1 commit d28c1b9

File tree

1 file changed

+5
-6
lines changed
  • Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS

1 file changed

+5
-6
lines changed

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/MSTS/AirSinglePipe.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,6 @@ public override void Initialize()
520520
(TwoStageSpeedUpMpS, TwoStageSpeedDownMpS) = (TwoStageSpeedDownMpS, TwoStageSpeedUpMpS);
521521
if (TwoStageLowPressurePSI == 0)
522522
TwoStageLowPressurePSI = MaxCylPressurePSI;
523-
524523
}
525524

526525
/// <summary>
@@ -1165,21 +1164,21 @@ public override void Update(float elapsedClockSeconds)
11651164
if (loco != null)
11661165
{
11671166
float volumeRatio = CylVolumeM3 / loco.MainResVolumeM3;
1168-
if (loco.MainResPressurePSI - dp * volumeRatio < CylPressurePSI + dp)
1167+
if (loco.MainResPressurePSI - (dp * volumeRatio) < CylPressurePSI + dp)
11691168
dp = (loco.MainResPressurePSI - CylPressurePSI) / (1 + volumeRatio);
11701169
loco.MainResPressurePSI -= dp * volumeRatio;
11711170
}
11721171
else if (TwoPipes)
11731172
{
1174-
if (BrakeLine2PressurePSI - dp * CylVolumeM3 / BrakePipeVolumeM3 < CylPressurePSI + dp)
1175-
dp = (BrakeLine2PressurePSI - CylPressurePSI) / (1 + CylVolumeM3 / BrakePipeVolumeM3);
1176-
BrakeLine2PressurePSI -= dp * CylVolumeM3 / BrakePipeVolumeM3;
1173+
if (BrakeLine2PressurePSI - dp * (CylVolumeM3 / BrakePipeVolumeM3) < CylPressurePSI + dp)
1174+
dp = (BrakeLine2PressurePSI - CylPressurePSI) / (1 + (CylVolumeM3 / BrakePipeVolumeM3));
1175+
BrakeLine2PressurePSI -= dp * (CylVolumeM3 / BrakePipeVolumeM3);
11771176
}
11781177
CylPressurePSI += dp;
11791178
}
11801179
else if (demandedPressurePSI < CylPressurePSI)
11811180
{
1182-
CylPressurePSI = Math.Max(Math.Max(demandedPressurePSI, CylPressurePSI - elapsedClockSeconds * RelayValveReleaseRatePSIpS), 0);
1181+
CylPressurePSI = Math.Max(Math.Max(demandedPressurePSI, CylPressurePSI - (elapsedClockSeconds * RelayValveReleaseRatePSIpS)), 0);
11831182
}
11841183
}
11851184
else

0 commit comments

Comments
 (0)