Skip to content

Commit 122ea76

Browse files
openrails-botopenrails-bot
committed
Automatic merge of T1.5.1-722-g01614a154 and 17 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 3b5a2fe: 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 #882 at 90255fb: Blueprint/train car operations UI window - Pull request #885 at c81447b: feat: Add notifications to Menu - Pull request #886 at b88f1d4: Scene viewer extension to TrackViewer - Pull request #888 at d7daf62: docs: Document player application model - Pull request #890 at 39a9fa4: Allow depart early - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #893 at bf8876b: Signal errors - Pull request #894 at 794fddf: 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
19 parents b99c0eb + 01614a1 + c59c788 + d00beb9 + 3b5a2fe + f8dbeab + 43bf33e + f92de76 + 90255fb + c81447b + b88f1d4 + d7daf62 + 39a9fa4 + 1f5ba4c + bf8876b + 794fddf + 5866028 + 0a9d939 + e271395 commit 122ea76

File tree

3 files changed

+46
-66
lines changed

3 files changed

+46
-66
lines changed

‎Source/RunActivity/Viewer3D/Cameras.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1284,7 +1284,7 @@ protected override void OnActivate(bool sameCamera)
12841284
var carPosition = !(TrainCarViewer.CarPosition < trainCars.Count()) ? TrainCarViewer.CarPosition - 1 : TrainCarViewer.CarPosition;
12851285
var isDownCameraOutsideFront = UserInput.IsDown(UserCommand.CameraOutsideFront);
12861286
var isDownCameraOutsideRear = UserInput.IsDown(UserCommand.CameraOutsideRear);
1287-
var isVisibleTrainCarViewerOrWebpage = Viewer.TrainCarOperationsViewerWindow.Visible || (Viewer.TrainCarOperationsWebpage.TrainCarSelected);
1287+
var isVisibleTrainCarViewerOrWebpage = Viewer.TrainCarOperationsViewerWindow.Visible || (Viewer.TrainCarOperationsWebpage.TrainCarSelected);
12881288

12891289
if (attachedCar == null || attachedCar.Train != Viewer.SelectedTrain || carPosition != oldCarPosition || isDownCameraOutsideFront || isDownCameraOutsideRear)
12901290
{

‎Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs‎

Lines changed: 21 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -283,43 +283,33 @@ void AddSpace(bool full)
283283

284284
{
285285
var car = PlayerTrain.Cars[CarPosition];
286-
//Front brake hose
287286
if (car != PlayerTrain.Cars.First())
288-
{
289-
AddSpace(false);
290-
line.Add(new buttonFrontBrakeHose(0, 0, textHeight, Owner.Viewer, car, CarPosition));
291-
line.Add(new buttonFrontAngleCock(0, 0, textHeight, Owner.Viewer, car, CarPosition));
292287
AddSpace(false);
293-
line.Add(new buttonCouplerFront(0, 0, textHeight, Owner.Viewer, car, CarPosition));
294-
}
295-
else
296-
{
297-
line.Add(new buttonFrontBrakeHose(0, 0, textHeight, Owner.Viewer, car, CarPosition));
298-
line.Add(new buttonFrontAngleCock(0, 0, textHeight, Owner.Viewer, car, CarPosition));
299-
line.Add(new buttonCouplerFront(0, 0, textHeight, Owner.Viewer, car, CarPosition));
300-
}
301288

302-
line.Add(new buttonLoco(0, 0, textHeight, Owner.Viewer, car));
289+
//Front brake hose
290+
line.Add(new buttonFrontBrakeHose(0, 0, textHeight, Owner.Viewer, car, CarPosition));
291+
// Front angle cock
292+
line.Add(new buttonFrontAngleCock(0, 0, textHeight, Owner.Viewer, car, CarPosition));
303293

304-
if (car != PlayerTrain.Cars.Last())
305-
{
306-
line.Add(new buttonCouplerRear(0, 0, textHeight, Owner.Viewer, car, CarPosition));
307-
AddSpace(false);
308-
line.Add(new buttonRearAngleCock(0, 0, textHeight, Owner.Viewer, car, CarPosition));
309-
line.Add(new buttonRearBrakeHose(0, 0, textHeight, Owner.Viewer, car, CarPosition));
310-
AddSpace(false);
311-
line.Add(new buttonHandBrake(0, 0, textHeight, Owner.Viewer, CarPosition));
312-
}
313-
else
314-
{
315-
line.Add(new buttonCouplerRear(0, 0, textHeight, Owner.Viewer, car, CarPosition));
316-
AddSpace(false);
317-
line.Add(new buttonRearAngleCock(0, 0, textHeight, Owner.Viewer, car, CarPosition));
318-
line.Add(new buttonRearBrakeHose(0, 0, textHeight, Owner.Viewer, car, CarPosition));
294+
if (car != PlayerTrain.Cars.First())
319295
AddSpace(false);
320-
line.Add(new buttonHandBrake(0, 0, textHeight, Owner.Viewer, CarPosition));
321-
}
296+
297+
// Front coupler
298+
line.Add(new buttonCouplerFront(0, 0, textHeight, Owner.Viewer, car, CarPosition));
299+
// Loco label
300+
line.Add(new buttonLoco(0, 0, textHeight, Owner.Viewer, car));
301+
// Rear coupler
302+
line.Add(new buttonCouplerRear(0, 0, textHeight, Owner.Viewer, car, CarPosition));
303+
AddSpace(false);
304+
// Rear angle cock
305+
line.Add(new buttonRearAngleCock(0, 0, textHeight, Owner.Viewer, car, CarPosition));
306+
// Rear brake hose
307+
line.Add(new buttonRearBrakeHose(0, 0, textHeight, Owner.Viewer, car, CarPosition));
308+
AddSpace(false);
309+
// Handbrake
310+
line.Add(new buttonHandBrake(0, 0, textHeight, Owner.Viewer, CarPosition));
322311
AddSpace(false);
312+
// Bleed off valve
323313
line.Add(new buttonBleedOffValve(0, 0, textHeight, Owner.Viewer, CarPosition));
324314
AddSpace(false);
325315

‎Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs‎

Lines changed: 24 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ void AddSpace()
337337
if (RefreshRestoredData)
338338
{ // Restores brake hose
339339
RefreshRestoredData = false;
340-
for (int i = 0; i < PlayerTrain.Cars.Count; i++)
340+
for (var i = 0; i < PlayerTrain.Cars.Count; i++)
341341
{
342342
(PlayerTrain.Cars[i] as MSTSWagon).BrakeSystem.RearBrakeHoseConnected = RearBrakes[i];
343343
}
@@ -378,51 +378,41 @@ void AddSpace()
378378

379379
if (car.BrakesStuck || ((car is MSTSLocomotive) && (car as MSTSLocomotive).PowerReduction > 0)) carLabel.Color = Color.Red;
380380

381+
// Left arrow
381382
line.Add(new buttonArrowLeft(0, 0, SymbolSize, Owner.Viewer, carPosition));
382383
AddSpace();
383-
if (car != PlayerTrain.Cars.First())
384-
{
385-
line.Add(new buttonFrontBrakeHose(0, 0, SymbolSize, Owner.Viewer, car, carPosition));
386-
line.Add(new buttonFrontAngleCock(0, 0, SymbolSize, Owner.Viewer, car, carPosition));
387-
AddSpace();
388-
line.Add(new buttonCouplerFront(0, 0, SymbolSize, Owner.Viewer, car));
389-
}
390-
else
391-
{
392-
line.Add(new buttonFrontBrakeHose(0, 0, SymbolSize, Owner.Viewer, car, carPosition));
393-
line.Add(new buttonFrontAngleCock(0, 0, SymbolSize, Owner.Viewer, car, carPosition));
394-
AddSpace();
395-
line.Add(new buttonCouplerFront(0, 0, SymbolSize, Owner.Viewer, car));
396-
}
384+
385+
// Front brake hose
386+
line.Add(new buttonFrontBrakeHose(0, 0, SymbolSize, Owner.Viewer, car, carPosition));
387+
// Front angle cock
388+
line.Add(new buttonFrontAngleCock(0, 0, SymbolSize, Owner.Viewer, car, carPosition));
389+
AddSpace();
390+
391+
// Front coupler
392+
line.Add(new buttonCouplerFront(0, 0, SymbolSize, Owner.Viewer, car));
393+
// Car label
397394
line.Add(carLabel);
398-
if (car != PlayerTrain.Cars.Last())
399-
{
400-
line.Add(new buttonCouplerRear(0, 0, SymbolSize, Owner.Viewer, car));
401-
AddSpace();
402-
line.Add(new buttonRearAngleCock(0, 0, SymbolSize, Owner.Viewer, car, carPosition));
403-
line.Add(new buttonRearBrakeHose(0, 0, SymbolSize, Owner.Viewer, car, carPosition));
404-
}
405-
else
406-
{
407-
line.Add(new buttonCouplerRear(0, 0, SymbolSize, Owner.Viewer, car));
408-
AddSpace();
409-
line.Add(new buttonRearAngleCock(0, 0, SymbolSize, Owner.Viewer, car, carPosition));
410-
line.Add(new buttonRearBrakeHose(0, 0, SymbolSize, Owner.Viewer, car, carPosition));
411-
}
395+
// Rear coupler
396+
line.Add(new buttonCouplerRear(0, 0, SymbolSize, Owner.Viewer, car));
397+
AddSpace();
412398

399+
// Rear angle cock
400+
line.Add(new buttonRearAngleCock(0, 0, SymbolSize, Owner.Viewer, car, carPosition));
401+
// Rear brake hose
402+
line.Add(new buttonRearBrakeHose(0, 0, SymbolSize, Owner.Viewer, car, carPosition));
413403
AddSpace();
414404

415405
// Handbrake
416406
line.Add(new buttonHandBrake(0, 0, SymbolSize, Owner.Viewer, carPosition));
417407
AddSpace();
418408

419-
// Bleed Off Valve
409+
// Bleed off valve
420410
line.Add(new buttonBleedOffValve(0, 0, SymbolSize, Owner.Viewer, carPosition));
421411
AddSpace();
422412

423413
if (AllSymbolsMode)//Allows to display all symbols
424414
{
425-
// Electric Train Supply Connection (ETS)
415+
// Electric train supply connection (ETS)
426416
if (PlayerTrain.Cars.Count() > 1 && wagon.PowerSupply != null)
427417
{
428418
line.Add(new buttonToggleElectricTrainSupplyCable(0, 0, SymbolSize, Owner.Viewer, carPosition));
@@ -445,7 +435,7 @@ void AddSpace()
445435
}
446436
}
447437
}
448-
438+
// Right arrow
449439
line.Add(new buttonArrowRight(0, 0, textHeight, Owner.Viewer, carPosition));
450440
AddSpace();
451441
AddSpace();
@@ -505,7 +495,7 @@ public void localScrollLayout(int selectedCarPosition)
505495

506496
LocalScrollPosition = 0;
507497

508-
if (CarPositionVisible > 0 && selectedCarPosition >= CarPositionVisible)// && selectedCarPosition != currentCarPosition)// Not related with CarID
498+
if (CarPositionVisible > 0 && selectedCarPosition >= CarPositionVisible)// Not related with CarID
509499
{
510500
Client = ControlLayoutScrollboxVertical.NewClient;
511501
var xcarPosition = CarPositionVisible;
@@ -615,7 +605,7 @@ public override void PrepareFrame(ElapsedTime elapsedTime, bool updateFull)
615605
carOperations.CarOperationChanged = carOperations.Visible && carOperations.CarOperationChanged;
616606
}
617607

618-
if (CarPosition != trainCarViewer.CarPosition)
608+
if (CarPosition != trainCarViewer.CarPosition && Owner.Viewer.TrainCarOperationsWebpage.Connections > 0)
619609
{
620610
// Required to scroll the main window from the web version
621611
UpdateTrainCarOperation = true;

0 commit comments

Comments
 (0)