Skip to content

Commit a5eda3c

Browse files
openrails-botopenrails-bot
committed
Automatic merge of T1.6-rc8-52-gede96ba171 and 12 pull requests
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 9b80fac: Automatic speed control - Pull request #1104 at ccc5c4d: Handle simple adhesion within the axle module - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1124 at e241a0d: Built-in PBL2 brake controller - Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1143 at 36327c4: Status in Work Orders popup set too fast - Pull request #1157 at 39cd994: Dynamic brake authorization by TCS - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1128 at 1d7643d: Particle Emitter Overhaul
14 parents 6792463 + ede96ba + e10390b + 9b80fac + ccc5c4d + 270f22f + ba3c47f + 91d2d26 + e241a0d + 8ae6bb7 + 36327c4 + 39cd994 + 5845a1a + 1d7643d commit a5eda3c

File tree

2 files changed

+67
-67
lines changed

2 files changed

+67
-67
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6605,8 +6605,8 @@ protected override void UpdateTractiveForce(float elapsedClockSeconds)
66056605
IndicatedHorsePowerHP += engine.IndicatedHorsePowerHP;
66066606
IndicatedHorsePowerHP = MathHelper.Clamp(IndicatedHorsePowerHP, 0, IndicatedHorsePowerHP);
66076607
}
6608-
//TODO - identify the maximum value for display??
6609-
PistonSpeedFtpMin = SteamEngines[0].PistonSpeedFtpMin;
6608+
//TODO - identify the maximum value for display??
6609+
PistonSpeedFtpMin = SteamEngines[0].PistonSpeedFtpMin;
66106610

66116611
// Find the maximum TE for debug i.e. @ start and full throttle
66126612
if (AbsTractionSpeedMpS < 1.0)
@@ -6724,8 +6724,8 @@ protected override void UpdateAxles(float elapsedClockSeconds)
67246724
axle.CurrentCurveRadiusM = CurrentCurveRadiusM;
67256725
axle.BogieRigidWheelBaseM = RigidWheelBaseM;
67266726
}
6727-
foreach (var engine in SteamEngines)
6728-
{
6727+
foreach (var engine in SteamEngines)
6728+
{
67296729
var axle = engine.AttachedAxle;
67306730
if (SteamEngineType == SteamEngineTypes.Geared || engine.AuxiliarySteamEngineType == SteamEngine.AuxiliarySteamEngineTypes.Booster)
67316731
// geared locomotive or booster locomotive
@@ -6739,7 +6739,7 @@ protected override void UpdateAxles(float elapsedClockSeconds)
67396739
float TotalWheelMomentofInertia = WheelMomentInertia + AxleMomentInertia; // Total MoI for generic wheelset
67406740
float TotalMomentInertia = TotalWheelMomentofInertia;
67416741
axle.InertiaKgm2 = TotalMomentInertia;
6742-
6742+
67436743
// Calculate internal resistance - IR = 3.8 * diameter of cylinder^2 * stroke * dia of drivers (all in inches) - This should reduce wheel force
67446744
axle.FrictionN = N.FromLbf(3.8f * Me.ToIn(engine.CylindersDiameterM) * Me.ToIn(engine.CylindersDiameterM) * Me.ToIn(engine.CylindersStrokeM) / (Me.ToIn(axle.WheelRadiusM * 2.0f)));
67456745
}
@@ -6758,7 +6758,7 @@ protected override void UpdateAxles(float elapsedClockSeconds)
67586758
float WheelMomentInertia = (wheelMassKG * axle.WheelRadiusM * axle.WheelRadiusM) / 2.0f;
67596759
float AxleMomentInertia = (AxleMassKG * AxleRadiusM * AxleRadiusM) / 2.0f;
67606760
float TotalWheelMomentofInertia = WheelMomentInertia + AxleMomentInertia; // Total MoI for generic wheelset
6761-
6761+
67626762
// The moment of inertia needs to be increased by the number of wheels in each set
67636763
TotalWheelMomentofInertia *= engine.AttachedAxle.NumWheelsetAxles;
67646764

‎Source/RunActivity/Viewer3D/InfoDisplay.cs‎

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ public void PrepareFrame(RenderFrame frame, ElapsedTime elapsedTime)
8080
LastUpdateRealTime = Viewer.RealTime;
8181
Profile(elapsedRealSeconds);
8282
}
83-
84-
if (Viewer.Settings.DataLogger)
85-
{
83+
84+
if (Viewer.Settings.DataLogger)
85+
{
8686
DataLoggerLog();
8787
}
8888
}
@@ -154,36 +154,36 @@ void DataLoggerLog()
154154
}
155155
}
156156
else
157-
{
158-
Logger.Data(VersionInfo.Version);
159-
Logger.Data(FrameNumber.ToString("F0"));
157+
{
158+
Logger.Data(VersionInfo.Version);
159+
Logger.Data(FrameNumber.ToString("F0"));
160160
Logger.Data(FormatStrings.FormatPreciseTime(Viewer.Simulator.ClockTime));
161161
if (Viewer.Settings.DataLogPerformance)
162162
{
163163
Logger.Data(Viewer.Game.HostProcess.CPUMemoryWorkingSet.ToString("F0"));
164-
Logger.Data(GC.GetTotalMemory(false).ToString("F0"));
165-
Logger.Data(GC.CollectionCount(0).ToString("F0"));
166-
Logger.Data(GC.CollectionCount(1).ToString("F0"));
167-
Logger.Data(GC.CollectionCount(2).ToString("F0"));
168-
Logger.Data(ProcessorCount.ToString("F0"));
169-
Logger.Data(Viewer.RenderProcess.FrameRate.Value.ToString("F0"));
170-
Logger.Data(Viewer.RenderProcess.FrameTime.Value.ToString("F6"));
171-
Logger.Data(Viewer.RenderProcess.ShadowPrimitivePerFrame.Sum().ToString("F0"));
172-
Logger.Data(Viewer.RenderProcess.PrimitivePerFrame.Sum().ToString("F0"));
173-
Logger.Data(Viewer.RenderProcess.Profiler.Wall.Value.ToString("F0"));
174-
Logger.Data(Viewer.UpdaterProcess.Profiler.Wall.Value.ToString("F0"));
175-
Logger.Data(Viewer.LoaderProcess.Profiler.Wall.Value.ToString("F0"));
176-
Logger.Data(Viewer.SoundProcess.Profiler.Wall.Value.ToString("F0"));
177-
}
178-
if (Viewer.Settings.DataLogPhysics)
179-
{
180-
Logger.Data(Viewer.PlayerLocomotive.Direction.ToString());
181-
Logger.Data(Viewer.PlayerTrain.MUReverserPercent.ToString("F0"));
182-
Logger.Data(Viewer.PlayerLocomotive.ThrottlePercent.ToString("F0"));
183-
Logger.Data(Viewer.PlayerLocomotive.MotiveForceN.ToString("F0"));
184-
Logger.Data(Viewer.PlayerLocomotive.BrakeForceN.ToString("F0"));
164+
Logger.Data(GC.GetTotalMemory(false).ToString("F0"));
165+
Logger.Data(GC.CollectionCount(0).ToString("F0"));
166+
Logger.Data(GC.CollectionCount(1).ToString("F0"));
167+
Logger.Data(GC.CollectionCount(2).ToString("F0"));
168+
Logger.Data(ProcessorCount.ToString("F0"));
169+
Logger.Data(Viewer.RenderProcess.FrameRate.Value.ToString("F0"));
170+
Logger.Data(Viewer.RenderProcess.FrameTime.Value.ToString("F6"));
171+
Logger.Data(Viewer.RenderProcess.ShadowPrimitivePerFrame.Sum().ToString("F0"));
172+
Logger.Data(Viewer.RenderProcess.PrimitivePerFrame.Sum().ToString("F0"));
173+
Logger.Data(Viewer.RenderProcess.Profiler.Wall.Value.ToString("F0"));
174+
Logger.Data(Viewer.UpdaterProcess.Profiler.Wall.Value.ToString("F0"));
175+
Logger.Data(Viewer.LoaderProcess.Profiler.Wall.Value.ToString("F0"));
176+
Logger.Data(Viewer.SoundProcess.Profiler.Wall.Value.ToString("F0"));
177+
}
178+
if (Viewer.Settings.DataLogPhysics)
179+
{
180+
Logger.Data(Viewer.PlayerLocomotive.Direction.ToString());
181+
Logger.Data(Viewer.PlayerTrain.MUReverserPercent.ToString("F0"));
182+
Logger.Data(Viewer.PlayerLocomotive.ThrottlePercent.ToString("F0"));
183+
Logger.Data(Viewer.PlayerLocomotive.MotiveForceN.ToString("F0"));
184+
Logger.Data(Viewer.PlayerLocomotive.BrakeForceN.ToString("F0"));
185185
Logger.Data((Viewer.PlayerLocomotive as MSTSLocomotive).LocomotiveAxles.AxleMotiveForceN.ToString("F2"));
186-
Logger.Data((Viewer.PlayerLocomotive as MSTSLocomotive).LocomotiveAxles.SlipSpeedPercent.ToString("F1"));
186+
Logger.Data((Viewer.PlayerLocomotive as MSTSLocomotive).LocomotiveAxles.SlipSpeedPercent.ToString("F1"));
187187
DataLoggerLogSpeed(Viewer.PlayerLocomotive.SpeedMpS);
188188
DataLoggerLogSpeed(Viewer.PlayerTrain.AllowedMaxSpeedMpS);
189189
Logger.Data((Viewer.PlayerLocomotive.DistanceM.ToString("F0")));
@@ -253,35 +253,35 @@ void DataLoggerLog()
253253
}
254254

255255
void DataLoggerLogSpeed(float speedMpS)
256-
{
257-
string result;
258-
switch (Viewer.Settings.DataLogSpeedUnits)
259-
{
260-
case "route":
261-
result = FormatStrings.FormatSpeed(speedMpS, Viewer.MilepostUnitsMetric);
262-
break;
263-
case "mps":
264-
result = speedMpS.ToString("F1");
265-
break;
266-
case "mph":
267-
result = MpS.FromMpS(speedMpS, false).ToString("F1");
268-
break;
269-
case "kmph":
270-
result = MpS.FromMpS(speedMpS, true).ToString("F1");
271-
break;
272-
default:
273-
result = FormatStrings.FormatSpeed(speedMpS, Viewer.MilepostUnitsMetric);
274-
break;
275-
}
276-
Logger.Data(result);
277-
}
256+
{
257+
string result;
258+
switch (Viewer.Settings.DataLogSpeedUnits)
259+
{
260+
case "route":
261+
result = FormatStrings.FormatSpeed(speedMpS, Viewer.MilepostUnitsMetric);
262+
break;
263+
case "mps":
264+
result = speedMpS.ToString("F1");
265+
break;
266+
case "mph":
267+
result = MpS.FromMpS(speedMpS, false).ToString("F1");
268+
break;
269+
case "kmph":
270+
result = MpS.FromMpS(speedMpS, true).ToString("F1");
271+
break;
272+
default:
273+
result = FormatStrings.FormatSpeed(speedMpS, Viewer.MilepostUnitsMetric);
274+
break;
275+
}
276+
Logger.Data(result);
277+
}
278278

279279
void DataLoggerStart()
280-
{
280+
{
281281
// NOTE: Conditions and data here MUST match similar code in DataLoggerLog
282282
// Failure to update both places will result in mismatched columns or worse
283283
if (Viewer.Settings.DataLogExclusiveSteamPerformance)
284-
{
284+
{
285285
Logger.Data("Speed (mph)");
286286
Logger.Data("Time (M)");
287287
Logger.Data("Throttle (%)");
@@ -323,14 +323,14 @@ void DataLoggerStart()
323323
Logger.Data("Power (hp)");
324324
Logger.Data("Throttle (%)");
325325
Logger.Data("Cut-off (%)");
326-
}
327-
else
328-
{
326+
}
327+
else
328+
{
329329
Logger.Data("Version");
330330
Logger.Data("Frame");
331331
Logger.Data("Time");
332332
if (Viewer.Settings.DataLogPerformance)
333-
{
333+
{
334334
Logger.Data("Memory");
335335
Logger.Data("Memory (Managed)");
336336
Logger.Data("Gen 0 GC");
@@ -345,9 +345,9 @@ void DataLoggerStart()
345345
Logger.Data("Updater Process");
346346
Logger.Data("Loader Process");
347347
Logger.Data("Sound Process");
348-
}
348+
}
349349
if (Viewer.Settings.DataLogPhysics)
350-
{
350+
{
351351
Logger.Data("Player Direction");
352352
Logger.Data("Player Reverser [%]");
353353
Logger.Data("Player Throttle [%]");
@@ -376,9 +376,9 @@ void DataLoggerStart()
376376
Logger.Data("D:null / E:null / S:Firing Rate");
377377
Logger.Data("D:null / E:null / S:Injector 1");
378378
Logger.Data("D:null / E:null / S:Injector 2");
379-
}
380-
}
381-
Logger.End();
379+
}
380+
}
381+
Logger.End();
382382
}
383383

384384
void DataLoggerStop()

0 commit comments

Comments
 (0)