Skip to content

Commit 6550dab

Browse files
committed
Revert "Add volume controlled curve for back pressure"
This reverts commit 6fcbe31.
1 parent 6fcbe31 commit 6550dab

File tree

4 files changed

+2
-9
lines changed

4 files changed

+2
-9
lines changed

Source/Orts.Formats.Msts/SoundManagmentFile.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ public struct CurvePoint
240240

241241
public class VolumeCurve
242242
{
243-
public enum Controls { None, DistanceControlled, SpeedControlled, Variable1Controlled, Variable1_2Controlled, Variable1_3Controlled, Variable1_4Controlled, Variable2Controlled, Variable2BoosterControlled, Variable3Controlled, BrakeCylControlled, CurveForceControlled, BackPressureControlled };
243+
public enum Controls { None, DistanceControlled, SpeedControlled, Variable1Controlled, Variable1_2Controlled, Variable1_3Controlled, Variable1_4Controlled, Variable2Controlled, Variable2BoosterControlled, Variable3Controlled, BrakeCylControlled, CurveForceControlled };
244244

245245
public Controls Control = Controls.None;
246246
public float Granularity = 1.0f;
@@ -264,7 +264,6 @@ public VolumeCurve(STFReader stf)
264264
case "variable3controlled": Control = Controls.Variable3Controlled; break;
265265
case "brakecylcontrolled": Control = Controls.BrakeCylControlled; break;
266266
case "curveforcecontrolled": Control = Controls.CurveForceControlled; break;
267-
case "backpressurecontrolled": Control = Controls.BackPressureControlled; break;
268267
default: STFException.TraceWarning(stf, "Crash expected: Skipped unknown VolumeCurve/Frequencycurve type " + type); stf.SkipRestOfBlock(); return;
269268
}
270269
stf.ParseBlock(new STFReader.TokenProcessor[] {

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3192,9 +3192,6 @@ public override void Update(float elapsedClockSeconds)
31923192

31933193
}
31943194

3195-
// calculate total back pressure from all exhausts
3196-
BackPressurePSIG = BackPressuretoSteamOutput[pS.TopH(CylinderSteamUsageLBpH)];
3197-
31983195
UpdateTractiveForce(elapsedClockSeconds, ThrottlePercent / 100f, AbsSpeedMpS, AbsWheelSpeedMpS);
31993196

32003197
#endregion

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// COPYRIGHT 2009 - 2022 by the Open Rails project.
1+
// COPYRIGHT 2009 - 2022 by the Open Rails project.
22
//
33
// This file is part of Open Rails.
44
//
@@ -183,8 +183,6 @@ public static Interpolator SteamHeatBoilerFuelUsageGalukpH()
183183
public float CarHeatCurrentCompartmentHeatJ;
184184
public float CarInsideTempC;
185185

186-
public float BackPressurePSIG; // Back pressure in steam cylinder for sound system
187-
188186
// some properties of this car
189187
public float CarWidthM = 2.5f;
190188
public float CarLengthM = 40; // derived classes must overwrite these defaults

Source/RunActivity/Viewer3D/Sound.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1504,7 +1504,6 @@ private float ReadValue(Orts.Formats.Msts.VolumeCurve.Controls control, MSTSWago
15041504
case Orts.Formats.Msts.VolumeCurve.Controls.Variable3Controlled: return car.Variable3;
15051505
case Orts.Formats.Msts.VolumeCurve.Controls.BrakeCylControlled: return car.BrakeSystem.GetCylPressurePSI();
15061506
case Orts.Formats.Msts.VolumeCurve.Controls.CurveForceControlled: return car.CurveForceNFiltered;
1507-
case Orts.Formats.Msts.VolumeCurve.Controls.BackPressureControlled: return car.BackPressurePSIG;
15081507
default: return 0;
15091508
}
15101509
}

0 commit comments

Comments
 (0)