From 824f96fd23c0bf9fa8e3fc573de61d493a4508de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Guly=C3=A1s?= <gulyasp@olajterv.hu>
Date: Mon, 15 Aug 2022 11:42:38 +0200
Subject: [PATCH] Merge branch 'master' into gltf2 - some more changes

---
 Source/RunActivity/RunActivity.csproj  | 141 -------------------------
 Source/RunActivity/Viewer3D/Shaders.cs |   1 -
 2 files changed, 142 deletions(-)

diff --git a/Source/RunActivity/RunActivity.csproj b/Source/RunActivity/RunActivity.csproj
index 243bf34bff..9bb8556811 100644
--- a/Source/RunActivity/RunActivity.csproj
+++ b/Source/RunActivity/RunActivity.csproj
@@ -23,9 +23,6 @@
     <ApplicationManifest>..\Launcher\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EmbedIO, Version=3.4.3.0, Culture=neutral, PublicKeyToken=5e5f048b6e04267e, processorArchitecture=MSIL">
-      <HintPath>..\packages\EmbedIO.3.4.3\lib\netstandard2.0\EmbedIO.dll</HintPath>
-    </Reference>
     <Reference Include="glTFLoader, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\3rdPartyLibs\glTFLoader\glTFLoader.dll</HintPath>
     </Reference>
@@ -47,144 +44,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\3rdPartyLibs\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="RailDriver, Version=0.7.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\RailDriver.0.7.10\lib\netstandard2.0\RailDriver.dll</HintPath>
-    </Reference>
-    <Reference Include="Swan.Lite, Version=3.0.0.0, Culture=neutral, PublicKeyToken=30c707c872729fff, processorArchitecture=MSIL">
-      <HintPath>..\packages\Unosquare.Swan.Lite.3.0.0\lib\net461\Swan.Lite.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Management" />
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Processes\ProcessState.cs" />
-    <Compile Include="Processes\Profiler.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Viewer3D\ALSoundHelper.cs" />
-    <Compile Include="Viewer3D\AnimatedPart.cs" />
-    <Compile Include="Viewer3D\Cameras.cs" />
-    <Compile Include="Viewer3D\Commands.cs" />
-    <Compile Include="Viewer3D\Common\Helpers.cs" />
-    <Compile Include="Viewer3D\Common\SunMoonPos.cs" />
-    <Compile Include="Viewer3D\DDSLib.cs" />
-    <Compile Include="Viewer3D\Debugging\DebugViewerForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Viewer3D\Debugging\DebugViewerForm.Designer.cs">
-      <DependentUpon>DebugViewerForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Viewer3D\Debugging\MessageViewer.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Viewer3D\Debugging\MessageViewer.Designer.cs">
-      <DependentUpon>MessageViewer.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Viewer3D\Debugging\SoundDebugForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Viewer3D\Debugging\SoundDebugForm.Designer.cs">
-      <DependentUpon>SoundDebugForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Viewer3D\Debugging\TimetableWindow.cs" />
-    <Compile Include="Viewer3D\DynamicTrack.cs" />
-    <Compile Include="Viewer3D\Forest.cs" />
-    <Compile Include="Viewer3D\GltfShape.cs" />
-    <Compile Include="Viewer3D\InfoDisplay.cs" />
-    <Compile Include="Viewer3D\Lights.cs" />
-    <Compile Include="Viewer3D\Materials.cs" />
-    <Compile Include="Viewer3D\MSTSSky.cs" />
-    <Compile Include="Viewer3D\MultiPlayerViewer.cs" />
-    <Compile Include="Viewer3D\Noise.cs" />
-    <Compile Include="Viewer3D\OpenAL.cs" />
-    <Compile Include="Viewer3D\ParticleEmitter.cs" />
-    <Compile Include="Viewer3D\Popups\ActivityWindow.cs" />
-    <Compile Include="Viewer3D\Popups\CarOperationsWindow.cs" />
-    <Compile Include="Viewer3D\Popups\CompassWindow.cs" />
-    <Compile Include="Viewer3D\Popups\ComposeMessage.cs" />
-    <Compile Include="Viewer3D\Popups\LabelPrimitive.cs" />
-    <Compile Include="Viewer3D\Popups\MultiPlayerWindow.cs" />
-    <Compile Include="Viewer3D\Popups\NoticeWindow.cs" />
-    <Compile Include="Viewer3D\Popups\HelpWindow.cs" />
-    <Compile Include="Viewer3D\Popups\HUDWindow.cs" />
-    <Compile Include="Viewer3D\Popups\LayeredWindow.cs" />
-    <Compile Include="Viewer3D\Popups\MessagesWindow.cs" />
-    <Compile Include="Viewer3D\Popups\NextStationWindow.cs" />
-    <Compile Include="Viewer3D\Popups\OSDCars.cs" />
-    <Compile Include="Viewer3D\Popups\OSDLocations.cs" />
-    <Compile Include="Viewer3D\Popups\PauseWindow.cs" />
-    <Compile Include="Viewer3D\Popups\QuitWindow.cs" />
-    <Compile Include="Viewer3D\Popups\SignallingDebugWindow.cs" />
-    <Compile Include="Viewer3D\Popups\SwitchWindow.cs" />
-    <Compile Include="Viewer3D\Popups\TrackMonitorWindow.cs" />
-    <Compile Include="Viewer3D\Popups\TracksDebugWindow.cs" />
-    <Compile Include="Viewer3D\Popups\TrainDPUWindow.cs" />
-    <Compile Include="Viewer3D\Popups\TrainDrivingWindow.cs" />
-    <Compile Include="Viewer3D\Popups\TrainListWindow.cs" />
-    <Compile Include="Viewer3D\Popups\TrainOperationsWindow.cs" />
-    <Compile Include="Viewer3D\Popups\TTDetachWindow.cs" />
-    <Compile Include="Viewer3D\Popups\Window.cs" />
-    <Compile Include="Viewer3D\Popups\WindowControls.cs" />
-    <Compile Include="Viewer3D\Popups\WindowManager.cs" />
-    <Compile Include="Viewer3D\Popups\WindowText.cs" />
-    <Compile Include="Viewer3D\Precipitation.cs" />
-    <Compile Include="Viewer3D\Processes\Game.cs" />
-    <Compile Include="Viewer3D\Processes\GameState.cs" />
-    <Compile Include="Viewer3D\Processes\GameStateRunActivity.cs" />
-    <Compile Include="Viewer3D\Processes\GameStateViewer3D.cs" />
-    <Compile Include="Viewer3D\Processes\LoaderProcess.cs" />
-    <Compile Include="Viewer3D\Processes\RenderProcess.cs" />
-    <Compile Include="Viewer3D\Processes\SoundProcess.cs" />
-    <Compile Include="Viewer3D\Processes\UpdaterProcess.cs" />
-    <Compile Include="Viewer3D\Processes\WatchdogProcess.cs" />
-    <Compile Include="Viewer3D\Processes\WebServerProcess.cs" />
-    <Compile Include="Viewer3D\RenderFrame.cs" />
-    <Compile Include="Viewer3D\RoadCars.cs" />
-    <Compile Include="Viewer3D\RollingStock\MSTSDieselLocomotiveViewer.cs" />
-    <Compile Include="Viewer3D\RollingStock\MSTSElectricLocomotiveViewer.cs" />
-    <Compile Include="Viewer3D\RollingStock\MSTSLocomotiveViewer.cs" />
-    <Compile Include="Viewer3D\RollingStock\MSTSSteamLocomotiveViewer.cs" />
-    <Compile Include="Viewer3D\RollingStock\MSTSWagonViewer.cs" />
-    <Compile Include="Viewer3D\RollingStock\SubSystems\DistributedPowerInterface.cs" />
-    <Compile Include="Viewer3D\RollingStock\SubSystems\ETCS\DataEntry.cs" />
-    <Compile Include="Viewer3D\RollingStock\SubSystems\ETCS\Menus.cs" />
-    <Compile Include="Viewer3D\RollingStock\SubSystems\ETCS\TextMessages.cs" />
-    <Compile Include="Viewer3D\RollingStock\SubSystems\FreightAnimationsViewer.cs" />
-    <Compile Include="Viewer3D\RollingStock\TrainCarViewer.cs" />
-    <Compile Include="Viewer3D\Scenery.cs" />
-    <Compile Include="Viewer3D\Shaders.cs" />
-    <Compile Include="Viewer3D\Shapes.cs" />
-    <Compile Include="Viewer3D\Signals.cs" />
-    <Compile Include="Viewer3D\Sky.cs" />
-    <Compile Include="Viewer3D\Sound.cs" />
-    <Compile Include="Viewer3D\SuperElevation.cs" />
-    <Compile Include="Viewer3D\Terrain.cs" />
-    <Compile Include="Viewer3D\Tiles.cs" />
-    <Compile Include="Viewer3D\Trains.cs" />
-    <Compile Include="Viewer3D\Transfers.cs" />
-    <Compile Include="Viewer3D\UserInput.cs" />
-    <Compile Include="Viewer3D\UserInputRailDriver.cs" />
-    <Compile Include="Viewer3D\Viewer.cs" />
-    <Compile Include="Viewer3D\Water.cs" />
-    <Compile Include="Viewer3D\Weather.cs" />
-    <Compile Include="Viewer3D\WebServices\ControlValue.cs" />
-    <Compile Include="Viewer3D\WebServices\TrackMonitorDisplay.cs" />
-    <Compile Include="Viewer3D\WebServices\TrainDpuDisplay.cs" />
-    <Compile Include="Viewer3D\WebServices\TrainDrivingDisplay.cs" />
-    <Compile Include="Viewer3D\WebServices\TrainInfo.cs" />
-    <Compile Include="Viewer3D\WebServices\WebServer.cs" />
-    <Compile Include="Viewer3D\Wire.cs" />
-    <Compile Include="Viewer3D\World.cs" />
-    <Compile Include="Viewer3D\RollingStock\SubSystems\ETCS\DriverMachineInterface.cs" />
-    <Compile Include="Viewer3D\RollingStock\SubSystems\ETCS\SpeedDistanceMonitoring.cs" />
-    <Compile Include="Viewer3D\RollingStock\SubSystems\ETCS\PlanningWindow.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="..\3rdPartyLibs\openal-soft\Win32\OpenAL32.dll">
diff --git a/Source/RunActivity/Viewer3D/Shaders.cs b/Source/RunActivity/Viewer3D/Shaders.cs
index e48c1bbfec..10e0d6a4b9 100644
--- a/Source/RunActivity/Viewer3D/Shaders.cs
+++ b/Source/RunActivity/Viewer3D/Shaders.cs
@@ -255,7 +255,6 @@ public void SetLightVector_ZFar(Vector3 sunDirection, float zFarDistance)
             zFar.SetValue(zFarDistance);
         }
 
-            if (fadeDuration < 0) lighting = 1 + lighting;
         public float SignalLightIntensity { set { signalLightIntensity.SetValue(value); } }
 
         public float Overcast { set { overcast.SetValue(new Vector2(value, value / 2)); } }