Skip to content

Commit 153bd75

Browse files
committed
Automatic merge of T1.5.1-766-gfad9fbc2f5 and 15 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 #875 at 43bf33e: Bug fix for https://bugs.launchpad.net/or/+bug/2036346 Player train switching doesn't work with 3D cabs - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #882 at a055bca: Blueprint/train car operations UI window - Pull request #885 at d9ce84b: feat: Add notifications to Menu - Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer - Pull request #888 at b20b888: docs: Document player application model - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #893 at bf8876b: Signal errors - Pull request #894 at 5ff1e73: Correct Decrease Colour - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #897 at 0a9d939: feat: Improved system information collection - Pull request #898 at e271395: Extra line with all the arguments for debugging purposes in logfile - Pull request #899 at 549ca09: Duplex steam engines - Booster Engine addition
17 parents bb47cc7 + fad9fbc + 3539862 + d00beb9 + 43bf33e + f92de76 + a055bca + d9ce84b + 6c0785b + b20b888 + 1f5ba4c + bf8876b + 5ff1e73 + 5866028 + 0a9d939 + e271395 + 549ca09 commit 153bd75

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

Source/Documentation/Manual/physics.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2986,7 +2986,7 @@ the following parameters will adjust the behaviour of air brakes:
29862986
air brakes are released while dynamic brakes satisfy the train brake demand.
29872987
If dynamic braking is not sufficient, air brakes will be partially applied
29882988
so the combination air+dynamic provides the required brake demand.
2989-
2989+
29902990
Sometimes the train brake controller is capable to apply the dynamic
29912991
brakes for the whole consist, usually as a first step before air brakes
29922992
are applied. This is usually known as "train blending", as opposed to

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1849,20 +1849,20 @@ public void DynamicBrakeBlending(float elapsedClockSeconds)
18491849
float maxCylPressurePSI = airPipeSystem.GetMaxCylPressurePSI();
18501850
float target = airPipeSystem.AutoCylPressurePSI * airPipeSystem.RelayValveRatio / maxCylPressurePSI;
18511851

1852-
if (DynamicBrakeBlendingForceMatch)
1853-
{
1854-
float diff = target * FrictionBrakeBlendingMaxForceN - DynamicBrakeForceN;
1855-
float threshold = 100;
1852+
if (DynamicBrakeBlendingForceMatch)
1853+
{
1854+
float diff = target * FrictionBrakeBlendingMaxForceN - DynamicBrakeForceN;
1855+
float threshold = 100;
18561856
if (diff > threshold && DynamicBrakePercent < 100)
18571857
DynamicBrakeBlendingPercent = Math.Min(DynamicBrakePercent + 100 * elapsedClockSeconds, 100);
18581858
else if (diff < -threshold && DynamicBrakePercent > 1)
18591859
DynamicBrakeBlendingPercent = Math.Max(DynamicBrakePercent - 100 * elapsedClockSeconds, 1);
1860-
}
1861-
else
1862-
{
1860+
}
1861+
else
1862+
{
18631863
DynamicBrakeBlendingPercent = target * 100;
1864-
}
18651864
}
1865+
}
18661866
else
18671867
{
18681868
DynamicBrakeBlendingPercent = -1;
@@ -2274,18 +2274,18 @@ protected virtual void UpdateControllers(float elapsedClockSeconds)
22742274
if (IsLeadLocomotive() && TrainBrakeController != null && TrainBrakeController.TrainDynamicBrakeIntervention > 0)
22752275
{
22762276
LocalDynamicBrakePercent = TrainBrakeController.TrainDynamicBrakeIntervention * 100;
2277-
}
2277+
}
22782278
if (DynamicBrakeController != null && DynamicBrakeIntervention >= 0)
2279-
{
2279+
{
22802280
if (DynamicBrake || !DynamicBrakeControllerSetupLock)
2281-
{
2282-
DynamicBrakeController.Update(elapsedClockSeconds);
2281+
{
2282+
DynamicBrakeController.Update(elapsedClockSeconds);
22832283
DynamicBrakeIntervention = DynamicBrakeController.CurrentValue;
2284-
}
2285-
else
2286-
{
2284+
}
2285+
else
2286+
{
22872287
DynamicBrakeIntervention = 0;
2288-
}
2288+
}
22892289
LocalDynamicBrakePercent = Math.Max(DynamicBrakeIntervention * 100, LocalDynamicBrakePercent);
22902290
}
22912291
if (IsLeadLocomotive()) DynamicBrakePercent = LocalDynamicBrakePercent;

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSNotchController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ protected virtual void SaveData(BinaryWriter outf)
544544
outf.Write(MinimumValue);
545545
outf.Write(MaximumValue);
546546
outf.Write(StepSize);
547-
outf.Write(CurrentNotch);
547+
outf.Write(CurrentNotch);
548548
}
549549

550550
public virtual void Restore(BinaryReader inf)
@@ -555,7 +555,7 @@ public virtual void Restore(BinaryReader inf)
555555
StepSize = inf.ReadSingle();
556556
CurrentNotch = inf.ReadInt32();
557557

558-
UpdateValue = 0;
558+
UpdateValue = 0;
559559
}
560560

561561
public MSTSNotch GetCurrentNotch()

0 commit comments

Comments
 (0)