Skip to content

Commit 0fbdfb4

Browse files
committed
Automatic merge of T1.5.1-794-g4cad06780 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 a055bca: 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 0a9d939: feat: Improved system information collection - Pull request #899 at f90a98b: Duplex steam engines - Booster Engine addition - Pull request #903 at 7353625: Downloading route content (Github, zip) - Pull request #906 at 5850660: Bug fix for https://bugs.launchpad.net/or/+bug/2047299 Crash loading a 3Dcab-only loco - 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
16 parents 85557db + 4cad067 + 3539862 + d00beb9 + f92de76 + a055bca + 8f94333 + 6c0785b + 1f5ba4c + 5866028 + 0a9d939 + f90a98b + 7353625 + 5850660 + 9b0b04f + 4b4afe3 commit 0fbdfb4

File tree

4 files changed

+20
-2
lines changed

4 files changed

+20
-2
lines changed

Source/Orts.Formats.Msts/SoundManagmentFile.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ public struct CurvePoint
198198

199199
public class VolumeCurve
200200
{
201-
public enum Controls { None, DistanceControlled, SpeedControlled, Variable1Controlled, Variable2_1Controlled, Variable3_1Controlled, Variable4_1Controlled, Variable2Controlled, Variable3Controlled, BrakeCylControlled, CurveForceControlled };
201+
public enum Controls { None, DistanceControlled, SpeedControlled, Variable1Controlled, Variable2_1Controlled, Variable3_1Controlled, Variable4_1Controlled, Variable2Controlled, Variable2BoosterControlled, Variable3Controlled, BrakeCylControlled, CurveForceControlled };
202202

203203
public Controls Control = Controls.None;
204204
public float Granularity = 1.0f;
@@ -218,6 +218,7 @@ public VolumeCurve(STFReader stf)
218218
case "variable3_1controlled": Control = Controls.Variable3_1Controlled; break;
219219
case "variable4_1controlled": Control = Controls.Variable4_1Controlled; break;
220220
case "variable2controlled": Control = Controls.Variable2Controlled; break;
221+
case "variable2BoosterControlled": Control = Controls.Variable2BoosterControlled; break;
221222
case "variable3controlled": Control = Controls.Variable3Controlled; break;
222223
case "brakecylcontrolled": Control = Controls.BrakeCylControlled; break;
223224
case "curveforcecontrolled": Control = Controls.CurveForceControlled; break;

Source/Orts.Simulation/Simulation/RollingStocks/MSTSSteamLocomotive.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3022,7 +3022,14 @@ private void UpdateFX(float elapsedClockSeconds)
30223022

30233023
Variable2 = MathHelper.Clamp((CylinderCocksPressureAtmPSI - OneAtmospherePSI) / BoilerPressurePSI * 100f, 0, 100);
30243024

3025-
// Trace.TraceInformation("Variable2 - {0}", Variable2);
3025+
if (SteamBoosterAirOpen && SteamBoosterRunMode && BoosterCylinderSteamExhaustOn && throttle > 0.0)
3026+
{
3027+
Variable2_Booster = SteamChestPressurePSI / MaxBoilerPressurePSI;
3028+
}
3029+
else
3030+
{
3031+
Variable2_Booster = 0;
3032+
}
30263033

30273034
Variable3 = FuelRateSmoothed * 100;
30283035

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ public enum WindowState
115115
public float Variable2_1;
116116
public float Variable3_1;
117117
public float Variable4_1;
118+
public float Variable2_Booster;
118119

119120
// wag file data
120121
public string MainShapeFileName;
@@ -1820,7 +1821,11 @@ public override void Save(BinaryWriter outf)
18201821
{
18211822
outf.Write(Variable1);
18221823
outf.Write(Variable2);
1824+
outf.Write(Variable2_Booster);
18231825
outf.Write(Variable3);
1826+
outf.Write(Variable2_1);
1827+
outf.Write(Variable3_1);
1828+
outf.Write(Variable4_1);
18241829
outf.Write(IsDavisFriction);
18251830
outf.Write(IsRollerBearing);
18261831
outf.Write(IsLowTorqueRollerBearing);
@@ -1881,7 +1886,11 @@ public override void Restore(BinaryReader inf)
18811886
{
18821887
Variable1 = inf.ReadSingle();
18831888
Variable2 = inf.ReadSingle();
1889+
Variable2_Booster = inf.ReadSingle();
18841890
Variable3 = inf.ReadSingle();
1891+
Variable2_1 = inf.ReadSingle();
1892+
Variable3_1 = inf.ReadSingle();
1893+
Variable4_1 = inf.ReadSingle();
18851894
IsDavisFriction = inf.ReadBoolean();
18861895
IsRollerBearing = inf.ReadBoolean();
18871896
IsLowTorqueRollerBearing = inf.ReadBoolean();

Source/RunActivity/Viewer3D/Sound.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1497,6 +1497,7 @@ private float ReadValue(Orts.Formats.Msts.VolumeCurve.Controls control, MSTSWago
14971497
case Orts.Formats.Msts.VolumeCurve.Controls.Variable2_1Controlled: return car.Variable2_1;
14981498
case Orts.Formats.Msts.VolumeCurve.Controls.Variable3_1Controlled: return car.Variable3_1;
14991499
case Orts.Formats.Msts.VolumeCurve.Controls.Variable4_1Controlled: return car.Variable4_1;
1500+
case Orts.Formats.Msts.VolumeCurve.Controls.Variable2BoosterControlled: return car.Variable2_Booster;
15001501
case Orts.Formats.Msts.VolumeCurve.Controls.Variable2Controlled: return car.Variable2;
15011502
case Orts.Formats.Msts.VolumeCurve.Controls.Variable3Controlled: return car.Variable3;
15021503
case Orts.Formats.Msts.VolumeCurve.Controls.BrakeCylControlled: return car.BrakeSystem.GetCylPressurePSI();

0 commit comments

Comments
 (0)