You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Automatic merge of T1.5.1-913-g91804456c and 14 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 #876 at f92de76: docs: add source for documents previously on website to source Documentation folder
- Pull request #882 at a057eff: Blueprint/train car operations UI window
- Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
- Pull request #903 at 9bead33: Downloading route content (Github, zip)
- Pull request #910 at 97d4569: Allow building code using .NET 6 (Windows)
- Pull request #911 at 6834af0: docs: Add refactoring as a special type of PR
- Pull request #919 at 9358732: Added mouse wheel support for controls which can be moved by pressing t…
- Pull request #920 at a94e403: Update RailDriver in Manual
- Pull request #923 at d0208cd: Add curve squeal to route
- Pull request #924 at 6c2c3cd: Default Asset Improvements
// TODO: Make leak apply to the whole train, not just the locomotives
1274
1274
if(loco.BrakeSystem.BrakeLine1PressurePSI-trainPipeLeakLossPSI>0&&loco.TrainBrakePipeLeakPSIorInHgpS!=0)// if train brake pipe has pressure in it, ensure result will not be negative if loss is subtracted
// Charge train brake pipe - adjust main reservoir pressure, and loco brake pressure line to maintain brake pipe equal to equalising resevoir pressure - release brakes
// Adjust brake pipe pressure based upon pressure differential
1322
-
if(lead.TrainBrakeController.TrainBrakeControllerState!=ControllerState.Lap)// in LAP psoition brake pipe is isolated, and thus brake pipe pressure decreases, but reservoir remains at same pressure
1323
-
{
1321
+
// Adjust brake pipe pressure based upon pressure differential
1322
+
if(lead.TrainBrakeController.TrainBrakeControllerState!=ControllerState.Lap)// in LAP psoition brake pipe is isolated, and thus brake pipe pressure decreases, but reservoir remains at same pressure
if(train.EqualReservoirPressurePSIorInHg>loco.BrakeSystem.BrakeLine1PressurePSI-5.0f)// Reduce exhausting rate if near EQ pressure to simulate feed valve
@@ -1343,16 +1343,16 @@ protected static void PropagateBrakeLinePressures(float elapsedClockSeconds, Tra
1343
1343
// Instantaneous flow rate out of BP to atmosphere
1344
1344
// Flow meters don't display this, still keeping track of it for reference
loco.FilteredBrakePipeFlowM3pS=loco.AFMFilter.Filter(Math.Max(loco.BrakePipeFlowM3pS,0.0f),trainPipeTimeVariationS);// Actual flow rate displayed by air flow meter
1352
1352
}
1353
1353
1354
1354
if(lead!=null)
1355
-
train.LeadPipePressurePSI=lead.BrakeSystem.BrakeLine1PressurePSI;// Keep a record of current train pipe pressure in lead locomotive
1355
+
train.LeadPipePressurePSI=lead.BrakeSystem.BrakeLine1PressurePSI;// Keep a record of current train pipe pressure in lead locomotive
1356
1356
}
1357
1357
1358
1358
// Propagate air pipe pressure along the train (brake pipe and main reservoir pipe)
@@ -1453,24 +1453,24 @@ protected static void PropagateBrakeLinePressures(float elapsedClockSeconds, Tra
0 commit comments