Skip to content

Commit 3f1fdb7

Browse files
committed
Automatic merge of T1.5.1-684-gc6e0de1c4 and 9 pull requests
- Pull request #570 at c59c788: 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 #865 at 67014b7: Dispatcher window improvements - Pull request #874 at f8dbeab: Dynamic brake controller refactoring - 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 #878 at 1fdec87: Implement Polach Adhesion - Pull request #882 at 3132306: Blueprint/train car operations UI window - Pull request #883 at aac4d3f: SwitchPanel disconnect/connect handling
11 parents aa036d3 + c6e0de1 + c59c788 + d00beb9 + 67014b7 + f8dbeab + 43bf33e + f92de76 + 1fdec87 + 3132306 + aac4d3f commit 3f1fdb7

File tree

77 files changed

+2400
-10
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+2400
-10
lines changed

Source/ORTS.Common/Input/UserCommand.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public enum UserCommand
4545
[GetString("Display Station Labels")] DisplayStationLabels,
4646
[GetString("Display Switch Window")] DisplaySwitchWindow,
4747
[GetString("Display Train Operations Window")] DisplayTrainOperationsWindow,
48+
[GetString("Display Train Car Operations Window")] DisplayTrainCarOperationsWindow,
4849
[GetString("Display Train Dpu Window")] DisplayTrainDpuWindow,
4950
[GetString("Display Next Station Window")] DisplayNextStationWindow,
5051
[GetString("Display Compass Window")] DisplayCompassWindow,

Source/ORTS.Settings/InputSettings.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,7 @@ static void InitializeCommands(UserCommandInput[] Commands)
506506
Commands[(int)UserCommand.DisplayHelpWindow] = new UserCommandModifiableKeyInput(0x3B, Commands[(int)UserCommand.DisplayNextWindowTab]);
507507
Commands[(int)UserCommand.DisplayHUD] = new UserCommandModifiableKeyInput(0x3F, KeyModifiers.Alt, Commands[(int)UserCommand.DisplayNextWindowTab]);
508508
Commands[(int)UserCommand.DisplayTrainDrivingWindow] = new UserCommandModifiableKeyInput(0x3F, Commands[(int)UserCommand.DisplayNextWindowTab]);
509+
Commands[(int)UserCommand.DisplayTrainCarOperationsWindow] = new UserCommandKeyInput(0x43, KeyModifiers.Control | KeyModifiers.Alt);
509510
Commands[(int)UserCommand.DisplayMultiPlayerWindow] = new UserCommandKeyInput(0x0A, KeyModifiers.Shift);
510511
Commands[(int)UserCommand.DisplayNextStationWindow] = new UserCommandKeyInput(0x44);
511512
Commands[(int)UserCommand.DisplayStationLabels] = new UserCommandModifiableKeyInput(0x40, Commands[(int)UserCommand.DisplayNextWindowTab]);

Source/ORTS.Settings/UserSettings.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,10 @@ public string DirectXFeatureLevel
412412
[Default(new[] { 50, 50 })]
413413
public int[] WindowPosition_TrainOperations { get; set; }
414414
[Default(new[] { 50, 50 })]
415+
public int[] WindowPosition_TrainCarOperations { get; set; }
416+
[Default(new[] { 50, 50 })]
417+
public int[] WindowPosition_TrainCarOperationsViewer { get; set; }
418+
[Default(new[] { 50, 50 })]
415419
public int[] WindowPosition_TrainDpu { get; set; }
416420
[Default(new[] { 50, 50 })]
417421
public int[] WindowPosition_CarOperations { get; set; }

Source/Orts.Simulation/Common/Commands.cs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -888,6 +888,30 @@ public override string ToString()
888888
}
889889
}
890890

891+
[Serializable()]
892+
public sealed class WagonBrakeHoseRearConnectCommand : BooleanCommand
893+
{
894+
public static MSTSWagon Receiver { get; set; }
895+
896+
public WagonBrakeHoseRearConnectCommand(CommandLog log, MSTSWagon car, bool toState)
897+
: base(log, toState)
898+
{
899+
Receiver = car;
900+
Redo();
901+
}
902+
903+
public override void Redo()
904+
{
905+
Receiver.BrakeSystem.RearBrakeHoseConnected = ToState;
906+
// Report();
907+
}
908+
909+
public override string ToString()
910+
{
911+
return base.ToString() + " - " + (ToState ? "connect" : "disconnect");
912+
}
913+
}
914+
891915
[Serializable()]
892916
public sealed class ToggleAngleCockACommand : BooleanCommand
893917
{

Source/Orts.Simulation/Simulation/Physics/Train.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4071,6 +4071,7 @@ public void ConnectBrakeHoses()
40714071
for (var i = 0; i < Cars.Count; i++)
40724072
{
40734073
Cars[i].BrakeSystem.FrontBrakeHoseConnected = i > 0;
4074+
Cars[i].BrakeSystem.RearBrakeHoseConnected = i < Cars.Count - 1;
40744075
Cars[i].BrakeSystem.AngleCockAOpen = i > 0;
40754076
Cars[i].BrakeSystem.AngleCockBOpen = i < Cars.Count - 1;
40764077
// If end of train is not reached yet, then test the attached following car. If it is a manual braked car then set the brake cock on this car to closed.

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Brakes/BrakeSystem.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ public abstract class BrakeSystem
4646
/// Front brake hoses connection status
4747
/// </summary>
4848
public bool FrontBrakeHoseConnected;
49+
50+
/// <summary>
51+
/// Rear brake hoses connection status
52+
/// </summary>
53+
public bool RearBrakeHoseConnected;
54+
4955
/// <summary>
5056
/// Front angle cock opened/closed status
5157
/// </summary>
6.48 KB
6.27 KB
8.17 KB
9.58 KB

0 commit comments

Comments
 (0)