Skip to content

Commit fd28a41

Browse files
twpoltwpol
committed
Merge branch 'master' into feature/less-windows-forms
2 parents 6fa5eed + ca63633 commit fd28a41

File tree

189 files changed

+21276
-12766
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+21276
-12766
lines changed

‎Source/ContentChecker/ContentChecker.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
3+
<TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<IsPublishable>False</IsPublishable>
77
<AssemblyTitle>Open Rails Content Checker</AssemblyTitle>

‎Source/Contrib/ActivityEditor/ActivityEditor/ActivityEditor.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
3+
<TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
55
<OutputType>WinExe</OutputType>
66
<AssemblyName>Contrib.ActivityEditor</AssemblyName>
77
<ApplicationIcon>..\..\..\ORTS.ico</ApplicationIcon>

‎Source/Contrib/ActivityEditor/LibAE/LibAE.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
3+
<TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
55
<OutputType>Library</OutputType>
66
<AssemblyName>Contrib.LibAE</AssemblyName>
77
<IsPublishable>False</IsPublishable>

‎Source/Contrib/ContentManager/ContentManager.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
3+
<TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
55
<OutputType>WinExe</OutputType>
66
<RootNamespace>ORTS.ContentManager</RootNamespace>
77
<AssemblyName>Contrib.ContentManager</AssemblyName>

‎Source/Contrib/DataCollector/DataCollector.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
3+
<TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<RootNamespace>ORTS.DataCollector</RootNamespace>
77
<AssemblyName>Contrib.DataCollector</AssemblyName>

‎Source/Contrib/DataConverter/DataConverter.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
3+
<TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<RootNamespace>Orts.DataConverter</RootNamespace>
77
<AssemblyName>Contrib.DataConverter</AssemblyName>

‎Source/Contrib/DataValidator/DataValidator.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
3+
<TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<AssemblyName>Contrib.DataValidator</AssemblyName>
77
<IsPublishable>False</IsPublishable>

‎Source/Contrib/SimulatorTester/SimulatorTester.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
3+
<TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<RootNamespace>Orts.SimulatorTester</RootNamespace>
77
<AssemblyName>Contrib.SimulatorTester</AssemblyName>

‎Source/Contrib/TrackViewer/Drawing/DrawTerrain.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,8 +486,14 @@ void UpdateCamera(DrawArea drawArea)
486486
float camHeight = width / device.Viewport.AspectRatio / 2;
487487
Vector3 cameraPosition = cameraTarget;
488488
cameraPosition.Y = -camHeight;
489+
float nearPlaneDistance = camHeight / 2;
490+
if (nearPlaneDistance <= 0)
491+
{
492+
// distance is too close for CreatePerspectiveFieldOfView
493+
return;
494+
}
489495
basicEffect.View = Matrix.CreateLookAt(cameraPosition, cameraTarget, new Vector3(0, 0, 1));
490-
basicEffect.Projection = Matrix.CreatePerspectiveFieldOfView(MathHelper.PiOver2, device.Viewport.AspectRatio, camHeight / 2, camHeight * 2);
496+
basicEffect.Projection = Matrix.CreatePerspectiveFieldOfView(MathHelper.PiOver2, device.Viewport.AspectRatio, nearPlaneDistance, camHeight * 2);
491497

492498
}
493499
#endregion

‎Source/Contrib/TrackViewer/TrackViewer.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
3+
<TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
55
<OutputType>WinExe</OutputType>
66
<RootNamespace>ORTS.TrackViewer</RootNamespace>
77
<AssemblyName>Contrib.TrackViewer</AssemblyName>

0 commit comments

Comments
 (0)