Merge branch 'master' into release

leezer3 · Nov 10, 2024 · c7edbd0 · c7edbd0
2 parents 4b94574 + dabd478
commit c7edbd0
Show file tree

Hide file tree

Showing 25 changed files with 66 additions and 44 deletions.
diff --git a/makefile b/makefile
@@ -209,6 +209,6 @@ ifeq (, $(PROGRAM_VERSION))
 	@mv installers/debian.deb OpenBVE-$$(date '+%F').deb
 else
 	@echo This is a $(COLOR_YELLOW)Tagged Release build$(COLOR_END)
-	@echo Final filename: $(COLOR_RED)OpenBVE-$(PROGRAM_VERSION).deb(COLOR_END)
+	@echo Final filename: $(COLOR_RED)OpenBVE-$(PROGRAM_VERSION).deb$(COLOR_END)
 	@mv "$(ROOT_DIR)/installers/debian.deb" OpenBVE-$(PROGRAM_VERSION).deb
 endif
diff --git a/source/InputDevicePlugins/DenshaDeGoInput/DenshaDeGoInput.csproj b/source/InputDevicePlugins/DenshaDeGoInput/DenshaDeGoInput.csproj
@@ -37,8 +37,8 @@
     <LangVersion>7</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="OpenTK, Version=3.3.3.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\OpenTK-OpenBVE.1.0.2\lib\net20\OpenTK.dll</HintPath>
+    <Reference Include="OpenTK, Version=3.3.2.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\OpenTK-OpenBVE.1.0.4\lib\net20\OpenTK.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/source/InputDevicePlugins/DenshaDeGoInput/packages.config b/source/InputDevicePlugins/DenshaDeGoInput/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="LibUsbDotNet" version="2.2.29" targetFramework="net461" />
-  <package id="OpenTK-OpenBVE" version="1.0.2" targetFramework="net461" />
+  <package id="OpenTK-OpenBVE" version="1.0.4" targetFramework="net461" />
 </packages>
diff --git a/source/InputDevicePlugins/SanYingInput/SanYingInput.csproj b/source/InputDevicePlugins/SanYingInput/SanYingInput.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -37,8 +37,8 @@
     <LangVersion>6</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="OpenTK, Version=3.3.3.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\OpenTK-OpenBVE.1.0.2\lib\net20\OpenTK.dll</HintPath>
+    <Reference Include="OpenTK, Version=3.3.2.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\OpenTK-OpenBVE.1.0.4\lib\net20\OpenTK.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/source/InputDevicePlugins/SanYingInput/packages.config b/source/InputDevicePlugins/SanYingInput/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="OpenTK-OpenBVE" version="1.0.2" targetFramework="net461" />
+  <package id="OpenTK-OpenBVE" version="1.0.4" targetFramework="net461" />
 </packages>
diff --git a/source/LibRender2/BaseRenderer.cs b/source/LibRender2/BaseRenderer.cs
@@ -30,10 +30,12 @@
 using OpenBveApi.Routes;
 using OpenBveApi.Textures;
 using OpenBveApi.World;
+using OpenTK;
 using OpenTK.Graphics;
 using OpenTK.Graphics.OpenGL;
 using Path = OpenBveApi.Path;
 using PixelFormat = OpenBveApi.Textures.PixelFormat;
+using Vector2 = OpenBveApi.Math.Vector2;
 using Vector3 = OpenBveApi.Math.Vector3;
 
 namespace LibRender2
@@ -85,6 +87,23 @@ public InterfaceType CurrentInterface
 			}
 		}
 
+		/// <summary>Gets the scale factor for the current display</summary>
+		public static Vector2 ScaleFactor
+		{
+			get
+			{
+				if (_scaleFactor.X > 0)
+				{
+					return _scaleFactor;
+				}
+				// guard against the fact that some systems return a scale factor of zero
+				_scaleFactor = new Vector2(Math.Max(DisplayDevice.Default.ScaleFactor.X, 1), Math.Max(DisplayDevice.Default.ScaleFactor.Y, 1));
+				return _scaleFactor;
+			}
+		}
+
+		private static Vector2 _scaleFactor = new Vector2(-1, -1);
+
 		/// <summary>Holds a reference to the previous interface type of the game</summary>
 		public InterfaceType PreviousInterface => previousInterface;
 

diff --git a/source/LibRender2/LibRender2.csproj b/source/LibRender2/LibRender2.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -37,8 +37,8 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="OpenTK, Version=3.3.3.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\OpenTK-OpenBVE.1.0.2\lib\net20\OpenTK.dll</HintPath>
+    <Reference Include="OpenTK, Version=3.3.2.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\OpenTK-OpenBVE.1.0.4\lib\net20\OpenTK.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/source/LibRender2/Menu/MenuEntries/MenuOption.cs b/source/LibRender2/Menu/MenuEntries/MenuOption.cs
@@ -169,23 +169,23 @@ public void Flip()
 					{
 						return;
 					}
-					BaseMenu.Renderer.SetWindowSize((int)(res.Width * DisplayDevice.Default.ScaleFactor.X), (int)(res.Height * DisplayDevice.Default.ScaleFactor.Y));
+					BaseMenu.Renderer.SetWindowSize((int)(res.Width * BaseRenderer.ScaleFactor.X), (int)(res.Height * BaseRenderer.ScaleFactor.Y));
 					if (BaseMenu.CurrentOptions.FullscreenMode)
 					{
 						IList<DisplayResolution> resolutions = DisplayDevice.Default.AvailableResolutions;
 						foreach (DisplayResolution currentResolution in resolutions)
 						{
 							//Test resolution
-							if (currentResolution.Width == BaseMenu.Renderer.Screen.Width / DisplayDevice.Default.ScaleFactor.X &&
-								currentResolution.Height == BaseMenu.Renderer.Screen.Height / DisplayDevice.Default.ScaleFactor.Y)
+							if (currentResolution.Width == BaseMenu.Renderer.Screen.Width / BaseRenderer.ScaleFactor.X &&
+								currentResolution.Height == BaseMenu.Renderer.Screen.Height / BaseRenderer.ScaleFactor.Y)
 							{
 								try
 								{
 									//HACK: some resolutions will result in openBVE not appearing on screen in full screen, so restore resolution then change resolution
 									DisplayDevice.Default.RestoreResolution();
 									DisplayDevice.Default.ChangeResolution(currentResolution);
 									BaseMenu.Renderer.SetWindowState(WindowState.Fullscreen);
-									BaseMenu.Renderer.SetWindowSize((int)(currentResolution.Width * DisplayDevice.Default.ScaleFactor.X), (int)(currentResolution.Height * DisplayDevice.Default.ScaleFactor.Y));
+									BaseMenu.Renderer.SetWindowSize((int)(currentResolution.Width * BaseRenderer.ScaleFactor.X), (int)(currentResolution.Height * BaseRenderer.ScaleFactor.Y));
 									BaseMenu.CurrentOptions.FullscreenWidth = currentResolution.Width;
 									BaseMenu.CurrentOptions.FullscreenHeight = currentResolution.Height;
 									return;
@@ -217,16 +217,16 @@ public void Flip()
 						foreach (DisplayResolution currentResolution in resolutions)
 						{
 							//Test resolution
-							if (currentResolution.Width == BaseMenu.Renderer.Screen.Width / DisplayDevice.Default.ScaleFactor.X &&
-								currentResolution.Height == BaseMenu.Renderer.Screen.Height / DisplayDevice.Default.ScaleFactor.Y)
+							if (currentResolution.Width == BaseMenu.Renderer.Screen.Width / BaseRenderer.ScaleFactor.X &&
+								currentResolution.Height == BaseMenu.Renderer.Screen.Height / BaseRenderer.ScaleFactor.Y)
 							{
 								try
 								{
 									//HACK: some resolutions will result in openBVE not appearing on screen in full screen, so restore resolution then change resolution
 									DisplayDevice.Default.RestoreResolution();
 									DisplayDevice.Default.ChangeResolution(currentResolution);
 									BaseMenu.Renderer.SetWindowState(WindowState.Fullscreen);
-									BaseMenu.Renderer.SetWindowSize((int)(currentResolution.Width * DisplayDevice.Default.ScaleFactor.X), (int)(currentResolution.Height * DisplayDevice.Default.ScaleFactor.Y));
+									BaseMenu.Renderer.SetWindowSize((int)(currentResolution.Width * BaseRenderer.ScaleFactor.X), (int)(currentResolution.Height * BaseRenderer.ScaleFactor.Y));
 									return;
 								}
 								catch

diff --git a/source/LibRender2/Overlays/Keys.cs b/source/LibRender2/Overlays/Keys.cs
@@ -24,7 +24,7 @@ public void Render(int Left, int Top, int Width, OpenGlFont Font, string[][] Key
 		{
 			int py = Top;
 
-			Width = (int)System.Math.Ceiling(OpenTK.DisplayDevice.Default.ScaleFactor.X * Width);
+			Width = (int)System.Math.Ceiling(BaseRenderer.ScaleFactor.X * Width);
 
 			foreach (string[] key in Keys)
 			{

diff --git a/source/LibRender2/Text/Fonts.cs b/source/LibRender2/Text/Fonts.cs
@@ -93,7 +93,7 @@ public Fonts(HostInterface host, string fontName)
 
 			}
 
-			float scaleFactor = DisplayDevice.Default.ScaleFactor.X;
+			float scaleFactor = (float)BaseRenderer.ScaleFactor.X;
 
 			VerySmallFont = new OpenGlFont(uiFont, 9.0f * scaleFactor);
 			SmallFont = new OpenGlFont(uiFont, 12.0f * scaleFactor);

diff --git a/source/LibRender2/packages.config b/source/LibRender2/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="OpenTK-OpenBVE" version="1.0.2" targetFramework="net461" />
+  <package id="OpenTK-OpenBVE" version="1.0.4" targetFramework="net461" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
 </packages>
diff --git a/source/ObjectViewer/Graphics/NewRendererS.cs b/source/ObjectViewer/Graphics/NewRendererS.cs
@@ -263,7 +263,7 @@ private void RenderOverlays(double timeElapsed)
 			CurrentViewMatrix = Matrix4D.Identity;
 
 			CultureInfo culture = CultureInfo.InvariantCulture;
-			double scaleFactor = DisplayDevice.Default.ScaleFactor.X;
+			double scaleFactor = BaseRenderer.ScaleFactor.X;
 
 			if (OptionInterface)
 			{

diff --git a/source/ObjectViewer/ObjectViewer.csproj b/source/ObjectViewer/ObjectViewer.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
   <PropertyGroup>
     <NoWarn>$(NoWarn),IDE1006</NoWarn>
@@ -64,8 +64,8 @@
     </AllowedReferenceRelatedFileExtensions>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="OpenTK, Version=3.3.3.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\OpenTK-OpenBVE.1.0.2\lib\net20\OpenTK.dll</HintPath>
+    <Reference Include="OpenTK, Version=3.3.2.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\OpenTK-OpenBVE.1.0.4\lib\net20\OpenTK.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />

diff --git a/source/ObjectViewer/packages.config b/source/ObjectViewer/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="OpenTK-OpenBVE" version="1.0.2" targetFramework="net461" />
+  <package id="OpenTK-OpenBVE" version="1.0.4" targetFramework="net461" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
 </packages>
diff --git a/source/OpenBVE/OpenBve.csproj b/source/OpenBVE/OpenBve.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -94,8 +94,8 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="OpenTK, Version=3.3.3.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\OpenTK-OpenBVE.1.0.2\lib\net20\OpenTK.dll</HintPath>
+    <Reference Include="OpenTK, Version=3.3.2.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\OpenTK-OpenBVE.1.0.4\lib\net20\OpenTK.dll</HintPath>
     </Reference>
     <Reference Include="PIEHid32Net">
       <HintPath>..\..\dependencies\PIEHid32Net.dll</HintPath>

diff --git a/source/OpenBVE/packages.config b/source/OpenBVE/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="OpenTK-OpenBVE" version="1.0.2" targetFramework="net461" />
+  <package id="OpenTK-OpenBVE" version="1.0.4" targetFramework="net461" />
   <package id="SharpCompress" version="0.32.2" targetFramework="net461" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
   <package id="System.Memory" version="4.5.5" targetFramework="net461" />

diff --git a/source/Plugins/Route.Bve5/MapParser/ConvertComponents.cs b/source/Plugins/Route.Bve5/MapParser/ConvertComponents.cs
@@ -261,6 +261,7 @@ private static void ConvertCurve(Statement Statement, RouteData RouteData)
 
 						if (StartRadius == EndRadius && StartCant == EndCant)
 						{
+							i++;
 							continue;
 						}
 
@@ -445,6 +446,7 @@ private static void ConvertGradient(Statement Statement, RouteData RouteData)
 
 						if (StartPitch == EndPitch)
 						{
+							i++;
 							continue;
 						}
 
@@ -847,6 +849,7 @@ private static void ConvertTrack(MapData ParseData, RouteData RouteData)
 
 						if (StartCant == EndCant)
 						{
+							i++;
 							continue;
 						}
 

diff --git a/source/RouteViewer/NewRendererR.cs b/source/RouteViewer/NewRendererR.cs
@@ -565,7 +565,7 @@ private void RenderOverlays(double timeElapsed)
 					totalObjects += ObjectManager.AnimatedWorldObjectsUsed;
 				}
 
-				double scaleFactor = DisplayDevice.Default.ScaleFactor.X;
+				double scaleFactor = BaseRenderer.ScaleFactor.X;
 
 				if (totalObjects == 0)
 				{

diff --git a/source/RouteViewer/RouteViewer.csproj b/source/RouteViewer/RouteViewer.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
   <PropertyGroup>
     <NoWarn>$(NoWarn),IDE1006</NoWarn>
@@ -62,8 +62,8 @@
     </AllowedReferenceRelatedFileExtensions>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="OpenTK, Version=3.3.3.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\OpenTK-OpenBVE.1.0.2\lib\net20\OpenTK.dll</HintPath>
+    <Reference Include="OpenTK, Version=3.3.2.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\OpenTK-OpenBVE.1.0.4\lib\net20\OpenTK.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

diff --git a/source/RouteViewer/packages.config b/source/RouteViewer/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="OpenTK-OpenBVE" version="1.0.2" targetFramework="net461" />
+  <package id="OpenTK-OpenBVE" version="1.0.4" targetFramework="net461" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
 </packages>
diff --git a/source/SoundManager/SoundManager.csproj b/source/SoundManager/SoundManager.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -38,8 +38,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="OpenTK, Version=3.3.3.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\OpenTK-OpenBVE.1.0.2\lib\net20\OpenTK.dll</HintPath>
+    <Reference Include="OpenTK, Version=3.3.2.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\OpenTK-OpenBVE.1.0.4\lib\net20\OpenTK.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/source/SoundManager/packages.config b/source/SoundManager/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="OpenTK-OpenBVE" version="1.0.2" targetFramework="net461" />
+  <package id="OpenTK-OpenBVE" version="1.0.4" targetFramework="net461" />
 </packages>
diff --git a/source/TrainEditor2/App.config b/source/TrainEditor2/App.config
@@ -17,7 +17,7 @@
 	  <probing privatePath="Data\Formats" />
      <dependentAssembly>
 	    <assemblyIdentity name="OpenTK" publicKeyToken="bad199fe84eb3df4" culture="neutral" />
-	    <bindingRedirect oldVersion="0.0.0.0-3.3.3.0" newVersion="3.3.3.0" />
+	    <bindingRedirect oldVersion="0.0.0.0-3.3.2.0" newVersion="3.3.2.0" />
 	   </dependentAssembly>
 	   <dependentAssembly>
 	    <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

diff --git a/source/TrainEditor2/TrainEditor2.csproj b/source/TrainEditor2/TrainEditor2.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -41,8 +41,8 @@
     <ApplicationIcon>..\..\assets\icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="OpenTK, Version=3.3.3.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\OpenTK-OpenBVE.1.0.2\lib\net20\OpenTK.dll</HintPath>
+    <Reference Include="OpenTK, Version=3.3.2.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\OpenTK-OpenBVE.1.0.4\lib\net20\OpenTK.dll</HintPath>
     </Reference>
     <Reference Include="OpenTK.GLControl, Version=3.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
       <HintPath>..\..\packages\OpenTK.GLControl-OpenBVE.1.0.1\lib\net20\OpenTK.GLControl.dll</HintPath>

diff --git a/source/TrainEditor2/packages.config b/source/TrainEditor2/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="OpenTK.GLControl-OpenBVE" version="1.0.1" targetFramework="net472" />
-  <package id="OpenTK-OpenBVE" version="1.0.2" targetFramework="net472" />
+  <package id="OpenTK-OpenBVE" version="1.0.4" targetFramework="net472" />
   <package id="Prism.Core" version="7.2.0.1422" targetFramework="net472" />
   <package id="ReactiveProperty" version="7.1.0" targetFramework="net472" />
   <package id="ReactiveProperty.Core" version="7.1.0" targetFramework="net472" />