Skip to content

Commit ec085e8

Browse files
committed
Automatic merge of T1.5.1-1806-g5522fc5fa and 11 pull requests
- Pull request #570 at 362e4e7: glTF 2.0 support with PBR lighting - Pull request #1062 at c8ac68d: Train Forces popup Window. - Pull request #1064 at 1be1fc4: Add Train Info tab to Help window (F1) - Pull request #1067 at 5bf4677: Traction and dynamic brake retardation - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #1074 at e9a66c1: Gradient - commit 2024-16-12 - Pull request #1076 at 3bbd537: Allow depart early - Pull request #1085 at 37e2817: updates key commands for Train Operations window and also Daylight Offset - Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification
13 parents e613a9d + 5522fc5 + 362e4e7 + c8ac68d + 1be1fc4 + 5bf4677 + 1f5ba4c + e9a66c1 + 3bbd537 + 37e2817 + e10390b + 5845a1a + 689494b commit ec085e8

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

Source/RunActivity/Viewer3D/Popups/TrainForcesWindow.cs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,12 @@
1818
// This file is the responsibility of the 3D & Environment Team.
1919

2020
#region Design Notes
21-
// This is a prototype to evaluate a train forces popup display. The
22-
// intent is to provide real-time train-handling feeback of the forces
21+
// The intent is to provide real-time train-handling feeback of the forces
2322
// within the train, particularly for long, heavy freight trains. The
2423
// Forces HUD, display or browser, is hard to read for long trains.
2524
// An alternative, better in the long-term, might be an external window
2625
// that provides both in-train and over time feedback, as seen on
27-
// professional train simulators. See the discussion in the Elvas tower
28-
// forum, at:
29-
// https://www.elvastower.com/forums/index.php?/topic/38056-proposal-for-train-forces-popup-display/
26+
// professional train simulators.
3027
//
3128
// Coupler Force (longitudinal):
3229
// Shows the length-wise pull or push force at each coupling, as a colored bar graph. Up
@@ -103,7 +100,6 @@ public class TrainForcesWindow : Window
103100
private float DerailForceScaleN;
104101

105102
private static readonly float HighestRealisticBrakeForceN = 2.0e5f; // 45k lbf, used for graph scale only
106-
private float LimitForBrakeForceN = HighestRealisticBrakeForceN;
107103
private float BrakeForceScaleN;
108104

109105
private Image[] CouplerForceBarGraph;
@@ -342,7 +338,6 @@ private void SetConsistProperties(Train theTrain)
342338
LimitForDerailForceN = lowestDerailForceN;
343339
DerailForceScaleN = lowestDerailForceN * 1.1f;
344340

345-
LimitForBrakeForceN = lowestMaxBrakeForceN;
346341
BrakeForceScaleN = lowestMaxBrakeForceN * 1.5f;
347342
}
348343

@@ -423,7 +418,7 @@ private void UpdateBrakeForceImage(TrainCar car, int carPosition)
423418

424419
if (absForceN > 1000f && BrakeForceScaleN > 1000f) // exclude improbabl values
425420
{
426-
// log scale, to be sensitve at small application: 1k lbf, 7%, 146%, 22%, 30%, 39%, 51%, 68%, 100%
421+
// log scale, to be sensitve at small application: 1k lbf, 7%, 14%, 22%, 30%, 39%, 51%, 68%, 100%
427422
var relForce = absForceN / BrakeForceScaleN;
428423
var logForce = (1 / (1 + Math.Pow(10, -1.5f * relForce)) - 0.5f) * 17.05f + 1f;
429424
idx = (int)Math.Floor(logForce);

0 commit comments

Comments
 (0)