Skip to content

Commit 4f13abd

Browse files
committed
Automatic merge of T1.5.1-1695-gade019506 and 17 pull requests
- Pull request #570 at f4a7495: glTF 2.0 support with PBR lighting - Pull request #900 at 4629736: DMI in 3D cab + two more dials - Pull request #1030 at d3ae4a2: Refactor settings, in prep for settings exporter - Pull request #1045 at cc4d53c: Bugfix: Empty Start Time for Explore, and other issues loading from Menu Selection and Content Routes - Pull request #1052 at 5bbc476: Content Manager: Add axle count, and lowest derail force - Pull request #1062 at de91cc4: Train Forces popup Window. - Pull request #1064 at 9b3415e: Add Train Info tab to Help window (F1) - Pull request #1066 at 62c89c1: Log derailment, using TraceInformation. - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #1000 at d8d9709: Locomotive operation from control car - Pull request #1029 at 92c74ef: Superelevation Follow Up Fixes - Pull request #1057 at 50c3789: Switchable brake system - Pull request #1069 at 3f153f0: Mouse wheel control only with Alt – Followup for #1051 - Pull request #1070 at 3a66597: Fix a NullReferenceException in TCS scripts - Pull request #1055 at f6bf9fa: Route Based TTrack Sounds - Pull request #896 at f1681df: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #1049 at 4dd8c4f: Re-organise document storage and access
19 parents 880a4a1 + ade0195 + f4a7495 + 4629736 + d3ae4a2 + cc4d53c + 5bbc476 + de91cc4 + 9b3415e + 62c89c1 + 1f5ba4c + d8d9709 + 92c74ef + 50c3789 + 3f153f0 + 3a66597 + f6bf9fa + f1681df + 4dd8c4f commit 4f13abd

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

Source/RunActivity/Viewer3D/Popups/TrainForcesWindow.cs

+9-6
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,16 @@ public class TrainForcesWindow : Window
9494
private int LastPlayerTrainCars;
9595
private bool LastPlayerLocomotiveFlippedState;
9696

97-
private float LimitForCouplerStrengthN = 2.2e6f; // 500k lbf, used for graph scale only
97+
private static readonly float HighestRealisticCouplerStrengthN = 2.2e6f; // 500k lbf, used for graph scale only
98+
private float LimitForCouplerStrengthN = HighestRealisticCouplerStrengthN;
9899
private float CouplerStrengthScaleN;
99100

100-
private float LimitForDerailForceN = 1.55e5f; // 35k lbf, used for graph scale only
101+
private static readonly float HighestRealisticDerailForceN = 1.55e5f; // 35k lbf, used for graph scale only
102+
private float LimitForDerailForceN = HighestRealisticDerailForceN;
101103
private float DerailForceScaleN;
102104

103-
private float LimitForBrakeForceN = 2.0e5f; // 45k lbf, used for graph scale only
105+
private static readonly float HighestRealisticBrakeForceN = 2.0e5f; // 45k lbf, used for graph scale only
106+
private float LimitForBrakeForceN = HighestRealisticBrakeForceN;
104107
private float BrakeForceScaleN;
105108

106109
private Image[] CouplerForceBarGraph;
@@ -312,9 +315,9 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
312315
/// </summary>
313316
private void SetConsistProperties(Train theTrain)
314317
{
315-
float lowestCouplerBreakN = LimitForCouplerStrengthN;
316-
float lowestDerailForceN = LimitForDerailForceN;
317-
float lowestMaxBrakeForceN = LimitForBrakeForceN;
318+
float lowestCouplerBreakN = HighestRealisticCouplerStrengthN;
319+
float lowestDerailForceN = HighestRealisticDerailForceN;
320+
float lowestMaxBrakeForceN = HighestRealisticBrakeForceN;
318321

319322
foreach (var car in theTrain.Cars)
320323
{

0 commit comments

Comments
 (0)