Skip to content

Commit a609d1a

Browse files
committed
Automatic merge of T1.5.1-722-g01614a154 and 18 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 #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 481ed9d: Blueprint/train car operations UI window - Pull request #885 at c81447b: feat: Add notifications to Menu - Pull request #886 at 697a4b6: 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 - Pull request #900 at 42ea7ad: DMI updates
20 parents 64f2131 + 01614a1 + 3539862 + d00beb9 + 3b5a2fe + f8dbeab + 43bf33e + f92de76 + 481ed9d + c81447b + 697a4b6 + d7daf62 + 39a9fa4 + 1f5ba4c + bf8876b + 794fddf + 5866028 + 0a9d939 + e271395 + 42ea7ad commit a609d1a

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

Source/RunActivity/Viewer3D/RenderFrame.cs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -540,9 +540,9 @@ public void Clear()
540540
NumLights = 0;
541541
}
542542

543-
bool lastLightState;
544-
double fadeStartTimer;
545-
float fadeDuration = -1;
543+
static bool lastLightState;
544+
static double fadeStartTimer;
545+
static float fadeDuration = -1;
546546

547547
public void PrepareFrame(Viewer viewer)
548548
{
@@ -589,11 +589,6 @@ public void PrepareFrame(Viewer viewer)
589589
}
590590
lastLightState = lightState;
591591
}
592-
else
593-
{
594-
fadeStartTimer = 0;
595-
fadeDuration = 0;
596-
}
597592
if (SolarDirection.Y <= -0.05)
598593
{
599594
clampValue = 1; // at nighttime max headlight

0 commit comments

Comments
 (0)