Skip to content

Commit d272ab8

Browse files
committed
Automatic merge of T1.5.1-913-g91804456c 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 a057eff: Blueprint/train car operations UI window - 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 #903 at 9bead33: Downloading route content (Github, zip) - Pull request #910 at 97d4569: Allow building code using .NET 6 (Windows) - Pull request #911 at 6834af0: docs: Add refactoring as a special type of PR - Pull request #912 at f7b85e4: New Triple Valve Features Vol. 2 - Pull request #919 at e6c08a2: Added mouse wheel support for controls which can be moved by pressing t… - Pull request #920 at a94e403: Update RailDriver in Manual - Pull request #923 at e0f3c55: Add curve squeal to route - Pull request #924 at 6c2c3cd: Default Asset Improvements
17 parents 7273361 + 9180445 + 3539862 + d00beb9 + f92de76 + a057eff + 6c0785b + 1f5ba4c + 5866028 + 9bead33 + 97d4569 + 6834af0 + f7b85e4 + e6c08a2 + a94e403 + e0f3c55 + 6c2c3cd commit d272ab8

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Source/Documentation/Manual/physics.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3157,7 +3157,7 @@ MaxAuxilaryChargingRate and EmergencyResChargingRate.
31573157
single: ORTSBrakeCylinderVolume
31583158
single: ORTSBrakeCylinderPipingVolume
31593159
single: ORTSBrakeCylinderSize
3160-
single: ORTSBrakeCylinderTravel
3160+
single: ORTSBrakeCylinderPistonTravel
31613161
single: ORTSNumberBrakeCylinders
31623162
single: ORTSEmergencyValveActuationRate
31633163
single: ORTSEmergencyDumpValveRate
@@ -3226,7 +3226,7 @@ MaxAuxilaryChargingRate and EmergencyResChargingRate.
32263226
- ``Wagon(ORTSBrakeCylinderSize`` -- If brake cylinder dimensions are
32273227
available, this can be used in place of ``ORTSBrakeCylinderVolume`` to
32283228
set the size of the brake cylinder(s).
3229-
- ``Wagon(ORTSBrakeCylinderTravel`` -- The length of brake cylinder extension
3229+
- ``Wagon(ORTSBrakeCylinderPistonTravel`` -- The length of brake cylinder extension
32303230
when the brakes are applied. Larger travel leads to larger brake cylinder
32313231
volume, and volume will increase as the brake cylinder pressurizes.
32323232
(Default 8 inches.)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ public override void Parse(string lowercasetoken, STFReader stf)
367367
case "wagon(ortsbrakecylindervolume": CylVolumeM3 = Me3.FromFt3(stf.ReadFloatBlock(STFReader.UNITS.VolumeDefaultFT3, null)); break;
368368
case "wagon(ortsbrakecylinderpipingvolume": CylPipeVolumeM3 = Me3.FromFt3(stf.ReadFloatBlock(STFReader.UNITS.VolumeDefaultFT3, null)); break;
369369
case "wagon(ortsbrakecylindersize": CylDiameterM = stf.ReadFloatBlock(STFReader.UNITS.Distance, null); break;
370-
case "wagon(ortsbrakecylindertravel": CylStrokeM = stf.ReadFloatBlock(STFReader.UNITS.Distance, null); break;
370+
case "wagon(ortsbrakecylinderpistontravel": CylStrokeM = stf.ReadFloatBlock(STFReader.UNITS.Distance, null); break;
371371
case "wagon(ortsnumberbrakecylinders": CylCount = stf.ReadIntBlock(null); break;
372372
case "wagon(ortsemergencyresquickrelease": EmergResQuickRelease = stf.ReadBoolBlock(true); break;
373373
case "wagon(ortsuniformchargingthreshold": UniformChargingThresholdPSI = stf.ReadFloatBlock(STFReader.UNITS.PressureDefaultPSI, 3.0f); break;
@@ -712,7 +712,7 @@ public void UpdateTripleValveState(float elapsedClockSeconds)
712712
TripleValveState = ValveState.Apply;
713713
}
714714
}
715-
else if (BrakeLine1PressurePSI > AuxResPressurePSI + (TripleValveState == ValveState.Release ? 0.0f : TripleValveSensitivityPSI * 1.75f))
715+
else if (BrakeLine1PressurePSI > AuxResPressurePSI + (TripleValveState == ValveState.Release ? 0.0f : TripleValveSensitivityPSI * 1.5f))
716716
{
717717
if (prevState != ValveState.Release) // If valve transitions to release, quick release activates, quick service deactivates
718718
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ public override void Parse(string lowercasetoken, STFReader stf)
254254
case "wagon(ortsauxiliaryrescapacity":
255255
case "wagon(ortsauxilaryrescapacity": VacResVolM3 = Me3.FromFt3(stf.ReadFloatBlock(STFReader.UNITS.VolumeDefaultFT3, null)); break;
256256
case "wagon(ortsbrakecylindersize": CylDiameterM = stf.ReadFloatBlock(STFReader.UNITS.Distance, null); break;
257-
case "wagon(ortsbrakecylindertravel": CylStrokeM = stf.ReadFloatBlock(STFReader.UNITS.Distance, null); break;
257+
case "wagon(ortsbrakecylinderpistontravel": CylStrokeM = stf.ReadFloatBlock(STFReader.UNITS.Distance, null); break;
258258
case "wagon(ortsnumberbrakecylinders": CylCount = stf.ReadIntBlock(null); break;
259259
}
260260
}

0 commit comments

Comments
 (0)