Skip to content

Commit 5a6b93a

Browse files
committed
Automatic merge of T1.5.1-1783-g77a649f09 and 14 pull requests
- Pull request #570 at 362e4e7: glTF 2.0 support with PBR lighting - Pull request #1062 at bbc0013: Train Forces popup Window. - Pull request #1064 at cb510d6: Add Train Info tab to Help window (F1) - Pull request #1066 at 62c89c1: Log derailment, using TraceInformation. - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #1057 at 84592f7: Switchable brake system - Pull request #1070 at f818e40: Fix a NullReferenceException in TCS scripts - Pull request #1074 at e9a66c1: Gradient - commit 2024-16-12 - Pull request #1076 at 3bbd537: Allow depart early - Pull request #1078 at 9ab642e: Default PowerSupply script for steam locomotives - Pull request #1079 at 5e37059: Adds Polish transations - Pull request #1083 at 7e6fb60: Menu contents route name clash - Pull request #1081 at 689494b: Brake cuts power unification
16 parents 860d4d9 + 77a649f + 362e4e7 + bbc0013 + cb510d6 + 62c89c1 + 5845a1a + 1f5ba4c + 84592f7 + f818e40 + e9a66c1 + 3bbd537 + 9ab642e + 5e37059 + 7e6fb60 + 689494b commit 5a6b93a

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7138,7 +7138,7 @@ private void UpdateWaterGauge()
71387138
float glasslevelM = 0;
71397139

71407140
// Calculate water level on level gradient
7141-
var referenceLevelFraction = (BoilerCrownCoverageHeightM + BoilerCrownHeightM + BoilerDiameterM / 2.0f)/BoilerDiameterM;
7141+
var referenceLevelFraction = (BoilerCrownCoverageHeightM + BoilerCrownHeightM + (BoilerDiameterM / 2.0f))/BoilerDiameterM;
71427142

71437143
// Convert reference point to reading on glass
71447144
if (WaterFraction > referenceLevelFraction)
@@ -7148,7 +7148,7 @@ private void UpdateWaterGauge()
71487148
}
71497149
else if (WaterFraction < referenceLevelFraction)
71507150
{
7151-
glasslevelfraction = -1.0f * referenceLevelFraction - WaterFraction;
7151+
glasslevelfraction = -1.0f * (referenceLevelFraction - WaterFraction);
71527152
}
71537153

71547154
glasslevelM = glasslevelfraction * BoilerDiameterM;
@@ -7158,9 +7158,7 @@ private void UpdateWaterGauge()
71587158

71597159
GradientBoilerLevelPercent = totalglassLevelM * 100;
71607160

7161-
// Trace.TraceInformation("Gradient - Current {0} BoilAng {1} GlassIN {2} Glass% {3}", CurrentElevationPercent, boilerangleRad, glasslevelIN, GradientBoilerLevelPercent);
7162-
7163-
// Trace.TraceInformation("Boiler - refLevel {0} GlassLevel {1} GlassLevelM {2} GradientLevel {3} TotalLevel {4} % {5}", referenceLevelFraction, glasslevelfraction, glasslevelM, glassLevelGradientM, totalglassLevelM, GradientBoilerLevelPercent);
7161+
// Trace.TraceInformation("Boiler - refLevel {0} GlassLevel {1} GlassLevelM {2} GradientLevel {3} TotalLevel {4} % {5} WaterFraction {6}", referenceLevelFraction, glasslevelfraction, glasslevelM, glassLevelGradientM, totalglassLevelM, GradientBoilerLevelPercent, WaterFraction);
71647162

71657163
}
71667164

0 commit comments

Comments
 (0)