Skip to content

Commit c7edbd0

Browse files
leezer3leezer3
committed
Merge branch 'master' into release
2 parents 4b94574 + dabd478 commit c7edbd0

25 files changed

+66
-44
lines changed

‎makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,6 @@ ifeq (, $(PROGRAM_VERSION))
209209
@mv installers/debian.deb OpenBVE-$$(date '+%F').deb
210210
else
211211
@echo This is a $(COLOR_YELLOW)Tagged Release build$(COLOR_END)
212-
@echo Final filename: $(COLOR_RED)OpenBVE-$(PROGRAM_VERSION).deb(COLOR_END)
212+
@echo Final filename: $(COLOR_RED)OpenBVE-$(PROGRAM_VERSION).deb$(COLOR_END)
213213
@mv "$(ROOT_DIR)/installers/debian.deb" OpenBVE-$(PROGRAM_VERSION).deb
214214
endif

‎source/InputDevicePlugins/DenshaDeGoInput/DenshaDeGoInput.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
<LangVersion>7</LangVersion>
3838
</PropertyGroup>
3939
<ItemGroup>
40-
<Reference Include="OpenTK, Version=3.3.3.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
41-
<HintPath>..\..\..\packages\OpenTK-OpenBVE.1.0.2\lib\net20\OpenTK.dll</HintPath>
40+
<Reference Include="OpenTK, Version=3.3.2.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
41+
<HintPath>..\..\..\packages\OpenTK-OpenBVE.1.0.4\lib\net20\OpenTK.dll</HintPath>
4242
</Reference>
4343
<Reference Include="System" />
4444
<Reference Include="System.Core" />

‎source/InputDevicePlugins/DenshaDeGoInput/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="LibUsbDotNet" version="2.2.29" targetFramework="net461" />
4-
<package id="OpenTK-OpenBVE" version="1.0.2" targetFramework="net461" />
4+
<package id="OpenTK-OpenBVE" version="1.0.4" targetFramework="net461" />
55
</packages>

‎source/InputDevicePlugins/SanYingInput/SanYingInput.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -37,8 +37,8 @@
3737
<LangVersion>6</LangVersion>
3838
</PropertyGroup>
3939
<ItemGroup>
40-
<Reference Include="OpenTK, Version=3.3.3.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
41-
<HintPath>..\..\..\packages\OpenTK-OpenBVE.1.0.2\lib\net20\OpenTK.dll</HintPath>
40+
<Reference Include="OpenTK, Version=3.3.2.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
41+
<HintPath>..\..\..\packages\OpenTK-OpenBVE.1.0.4\lib\net20\OpenTK.dll</HintPath>
4242
</Reference>
4343
<Reference Include="System" />
4444
<Reference Include="System.Core" />

‎source/InputDevicePlugins/SanYingInput/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="OpenTK-OpenBVE" version="1.0.2" targetFramework="net461" />
3+
<package id="OpenTK-OpenBVE" version="1.0.4" targetFramework="net461" />
44
</packages>

‎source/LibRender2/BaseRenderer.cs

+19
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@
3030
using OpenBveApi.Routes;
3131
using OpenBveApi.Textures;
3232
using OpenBveApi.World;
33+
using OpenTK;
3334
using OpenTK.Graphics;
3435
using OpenTK.Graphics.OpenGL;
3536
using Path = OpenBveApi.Path;
3637
using PixelFormat = OpenBveApi.Textures.PixelFormat;
38+
using Vector2 = OpenBveApi.Math.Vector2;
3739
using Vector3 = OpenBveApi.Math.Vector3;
3840

3941
namespace LibRender2
@@ -85,6 +87,23 @@ public InterfaceType CurrentInterface
8587
}
8688
}
8789

90+
/// <summary>Gets the scale factor for the current display</summary>
91+
public static Vector2 ScaleFactor
92+
{
93+
get
94+
{
95+
if (_scaleFactor.X > 0)
96+
{
97+
return _scaleFactor;
98+
}
99+
// guard against the fact that some systems return a scale factor of zero
100+
_scaleFactor = new Vector2(Math.Max(DisplayDevice.Default.ScaleFactor.X, 1), Math.Max(DisplayDevice.Default.ScaleFactor.Y, 1));
101+
return _scaleFactor;
102+
}
103+
}
104+
105+
private static Vector2 _scaleFactor = new Vector2(-1, -1);
106+
88107
/// <summary>Holds a reference to the previous interface type of the game</summary>
89108
public InterfaceType PreviousInterface => previousInterface;
90109

‎source/LibRender2/LibRender2.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -37,8 +37,8 @@
3737
<PlatformTarget>AnyCPU</PlatformTarget>
3838
</PropertyGroup>
3939
<ItemGroup>
40-
<Reference Include="OpenTK, Version=3.3.3.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
41-
<HintPath>..\..\packages\OpenTK-OpenBVE.1.0.2\lib\net20\OpenTK.dll</HintPath>
40+
<Reference Include="OpenTK, Version=3.3.2.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
41+
<HintPath>..\..\packages\OpenTK-OpenBVE.1.0.4\lib\net20\OpenTK.dll</HintPath>
4242
</Reference>
4343
<Reference Include="System" />
4444
<Reference Include="System.Core" />

‎source/LibRender2/Menu/MenuEntries/MenuOption.cs

+7-7
Original file line numberDiff line numberDiff line change
@@ -169,23 +169,23 @@ public void Flip()
169169
{
170170
return;
171171
}
172-
BaseMenu.Renderer.SetWindowSize((int)(res.Width * DisplayDevice.Default.ScaleFactor.X), (int)(res.Height * DisplayDevice.Default.ScaleFactor.Y));
172+
BaseMenu.Renderer.SetWindowSize((int)(res.Width * BaseRenderer.ScaleFactor.X), (int)(res.Height * BaseRenderer.ScaleFactor.Y));
173173
if (BaseMenu.CurrentOptions.FullscreenMode)
174174
{
175175
IList<DisplayResolution> resolutions = DisplayDevice.Default.AvailableResolutions;
176176
foreach (DisplayResolution currentResolution in resolutions)
177177
{
178178
//Test resolution
179-
if (currentResolution.Width == BaseMenu.Renderer.Screen.Width / DisplayDevice.Default.ScaleFactor.X &&
180-
currentResolution.Height == BaseMenu.Renderer.Screen.Height / DisplayDevice.Default.ScaleFactor.Y)
179+
if (currentResolution.Width == BaseMenu.Renderer.Screen.Width / BaseRenderer.ScaleFactor.X &&
180+
currentResolution.Height == BaseMenu.Renderer.Screen.Height / BaseRenderer.ScaleFactor.Y)
181181
{
182182
try
183183
{
184184
//HACK: some resolutions will result in openBVE not appearing on screen in full screen, so restore resolution then change resolution
185185
DisplayDevice.Default.RestoreResolution();
186186
DisplayDevice.Default.ChangeResolution(currentResolution);
187187
BaseMenu.Renderer.SetWindowState(WindowState.Fullscreen);
188-
BaseMenu.Renderer.SetWindowSize((int)(currentResolution.Width * DisplayDevice.Default.ScaleFactor.X), (int)(currentResolution.Height * DisplayDevice.Default.ScaleFactor.Y));
188+
BaseMenu.Renderer.SetWindowSize((int)(currentResolution.Width * BaseRenderer.ScaleFactor.X), (int)(currentResolution.Height * BaseRenderer.ScaleFactor.Y));
189189
BaseMenu.CurrentOptions.FullscreenWidth = currentResolution.Width;
190190
BaseMenu.CurrentOptions.FullscreenHeight = currentResolution.Height;
191191
return;
@@ -217,16 +217,16 @@ public void Flip()
217217
foreach (DisplayResolution currentResolution in resolutions)
218218
{
219219
//Test resolution
220-
if (currentResolution.Width == BaseMenu.Renderer.Screen.Width / DisplayDevice.Default.ScaleFactor.X &&
221-
currentResolution.Height == BaseMenu.Renderer.Screen.Height / DisplayDevice.Default.ScaleFactor.Y)
220+
if (currentResolution.Width == BaseMenu.Renderer.Screen.Width / BaseRenderer.ScaleFactor.X &&
221+
currentResolution.Height == BaseMenu.Renderer.Screen.Height / BaseRenderer.ScaleFactor.Y)
222222
{
223223
try
224224
{
225225
//HACK: some resolutions will result in openBVE not appearing on screen in full screen, so restore resolution then change resolution
226226
DisplayDevice.Default.RestoreResolution();
227227
DisplayDevice.Default.ChangeResolution(currentResolution);
228228
BaseMenu.Renderer.SetWindowState(WindowState.Fullscreen);
229-
BaseMenu.Renderer.SetWindowSize((int)(currentResolution.Width * DisplayDevice.Default.ScaleFactor.X), (int)(currentResolution.Height * DisplayDevice.Default.ScaleFactor.Y));
229+
BaseMenu.Renderer.SetWindowSize((int)(currentResolution.Width * BaseRenderer.ScaleFactor.X), (int)(currentResolution.Height * BaseRenderer.ScaleFactor.Y));
230230
return;
231231
}
232232
catch

‎source/LibRender2/Overlays/Keys.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public void Render(int Left, int Top, int Width, OpenGlFont Font, string[][] Key
2424
{
2525
int py = Top;
2626

27-
Width = (int)System.Math.Ceiling(OpenTK.DisplayDevice.Default.ScaleFactor.X * Width);
27+
Width = (int)System.Math.Ceiling(BaseRenderer.ScaleFactor.X * Width);
2828

2929
foreach (string[] key in Keys)
3030
{

‎source/LibRender2/Text/Fonts.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public Fonts(HostInterface host, string fontName)
9393

9494
}
9595

96-
float scaleFactor = DisplayDevice.Default.ScaleFactor.X;
96+
float scaleFactor = (float)BaseRenderer.ScaleFactor.X;
9797

9898
VerySmallFont = new OpenGlFont(uiFont, 9.0f * scaleFactor);
9999
SmallFont = new OpenGlFont(uiFont, 12.0f * scaleFactor);

‎source/LibRender2/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="OpenTK-OpenBVE" version="1.0.2" targetFramework="net461" />
3+
<package id="OpenTK-OpenBVE" version="1.0.4" targetFramework="net461" />
44
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
55
</packages>

‎source/ObjectViewer/Graphics/NewRendererS.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ private void RenderOverlays(double timeElapsed)
263263
CurrentViewMatrix = Matrix4D.Identity;
264264

265265
CultureInfo culture = CultureInfo.InvariantCulture;
266-
double scaleFactor = DisplayDevice.Default.ScaleFactor.X;
266+
double scaleFactor = BaseRenderer.ScaleFactor.X;
267267

268268
if (OptionInterface)
269269
{

‎source/ObjectViewer/ObjectViewer.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
33
<PropertyGroup>
44
<NoWarn>$(NoWarn),IDE1006</NoWarn>
@@ -64,8 +64,8 @@
6464
</AllowedReferenceRelatedFileExtensions>
6565
</PropertyGroup>
6666
<ItemGroup>
67-
<Reference Include="OpenTK, Version=3.3.3.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
68-
<HintPath>..\..\packages\OpenTK-OpenBVE.1.0.2\lib\net20\OpenTK.dll</HintPath>
67+
<Reference Include="OpenTK, Version=3.3.2.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
68+
<HintPath>..\..\packages\OpenTK-OpenBVE.1.0.4\lib\net20\OpenTK.dll</HintPath>
6969
</Reference>
7070
<Reference Include="System" />
7171
<Reference Include="System.Drawing" />

‎source/ObjectViewer/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="OpenTK-OpenBVE" version="1.0.2" targetFramework="net461" />
3+
<package id="OpenTK-OpenBVE" version="1.0.4" targetFramework="net461" />
44
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
55
</packages>

‎source/OpenBVE/OpenBve.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -94,8 +94,8 @@
9494
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
9595
</PropertyGroup>
9696
<ItemGroup>
97-
<Reference Include="OpenTK, Version=3.3.3.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
98-
<HintPath>..\..\packages\OpenTK-OpenBVE.1.0.2\lib\net20\OpenTK.dll</HintPath>
97+
<Reference Include="OpenTK, Version=3.3.2.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
98+
<HintPath>..\..\packages\OpenTK-OpenBVE.1.0.4\lib\net20\OpenTK.dll</HintPath>
9999
</Reference>
100100
<Reference Include="PIEHid32Net">
101101
<HintPath>..\..\dependencies\PIEHid32Net.dll</HintPath>

‎source/OpenBVE/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="OpenTK-OpenBVE" version="1.0.2" targetFramework="net461" />
3+
<package id="OpenTK-OpenBVE" version="1.0.4" targetFramework="net461" />
44
<package id="SharpCompress" version="0.32.2" targetFramework="net461" />
55
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
66
<package id="System.Memory" version="4.5.5" targetFramework="net461" />

‎source/Plugins/Route.Bve5/MapParser/ConvertComponents.cs

+3
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ private static void ConvertCurve(Statement Statement, RouteData RouteData)
261261

262262
if (StartRadius == EndRadius && StartCant == EndCant)
263263
{
264+
i++;
264265
continue;
265266
}
266267

@@ -445,6 +446,7 @@ private static void ConvertGradient(Statement Statement, RouteData RouteData)
445446

446447
if (StartPitch == EndPitch)
447448
{
449+
i++;
448450
continue;
449451
}
450452

@@ -847,6 +849,7 @@ private static void ConvertTrack(MapData ParseData, RouteData RouteData)
847849

848850
if (StartCant == EndCant)
849851
{
852+
i++;
850853
continue;
851854
}
852855

‎source/RouteViewer/NewRendererR.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ private void RenderOverlays(double timeElapsed)
565565
totalObjects += ObjectManager.AnimatedWorldObjectsUsed;
566566
}
567567

568-
double scaleFactor = DisplayDevice.Default.ScaleFactor.X;
568+
double scaleFactor = BaseRenderer.ScaleFactor.X;
569569

570570
if (totalObjects == 0)
571571
{

‎source/RouteViewer/RouteViewer.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
33
<PropertyGroup>
44
<NoWarn>$(NoWarn),IDE1006</NoWarn>
@@ -62,8 +62,8 @@
6262
</AllowedReferenceRelatedFileExtensions>
6363
</PropertyGroup>
6464
<ItemGroup>
65-
<Reference Include="OpenTK, Version=3.3.3.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
66-
<HintPath>..\..\packages\OpenTK-OpenBVE.1.0.2\lib\net20\OpenTK.dll</HintPath>
65+
<Reference Include="OpenTK, Version=3.3.2.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
66+
<HintPath>..\..\packages\OpenTK-OpenBVE.1.0.4\lib\net20\OpenTK.dll</HintPath>
6767
</Reference>
6868
<Reference Include="System" />
6969
<Reference Include="System.Data" />

‎source/RouteViewer/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="OpenTK-OpenBVE" version="1.0.2" targetFramework="net461" />
3+
<package id="OpenTK-OpenBVE" version="1.0.4" targetFramework="net461" />
44
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
55
</packages>

‎source/SoundManager/SoundManager.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -38,8 +38,8 @@
3838
<Prefer32Bit>false</Prefer32Bit>
3939
</PropertyGroup>
4040
<ItemGroup>
41-
<Reference Include="OpenTK, Version=3.3.3.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
42-
<HintPath>..\..\packages\OpenTK-OpenBVE.1.0.2\lib\net20\OpenTK.dll</HintPath>
41+
<Reference Include="OpenTK, Version=3.3.2.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
42+
<HintPath>..\..\packages\OpenTK-OpenBVE.1.0.4\lib\net20\OpenTK.dll</HintPath>
4343
</Reference>
4444
<Reference Include="System" />
4545
<Reference Include="System.Core" />

‎source/SoundManager/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="OpenTK-OpenBVE" version="1.0.2" targetFramework="net461" />
3+
<package id="OpenTK-OpenBVE" version="1.0.4" targetFramework="net461" />
44
</packages>

‎source/TrainEditor2/App.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<probing privatePath="Data\Formats" />
1818
<dependentAssembly>
1919
<assemblyIdentity name="OpenTK" publicKeyToken="bad199fe84eb3df4" culture="neutral" />
20-
<bindingRedirect oldVersion="0.0.0.0-3.3.3.0" newVersion="3.3.3.0" />
20+
<bindingRedirect oldVersion="0.0.0.0-3.3.2.0" newVersion="3.3.2.0" />
2121
</dependentAssembly>
2222
<dependentAssembly>
2323
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

‎source/TrainEditor2/TrainEditor2.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -41,8 +41,8 @@
4141
<ApplicationIcon>..\..\assets\icon.ico</ApplicationIcon>
4242
</PropertyGroup>
4343
<ItemGroup>
44-
<Reference Include="OpenTK, Version=3.3.3.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
45-
<HintPath>..\..\packages\OpenTK-OpenBVE.1.0.2\lib\net20\OpenTK.dll</HintPath>
44+
<Reference Include="OpenTK, Version=3.3.2.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
45+
<HintPath>..\..\packages\OpenTK-OpenBVE.1.0.4\lib\net20\OpenTK.dll</HintPath>
4646
</Reference>
4747
<Reference Include="OpenTK.GLControl, Version=3.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
4848
<HintPath>..\..\packages\OpenTK.GLControl-OpenBVE.1.0.1\lib\net20\OpenTK.GLControl.dll</HintPath>

‎source/TrainEditor2/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="OpenTK.GLControl-OpenBVE" version="1.0.1" targetFramework="net472" />
4-
<package id="OpenTK-OpenBVE" version="1.0.2" targetFramework="net472" />
4+
<package id="OpenTK-OpenBVE" version="1.0.4" targetFramework="net472" />
55
<package id="Prism.Core" version="7.2.0.1422" targetFramework="net472" />
66
<package id="ReactiveProperty" version="7.1.0" targetFramework="net472" />
77
<package id="ReactiveProperty.Core" version="7.1.0" targetFramework="net472" />

0 commit comments

Comments
 (0)