Skip to content

Commit 150725c

Browse files
committed
Automatic merge of T1.5.1-925-g1c557094e and 17 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 3ca0eb1: Blueprint/train car operations UI window - Pull request #885 at fb6b812: 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 #903 at 7af1f91: Downloading route content (Github, zip) - Pull request #912 at f7b85e4: New Triple Valve Features Vol. 2 - Pull request #919 at 26cc6a8: Added mouse wheel support for controls which can be moved by pressing t… - Pull request #923 at cc1b5b6: Add curve squeal to route - Pull request #924 at 6c2c3cd: Default Asset Improvements - Pull request #925 at e3b1688: Fix brakeshoe force bug - Pull request #927 at 7bce293: AI Train Power Supply/Lights Fix - Pull request #929 at a406a69: Add support for common circuit breaker variants - Pull request #930 at 42398f4: Further enhancements for duplex locoomotive
19 parents 0e5b0ec + 1c55709 + 3539862 + d00beb9 + f92de76 + 3ca0eb1 + fb6b812 + 6c0785b + 1f5ba4c + 5866028 + 7af1f91 + f7b85e4 + 26cc6a8 + cc1b5b6 + 6c2c3cd + e3b1688 + 7bce293 + a406a69 + 42398f4 commit 150725c

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1448,6 +1448,19 @@ public override void Initialize()
14481448
// Model current based upon a four cylinder, balanced compound, type Vauclain, as built by Baldwin, with no receiver between the HP and LP cylinder
14491449
// Set to compound operation intially
14501450

1451+
// include check to see if it is a balanced compound locomotive, ie number of HP cylinders = number of LP cylinders
1452+
if(SteamEngines[i].NumberCylinders != SteamEngines[i].LPNumberCylinders && Simulator.Settings.VerboseConfigurationMessages)
1453+
{
1454+
1455+
Trace.TraceInformation("This doesn't appear to be a balanced compound locomotive, ie LP Cylinders = HP Cylinders. Game performnce may not be realistic.");
1456+
SteamEngines[i].NumberCylinders = 2;
1457+
SteamEngines[i].LPNumberCylinders = 2;
1458+
1459+
Trace.TraceInformation("Compound locomotive set to balanced with HP Cylinder = {0} and LP Cylinder = {1}", SteamEngines[i].NumberCylinders, SteamEngines[i].LPNumberCylinders);
1460+
1461+
}
1462+
1463+
14511464
CompoundCylinderRatio = (SteamEngines[i].LPCylindersDiameterM * SteamEngines[i].LPCylindersDiameterM) / (SteamEngines[i].CylindersDiameterM * SteamEngines[i].CylindersDiameterM);
14521465
SteamEngines[i].MaxTractiveEffortLbf = CylinderEfficiencyRate * (1.6f * MaxBoilerPressurePSI * Me.ToIn(SteamEngines[i].LPCylindersDiameterM) * Me.ToIn(SteamEngines[i].LPCylindersDiameterM) * Me.ToIn(SteamEngines[i].LPCylindersStrokeM)) / ((CompoundCylinderRatio + 1.0f) * (Me.ToIn(SteamEngines[i].AttachedAxle.WheelRadiusM * 2.0f)));
14531466

@@ -5794,6 +5807,7 @@ private void UpdateSteamTractiveForce(float elapsedClockSeconds, float locomotiv
57945807

57955808
for (int i = 0; i < SteamEngines[numberofengine].NumberCylinders; i++)
57965809
{
5810+
57975811
// This feature sues some different reference angles as follows:
57985812
// AxlePositionRad - comes from the axle module and is -180 - 0 - 180
57995813
// Crank Angle - converts the above range to 0 - 180 - 0 - this is the principle reference used so that it lines up with reference

0 commit comments

Comments
 (0)