mirror of
https://github.com/MaSzyna-EU07/StarterNG.git
synced 2026-11-18 22:45:59 +01:00
Compare commits
19 Commits
fix/screen
...
v1.6.266
| Author | SHA1 | Date | |
|---|---|---|---|
| 156af3fdd1 | |||
| 49b76aa66c | |||
| 9b1523ef78 | |||
| 1d5b0ea1f4 | |||
|
|
38802845c7 | ||
|
|
bba9e3ef48 | ||
|
|
6e2dbf9eac | ||
|
|
91c496ab48 | ||
|
|
7cd3ef8f1a | ||
|
|
1b41ef752a | ||
|
|
42f702a096 | ||
|
|
7f57160aae | ||
|
|
2efae83b57 | ||
|
|
34f2ce99e8 | ||
|
|
52408a9931 | ||
|
|
290b753f40 | ||
|
|
6279228a7d | ||
|
|
d4975796a8 | ||
|
|
48af11b4b2 |
119
StarterNG.Tests/CaseInsensitivePathsTests.cs
Normal file
119
StarterNG.Tests/CaseInsensitivePathsTests.cs
Normal file
@@ -0,0 +1,119 @@
|
|||||||
|
using StarterNG.Infrastructure;
|
||||||
|
using StarterNG.Tests.Fakes;
|
||||||
|
|
||||||
|
namespace StarterNG.Tests;
|
||||||
|
|
||||||
|
public class CaseInsensitivePathsTests
|
||||||
|
{
|
||||||
|
private static InMemoryFileSystem Disk() => new InMemoryFileSystem(caseSensitive: true)
|
||||||
|
.WithFile("game/scenery/Braniewo/Base.ctr", "")
|
||||||
|
.WithFile("game/scenery/Braniewo/rozklady/TGS3657.txt", "")
|
||||||
|
.WithDirectory("game/textures/mini");
|
||||||
|
|
||||||
|
[Theory]
|
||||||
|
[InlineData("braniewo/base.ctr", "Braniewo/Base.ctr")]
|
||||||
|
[InlineData(@"BRANIEWO\Rozklady\tgs3657.TXT", "Braniewo/rozklady/TGS3657.txt")]
|
||||||
|
[InlineData("Braniewo/Base.ctr", "Braniewo/Base.ctr")]
|
||||||
|
[InlineData("braniewo//base.ctr", "Braniewo/Base.ctr")]
|
||||||
|
[InlineData("/braniewo/base.ctr", "Braniewo/Base.ctr")]
|
||||||
|
[InlineData(@"\Braniewo\Base.ctr", "Braniewo/Base.ctr")]
|
||||||
|
public void A_name_in_any_case_is_given_as_it_is_on_disk(string name, string onDisk) =>
|
||||||
|
Assert.Equal(onDisk, new CaseInsensitivePaths(Disk()).Resolve("game/scenery", name));
|
||||||
|
|
||||||
|
[Theory]
|
||||||
|
[InlineData("braniewo/brak.ctr")]
|
||||||
|
[InlineData("brak/base.ctr")]
|
||||||
|
[InlineData("")]
|
||||||
|
public void A_name_nothing_answers_to_is_not_found(string name) =>
|
||||||
|
Assert.Null(new CaseInsensitivePaths(Disk()).Resolve("game/scenery", name));
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void A_folder_is_found_only_when_one_is_asked_for()
|
||||||
|
{
|
||||||
|
var names = new CaseInsensitivePaths(Disk());
|
||||||
|
|
||||||
|
Assert.Equal("Braniewo/rozklady", names.Resolve("game/scenery", "braniewo/ROZKLADY", directory: true));
|
||||||
|
Assert.Null(names.Resolve("game/scenery", "braniewo/ROZKLADY"));
|
||||||
|
Assert.Null(names.Resolve("game/scenery", "braniewo/base.ctr", directory: true));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void The_name_written_as_on_disk_wins_over_one_in_other_case()
|
||||||
|
{
|
||||||
|
var files = Disk().WithFile("game/scenery/braniewo/base.ctr", "");
|
||||||
|
var names = new CaseInsensitivePaths(files);
|
||||||
|
|
||||||
|
Assert.Equal("braniewo/base.ctr", names.Resolve("game/scenery", "braniewo/base.ctr"));
|
||||||
|
Assert.Equal("Braniewo/Base.ctr", names.Resolve("game/scenery", "Braniewo/base.CTR"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Of_folders_named_alike_the_one_holding_the_file_is_taken()
|
||||||
|
{
|
||||||
|
var files = Disk().WithFile("game/scenery/braniewo/tory.scm", "");
|
||||||
|
var names = new CaseInsensitivePaths(files);
|
||||||
|
|
||||||
|
Assert.Equal("Braniewo/Base.ctr", names.Resolve("game/scenery", "braniewo/base.ctr"));
|
||||||
|
Assert.Equal("braniewo/tory.scm", names.Resolve("game/scenery", "Braniewo/Tory.scm"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void The_full_path_joins_the_folder_and_the_name_on_disk() =>
|
||||||
|
Assert.Equal(Path.Combine("game/scenery", "Braniewo", "Base.ctr"),
|
||||||
|
new CaseInsensitivePaths(Disk()).Find("game/scenery", "BRANIEWO/BASE.CTR"));
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void A_full_path_is_found_from_its_own_root()
|
||||||
|
{
|
||||||
|
string scenery = Path.GetFullPath(Path.Combine("game", "scenery"));
|
||||||
|
var files = new InMemoryFileSystem(caseSensitive: true)
|
||||||
|
.WithFile(Path.Combine(scenery, "Braniewo", "Base.ctr"), "");
|
||||||
|
|
||||||
|
Assert.Equal(Path.Combine(scenery, "Braniewo", "Base.ctr"),
|
||||||
|
new CaseInsensitivePaths(files).Find("elsewhere", Path.Combine(scenery, "BRANIEWO", "base.CTR")));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void A_disk_that_ignores_case_gives_the_name_back_as_written()
|
||||||
|
{
|
||||||
|
var files = new InMemoryFileSystem().WithFile("game/scenery/Braniewo/Base.ctr", "");
|
||||||
|
var names = new CaseInsensitivePaths(files);
|
||||||
|
|
||||||
|
Assert.Equal("BRANIEWO/base.CTR", names.Resolve("game/scenery", "BRANIEWO/base.CTR"));
|
||||||
|
Assert.Null(names.Resolve("game/scenery", "braniewo/brak.ctr"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Kept_listings_hold_until_forgotten()
|
||||||
|
{
|
||||||
|
var files = Disk();
|
||||||
|
var names = new CaseInsensitivePaths(files, keepListings: true);
|
||||||
|
Assert.Null(names.Resolve("game/scenery", "braniewo/nowy.scm"));
|
||||||
|
|
||||||
|
files.WithFile("game/scenery/Braniewo/Nowy.scm", "");
|
||||||
|
Assert.Null(names.Resolve("game/scenery", "braniewo/nowy.scm"));
|
||||||
|
|
||||||
|
names.Forget();
|
||||||
|
Assert.Equal("Braniewo/Nowy.scm", names.Resolve("game/scenery", "braniewo/nowy.scm"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Listings_not_kept_see_a_file_added_since()
|
||||||
|
{
|
||||||
|
var files = Disk();
|
||||||
|
var names = new CaseInsensitivePaths(files);
|
||||||
|
Assert.Null(names.Resolve("game/scenery", "braniewo/nowy.scm"));
|
||||||
|
|
||||||
|
files.WithFile("game/scenery/Braniewo/Nowy.scm", "");
|
||||||
|
|
||||||
|
Assert.Equal("Braniewo/Nowy.scm", names.Resolve("game/scenery", "braniewo/nowy.scm"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void A_folder_that_cannot_be_listed_holds_nothing_to_find()
|
||||||
|
{
|
||||||
|
var files = Disk().DenyListing("game/scenery");
|
||||||
|
|
||||||
|
Assert.Null(new CaseInsensitivePaths(files).Resolve("game/scenery", "braniewo/base.ctr"));
|
||||||
|
}
|
||||||
|
}
|
||||||
82
StarterNG.Tests/ExecutableNoAvx2Tests.cs
Normal file
82
StarterNG.Tests/ExecutableNoAvx2Tests.cs
Normal file
@@ -0,0 +1,82 @@
|
|||||||
|
using StarterNG.Domain.Settings;
|
||||||
|
using StarterNG.Infrastructure.Settings;
|
||||||
|
using StarterNG.Tests.Fakes;
|
||||||
|
|
||||||
|
namespace StarterNG.Tests;
|
||||||
|
|
||||||
|
public class ExecutableNoAvx2Tests
|
||||||
|
{
|
||||||
|
private const string Elf = "\u007fELF binary";
|
||||||
|
private static readonly DateTime Older = new(2026, 11, 1, 0, 0, 0, DateTimeKind.Utc);
|
||||||
|
private static readonly DateTime Newer = new(2026, 11, 15, 0, 0, 0, DateTimeKind.Utc);
|
||||||
|
|
||||||
|
private static InMemoryFileSystem With(params string[] names)
|
||||||
|
{
|
||||||
|
var files = new InMemoryFileSystem();
|
||||||
|
foreach (string name in names)
|
||||||
|
files.WithExecutable(TestInstallation.At(name), Elf);
|
||||||
|
return files;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string Automatic(InMemoryFileSystem files, bool lacksAvx2) =>
|
||||||
|
Path.GetFileName(new TestInstallation(files, lacksAvx2: lacksAvx2).Executables
|
||||||
|
.Resolve(new SimulatorSettings(), out _));
|
||||||
|
|
||||||
|
[Theory]
|
||||||
|
[InlineData("eu07_noavx2", true)]
|
||||||
|
[InlineData("eu07-x64_2026-11-15_abc1234_noavx2.exe", true)]
|
||||||
|
[InlineData("EU07_NOAVX2.EXE", true)]
|
||||||
|
[InlineData("eu07", false)]
|
||||||
|
[InlineData("eu07-x64_2026-11-15_abc1234.exe", false)]
|
||||||
|
[InlineData("eu07_noavx2_old.exe", false)]
|
||||||
|
public void A_build_without_avx2_is_known_by_the_end_of_its_name(string name, bool noAvx2) =>
|
||||||
|
Assert.Equal(noAvx2, ExecutableLocator.IsNoAvx2(name));
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Without_avx2_the_build_without_it_is_chosen_over_the_canonical_one() =>
|
||||||
|
Assert.Equal("eu07_noavx2", Automatic(With("eu07", "eu07_noavx2"), lacksAvx2: true));
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void With_avx2_the_build_made_for_it_stays_first() =>
|
||||||
|
Assert.Equal("eu07", Automatic(With("eu07", "eu07_noavx2"), lacksAvx2: false));
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void With_avx2_a_build_without_it_is_used_when_it_is_the_only_one() =>
|
||||||
|
Assert.Equal("eu07_noavx2", Automatic(With("eu07_noavx2"), lacksAvx2: false));
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Without_avx2_the_newest_build_without_it_is_chosen()
|
||||||
|
{
|
||||||
|
var files = With("eu07_2026-11-01_aaa_noavx2", "eu07_2026-11-15_bbb_noavx2")
|
||||||
|
.WrittenAt(TestInstallation.At("eu07_2026-11-01_aaa_noavx2"), Older)
|
||||||
|
.WrittenAt(TestInstallation.At("eu07_2026-11-15_bbb_noavx2"), Newer);
|
||||||
|
|
||||||
|
Assert.Equal("eu07_2026-11-15_bbb_noavx2", Automatic(files, lacksAvx2: true));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Without_avx2_and_no_build_without_it_the_usual_choice_stands() =>
|
||||||
|
Assert.Equal("eu07", Automatic(With("eu07-dev", "eu07"), lacksAvx2: true));
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Only_a_build_with_avx2_on_a_processor_without_it_will_not_run()
|
||||||
|
{
|
||||||
|
var lacking = new TestInstallation(lacksAvx2: true).Executables;
|
||||||
|
var able = new TestInstallation(lacksAvx2: false).Executables;
|
||||||
|
|
||||||
|
Assert.True(lacking.WillNotRunHere("eu07.exe"));
|
||||||
|
Assert.False(lacking.WillNotRunHere("eu07-x64_noavx2.exe"));
|
||||||
|
Assert.False(able.WillNotRunHere("eu07.exe"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void The_newest_build_without_avx2_is_offered_by_name()
|
||||||
|
{
|
||||||
|
var files = With("eu07", "eu07_2026-11-01_aaa_noavx2", "eu07_2026-11-15_bbb_noavx2")
|
||||||
|
.WrittenAt(TestInstallation.At("eu07_2026-11-01_aaa_noavx2"), Older)
|
||||||
|
.WrittenAt(TestInstallation.At("eu07_2026-11-15_bbb_noavx2"), Newer);
|
||||||
|
|
||||||
|
Assert.Equal("eu07_2026-11-15_bbb_noavx2", new TestInstallation(files).Executables.NewestNoAvx2());
|
||||||
|
Assert.Null(new TestInstallation(With("eu07")).Executables.NewestNoAvx2());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -97,6 +97,8 @@ public sealed class InMemoryFileSystem : IFileSystem
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool IgnoresCase => _comparison == StringComparison.OrdinalIgnoreCase;
|
||||||
|
|
||||||
public bool FileExists(string path) => _files.ContainsKey(Normalize(path));
|
public bool FileExists(string path) => _files.ContainsKey(Normalize(path));
|
||||||
|
|
||||||
/// <summary>A link counts as the directory it points at, as the disk has it.</summary>
|
/// <summary>A link counts as the directory it points at, as the disk has it.</summary>
|
||||||
@@ -273,6 +275,9 @@ public sealed class InMemoryFileSystem : IFileSystem
|
|||||||
return;
|
return;
|
||||||
slash = key.LastIndexOf('/');
|
slash = key.LastIndexOf('/');
|
||||||
}
|
}
|
||||||
|
// An absolute Unix path's parent is the root, "/", which normalises to "".
|
||||||
|
if (slash == 0)
|
||||||
|
_directories.Add("");
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string Normalize(string path) =>
|
private static string Normalize(string path) =>
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ public sealed class TestInstallation
|
|||||||
{
|
{
|
||||||
public const string Root = "game";
|
public const string Root = "game";
|
||||||
|
|
||||||
public TestInstallation(InMemoryFileSystem? files = null, DateTime? now = null)
|
public TestInstallation(InMemoryFileSystem? files = null, DateTime? now = null, bool lacksAvx2 = false)
|
||||||
{
|
{
|
||||||
Files = files ?? new InMemoryFileSystem();
|
Files = files ?? new InMemoryFileSystem();
|
||||||
Paths = new GamePaths(Root);
|
Paths = new GamePaths(Root);
|
||||||
@@ -35,7 +35,8 @@ public sealed class TestInstallation
|
|||||||
SettingsPaths.VehicleCacheDirectory());
|
SettingsPaths.VehicleCacheDirectory());
|
||||||
Library = new GameLibrary(VehicleCache, Sceneries, MiniTextures, Physics, Log);
|
Library = new GameLibrary(VehicleCache, Sceneries, MiniTextures, Physics, Log);
|
||||||
|
|
||||||
Executables = new ExecutableLocator(Files, Paths, Environment, Log);
|
// The processor of the machine running the tests is not the one tested.
|
||||||
|
Executables = new ExecutableLocator(Files, Paths, Environment, Log, lacksAvx2);
|
||||||
SettingsStore = new SettingsStore(Files, Clock, Log, SettingsPaths, new SettingsSerializer(), Executables);
|
SettingsStore = new SettingsStore(Files, Clock, Log, SettingsPaths, new SettingsSerializer(), Executables);
|
||||||
Tapes = new HaslerTapes(Files, Paths, Log, Clock, new TimetableLocator(Files), () => SimulatorRunning);
|
Tapes = new HaslerTapes(Files, Paths, Log, Clock, new TimetableLocator(Files), () => SimulatorRunning);
|
||||||
}
|
}
|
||||||
|
|||||||
28
StarterNG.Tests/LoadingScreenLogoTests.cs
Normal file
28
StarterNG.Tests/LoadingScreenLogoTests.cs
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
using StarterNG.Infrastructure;
|
||||||
|
using StarterNG.Tests.Fakes;
|
||||||
|
|
||||||
|
namespace StarterNG.Tests;
|
||||||
|
|
||||||
|
public class LoadingScreenLogoTests
|
||||||
|
{
|
||||||
|
private static InMemoryFileSystem Logos() => new InMemoryFileSystem(caseSensitive: true)
|
||||||
|
.WithFile("game/Textures/Logo/EP09_Logo.PNG", "png")
|
||||||
|
.WithFile("game/Textures/Logo/Braniewo.JPG", "jpg")
|
||||||
|
.WithFile("game/Textures/Logo/Logo1.BMP", "bmp")
|
||||||
|
.WithFile("game/Textures/Logo/notes.txt", "");
|
||||||
|
|
||||||
|
[Theory]
|
||||||
|
[InlineData("ep09_logo", null, "EP09_Logo.PNG")]
|
||||||
|
[InlineData("ep09_logo.bmp", "braniewo", "EP09_Logo.PNG")]
|
||||||
|
[InlineData(null, "braniewo", "Braniewo.JPG")]
|
||||||
|
[InlineData("brak", "brak", "Logo1.BMP")]
|
||||||
|
public void The_logo_is_found_whatever_the_case_of_its_name_and_extension(string? logo, string? scenery,
|
||||||
|
string onDisk) =>
|
||||||
|
Assert.Equal(Path.GetFullPath(Path.Combine("game", "Textures", "Logo", onDisk)),
|
||||||
|
Path.GetFullPath(LoadingScreen.FindSource(Logos(), "game", logo, scenery, new Random(1))!));
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void With_no_logo_folder_there_is_no_logo() =>
|
||||||
|
Assert.Null(LoadingScreen.FindSource(new InMemoryFileSystem(caseSensitive: true), "game", "x", "y",
|
||||||
|
new Random(1)));
|
||||||
|
}
|
||||||
@@ -21,6 +21,20 @@ public sealed class PhysicalFileSystemTests : IDisposable
|
|||||||
Assert.Equal(new[] { path }, Directory.GetFiles(_root));
|
Assert.Equal(new[] { path }, Directory.GetFiles(_root));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void A_pattern_lists_names_in_any_letter_case()
|
||||||
|
{
|
||||||
|
Directory.CreateDirectory(Path.Combine(_root, "PKP", "EP09"));
|
||||||
|
foreach (string name in new[] { "Braniewo.SCN", "kato.scn", "notes.txt", Path.Combine("PKP", "EP09", "EP09.FIZ"),
|
||||||
|
Path.Combine("PKP", "EP09", "ep09dumb.fiz") })
|
||||||
|
File.WriteAllText(Path.Combine(_root, name), "");
|
||||||
|
|
||||||
|
Assert.Equal(new[] { "Braniewo.SCN", "kato.scn" },
|
||||||
|
_files.GetFiles(_root, "*.scn").Select(Path.GetFileName).Order(StringComparer.Ordinal));
|
||||||
|
Assert.Equal(new[] { "EP09.FIZ", "ep09dumb.fiz" },
|
||||||
|
_files.GetFilesRecursive(_root, "*.fiz").Select(Path.GetFileName).Order(StringComparer.Ordinal));
|
||||||
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public void An_atomic_write_that_cannot_finish_leaves_what_stood_there()
|
public void An_atomic_write_that_cannot_finish_leaves_what_stood_there()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -65,6 +65,19 @@ public class PhysicsAndAssetsTests
|
|||||||
Assert.Equal(125, physics.VMax);
|
Assert.Equal(125, physics.VMax);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void An_include_named_in_other_case_is_followed()
|
||||||
|
{
|
||||||
|
var installation = new TestInstallation(new InMemoryFileSystem(caseSensitive: true)
|
||||||
|
.WithFile(Fiz("pkp", "ep07", "ep07"), "include Common.FIZ 84000 end")
|
||||||
|
.WithFile(TestInstallation.At("dynamic", "pkp", "ep07", "common.fiz"), "Param: M=(1) Vmax=125"));
|
||||||
|
|
||||||
|
var physics = installation.Physics.For("pkp/ep07/", "ep07")!;
|
||||||
|
|
||||||
|
Assert.Equal(84000, physics.Mass);
|
||||||
|
Assert.Equal(125, physics.VMax);
|
||||||
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public void A_dot_in_the_model_name_is_part_of_the_name()
|
public void A_dot_in_the_model_name_is_part_of_the_name()
|
||||||
{
|
{
|
||||||
@@ -202,4 +215,31 @@ public class PhysicsAndAssetsTests
|
|||||||
|
|
||||||
Assert.Empty(installation.MissingAssets.Scan(installation.Library.Vehicles));
|
Assert.Empty(installation.MissingAssets.Scan(installation.Library.Vehicles));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void A_livery_with_no_folder_is_looked_for_in_dynamic_itself()
|
||||||
|
{
|
||||||
|
var installation = new TestInstallation(new InMemoryFileSystem(caseSensitive: true)
|
||||||
|
.WithFile(TestInstallation.At("dynamic", "EP09.bmp"), "bitmap")
|
||||||
|
.WithFile(TestInstallation.At("dynamic", "ep09.e3d"), "model"));
|
||||||
|
var catalog = new StarterNG.Domain.Vehicles.VehicleCatalog(installation.MiniTextures);
|
||||||
|
catalog.Textures.Add(new StarterNG.Domain.Vehicles.VehicleTexture { Directory = "", Skinfile = "ep09", Model = "EP09" });
|
||||||
|
|
||||||
|
Assert.Empty(installation.MissingAssets.Scan(catalog));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void A_skin_and_model_on_disk_in_other_case_are_not_reported()
|
||||||
|
{
|
||||||
|
var files = new InMemoryFileSystem(caseSensitive: true)
|
||||||
|
.WithFile(TestInstallation.At("dynamic", "PKP", "EP09", "textures.txt"),
|
||||||
|
"EP09-014.mat=ep09.e3d,ep09")
|
||||||
|
.WithFile(TestInstallation.At("dynamic", "PKP", "EP09", "ep09-014.BMP"), "bitmap")
|
||||||
|
.WithFile(TestInstallation.At("dynamic", "PKP", "EP09", "EP09.E3D"), "model");
|
||||||
|
var installation = new TestInstallation(files);
|
||||||
|
installation.Vehicles.Load(installation.Library.Vehicles);
|
||||||
|
Assert.NotEmpty(installation.Library.Vehicles.Textures);
|
||||||
|
|
||||||
|
Assert.Empty(installation.MissingAssets.Scan(installation.Library.Vehicles));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -182,6 +182,20 @@ public class TimetableLocatorTests
|
|||||||
Assert.NotNull(new TimetableLocator(files).Resolve(scenery, "r1.txt"));
|
Assert.NotNull(new TimetableLocator(files).Resolve(scenery, "r1.txt"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Theory]
|
||||||
|
[InlineData(@"rozklady\tgs3657")]
|
||||||
|
[InlineData("ROZKLADY/TGS3657.TXT")]
|
||||||
|
public void A_timetable_named_in_other_case_or_with_backslashes_is_found_as_on_disk(string name)
|
||||||
|
{
|
||||||
|
var files = new InMemoryFileSystem(caseSensitive: true)
|
||||||
|
.WithFile(TestInstallation.At("scenery", "Braniewo.scn"), "//$n Braniewo")
|
||||||
|
.WithFile(TestInstallation.At("scenery", "Rozklady", "TGS3657.txt"), "rozkład");
|
||||||
|
var scenery = Assert.Single(new TestInstallation(files).Sceneries.LoadAll());
|
||||||
|
|
||||||
|
Assert.Equal(TestInstallation.At("scenery", "Rozklady", "TGS3657.txt"),
|
||||||
|
new TimetableLocator(files).Resolve(scenery, name));
|
||||||
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public void The_formats_none_and_a_missing_file_both_resolve_to_nothing()
|
public void The_formats_none_and_a_missing_file_both_resolve_to_nothing()
|
||||||
{
|
{
|
||||||
@@ -195,3 +209,26 @@ public class TimetableLocatorTests
|
|||||||
Assert.Null(locator.Resolve(scenery, null));
|
Assert.Null(locator.Resolve(scenery, null));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class AttachmentLocatorTests
|
||||||
|
{
|
||||||
|
[Theory]
|
||||||
|
[InlineData(@"scenery\Braniewo\opis.PDF")]
|
||||||
|
[InlineData("SCENERY/braniewo/Opis.pdf")]
|
||||||
|
public void An_attachment_named_in_other_case_is_found_as_on_disk(string named)
|
||||||
|
{
|
||||||
|
var installation = new TestInstallation(new InMemoryFileSystem(caseSensitive: true)
|
||||||
|
.WithFile(TestInstallation.At("scenery", "Braniewo", "Opis.pdf"), "%PDF"));
|
||||||
|
|
||||||
|
Assert.Equal(TestInstallation.At("scenery", "Braniewo", "Opis.pdf"),
|
||||||
|
new AttachmentLocator(installation.Files, installation.Paths)
|
||||||
|
.Resolve(new SceneryAttachment { FilePath = named }));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Theory]
|
||||||
|
[InlineData("scenery/brak.pdf")]
|
||||||
|
[InlineData("")]
|
||||||
|
public void An_attachment_that_is_not_there_is_not_found(string named) =>
|
||||||
|
Assert.Null(new AttachmentLocator(new InMemoryFileSystem(caseSensitive: true), new TestInstallation().Paths)
|
||||||
|
.Resolve(new SceneryAttachment { FilePath = named }));
|
||||||
|
}
|
||||||
|
|||||||
@@ -89,6 +89,23 @@ public class SceneryRepositoryTests
|
|||||||
Assert.Equal(Path.Combine("game", "scenery", "images", "kato.jpg"), image);
|
Assert.Equal(Path.Combine("game", "scenery", "images", "kato.jpg"), image);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Theory]
|
||||||
|
[InlineData("calkowo_v2_kopalniaA.jpg", "game/scenery/images/calkowo_v2_kopalniaA.jpg")]
|
||||||
|
[InlineData(@"Images\Calkowo_V2_KopalniaA.JPG", "game/scenery/images/calkowo_v2_kopalniaA.jpg")]
|
||||||
|
[InlineData("CALKOWO_V2.JPG", "game/scenery/Calkowo_v2.jpg")]
|
||||||
|
public void The_preview_image_is_found_whatever_the_case_it_is_named_in(string named, string onDisk)
|
||||||
|
{
|
||||||
|
var files = new InMemoryFileSystem(caseSensitive: true)
|
||||||
|
.WithFile("game/scenery/calkowo.scn", "//$i " + named)
|
||||||
|
.WithFile("game/scenery/images/calkowo_v2_kopalniaA.jpg", "binary")
|
||||||
|
.WithFile("game/scenery/Calkowo_v2.jpg", "binary");
|
||||||
|
var scenery = Assert.Single(Build(files, out _).LoadAll());
|
||||||
|
|
||||||
|
string? image = new SceneryImageLocator(files).Resolve(scenery);
|
||||||
|
|
||||||
|
Assert.Equal(Path.GetFullPath(onDisk), Path.GetFullPath(image!));
|
||||||
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public void A_scenery_without_an_image_directive_resolves_to_nothing()
|
public void A_scenery_without_an_image_directive_resolves_to_nothing()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -273,7 +273,7 @@ public class ScenerySyntaxTests
|
|||||||
include koniec.scm
|
include koniec.scm
|
||||||
""";
|
""";
|
||||||
|
|
||||||
var scenery = TestScenery.Parser().Parse("scenery/x.scn", scn, _ => new IncludeLookup(true));
|
var scenery = TestScenery.Parser().Parse("scenery/x.scn", scn, _ => true);
|
||||||
|
|
||||||
Assert.Empty(scenery.Faults);
|
Assert.Empty(scenery.Faults);
|
||||||
Assert.Equal("td/rozklad", Assert.Single(scenery.Trainsets).Name);
|
Assert.Equal("td/rozklad", Assert.Single(scenery.Trainsets).Name);
|
||||||
@@ -326,7 +326,7 @@ public class ScenerySyntaxTests
|
|||||||
endoptional
|
endoptional
|
||||||
""";
|
""";
|
||||||
|
|
||||||
var faults = TestScenery.Parser().Parse("scenery/x.scn", scn, name => new IncludeLookup(name is "tory.scm" or "budynek.inc")).Faults;
|
var faults = TestScenery.Parser().Parse("scenery/x.scn", scn, name => name is "tory.scm" or "budynek.inc").Faults;
|
||||||
|
|
||||||
Assert.Equal((SceneryFaultKind.MissingInclude, "x.scn", 2, null, "brak.scm"), Seen(Assert.Single(faults)));
|
Assert.Equal((SceneryFaultKind.MissingInclude, "x.scn", 2, null, "brak.scm"), Seen(Assert.Single(faults)));
|
||||||
}
|
}
|
||||||
@@ -347,9 +347,9 @@ public class ScenerySyntaxTests
|
|||||||
}
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public void An_include_on_disk_only_in_other_letter_case_is_what_linux_misses()
|
public void An_include_on_disk_in_other_letter_case_is_no_fault()
|
||||||
{
|
{
|
||||||
// The simulator folds the name to lower case and opens it so.
|
// The simulator finds the file whatever the case of its letters, on Linux too.
|
||||||
var files = new InMemoryFileSystem(caseSensitive: true)
|
var files = new InMemoryFileSystem(caseSensitive: true)
|
||||||
.WithLegacyFile("game/scenery/braniewo_szeroki.scn",
|
.WithLegacyFile("game/scenery/braniewo_szeroki.scn",
|
||||||
"include braniewo/base.ctr end\ninclude Braniewo/Tory.SCM end\n")
|
"include braniewo/base.ctr end\ninclude Braniewo/Tory.SCM end\n")
|
||||||
@@ -357,21 +357,20 @@ public class ScenerySyntaxTests
|
|||||||
.WithFile("game/scenery/braniewo/tory.scm", "");
|
.WithFile("game/scenery/braniewo/tory.scm", "");
|
||||||
var repository = TestScenery.Repository(files);
|
var repository = TestScenery.Repository(files);
|
||||||
|
|
||||||
var faults = repository.Load("game/scenery/braniewo_szeroki.scn")!.Faults;
|
Assert.Empty(repository.Load("game/scenery/braniewo_szeroki.scn")!.Faults);
|
||||||
|
|
||||||
Assert.Equal((SceneryFaultKind.IncludeLetterCase, "braniewo_szeroki.scn", 1, "Braniewo/Base.ctr", "braniewo/base.ctr"),
|
|
||||||
Seen(Assert.Single(faults)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[Theory]
|
[Theory]
|
||||||
[InlineData(true)]
|
[InlineData(null)]
|
||||||
[InlineData(false)]
|
[InlineData("lk2_sandbox.sbt")]
|
||||||
public void A_missing_terrain_file_is_no_fault_while_the_scenery_has_its_own_sbt(bool sbt)
|
[InlineData("Lk2_Sandbox.SBT")]
|
||||||
|
public void A_missing_terrain_file_is_no_fault_while_the_scenery_has_its_own_sbt(string? sbtOnDisk)
|
||||||
{
|
{
|
||||||
|
bool sbt = sbtOnDisk is not null;
|
||||||
var files = new InMemoryFileSystem(caseSensitive: true)
|
var files = new InMemoryFileSystem(caseSensitive: true)
|
||||||
.WithLegacyFile("game/scenery/Lk2_Sandbox.scn", "include nmt/nmt100_mazowieckie_ter.scm end\nFirstInit\n");
|
.WithLegacyFile("game/scenery/Lk2_Sandbox.scn", "include nmt/nmt100_mazowieckie_ter.scm end\nFirstInit\n");
|
||||||
if (sbt)
|
if (sbt)
|
||||||
files.WithFile("game/scenery/lk2_sandbox.sbt", "EU07");
|
files.WithFile("game/scenery/" + sbtOnDisk, "EU07");
|
||||||
var repository = TestScenery.Repository(files);
|
var repository = TestScenery.Repository(files);
|
||||||
|
|
||||||
var scenery = repository.Load("game/scenery/Lk2_Sandbox.scn")!;
|
var scenery = repository.Load("game/scenery/Lk2_Sandbox.scn")!;
|
||||||
|
|||||||
@@ -39,6 +39,24 @@ public class SceneryTranslationsTests
|
|||||||
Assert.Equal("Polski", scenery.LocalizedDescription(translations));
|
Assert.Equal("Polski", scenery.LocalizedDescription(translations));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void The_tables_are_found_whatever_the_case_of_their_names()
|
||||||
|
{
|
||||||
|
var files = new InMemoryFileSystem(caseSensitive: true)
|
||||||
|
.WithFile(TestInstallation.At("scenery", "Braniewo.scn"), "//$d @brief")
|
||||||
|
.WithFile(Path.Combine(Path.GetFullPath(TestInstallation.At("scenery")), "I18N", "braniewo_en.json"),
|
||||||
|
"""{ "brief": "English" }""")
|
||||||
|
.WithFile(Path.Combine(Path.GetFullPath(TestInstallation.At("scenery")), "I18N", "BRANIEWO_PL.json"),
|
||||||
|
"""{ "brief": "Polski" }""");
|
||||||
|
var installation = new TestInstallation(files);
|
||||||
|
var scenery = Assert.Single(installation.Sceneries.LoadAll());
|
||||||
|
var translations = new SceneryTranslations(files, installation.Log);
|
||||||
|
|
||||||
|
translations.LoadFor(scenery, "Polski");
|
||||||
|
|
||||||
|
Assert.Equal("Polski", scenery.LocalizedDescription(translations));
|
||||||
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public void Literal_text_and_unknown_keys_are_left_alone()
|
public void Literal_text_and_unknown_keys_are_left_alone()
|
||||||
{
|
{
|
||||||
|
|||||||
45
StarterNG.Tests/SoftwareRenderTests.cs
Normal file
45
StarterNG.Tests/SoftwareRenderTests.cs
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
using Avalonia;
|
||||||
|
using StarterNG.Infrastructure;
|
||||||
|
|
||||||
|
namespace StarterNG.Tests;
|
||||||
|
|
||||||
|
public class SoftwareRenderTests
|
||||||
|
{
|
||||||
|
[Theory]
|
||||||
|
[InlineData("--software-render")]
|
||||||
|
[InlineData("--Software-Render")]
|
||||||
|
public void The_switch_asks_for_it_in_any_case(string arg)
|
||||||
|
{
|
||||||
|
Assert.True(SoftwareRender.AskedIn(new[] { "--other", arg }));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Without_the_switch_the_graphics_card_draws()
|
||||||
|
{
|
||||||
|
Assert.False(SoftwareRender.AskedIn(Array.Empty<string>()));
|
||||||
|
Assert.False(SoftwareRender.AskedIn(new[] { "--software" }));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Windows_draws_on_the_processor_into_a_plain_window_surface()
|
||||||
|
{
|
||||||
|
var options = SoftwareRender.Win32Options;
|
||||||
|
|
||||||
|
Assert.Equal(new[] { Win32RenderingMode.Software }, options.RenderingMode);
|
||||||
|
Assert.Equal(new[] { Win32CompositionMode.RedirectionSurface }, options.CompositionMode);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void X11_draws_on_the_processor()
|
||||||
|
{
|
||||||
|
Assert.Equal(new[] { X11RenderingMode.Software }, SoftwareRender.X11Options.RenderingMode);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Both_platforms_options_go_to_the_same_builder()
|
||||||
|
{
|
||||||
|
var builder = AppBuilder.Configure<Avalonia.Application>();
|
||||||
|
|
||||||
|
Assert.Same(builder, SoftwareRender.ApplyTo(builder));
|
||||||
|
}
|
||||||
|
}
|
||||||
98
StarterNG.Tests/SystemGraphicsLibrariesTests.cs
Normal file
98
StarterNG.Tests/SystemGraphicsLibrariesTests.cs
Normal file
@@ -0,0 +1,98 @@
|
|||||||
|
using StarterNG.Infrastructure;
|
||||||
|
|
||||||
|
namespace StarterNG.Tests;
|
||||||
|
|
||||||
|
public class SystemGraphicsLibrariesTests
|
||||||
|
{
|
||||||
|
private const string System32 = @"C:\Windows\System32";
|
||||||
|
private const string Game = @"E:\SteamLibrary\steamapps\common\MaSzyna";
|
||||||
|
|
||||||
|
private static readonly IntPtr Dxgi = new(0x1000);
|
||||||
|
private static readonly IntPtr D3d11 = new(0x2000);
|
||||||
|
|
||||||
|
private static SystemGraphicsLibraries Take(Func<string, bool> beside, Dictionary<string, IntPtr> system)
|
||||||
|
{
|
||||||
|
return SystemGraphicsLibraries.Take(System32, Game, beside, Load);
|
||||||
|
|
||||||
|
bool Load(string path, out IntPtr handle)
|
||||||
|
{
|
||||||
|
handle = system.GetValueOrDefault(Path.GetFileName(path));
|
||||||
|
return handle != IntPtr.Zero;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static SystemGraphicsLibraries WithDxgiAndD3d11(Func<string, bool> beside) =>
|
||||||
|
Take(beside, new Dictionary<string, IntPtr> { ["dxgi.dll"] = Dxgi, ["d3d11.dll"] = D3d11 });
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void An_import_by_name_gets_the_system_library_with_or_without_its_extension()
|
||||||
|
{
|
||||||
|
var taken = WithDxgiAndD3d11(_ => false);
|
||||||
|
|
||||||
|
Assert.Equal(Dxgi, taken.Resolve("dxgi"));
|
||||||
|
Assert.Equal(Dxgi, taken.Resolve("dxgi.dll"));
|
||||||
|
Assert.Equal(D3d11, taken.Resolve("D3D11.DLL"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Other_libraries_and_ones_the_system_lacks_are_left_to_the_usual_search()
|
||||||
|
{
|
||||||
|
var taken = WithDxgiAndD3d11(_ => false);
|
||||||
|
|
||||||
|
Assert.Equal(IntPtr.Zero, taken.Resolve("user32.dll"));
|
||||||
|
Assert.Equal(IntPtr.Zero, taken.Resolve("opengl32"));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void They_are_loaded_from_the_system_folder_dxgi_first()
|
||||||
|
{
|
||||||
|
var asked = new List<string>();
|
||||||
|
SystemGraphicsLibraries.Take(System32, Game, _ => false, Load);
|
||||||
|
|
||||||
|
Assert.Equal(SystemGraphicsLibraries.Names.Select(n => Path.Combine(System32, n + ".dll")), asked);
|
||||||
|
Assert.Equal("dxgi", SystemGraphicsLibraries.Names[0]);
|
||||||
|
|
||||||
|
bool Load(string path, out IntPtr handle)
|
||||||
|
{
|
||||||
|
asked.Add(path);
|
||||||
|
handle = IntPtr.Zero;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void A_wrapper_beside_the_starter_is_noted()
|
||||||
|
{
|
||||||
|
var taken = WithDxgiAndD3d11(path => path == Path.Combine(Game, "dxgi.dll"));
|
||||||
|
|
||||||
|
Assert.Equal(new[] { "dxgi.dll" }, taken.Shadowed);
|
||||||
|
Assert.Contains("dxgi.dll", taken.Note);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void With_nothing_beside_the_starter_there_is_nothing_to_note()
|
||||||
|
{
|
||||||
|
var taken = WithDxgiAndD3d11(_ => false);
|
||||||
|
|
||||||
|
Assert.Empty(taken.Shadowed);
|
||||||
|
Assert.Null(taken.Note);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void Only_windows_has_system_libraries_to_take()
|
||||||
|
{
|
||||||
|
var taken = SystemGraphicsLibraries.TakeOnWindows();
|
||||||
|
|
||||||
|
Assert.Equal(OperatingSystem.IsWindows(), taken is not null);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void An_assembly_with_a_resolver_of_its_own_keeps_it()
|
||||||
|
{
|
||||||
|
var taken = WithDxgiAndD3d11(_ => false);
|
||||||
|
var assembly = typeof(SystemGraphicsLibrariesTests).Assembly;
|
||||||
|
|
||||||
|
Assert.True(taken.ServeTo(assembly));
|
||||||
|
Assert.False(taken.ServeTo(assembly));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -130,6 +130,17 @@ public class TapeLaunchTests
|
|||||||
Assert.Null(new StarterNG.Infrastructure.Sceneries.TimetableLocator(new InMemoryFileSystem())
|
Assert.Null(new StarterNG.Infrastructure.Sceneries.TimetableLocator(new InMemoryFileSystem())
|
||||||
.TrainNumber(new StarterNG.Domain.Sceneries.Scenery(TestInstallation.At("scenery", "td.scn"), ""), name));
|
.TrainNumber(new StarterNG.Domain.Sceneries.Scenery(TestInstallation.At("scenery", "td.scn"), ""), name));
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void The_train_number_comes_from_a_timetable_named_in_other_case_with_backslashes()
|
||||||
|
{
|
||||||
|
var files = new InMemoryFileSystem(caseSensitive: true)
|
||||||
|
.WithFile(TestInstallation.At("scenery", "Baltyk", "EIE1531.txt"), "[ Rodzaj i numer pociagu | EIE1531 ]\r\n");
|
||||||
|
|
||||||
|
Assert.Equal("EIE1531", new StarterNG.Infrastructure.Sceneries.TimetableLocator(files)
|
||||||
|
.TrainNumber(new StarterNG.Domain.Sceneries.Scenery(TestInstallation.At("scenery", "td.scn"), ""),
|
||||||
|
@"baltyk\eie1531"));
|
||||||
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public void A_timetable_that_is_not_there_gives_no_train_number() =>
|
public void A_timetable_that_is_not_there_gives_no_train_number() =>
|
||||||
Assert.Null(new StarterNG.Infrastructure.Sceneries.TimetableLocator(new InMemoryFileSystem())
|
Assert.Null(new StarterNG.Infrastructure.Sceneries.TimetableLocator(new InMemoryFileSystem())
|
||||||
|
|||||||
22
StarterNG.Tests/TextureFolderTests.cs
Normal file
22
StarterNG.Tests/TextureFolderTests.cs
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
using StarterNG.Domain.Vehicles;
|
||||||
|
using StarterNG.Infrastructure.Vehicles;
|
||||||
|
using StarterNG.Tests.Fakes;
|
||||||
|
|
||||||
|
namespace StarterNG.Tests;
|
||||||
|
|
||||||
|
public class TextureFolderTests
|
||||||
|
{
|
||||||
|
private static readonly TestInstallation Installation = new(new InMemoryFileSystem(caseSensitive: true)
|
||||||
|
.WithFile("game/dynamic/PKP/EP09_v1/textures.txt", "")
|
||||||
|
.WithDirectory("game/Other/Folder"));
|
||||||
|
|
||||||
|
[Theory]
|
||||||
|
[InlineData("pkp/ep09_v1/", "dynamic/PKP/EP09_v1")]
|
||||||
|
[InlineData(@"PKP\EP09_V1", "dynamic/PKP/EP09_v1")]
|
||||||
|
[InlineData("other/folder/", "Other/Folder")]
|
||||||
|
[InlineData("pkp/brak/", "pkp/brak")]
|
||||||
|
public void A_liverys_folder_is_found_as_it_is_named_on_disk(string named, string onDisk) =>
|
||||||
|
Assert.Equal(Path.GetFullPath(Path.Combine("game", onDisk)),
|
||||||
|
Path.GetFullPath(TextureFolder.Of(Installation.Files, Installation.Paths,
|
||||||
|
new VehicleTexture { Directory = named })));
|
||||||
|
}
|
||||||
@@ -207,8 +207,12 @@ public partial class App : Avalonia.Application
|
|||||||
if (check.ExecutableMissing())
|
if (check.ExecutableMissing())
|
||||||
await main.OfferExecutablePickAsync();
|
await main.OfferExecutablePickAsync();
|
||||||
|
|
||||||
if (CpuFeatures.LacksAvx2 && AppServices.Current.Settings.CpuNotice)
|
// A build without AVX2 in the folder is started instead, and needs no notice.
|
||||||
await main.ShowCpuNoticeAsync();
|
var services = AppServices.Current;
|
||||||
|
if (services.Settings.CpuNotice
|
||||||
|
&& services.Executables.Resolve(services.Settings, out _) is var executable
|
||||||
|
&& services.Executables.WillNotRunHere(executable))
|
||||||
|
await main.ShowCpuNoticeAsync(executable);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,9 @@ namespace StarterNG.Application.Abstractions;
|
|||||||
|
|
||||||
public interface IFileSystem
|
public interface IFileSystem
|
||||||
{
|
{
|
||||||
|
/// <summary>Whether a name finds its file whatever the case of its letters, as on Windows and macOS.</summary>
|
||||||
|
bool IgnoresCase { get; }
|
||||||
|
|
||||||
bool FileExists(string path);
|
bool FileExists(string path);
|
||||||
|
|
||||||
bool DirectoryExists(string path);
|
bool DirectoryExists(string path);
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ public sealed class AppServices
|
|||||||
var missingAssets = new MissingAssetScanner(files, paths);
|
var missingAssets = new MissingAssetScanner(files, paths);
|
||||||
SceneryTexts = new SceneryTranslations(files, log);
|
SceneryTexts = new SceneryTranslations(files, log);
|
||||||
Timetables = new TimetableLocator(files);
|
Timetables = new TimetableLocator(files);
|
||||||
|
Attachments = new AttachmentLocator(files, paths);
|
||||||
LoadWeights = new LoadWeightsRepository(files, paths, log);
|
LoadWeights = new LoadWeightsRepository(files, paths, log);
|
||||||
Library = new GameLibrary(Vehicles, Sceneries, MiniTextures, Physics, log);
|
Library = new GameLibrary(Vehicles, Sceneries, MiniTextures, Physics, log);
|
||||||
State = new AppState();
|
State = new AppState();
|
||||||
@@ -122,6 +123,8 @@ public sealed class AppServices
|
|||||||
|
|
||||||
public TimetableLocator Timetables { get; }
|
public TimetableLocator Timetables { get; }
|
||||||
|
|
||||||
|
public AttachmentLocator Attachments { get; }
|
||||||
|
|
||||||
public LoadWeightsRepository LoadWeights { get; }
|
public LoadWeightsRepository LoadWeights { get; }
|
||||||
|
|
||||||
public GameLibrary Library { get; }
|
public GameLibrary Library { get; }
|
||||||
|
|||||||
@@ -61,13 +61,6 @@ public enum SceneryFaultKind
|
|||||||
/// <summary>An include whose file is not there; <see cref="SceneryFault.Token"/> names it.</summary>
|
/// <summary>An include whose file is not there; <see cref="SceneryFault.Token"/> names it.</summary>
|
||||||
MissingInclude,
|
MissingInclude,
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// An include whose file is there only under a name in other letter case: the
|
|
||||||
/// simulator looks for it in lower case, which on Linux misses it. The
|
|
||||||
/// <see cref="SceneryFault.Subject"/> holds the name on disk.
|
|
||||||
/// </summary>
|
|
||||||
IncludeLetterCase,
|
|
||||||
|
|
||||||
/// <summary>An include with no <c>end</c>, which swallows what follows it.</summary>
|
/// <summary>An include with no <c>end</c>, which swallows what follows it.</summary>
|
||||||
IncludeNotClosed,
|
IncludeNotClosed,
|
||||||
|
|
||||||
|
|||||||
@@ -5,12 +5,6 @@ using System.Linq;
|
|||||||
|
|
||||||
namespace StarterNG.Domain.Sceneries;
|
namespace StarterNG.Domain.Sceneries;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// What the simulator makes of an include: whether it opens the file - and when
|
|
||||||
/// it does not, the file that is there under a name differing only in letter case.
|
|
||||||
/// </summary>
|
|
||||||
public readonly record struct IncludeLookup(bool Opens, string? OnDisk = null);
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Goes through a scenery's text for the parts the starter reads - trainsets,
|
/// Goes through a scenery's text for the parts the starter reads - trainsets,
|
||||||
/// vehicles, includes - finding where each trainset and loose vehicle is, and
|
/// vehicles, includes - finding where each trainset and loose vehicle is, and
|
||||||
@@ -35,17 +29,17 @@ public static class ScenerySyntax
|
|||||||
|
|
||||||
/// <param name="text">The scenery's text, its includes put in place.</param>
|
/// <param name="text">The scenery's text, its includes put in place.</param>
|
||||||
/// <param name="file">The scenery's file name, for faults in its own text.</param>
|
/// <param name="file">The scenery's file name, for faults in its own text.</param>
|
||||||
/// <param name="findInclude">
|
/// <param name="opensInclude">
|
||||||
/// What the simulator makes of an include, named as the include names it; null
|
/// Whether the simulator opens an include, named as the include names it; null
|
||||||
/// leaves includes unchecked.
|
/// leaves includes unchecked.
|
||||||
/// </param>
|
/// </param>
|
||||||
public static Result Scan(string text, string file, Func<string, IncludeLookup>? findInclude = null)
|
public static Result Scan(string text, string file, Func<string, bool>? opensInclude = null)
|
||||||
{
|
{
|
||||||
string code = SceneryCode.Mask(text, out int unclosed);
|
string code = SceneryCode.Mask(text, out int unclosed);
|
||||||
var tokens = SceneryCode.Tokens(code);
|
var tokens = SceneryCode.Tokens(code);
|
||||||
var lines = new SceneryLines(text, file);
|
var lines = new SceneryLines(text, file);
|
||||||
|
|
||||||
var simulator = new Reading(tokens, lines, findInclude, asSimulator: true);
|
var simulator = new Reading(tokens, lines, opensInclude, asSimulator: true);
|
||||||
simulator.Run();
|
simulator.Run();
|
||||||
var author = new Reading(tokens, lines, null, asSimulator: false);
|
var author = new Reading(tokens, lines, null, asSimulator: false);
|
||||||
author.Run();
|
author.Run();
|
||||||
@@ -116,7 +110,7 @@ public static class ScenerySyntax
|
|||||||
}
|
}
|
||||||
|
|
||||||
private sealed class Reading(
|
private sealed class Reading(
|
||||||
List<SceneryCode.Token> tokens, SceneryLines lines, Func<string, IncludeLookup>? findInclude, bool asSimulator)
|
List<SceneryCode.Token> tokens, SceneryLines lines, Func<string, bool>? opensInclude, bool asSimulator)
|
||||||
{
|
{
|
||||||
public readonly List<(int Start, int End, string Name)> Trainsets = new();
|
public readonly List<(int Start, int End, string Name)> Trainsets = new();
|
||||||
public readonly List<(int, int)> Loose = new();
|
public readonly List<(int, int)> Loose = new();
|
||||||
@@ -375,13 +369,8 @@ public static class ScenerySyntax
|
|||||||
return stop < tokens.Count && tokens[stop].Is("end") ? stop : stop - 1;
|
return stop < tokens.Count && tokens[stop].Is("end") ? stop : stop - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (findInclude is not null && Plain(name) && findInclude(name) is { Opens: false } lookup)
|
if (opensInclude is not null && Plain(name) && !opensInclude(name))
|
||||||
{
|
Fault(SceneryFaultKind.MissingInclude, token.Index, token: name);
|
||||||
if (lookup.OnDisk is { } onDisk)
|
|
||||||
Fault(SceneryFaultKind.IncludeLetterCase, token.Index, onDisk, name);
|
|
||||||
else
|
|
||||||
Fault(SceneryFaultKind.MissingInclude, token.Index, token: name);
|
|
||||||
}
|
|
||||||
|
|
||||||
// The simulator takes its parameters up to the word "end", written just so,
|
// The simulator takes its parameters up to the word "end", written just so,
|
||||||
// whatever comes before it.
|
// whatever comes before it.
|
||||||
|
|||||||
@@ -10,6 +10,9 @@ public sealed class PhysicalFileSystem : IFileSystem
|
|||||||
{
|
{
|
||||||
public const string TempSuffix = ".starter.tmp";
|
public const string TempSuffix = ".starter.tmp";
|
||||||
|
|
||||||
|
// Their disks as they come; a Linux one tells case apart.
|
||||||
|
public bool IgnoresCase { get; } = OperatingSystem.IsWindows() || OperatingSystem.IsMacOS();
|
||||||
|
|
||||||
public bool FileExists(string path) => File.Exists(path);
|
public bool FileExists(string path) => File.Exists(path);
|
||||||
|
|
||||||
public bool DirectoryExists(string path) => Directory.Exists(path);
|
public bool DirectoryExists(string path) => Directory.Exists(path);
|
||||||
@@ -88,8 +91,18 @@ public sealed class PhysicalFileSystem : IFileSystem
|
|||||||
public void CopyFile(string sourcePath, string destinationPath, bool overwrite) =>
|
public void CopyFile(string sourcePath, string destinationPath, bool overwrite) =>
|
||||||
File.Copy(sourcePath, destinationPath, overwrite);
|
File.Copy(sourcePath, destinationPath, overwrite);
|
||||||
|
|
||||||
|
// The pattern matches names in any letter case, as on Windows: the game's data,
|
||||||
|
// made there, has X.SCN as well as x.scn.
|
||||||
public IReadOnlyList<string> GetFiles(string path, string searchPattern = "*") =>
|
public IReadOnlyList<string> GetFiles(string path, string searchPattern = "*") =>
|
||||||
Directory.Exists(path) ? Directory.GetFiles(path, searchPattern) : Array.Empty<string>();
|
Directory.Exists(path)
|
||||||
|
? Directory.GetFiles(path, searchPattern, new EnumerationOptions
|
||||||
|
{
|
||||||
|
IgnoreInaccessible = false,
|
||||||
|
AttributesToSkip = 0,
|
||||||
|
MatchType = MatchType.Win32,
|
||||||
|
MatchCasing = MatchCasing.CaseInsensitive
|
||||||
|
})
|
||||||
|
: Array.Empty<string>();
|
||||||
|
|
||||||
// A folder it may not enter costs what is in it, not the whole listing.
|
// A folder it may not enter costs what is in it, not the whole listing.
|
||||||
public IReadOnlyList<string> GetFilesRecursive(string path, string searchPattern) =>
|
public IReadOnlyList<string> GetFilesRecursive(string path, string searchPattern) =>
|
||||||
@@ -99,7 +112,8 @@ public sealed class PhysicalFileSystem : IFileSystem
|
|||||||
RecurseSubdirectories = true,
|
RecurseSubdirectories = true,
|
||||||
IgnoreInaccessible = true,
|
IgnoreInaccessible = true,
|
||||||
AttributesToSkip = 0,
|
AttributesToSkip = 0,
|
||||||
MatchType = MatchType.Win32
|
MatchType = MatchType.Win32,
|
||||||
|
MatchCasing = MatchCasing.CaseInsensitive
|
||||||
})
|
})
|
||||||
: Array.Empty<string>();
|
: Array.Empty<string>();
|
||||||
|
|
||||||
|
|||||||
132
StarterNG/Infrastructure/CaseInsensitivePaths.cs
Normal file
132
StarterNG/Infrastructure/CaseInsensitivePaths.cs
Normal file
@@ -0,0 +1,132 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Concurrent;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using StarterNG.Application.Abstractions;
|
||||||
|
|
||||||
|
namespace StarterNG.Infrastructure;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Finds a file or folder of the game's data by a name whose letters may stand in
|
||||||
|
/// another case than on disk, as Windows, Wine and the simulator find it, and gives
|
||||||
|
/// the name as the disk has it. The data is made on Windows: its names and the
|
||||||
|
/// names written in it seldom agree letter for letter, which on Linux matters.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class CaseInsensitivePaths
|
||||||
|
{
|
||||||
|
private readonly IFileSystem _files;
|
||||||
|
private readonly Func<(string Folder, bool Files), ILookup<string, string>> _list;
|
||||||
|
|
||||||
|
/// <summary>Each folder's files and folders by name, listed once until <see cref="Forget"/>; null lists every time.</summary>
|
||||||
|
private readonly ConcurrentDictionary<(string Folder, bool Files), ILookup<string, string>>? _listings;
|
||||||
|
|
||||||
|
/// <param name="keepListings">
|
||||||
|
/// Lists each folder once, for many names looked up in data that stays as it is
|
||||||
|
/// meanwhile, until <see cref="Forget"/>.
|
||||||
|
/// </param>
|
||||||
|
public CaseInsensitivePaths(IFileSystem files, bool keepListings = false)
|
||||||
|
{
|
||||||
|
_files = files;
|
||||||
|
_list = List;
|
||||||
|
if (keepListings)
|
||||||
|
_listings = new ConcurrentDictionary<(string, bool), ILookup<string, string>>();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Lets the next lookups list the folders again.</summary>
|
||||||
|
public void Forget() => _listings?.Clear();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The file named so under <paramref name="folder"/> as it is named on disk, relative
|
||||||
|
/// to the folder with forward slashes; null when nothing there answers to it. A name
|
||||||
|
/// written with its letters as on disk wins over one differing only in their case;
|
||||||
|
/// a disk that does not tell case apart gives it back as written.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="name">
|
||||||
|
/// A name under the folder, with either slash, joined to it as the simulator joins
|
||||||
|
/// it: a slash ahead of it counts for nothing.
|
||||||
|
/// </param>
|
||||||
|
/// <param name="directory">Looks for a folder instead of a file.</param>
|
||||||
|
public string? Resolve(string folder, string name, bool directory = false)
|
||||||
|
{
|
||||||
|
string[] parts = name.Replace('\\', '/').Split('/', StringSplitOptions.RemoveEmptyEntries);
|
||||||
|
if (parts.Length == 0)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
string exact = string.Join('/', parts);
|
||||||
|
string whole = Path.Combine(folder, exact);
|
||||||
|
if (directory ? _files.DirectoryExists(whole) : _files.FileExists(whole))
|
||||||
|
return exact;
|
||||||
|
// Where case does not matter, missed as written is missed in any case.
|
||||||
|
if (_files.IgnoresCase)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
var found = new string[parts.Length];
|
||||||
|
return Walk(folder, parts, 0, directory, found) ? string.Join('/', found) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The full path of the file named so, its letters as on disk; null when there is
|
||||||
|
/// none. A name given in full is looked up from its own root, any other under
|
||||||
|
/// <paramref name="folder"/> as <see cref="Resolve"/> does.
|
||||||
|
/// </summary>
|
||||||
|
public string? Find(string folder, string name, bool directory = false)
|
||||||
|
{
|
||||||
|
if (Path.IsPathFullyQualified(name))
|
||||||
|
{
|
||||||
|
folder = Path.GetPathRoot(name)!;
|
||||||
|
name = name[folder.Length..];
|
||||||
|
}
|
||||||
|
|
||||||
|
return Resolve(folder, name, directory) is { } found
|
||||||
|
? Path.Combine(folder, found.Replace('/', Path.DirectorySeparatorChar))
|
||||||
|
: null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Finds the parts from <paramref name="at"/> on under <paramref name="current"/>. Of
|
||||||
|
/// folders named alike in other case - two copies of the data on Linux - each is
|
||||||
|
/// tried, the one written as on disk first.
|
||||||
|
/// </summary>
|
||||||
|
private bool Walk(string current, string[] parts, int at, bool directory, string[] found)
|
||||||
|
{
|
||||||
|
if (at == parts.Length)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
string part = parts[at];
|
||||||
|
if (part is "." or "..")
|
||||||
|
{
|
||||||
|
found[at] = part;
|
||||||
|
return Walk(Path.Combine(current, part), parts, at + 1, directory, found);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool last = at == parts.Length - 1;
|
||||||
|
var matches = Listing(current, files: last && !directory)[part]
|
||||||
|
.OrderBy(entry => string.Equals(Path.GetFileName(entry), part, StringComparison.Ordinal) ? 0 : 1);
|
||||||
|
foreach (string match in matches)
|
||||||
|
{
|
||||||
|
found[at] = Path.GetFileName(match);
|
||||||
|
if (Walk(match, parts, at + 1, directory, found))
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ILookup<string, string> Listing(string folder, bool files) =>
|
||||||
|
_listings is null ? List((folder, files)) : _listings.GetOrAdd((folder, files), _list);
|
||||||
|
|
||||||
|
// A folder that cannot be listed holds nothing to be found.
|
||||||
|
private ILookup<string, string> List((string Folder, bool Files) key)
|
||||||
|
{
|
||||||
|
var entries = Array.Empty<string>();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (_files.DirectoryExists(key.Folder))
|
||||||
|
entries = (key.Files ? _files.GetFiles(key.Folder) : _files.GetDirectories(key.Folder)).ToArray();
|
||||||
|
}
|
||||||
|
catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
|
||||||
|
{
|
||||||
|
// Nothing listed, nothing found.
|
||||||
|
}
|
||||||
|
return entries.ToLookup(entry => Path.GetFileName(entry), StringComparer.OrdinalIgnoreCase);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,16 +5,21 @@ using System.Runtime.InteropServices;
|
|||||||
using Avalonia;
|
using Avalonia;
|
||||||
using Avalonia.Media.Imaging;
|
using Avalonia.Media.Imaging;
|
||||||
using Avalonia.Platform;
|
using Avalonia.Platform;
|
||||||
|
using StarterNG.Application.Abstractions;
|
||||||
|
using StarterNG.Infrastructure.Adapters;
|
||||||
|
|
||||||
namespace StarterNG.Infrastructure;
|
namespace StarterNG.Infrastructure;
|
||||||
|
|
||||||
public static class LoadingScreen
|
public static class LoadingScreen
|
||||||
{
|
{
|
||||||
|
private static readonly string[] Extensions = { ".bmp", ".jpg", ".jpeg", ".png" };
|
||||||
|
|
||||||
public static void Prepare(string? logoKey, string? sceneryName = null)
|
public static void Prepare(string? logoKey, string? sceneryName = null)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
string? src = ResolveSource(logoKey) ?? ResolveSource(sceneryName) ?? PickRandom();
|
string? src = FindSource(new PhysicalFileSystem(), Directory.GetCurrentDirectory(), logoKey, sceneryName,
|
||||||
|
Random.Shared);
|
||||||
if (src is null) return;
|
if (src is null) return;
|
||||||
|
|
||||||
string destDir = Path.Combine(Directory.GetCurrentDirectory(), "textures");
|
string destDir = Path.Combine(Directory.GetCurrentDirectory(), "textures");
|
||||||
@@ -35,32 +40,36 @@ public static class LoadingScreen
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string? ResolveSource(string? key)
|
/// <summary>
|
||||||
|
/// The picture of textures/logo under <paramref name="root"/> to show: the trainset's,
|
||||||
|
/// else the scenery's, else one of logo*.* at random; its name and extension in any
|
||||||
|
/// letter case. Null when there is none.
|
||||||
|
/// </summary>
|
||||||
|
public static string? FindSource(IFileSystem files, string root, string? logoKey, string? sceneryName,
|
||||||
|
Random random)
|
||||||
|
{
|
||||||
|
var names = new CaseInsensitivePaths(files);
|
||||||
|
if (names.Find(root, "textures/logo", directory: true) is not { } dir)
|
||||||
|
return null;
|
||||||
|
return Named(names, dir, logoKey) ?? Named(names, dir, sceneryName) ?? PickRandom(files, dir, random);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string? Named(CaseInsensitivePaths names, string dir, string? key)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(key)) return null;
|
if (string.IsNullOrWhiteSpace(key)) return null;
|
||||||
key = Path.GetFileNameWithoutExtension(key.Trim());
|
key = Path.GetFileNameWithoutExtension(key.Trim());
|
||||||
string dir = Path.Combine(Directory.GetCurrentDirectory(), "textures", "logo");
|
if (key.Length == 0) return null;
|
||||||
foreach (string ext in new[] { ".bmp", ".jpg", ".jpeg", ".png" })
|
return Extensions.Select(ext => names.Find(dir, key + ext)).FirstOrDefault(path => path is not null);
|
||||||
{
|
|
||||||
string path = Path.Combine(dir, key + ext);
|
|
||||||
if (File.Exists(path)) return path;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string? PickRandom()
|
private static string? PickRandom(IFileSystem files, string dir, Random random)
|
||||||
{
|
{
|
||||||
string dir = Path.Combine(Directory.GetCurrentDirectory(), "textures", "logo");
|
var logos = files.GetFiles(dir, "logo*.*")
|
||||||
if (!Directory.Exists(dir)) return null;
|
.Where(f => Extensions.Contains(Path.GetExtension(f), StringComparer.OrdinalIgnoreCase))
|
||||||
var files = Directory.GetFiles(dir, "logo*.*")
|
.Order(StringComparer.Ordinal)
|
||||||
.Where(f =>
|
|
||||||
{
|
|
||||||
string e = Path.GetExtension(f).ToLowerInvariant();
|
|
||||||
return e is ".bmp" or ".jpg" or ".jpeg" or ".png";
|
|
||||||
})
|
|
||||||
.ToArray();
|
.ToArray();
|
||||||
if (files.Length == 0) return null;
|
if (logos.Length == 0) return null;
|
||||||
return files[Random.Shared.Next(files.Length)];
|
return logos[random.Next(logos.Length)];
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void WriteBmp(string sourcePath, string destPath)
|
private static void WriteBmp(string sourcePath, string destPath)
|
||||||
|
|||||||
24
StarterNG/Infrastructure/Sceneries/AttachmentLocator.cs
Normal file
24
StarterNG/Infrastructure/Sceneries/AttachmentLocator.cs
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
using StarterNG.Application.Abstractions;
|
||||||
|
using StarterNG.Domain.Sceneries;
|
||||||
|
|
||||||
|
namespace StarterNG.Infrastructure.Sceneries;
|
||||||
|
|
||||||
|
/// <summary>Where the file a scenery attaches (<c>//$f</c>) is on disk.</summary>
|
||||||
|
public sealed class AttachmentLocator
|
||||||
|
{
|
||||||
|
private readonly IGamePaths _paths;
|
||||||
|
private readonly CaseInsensitivePaths _names;
|
||||||
|
|
||||||
|
public AttachmentLocator(IFileSystem files, IGamePaths paths)
|
||||||
|
{
|
||||||
|
_paths = paths;
|
||||||
|
_names = new CaseInsensitivePaths(files);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The attachment's file, named from the game's folder or in full, with its letters
|
||||||
|
/// as on disk; null when it is not there.
|
||||||
|
/// </summary>
|
||||||
|
public string? Resolve(SceneryAttachment attachment) =>
|
||||||
|
string.IsNullOrWhiteSpace(attachment.FilePath) ? null : _names.Find(_paths.Root, attachment.FilePath.Trim());
|
||||||
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
using StarterNG.Application.Abstractions;
|
using StarterNG.Application.Abstractions;
|
||||||
using StarterNG.Domain.Sceneries;
|
using StarterNG.Domain.Sceneries;
|
||||||
|
|
||||||
@@ -8,11 +9,13 @@ namespace StarterNG.Infrastructure.Sceneries;
|
|||||||
public sealed class SceneryImageLocator
|
public sealed class SceneryImageLocator
|
||||||
{
|
{
|
||||||
private readonly IFileSystem _files;
|
private readonly IFileSystem _files;
|
||||||
|
private readonly CaseInsensitivePaths _names;
|
||||||
private readonly Dictionary<string, string?> _cache = new();
|
private readonly Dictionary<string, string?> _cache = new();
|
||||||
|
|
||||||
public SceneryImageLocator(IFileSystem files)
|
public SceneryImageLocator(IFileSystem files)
|
||||||
{
|
{
|
||||||
_files = files;
|
_files = files;
|
||||||
|
_names = new CaseInsensitivePaths(files);
|
||||||
}
|
}
|
||||||
|
|
||||||
public string? Resolve(Scenery scenery)
|
public string? Resolve(Scenery scenery)
|
||||||
@@ -34,22 +37,23 @@ public sealed class SceneryImageLocator
|
|||||||
return null;
|
return null;
|
||||||
|
|
||||||
string name = scenery.ImageName.Replace('\\', '/').Trim();
|
string name = scenery.ImageName.Replace('\\', '/').Trim();
|
||||||
|
if (Path.IsPathFullyQualified(name))
|
||||||
|
return _names.Find("", name);
|
||||||
|
if (_files.FileExists(name))
|
||||||
|
return name;
|
||||||
|
|
||||||
string sceneryDir = Path.GetDirectoryName(scenery.Path) ?? ".";
|
string sceneryDir = Path.GetDirectoryName(scenery.Path) ?? ".";
|
||||||
string root = Path.GetDirectoryName(sceneryDir) ?? ".";
|
string root = Path.GetDirectoryName(sceneryDir) ?? ".";
|
||||||
|
|
||||||
string[] candidates =
|
(string Folder, string Name)[] candidates =
|
||||||
{
|
{
|
||||||
name,
|
(root, name),
|
||||||
Path.Combine(root, name),
|
(sceneryDir, name),
|
||||||
Path.Combine(sceneryDir, name),
|
(sceneryDir, "images/" + name),
|
||||||
Path.Combine(sceneryDir, "images", name),
|
(root, "scenery/images/" + name)
|
||||||
Path.Combine(root, "scenery", "images", name)
|
|
||||||
};
|
};
|
||||||
|
|
||||||
foreach (string candidate in candidates)
|
return candidates.Select(candidate => _names.Find(candidate.Folder, candidate.Name))
|
||||||
if (_files.FileExists(candidate))
|
.FirstOrDefault(found => found is not null);
|
||||||
return candidate;
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,11 +20,11 @@ public sealed class SceneryParser
|
|||||||
_random = random;
|
_random = random;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <param name="findInclude">
|
/// <param name="opensInclude">
|
||||||
/// What the simulator makes of an include, as the include names it; null leaves
|
/// Whether the simulator opens an include, as the include names it; null leaves
|
||||||
/// includes unchecked.
|
/// includes unchecked.
|
||||||
/// </param>
|
/// </param>
|
||||||
public Scenery Parse(string path, string content, Func<string, IncludeLookup>? findInclude = null)
|
public Scenery Parse(string path, string content, Func<string, bool>? opensInclude = null)
|
||||||
{
|
{
|
||||||
string original = content;
|
string original = content;
|
||||||
|
|
||||||
@@ -38,7 +38,7 @@ public sealed class SceneryParser
|
|||||||
|
|
||||||
// Read from the text with its optional includes blanked, which keeps every
|
// Read from the text with its optional includes blanked, which keeps every
|
||||||
// place where it was, so a fault's line is the line in the file.
|
// place where it was, so a fault's line is the line in the file.
|
||||||
var syntax = ScenerySyntax.Scan(content, System.IO.Path.GetFileName(path), findInclude);
|
var syntax = ScenerySyntax.Scan(content, System.IO.Path.GetFileName(path), opensInclude);
|
||||||
var faults = syntax.Faults.ToList();
|
var faults = syntax.Faults.ToList();
|
||||||
var inlined = SceneryIncludes.Ranges(content);
|
var inlined = SceneryIncludes.Ranges(content);
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ public sealed class SceneryRepository : ISceneryRepository
|
|||||||
private readonly SceneryParser _parser;
|
private readonly SceneryParser _parser;
|
||||||
|
|
||||||
/// <summary>The scenery folders' files and folders, listed once per load of them all.</summary>
|
/// <summary>The scenery folders' files and folders, listed once per load of them all.</summary>
|
||||||
private readonly ConcurrentDictionary<(string, bool), IReadOnlyList<string>> _listings = new();
|
private readonly CaseInsensitivePaths _names;
|
||||||
|
|
||||||
public SceneryRepository(IFileSystem files, IGamePaths paths, IDiagnosticsLog log, SceneryParser parser)
|
public SceneryRepository(IFileSystem files, IGamePaths paths, IDiagnosticsLog log, SceneryParser parser)
|
||||||
{
|
{
|
||||||
@@ -31,11 +31,12 @@ public sealed class SceneryRepository : ISceneryRepository
|
|||||||
_paths = paths;
|
_paths = paths;
|
||||||
_log = log;
|
_log = log;
|
||||||
_parser = parser;
|
_parser = parser;
|
||||||
|
_names = new CaseInsensitivePaths(files, keepListings: true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public IReadOnlyList<Scenery> LoadAll(IProgress<SceneryLoadProgress>? progress = null)
|
public IReadOnlyList<Scenery> LoadAll(IProgress<SceneryLoadProgress>? progress = null)
|
||||||
{
|
{
|
||||||
_listings.Clear();
|
_names.Forget();
|
||||||
var files = SceneryFiles().ToList();
|
var files = SceneryFiles().ToList();
|
||||||
var loaded = new ConcurrentBag<Scenery>();
|
var loaded = new ConcurrentBag<Scenery>();
|
||||||
int total = Math.Max(1, files.Count);
|
int total = Math.Max(1, files.Count);
|
||||||
@@ -58,7 +59,7 @@ public sealed class SceneryRepository : ISceneryRepository
|
|||||||
|
|
||||||
public Scenery? Load(string path)
|
public Scenery? Load(string path)
|
||||||
{
|
{
|
||||||
_listings.Clear();
|
_names.Forget();
|
||||||
return LoadOne(path);
|
return LoadOne(path);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -79,10 +80,8 @@ public sealed class SceneryRepository : ISceneryRepository
|
|||||||
// With its own .sbt the scenery's terrain comes from it, and the simulator
|
// With its own .sbt the scenery's terrain comes from it, and the simulator
|
||||||
// passes its terrain includes over without opening them.
|
// passes its terrain includes over without opening them.
|
||||||
bool binaryTerrain = Opens(Path.GetFileNameWithoutExtension(path) + ".sbt");
|
bool binaryTerrain = Opens(Path.GetFileNameWithoutExtension(path) + ".sbt");
|
||||||
IncludeLookup FindInclude(string name) =>
|
bool OpensInclude(string name) =>
|
||||||
Opens(name) || (binaryTerrain && SimulatorNames.Lower(name).Contains("_ter.scm"))
|
Opens(name) || (binaryTerrain && SimulatorNames.Lower(name).Contains("_ter.scm"));
|
||||||
? new IncludeLookup(true)
|
|
||||||
: new IncludeLookup(false, ResolveInclude(name));
|
|
||||||
|
|
||||||
(string File, string Text)? ReadInclude(string name)
|
(string File, string Text)? ReadInclude(string name)
|
||||||
{
|
{
|
||||||
@@ -99,7 +98,7 @@ public sealed class SceneryRepository : ISceneryRepository
|
|||||||
|
|
||||||
string own = LegacyText.Decode(_files.ReadAllBytes(path), out var ownEncoding);
|
string own = LegacyText.Decode(_files.ReadAllBytes(path), out var ownEncoding);
|
||||||
string text = SceneryIncludes.Inline(own, ReadInclude);
|
string text = SceneryIncludes.Inline(own, ReadInclude);
|
||||||
var scenery = _parser.Parse(path, text, FindInclude);
|
var scenery = _parser.Parse(path, text, OpensInclude);
|
||||||
scenery.HasCompanionTimetable = binaryTerrain;
|
scenery.HasCompanionTimetable = binaryTerrain;
|
||||||
scenery.Sources = sources;
|
scenery.Sources = sources;
|
||||||
scenery.TextEncoding = ownEncoding;
|
scenery.TextEncoding = ownEncoding;
|
||||||
@@ -114,11 +113,11 @@ public sealed class SceneryRepository : ISceneryRepository
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Whether the simulator opens a file of the scenery folder named so: by the
|
/// Whether the simulator opens a file of the scenery folder named so: whatever the
|
||||||
/// name in lower case, which on Linux has to be how it is named on disk.
|
/// case of its letters, on Linux too. A shade more lenient than eu07 there, which
|
||||||
|
/// folds only the letters A to Z and of two folders named alike takes the first.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private bool Opens(string name) =>
|
private bool Opens(string name) => ResolveInclude(name) is not null;
|
||||||
_files.FileExists(Path.Combine(_paths.Scenery, SimulatorNames.Lower(name.Replace('\\', '/'))));
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// An include's file as it is named on disk, from the scenery folder, whatever
|
/// An include's file as it is named on disk, from the scenery folder, whatever
|
||||||
@@ -126,44 +125,7 @@ public sealed class SceneryRepository : ISceneryRepository
|
|||||||
/// copy written for a start carries in place of the include, so they come along
|
/// copy written for a start carries in place of the include, so they come along
|
||||||
/// on Linux too.
|
/// on Linux too.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private string? ResolveInclude(string name)
|
private string? ResolveInclude(string name) => _names.Resolve(_paths.Scenery, name);
|
||||||
{
|
|
||||||
string relative = name.Replace('\\', '/');
|
|
||||||
if (_files.FileExists(Path.Combine(_paths.Scenery, relative)))
|
|
||||||
return relative;
|
|
||||||
|
|
||||||
string[] parts = relative.Split('/', StringSplitOptions.RemoveEmptyEntries);
|
|
||||||
string directory = _paths.Scenery;
|
|
||||||
var found = new List<string>();
|
|
||||||
for (int i = 0; i < parts.Length; i++)
|
|
||||||
{
|
|
||||||
if (parts[i] is "." or "..")
|
|
||||||
{
|
|
||||||
directory = Path.Combine(directory, parts[i]);
|
|
||||||
found.Add(parts[i]);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool last = i == parts.Length - 1;
|
|
||||||
string? match = Listing(directory, last)
|
|
||||||
.FirstOrDefault(entry => string.Equals(Path.GetFileName(entry), parts[i],
|
|
||||||
StringComparison.OrdinalIgnoreCase));
|
|
||||||
if (match is null)
|
|
||||||
return null;
|
|
||||||
directory = match;
|
|
||||||
found.Add(Path.GetFileName(match));
|
|
||||||
}
|
|
||||||
|
|
||||||
return string.Join('/', found);
|
|
||||||
}
|
|
||||||
|
|
||||||
private IReadOnlyList<string> Listing(string directory, bool files) =>
|
|
||||||
_listings.GetOrAdd((directory, files), key =>
|
|
||||||
{
|
|
||||||
if (!_files.DirectoryExists(key.Item1))
|
|
||||||
return Array.Empty<string>();
|
|
||||||
return key.Item2 ? _files.GetFiles(key.Item1) : _files.GetDirectories(key.Item1);
|
|
||||||
});
|
|
||||||
|
|
||||||
private IEnumerable<string> SceneryFiles() =>
|
private IEnumerable<string> SceneryFiles() =>
|
||||||
_files.GetFiles(_paths.Scenery, "*.scn")
|
_files.GetFiles(_paths.Scenery, "*.scn")
|
||||||
|
|||||||
@@ -14,12 +14,14 @@ public sealed class SceneryTranslations : ISceneryTranslations
|
|||||||
private const string BaseLanguage = "en";
|
private const string BaseLanguage = "en";
|
||||||
|
|
||||||
private readonly IFileSystem _files;
|
private readonly IFileSystem _files;
|
||||||
|
private readonly CaseInsensitivePaths _names;
|
||||||
private readonly IDiagnosticsLog _log;
|
private readonly IDiagnosticsLog _log;
|
||||||
private readonly Dictionary<string, string> _map = new(StringComparer.OrdinalIgnoreCase);
|
private readonly Dictionary<string, string> _map = new(StringComparer.OrdinalIgnoreCase);
|
||||||
|
|
||||||
public SceneryTranslations(IFileSystem files, IDiagnosticsLog log)
|
public SceneryTranslations(IFileSystem files, IDiagnosticsLog log)
|
||||||
{
|
{
|
||||||
_files = files;
|
_files = files;
|
||||||
|
_names = new CaseInsensitivePaths(files);
|
||||||
_log = log;
|
_log = log;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -29,12 +31,11 @@ public sealed class SceneryTranslations : ISceneryTranslations
|
|||||||
|
|
||||||
string sceneryDir = Path.GetDirectoryName(Path.GetFullPath(scenery.Path)) ?? "scenery";
|
string sceneryDir = Path.GetDirectoryName(Path.GetFullPath(scenery.Path)) ?? "scenery";
|
||||||
string id = Path.GetFileNameWithoutExtension(scenery.Path);
|
string id = Path.GetFileNameWithoutExtension(scenery.Path);
|
||||||
string i18nDir = Path.Combine(sceneryDir, "i18n");
|
|
||||||
string language = NormalizeLanguage(langCode);
|
string language = NormalizeLanguage(langCode);
|
||||||
|
|
||||||
TryLoad(Path.Combine(i18nDir, $"{id}_{BaseLanguage}.json"));
|
TryLoad(_names.Find(sceneryDir, $"i18n/{id}_{BaseLanguage}.json"));
|
||||||
if (!string.Equals(language, BaseLanguage, StringComparison.OrdinalIgnoreCase))
|
if (!string.Equals(language, BaseLanguage, StringComparison.OrdinalIgnoreCase))
|
||||||
TryLoad(Path.Combine(i18nDir, $"{id}_{language}.json"));
|
TryLoad(_names.Find(sceneryDir, $"i18n/{id}_{language}.json"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public string Translate(string? text)
|
public string Translate(string? text)
|
||||||
@@ -50,9 +51,9 @@ public sealed class SceneryTranslations : ISceneryTranslations
|
|||||||
return _map.TryGetValue(key, out string? translated) ? translated : text;
|
return _map.TryGetValue(key, out string? translated) ? translated : text;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void TryLoad(string path)
|
private void TryLoad(string? path)
|
||||||
{
|
{
|
||||||
if (!_files.FileExists(path))
|
if (path is null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
try
|
try
|
||||||
|
|||||||
@@ -17,10 +17,12 @@ public sealed class TimetableLocator
|
|||||||
RegexOptions.Multiline | RegexOptions.IgnoreCase);
|
RegexOptions.Multiline | RegexOptions.IgnoreCase);
|
||||||
|
|
||||||
private readonly IFileSystem _files;
|
private readonly IFileSystem _files;
|
||||||
|
private readonly CaseInsensitivePaths _names;
|
||||||
|
|
||||||
public TimetableLocator(IFileSystem files)
|
public TimetableLocator(IFileSystem files)
|
||||||
{
|
{
|
||||||
_files = files;
|
_files = files;
|
||||||
|
_names = new CaseInsensitivePaths(files);
|
||||||
}
|
}
|
||||||
|
|
||||||
public string? Resolve(Scenery scenery, string? name)
|
public string? Resolve(Scenery scenery, string? name)
|
||||||
@@ -30,17 +32,19 @@ public sealed class TimetableLocator
|
|||||||
|
|
||||||
string sceneryDir = Path.GetDirectoryName(scenery.Path) ?? ".";
|
string sceneryDir = Path.GetDirectoryName(scenery.Path) ?? ".";
|
||||||
string root = Path.GetDirectoryName(sceneryDir) ?? ".";
|
string root = Path.GetDirectoryName(sceneryDir) ?? ".";
|
||||||
|
name = name.Replace('\\', '/');
|
||||||
|
|
||||||
string[] candidates =
|
(string Folder, string Name)[] candidates =
|
||||||
{
|
{
|
||||||
Path.Combine(root, "timetables", name + ".txt"),
|
(root, "timetables/" + name + ".txt"),
|
||||||
Path.Combine(sceneryDir, name + ".txt"),
|
(sceneryDir, name + ".txt"),
|
||||||
Path.Combine(root, "scenario", name + ".txt"),
|
(root, "scenario/" + name + ".txt"),
|
||||||
Path.Combine(root, "timetables", name),
|
(root, "timetables/" + name),
|
||||||
Path.Combine(sceneryDir, name)
|
(sceneryDir, name)
|
||||||
};
|
};
|
||||||
|
|
||||||
return candidates.FirstOrDefault(_files.FileExists);
|
return candidates.Select(candidate => _names.Find(candidate.Folder, candidate.Name))
|
||||||
|
.FirstOrDefault(found => found is not null);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>The number the timetable gives its train; null with no timetable or no such heading in it.</summary>
|
/// <summary>The number the timetable gives its train; null with no timetable or no such heading in it.</summary>
|
||||||
|
|||||||
@@ -22,15 +22,37 @@ public sealed class ExecutableLocator
|
|||||||
private string? _wine;
|
private string? _wine;
|
||||||
private bool _wineLookedUp;
|
private bool _wineLookedUp;
|
||||||
private string? _missingPickLogged;
|
private string? _missingPickLogged;
|
||||||
|
private readonly bool _lacksAvx2;
|
||||||
|
|
||||||
public ExecutableLocator(IFileSystem files, IGamePaths paths, IEnvironment environment, IDiagnosticsLog log)
|
/// <param name="lacksAvx2">Whether this processor runs no AVX2; asked of it when left out.</param>
|
||||||
|
public ExecutableLocator(IFileSystem files, IGamePaths paths, IEnvironment environment, IDiagnosticsLog log,
|
||||||
|
bool? lacksAvx2 = null)
|
||||||
{
|
{
|
||||||
_files = files;
|
_files = files;
|
||||||
_paths = paths;
|
_paths = paths;
|
||||||
_environment = environment;
|
_environment = environment;
|
||||||
_log = log;
|
_log = log;
|
||||||
|
_lacksAvx2 = lacksAvx2 ?? CpuFeatures.LacksAvx2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The end of the name of a simulator built without AVX2, last before any extension:
|
||||||
|
/// eu07-x64_2026-11-15_abc1234_noavx2.exe, eu07_noavx2. It runs on any x86-64 processor.
|
||||||
|
/// </summary>
|
||||||
|
public const string NoAvx2Suffix = "_noavx2";
|
||||||
|
|
||||||
|
public static bool IsNoAvx2(string path) =>
|
||||||
|
Path.GetFileNameWithoutExtension(path).EndsWith(NoAvx2Suffix, StringComparison.OrdinalIgnoreCase);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Whether <paramref name="executable"/> stops at its first instruction here: a build
|
||||||
|
/// with AVX2 on a processor without it. Such a processor is told so before a start.
|
||||||
|
/// </summary>
|
||||||
|
public bool WillNotRunHere(string executable) => _lacksAvx2 && !IsNoAvx2(executable);
|
||||||
|
|
||||||
|
/// <summary>The newest build without AVX2 in the installation, or null where there is none.</summary>
|
||||||
|
public string? NewestNoAvx2() => ListCandidates().FirstOrDefault(IsNoAvx2);
|
||||||
|
|
||||||
public string CanonicalName => _environment.IsWindows ? "eu07.exe" : "eu07";
|
public string CanonicalName => _environment.IsWindows ? "eu07.exe" : "eu07";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -71,7 +93,8 @@ public sealed class ExecutableLocator
|
|||||||
{
|
{
|
||||||
var candidates = _files.GetFiles(_paths.Root, "eu07*")
|
var candidates = _files.GetFiles(_paths.Root, "eu07*")
|
||||||
.Where(IsCandidate)
|
.Where(IsCandidate)
|
||||||
.OrderBy(path => IsExeOnLinux(path) ? 1 : 0)
|
.OrderBy(Rank)
|
||||||
|
.ThenByDescending(path => _lacksAvx2 && IsNoAvx2(path) ? _files.GetLastWriteTimeUtc(path) : DateTime.MinValue)
|
||||||
.ThenBy(path => string.Equals(Path.GetFileName(path), CanonicalName,
|
.ThenBy(path => string.Equals(Path.GetFileName(path), CanonicalName,
|
||||||
StringComparison.OrdinalIgnoreCase) ? 0 : 1)
|
StringComparison.OrdinalIgnoreCase) ? 0 : 1)
|
||||||
.ThenBy(path => Path.GetFileName(path).Length);
|
.ThenBy(path => Path.GetFileName(path).Length);
|
||||||
@@ -101,6 +124,18 @@ public sealed class ExecutableLocator
|
|||||||
return CanonicalName;
|
return CanonicalName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The order of the search. Without AVX2 a build without it comes first, the newest of
|
||||||
|
/// them, even through Wine: the others stop at once. With AVX2 one is the last resort,
|
||||||
|
/// as the build made for the processor runs faster; native before Wine either way.
|
||||||
|
/// </summary>
|
||||||
|
private int Rank(string path)
|
||||||
|
{
|
||||||
|
int wine = IsExeOnLinux(path) ? 1 : 0;
|
||||||
|
int noAvx2 = IsNoAvx2(path) ? 1 : 0;
|
||||||
|
return _lacksAvx2 ? (1 - noAvx2) * 2 + wine : wine * 2 + noAvx2;
|
||||||
|
}
|
||||||
|
|
||||||
public List<string> ListCandidates(string? directory = null)
|
public List<string> ListCandidates(string? directory = null)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|||||||
32
StarterNG/Infrastructure/SoftwareRender.cs
Normal file
32
StarterNG/Infrastructure/SoftwareRender.cs
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using Avalonia;
|
||||||
|
|
||||||
|
namespace StarterNG.Infrastructure;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Drawn by the processor instead of the graphics card, for a machine on which the
|
||||||
|
/// window comes up empty. Each platform reads only its own options, so both are given.
|
||||||
|
/// </summary>
|
||||||
|
public static class SoftwareRender
|
||||||
|
{
|
||||||
|
public const string Switch = "--software-render";
|
||||||
|
|
||||||
|
public static bool AskedIn(IEnumerable<string> args) =>
|
||||||
|
args.Any(a => string.Equals(a, Switch, StringComparison.OrdinalIgnoreCase));
|
||||||
|
|
||||||
|
public static Win32PlatformOptions Win32Options => new()
|
||||||
|
{
|
||||||
|
RenderingMode = new[] { Win32RenderingMode.Software },
|
||||||
|
CompositionMode = new[] { Win32CompositionMode.RedirectionSurface }
|
||||||
|
};
|
||||||
|
|
||||||
|
public static X11PlatformOptions X11Options => new()
|
||||||
|
{
|
||||||
|
RenderingMode = new[] { X11RenderingMode.Software }
|
||||||
|
};
|
||||||
|
|
||||||
|
public static AppBuilder ApplyTo(AppBuilder builder) =>
|
||||||
|
builder.With(Win32Options).With(X11Options);
|
||||||
|
}
|
||||||
90
StarterNG/Infrastructure/SystemGraphicsLibraries.cs
Normal file
90
StarterNG/Infrastructure/SystemGraphicsLibraries.cs
Normal file
@@ -0,0 +1,90 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
namespace StarterNG.Infrastructure;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The starter sits in the simulator's folder, and so do the graphics wrappers a player
|
||||||
|
/// puts there for the simulator - ReShade and the like, named after the system library
|
||||||
|
/// they stand in for. Windows looks in the program's own folder first, so the starter's
|
||||||
|
/// window drew through them too, and with some of them it drew nothing at all.
|
||||||
|
/// Loaded from System32 by full path before anything asks for them, these names are
|
||||||
|
/// taken: a native library that asks by name gets the system one. .NET looks beside the
|
||||||
|
/// program by full path before it asks by name, so the window code's own imports are
|
||||||
|
/// handed the same libraries. The simulator is a process of its own and still finds its
|
||||||
|
/// wrappers.
|
||||||
|
/// Elsewhere there is nothing of the kind to keep out. Under Wine or Proton the system
|
||||||
|
/// folder is the prefix's, so what is taken there is what would have been taken anyway.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class SystemGraphicsLibraries
|
||||||
|
{
|
||||||
|
public delegate bool Loader(string path, out IntPtr handle);
|
||||||
|
|
||||||
|
// dxgi ahead of d3d11, which asks for it.
|
||||||
|
public static readonly IReadOnlyList<string> Names = new[] { "dxgi", "d3d11", "d3d9", "opengl32" };
|
||||||
|
|
||||||
|
private readonly Dictionary<string, IntPtr> _loaded = new(StringComparer.OrdinalIgnoreCase);
|
||||||
|
private readonly List<string> _shadowed = new();
|
||||||
|
|
||||||
|
private SystemGraphicsLibraries()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>The files of these names that lay beside the starter.</summary>
|
||||||
|
public IReadOnlyList<string> Shadowed => _shadowed;
|
||||||
|
|
||||||
|
/// <summary>What goes to the log about them, or null when none lay there.</summary>
|
||||||
|
public string? Note => _shadowed.Count > 0
|
||||||
|
? $"Graphics libraries beside the starter, left to the simulator: {string.Join(", ", _shadowed)}"
|
||||||
|
: null;
|
||||||
|
|
||||||
|
/// <summary>The libraries of this Windows, or null on any other system.</summary>
|
||||||
|
public static SystemGraphicsLibraries? TakeOnWindows() =>
|
||||||
|
OperatingSystem.IsWindows()
|
||||||
|
? Take(Environment.SystemDirectory, AppContext.BaseDirectory, File.Exists, NativeLibrary.TryLoad)
|
||||||
|
: null;
|
||||||
|
|
||||||
|
public static SystemGraphicsLibraries Take(string systemDirectory, string ownDirectory,
|
||||||
|
Func<string, bool> exists, Loader load)
|
||||||
|
{
|
||||||
|
var taken = new SystemGraphicsLibraries();
|
||||||
|
foreach (string name in Names)
|
||||||
|
{
|
||||||
|
string file = name + ".dll";
|
||||||
|
if (exists(Path.Combine(ownDirectory, file)))
|
||||||
|
taken._shadowed.Add(file);
|
||||||
|
if (load(Path.Combine(systemDirectory, file), out IntPtr handle))
|
||||||
|
taken._loaded[name] = handle;
|
||||||
|
}
|
||||||
|
return taken;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>The system library for an import of one of these names; zero leaves it to the usual search.</summary>
|
||||||
|
public IntPtr Resolve(string libraryName)
|
||||||
|
{
|
||||||
|
string name = libraryName.EndsWith(".dll", StringComparison.OrdinalIgnoreCase)
|
||||||
|
? libraryName[..^4]
|
||||||
|
: libraryName;
|
||||||
|
return _loaded.TryGetValue(name, out IntPtr handle) ? handle : IntPtr.Zero;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The assembly's imports of these names get the system libraries. False when it
|
||||||
|
/// has a resolver of its own already; that one decides.
|
||||||
|
/// </summary>
|
||||||
|
public bool ServeTo(Assembly importer)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
NativeLibrary.SetDllImportResolver(importer, (name, _, _) => Resolve(name));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (InvalidOperationException)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -23,6 +23,7 @@ public sealed class FizPhysicsRepository : IPhysicsRepository
|
|||||||
};
|
};
|
||||||
|
|
||||||
private readonly IFileSystem _files;
|
private readonly IFileSystem _files;
|
||||||
|
private readonly CaseInsensitivePaths _names;
|
||||||
private readonly IGamePaths _paths;
|
private readonly IGamePaths _paths;
|
||||||
private readonly IDiagnosticsLog _log;
|
private readonly IDiagnosticsLog _log;
|
||||||
|
|
||||||
@@ -38,6 +39,7 @@ public sealed class FizPhysicsRepository : IPhysicsRepository
|
|||||||
public FizPhysicsRepository(IFileSystem files, IGamePaths paths, IDiagnosticsLog log)
|
public FizPhysicsRepository(IFileSystem files, IGamePaths paths, IDiagnosticsLog log)
|
||||||
{
|
{
|
||||||
_files = files;
|
_files = files;
|
||||||
|
_names = new CaseInsensitivePaths(files);
|
||||||
_paths = paths;
|
_paths = paths;
|
||||||
_log = log;
|
_log = log;
|
||||||
}
|
}
|
||||||
@@ -165,8 +167,9 @@ public sealed class FizPhysicsRepository : IPhysicsRepository
|
|||||||
while (i < tokens.Count && !tokens[i].Equals("end", StringComparison.OrdinalIgnoreCase))
|
while (i < tokens.Count && !tokens[i].Equals("end", StringComparison.OrdinalIgnoreCase))
|
||||||
includeParameters.Add(Resolve(tokens[i++], parameters));
|
includeParameters.Add(Resolve(tokens[i++], parameters));
|
||||||
|
|
||||||
Parse(physics, Path.Combine(directory, includeFile), directory, includeParameters.ToArray(),
|
// Named in the letter case of whoever wrote the include, not always that of the file.
|
||||||
depth + 1);
|
string included = _names.Find(directory, includeFile) ?? Path.Combine(directory, includeFile);
|
||||||
|
Parse(physics, included, directory, includeParameters.ToArray(), depth + 1);
|
||||||
pendingKey = null;
|
pendingKey = null;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,44 +10,53 @@ public sealed class MissingAssetScanner
|
|||||||
private static readonly string[] TextureExtensions = { ".mat", ".bmp" };
|
private static readonly string[] TextureExtensions = { ".mat", ".bmp" };
|
||||||
private static readonly string[] ModelExtensions = { ".t3d", ".e3d" };
|
private static readonly string[] ModelExtensions = { ".t3d", ".e3d" };
|
||||||
|
|
||||||
private readonly IFileSystem _files;
|
|
||||||
private readonly IGamePaths _paths;
|
private readonly IGamePaths _paths;
|
||||||
|
private readonly CaseInsensitivePaths _names;
|
||||||
|
|
||||||
public MissingAssetScanner(IFileSystem files, IGamePaths paths)
|
public MissingAssetScanner(IFileSystem files, IGamePaths paths)
|
||||||
{
|
{
|
||||||
_files = files;
|
|
||||||
_paths = paths;
|
_paths = paths;
|
||||||
|
_names = new CaseInsensitivePaths(files, keepListings: true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<string> Scan(VehicleCatalog catalog)
|
public List<string> Scan(VehicleCatalog catalog)
|
||||||
{
|
{
|
||||||
var lines = new List<string>();
|
var lines = new List<string>();
|
||||||
|
try
|
||||||
foreach (var texture in catalog.Textures)
|
|
||||||
{
|
{
|
||||||
string directory = Path.Combine(
|
foreach (var texture in catalog.Textures)
|
||||||
_paths.Dynamic,
|
{
|
||||||
texture.Directory.Replace('/', Path.DirectorySeparatorChar).TrimEnd('\\', '/'));
|
string directory = texture.Directory.Replace('\\', '/').TrimEnd('/');
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(texture.Skinfile) &&
|
if (!string.IsNullOrEmpty(texture.Skinfile) &&
|
||||||
!ExistsWithAnyExtension(Path.Combine(directory, texture.Skinfile), TextureExtensions))
|
!ExistsWithAnyExtension(Under(directory, texture.Skinfile), TextureExtensions))
|
||||||
lines.Add($"# no file: {texture.Directory}{texture.Skinfile}");
|
lines.Add($"# no file: {texture.Directory}{texture.Skinfile}");
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(texture.Model) &&
|
if (!string.IsNullOrEmpty(texture.Model) &&
|
||||||
!ExistsWithAnyExtension(Path.Combine(directory, texture.Model), ModelExtensions))
|
!ExistsWithAnyExtension(Under(directory, texture.Model), ModelExtensions))
|
||||||
lines.Add($"# no model: {texture.Directory}{texture.Model}");
|
lines.Add($"# no model: {texture.Directory}{texture.Model}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
// The folders are listed once for the whole catalog, and not kept past it.
|
||||||
|
_names.Forget();
|
||||||
}
|
}
|
||||||
|
|
||||||
return lines;
|
return lines;
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool ExistsWithAnyExtension(string path, string[] extensions)
|
private static string Under(string directory, string name) =>
|
||||||
|
directory.Length == 0 ? name : directory + "/" + name;
|
||||||
|
|
||||||
|
/// <summary>Whether the file is under dynamic as named, or with one of the extensions, in any letter case.</summary>
|
||||||
|
private bool ExistsWithAnyExtension(string name, string[] extensions)
|
||||||
{
|
{
|
||||||
if (_files.FileExists(path))
|
if (_names.Resolve(_paths.Dynamic, name) is not null)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
foreach (string extension in extensions)
|
foreach (string extension in extensions)
|
||||||
if (_files.FileExists(Path.ChangeExtension(path, extension)))
|
if (_names.Resolve(_paths.Dynamic, Path.ChangeExtension(name, extension)) is not null)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
24
StarterNG/Infrastructure/Vehicles/TextureFolder.cs
Normal file
24
StarterNG/Infrastructure/Vehicles/TextureFolder.cs
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
using System.IO;
|
||||||
|
using StarterNG.Application.Abstractions;
|
||||||
|
using StarterNG.Domain.Vehicles;
|
||||||
|
|
||||||
|
namespace StarterNG.Infrastructure.Vehicles;
|
||||||
|
|
||||||
|
public static class TextureFolder
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// A livery's folder as it is named on disk: under dynamic, or from the game's folder
|
||||||
|
/// when its name starts there, in any letter case. Where it would be when it is not there.
|
||||||
|
/// </summary>
|
||||||
|
public static string Of(IFileSystem files, IGamePaths paths, VehicleTexture texture)
|
||||||
|
{
|
||||||
|
string directory = texture.Directory.Replace('\\', '/').TrimEnd('/');
|
||||||
|
if (directory.Length == 0)
|
||||||
|
return paths.Dynamic;
|
||||||
|
|
||||||
|
var names = new CaseInsensitivePaths(files);
|
||||||
|
return names.Find(paths.Dynamic, directory, directory: true) ??
|
||||||
|
names.Find(paths.Root, directory, directory: true) ??
|
||||||
|
Path.Combine(paths.Root, directory.Replace('/', Path.DirectorySeparatorChar));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -521,11 +521,34 @@ public partial class MainWindow : Window
|
|||||||
private const string SimulatorBuildGuide = "https://github.com/MaSzyna-EU07/maszyna#getting-started";
|
private const string SimulatorBuildGuide = "https://github.com/MaSzyna-EU07/maszyna#getting-started";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Tells a user whose processor lacks AVX2 that the published simulator will
|
/// Tells a user whose processor lacks AVX2 that the simulator that would start will
|
||||||
/// not run, and where the instructions for a build of their own are.
|
/// not run. With a build without AVX2 in the folder, chosen away from by hand, the
|
||||||
|
/// notice offers to go back to the automatic choice, which takes it; with none, it
|
||||||
|
/// says what such a build is called and where the instructions for one's own are.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public async Task ShowCpuNoticeAsync()
|
public async Task ShowCpuNoticeAsync(string executable)
|
||||||
{
|
{
|
||||||
|
var services = AppServices.Current;
|
||||||
|
if (services.Executables.NewestNoAvx2() is { } noAvx2)
|
||||||
|
{
|
||||||
|
var (useIt, quiet) = await MessageBox.ShowNotice(
|
||||||
|
this, string.Format(App.Loc["CpuNoAvx2Chosen"], Path.GetFileName(executable), noAvx2),
|
||||||
|
App.Loc["CpuNoAvx2Title"], App.Loc["CpuNoAvx2UseIt"], App.Loc["DontShowAgain"]);
|
||||||
|
if (useIt)
|
||||||
|
{
|
||||||
|
services.Settings.SelectExeAutomatically = true;
|
||||||
|
services.SettingsStore.Save();
|
||||||
|
SettingsView.ReloadFromSettings();
|
||||||
|
UpdateStartButton();
|
||||||
|
}
|
||||||
|
if (quiet)
|
||||||
|
{
|
||||||
|
services.Settings.CpuNotice = false;
|
||||||
|
services.SettingsStore.Save();
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var (open, silence) = await MessageBox.ShowNotice(
|
var (open, silence) = await MessageBox.ShowNotice(
|
||||||
this, string.Format(App.Loc["CpuNoAvx2"], SimulatorBuildGuide), App.Loc["CpuNoAvx2Title"],
|
this, string.Format(App.Loc["CpuNoAvx2"], SimulatorBuildGuide), App.Loc["CpuNoAvx2Title"],
|
||||||
App.Loc["CpuNoAvx2Open"], App.Loc["DontShowAgain"]);
|
App.Loc["CpuNoAvx2Open"], App.Loc["DontShowAgain"]);
|
||||||
|
|||||||
@@ -10,12 +10,22 @@ namespace StarterNG;
|
|||||||
static class Program
|
static class Program
|
||||||
{
|
{
|
||||||
|
|
||||||
|
private static bool _softwareRender;
|
||||||
|
|
||||||
[STAThread]
|
[STAThread]
|
||||||
public static void Main(string[] args)
|
public static void Main(string[] args)
|
||||||
{
|
{
|
||||||
|
// Ahead of everything that could draw: what lies beside the starter is the simulator's.
|
||||||
|
var graphics = SystemGraphicsLibraries.TakeOnWindows();
|
||||||
|
graphics?.ServeTo(typeof(Win32PlatformOptions).Assembly);
|
||||||
|
|
||||||
|
_softwareRender = SoftwareRender.AskedIn(args);
|
||||||
|
|
||||||
// Composition root first: everything below, including the crash handlers,
|
// Composition root first: everything below, including the crash handlers,
|
||||||
// resolves its collaborators from this graph.
|
// resolves its collaborators from this graph.
|
||||||
AppServices.Initialize();
|
AppServices.Initialize();
|
||||||
|
if (graphics?.Note is { } note)
|
||||||
|
Diagnostics.Log(note);
|
||||||
|
|
||||||
AppDomain.CurrentDomain.UnhandledException += (_, e) =>
|
AppDomain.CurrentDomain.UnhandledException += (_, e) =>
|
||||||
{
|
{
|
||||||
@@ -63,9 +73,13 @@ static class Program
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static AppBuilder WithSoftwareRenderIfAsked(this AppBuilder builder) =>
|
||||||
|
_softwareRender ? SoftwareRender.ApplyTo(builder) : builder;
|
||||||
|
|
||||||
public static AppBuilder BuildAvaloniaApp()
|
public static AppBuilder BuildAvaloniaApp()
|
||||||
=> AppBuilder.Configure<App>()
|
=> AppBuilder.Configure<App>()
|
||||||
.UsePlatformDetect()
|
.UsePlatformDetect()
|
||||||
|
.WithSoftwareRenderIfAsked()
|
||||||
.WithInterFont()
|
.WithInterFont()
|
||||||
.WithDiagnosticsLogging()
|
.WithDiagnosticsLogging()
|
||||||
.AfterSetup(_ => LogUiExceptions());
|
.AfterSetup(_ => LogUiExceptions());
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
|
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
|
||||||
<!-- Major and minor only: CI adds the patch, the number of commits, so every
|
<!-- Major and minor only: CI adds the patch, the number of commits, so every
|
||||||
build of main is a higher version without anyone bumping it. -->
|
build of main is a higher version without anyone bumping it. -->
|
||||||
<VersionPrefix>1.5</VersionPrefix>
|
<VersionPrefix>1.6</VersionPrefix>
|
||||||
<AssemblyName>Starter</AssemblyName>
|
<AssemblyName>Starter</AssemblyName>
|
||||||
<Company>eu07.pl</Company>
|
<Company>eu07.pl</Company>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
using System.IO;
|
using System.IO;
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
using Avalonia.Input.Platform;
|
using Avalonia.Input.Platform;
|
||||||
|
using StarterNG.Application;
|
||||||
using StarterNG.Domain;
|
using StarterNG.Domain;
|
||||||
using StarterNG.Domain.Vehicles;
|
using StarterNG.Domain.Vehicles;
|
||||||
|
using StarterNG.Infrastructure.Vehicles;
|
||||||
|
|
||||||
namespace StarterNG.Views;
|
namespace StarterNG.Views;
|
||||||
|
|
||||||
@@ -17,13 +19,7 @@ internal static class TextureMenuItems
|
|||||||
if (TopLevel.GetTopLevel(owner)?.Clipboard is { } clipboard)
|
if (TopLevel.GetTopLevel(owner)?.Clipboard is { } clipboard)
|
||||||
await clipboard.SetTextAsync(Consist.Base(texture.Skinfile));
|
await clipboard.SetTextAsync(Consist.Base(texture.Skinfile));
|
||||||
});
|
});
|
||||||
menu.AddItem(App.Loc["OpenTextureFolder"], () => Infrastructure.Diagnostics.OpenOrReport(FolderOf(texture)));
|
menu.AddItem(App.Loc["OpenTextureFolder"], () => Infrastructure.Diagnostics.OpenOrReport(
|
||||||
}
|
Path.GetFullPath(TextureFolder.Of(AppServices.Current.Files, AppServices.Current.Paths, texture))));
|
||||||
|
|
||||||
private static string FolderOf(VehicleTexture texture)
|
|
||||||
{
|
|
||||||
string dir = Path.Combine(Directory.GetCurrentDirectory(), "dynamic",
|
|
||||||
texture.Directory.Replace('/', Path.DirectorySeparatorChar).TrimEnd('\\', '/'));
|
|
||||||
return Directory.Exists(dir) ? dir : Path.Combine(Directory.GetCurrentDirectory(), texture.Directory);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -496,20 +496,18 @@ public partial class Scenarios : UserControl
|
|||||||
btn.Classes.Add("Flat");
|
btn.Classes.Add("Flat");
|
||||||
ToolTip.SetTip(btn, att.FilePath);
|
ToolTip.SetTip(btn, att.FilePath);
|
||||||
// A button that does nothing is no way to say the file is not there.
|
// A button that does nothing is no way to say the file is not there.
|
||||||
btn.IsEnabled = File.Exists(Path.GetFullPath(att.FilePath));
|
btn.IsEnabled = AppServices.Current.Attachments.Resolve(att) is not null;
|
||||||
ToolTip.SetShowOnDisabled(btn, true);
|
ToolTip.SetShowOnDisabled(btn, true);
|
||||||
btn.Click += (_, _) => OpenAttachment(att.FilePath);
|
btn.Click += (_, _) => OpenAttachment(att);
|
||||||
attachmentsPanel.Children.Add(btn);
|
attachmentsPanel.Children.Add(btn);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void OpenAttachment(string relativePath)
|
private static void OpenAttachment(SceneryAttachment attachment)
|
||||||
{
|
{
|
||||||
string full = Path.GetFullPath(relativePath);
|
if (AppServices.Current.Attachments.Resolve(attachment) is not { } found)
|
||||||
if (!File.Exists(full))
|
|
||||||
full = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), relativePath));
|
|
||||||
if (!File.Exists(full))
|
|
||||||
return;
|
return;
|
||||||
|
string full = Path.GetFullPath(found);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Process.Start(new ProcessStartInfo(full) { UseShellExecute = true });
|
Process.Start(new ProcessStartInfo(full) { UseShellExecute = true });
|
||||||
|
|||||||
@@ -633,8 +633,10 @@
|
|||||||
<String key="About">O programu</String>
|
<String key="About">O programu</String>
|
||||||
<String key="Close">Zavřít</String>
|
<String key="Close">Zavřít</String>
|
||||||
<String key="CpuNoAvx2Title">Procesor bez AVX2</String>
|
<String key="CpuNoAvx2Title">Procesor bez AVX2</String>
|
||||||
<String key="CpuNoAvx2">Tento procesor nemá AVX2 a oficiální simulátor ho vyžaduje: nespustí se. Simulátor lze sestavit bez AVX2 (CMake -DENABLE_AVX2=OFF). Návod: {0}</String>
|
<String key="CpuNoAvx2">Tento procesor nemá AVX2 a oficiální simulátor ho vyžaduje: nespustí se. Existuje verze simulátoru bez AVX2 - název jejího souboru končí na _noavx2. Vložte ji do složky hry a starter ji sám použije. Simulátor lze také sestavit sám (CMake -DENABLE_AVX2=OFF). Návod: {0}</String>
|
||||||
<String key="CpuNoAvx2Open">Otevřít návod</String>
|
<String key="CpuNoAvx2Open">Otevřít návod</String>
|
||||||
|
<String key="CpuNoAvx2Chosen">Tento procesor nemá AVX2 a zvolený simulátor {0} ho vyžaduje: nespustí se. Ve složce hry je verze bez AVX2: {1}. Automatická volba vezme právě ji.</String>
|
||||||
|
<String key="CpuNoAvx2UseIt">Volit automaticky</String>
|
||||||
<String key="DontShowAgain">Znovu nezobrazovat</String>
|
<String key="DontShowAgain">Znovu nezobrazovat</String>
|
||||||
<String key="SettingsPath">Nastavení načteno z:</String>
|
<String key="SettingsPath">Nastavení načteno z:</String>
|
||||||
|
|
||||||
@@ -783,7 +785,6 @@
|
|||||||
<String key="SyntaxVehicleOutsideTrainset">Vozidlo {0} stojí mimo soupravu: chybí záhlaví trainset?</String>
|
<String key="SyntaxVehicleOutsideTrainset">Vozidlo {0} stojí mimo soupravu: chybí záhlaví trainset?</String>
|
||||||
<String key="SyntaxNotANumber">{0}: „{1}“ místo čísla</String>
|
<String key="SyntaxNotANumber">{0}: „{1}“ místo čísla</String>
|
||||||
<String key="SyntaxMissingInclude">Soubor {1} nenalezen (include)</String>
|
<String key="SyntaxMissingInclude">Soubor {1} nenalezen (include)</String>
|
||||||
<String key="SyntaxIncludeLetterCase">Soubor {1} je na disku jako {0}: linuxový eu07 ho nenačte</String>
|
|
||||||
<String key="SyntaxIncludeNotClosed">include {1} bez end</String>
|
<String key="SyntaxIncludeNotClosed">include {1} bez end</String>
|
||||||
<String key="SyntaxTrainsetUnreadable">Soupravu {0} se nepodařilo načíst</String>
|
<String key="SyntaxTrainsetUnreadable">Soupravu {0} se nepodařilo načíst</String>
|
||||||
<String key="SyntaxVehicleUnreadable">Vozidlo {0} se nepodařilo načíst</String>
|
<String key="SyntaxVehicleUnreadable">Vozidlo {0} se nepodařilo načíst</String>
|
||||||
|
|||||||
@@ -659,8 +659,10 @@
|
|||||||
<String key="About">About</String>
|
<String key="About">About</String>
|
||||||
<String key="Close">Close</String>
|
<String key="Close">Close</String>
|
||||||
<String key="CpuNoAvx2Title">Processor without AVX2</String>
|
<String key="CpuNoAvx2Title">Processor without AVX2</String>
|
||||||
<String key="CpuNoAvx2">This processor has no AVX2 and the official simulator needs it: it will not start. You can build the simulator without AVX2 (CMake -DENABLE_AVX2=OFF). Instructions: {0}</String>
|
<String key="CpuNoAvx2">This processor has no AVX2 and the official simulator needs it: it will not start. There is a simulator build without AVX2 - its file name ends in _noavx2. Put it in the game folder and the starter will use it. You can also build the simulator yourself (CMake -DENABLE_AVX2=OFF). Instructions: {0}</String>
|
||||||
<String key="CpuNoAvx2Open">Open the instructions</String>
|
<String key="CpuNoAvx2Open">Open the instructions</String>
|
||||||
|
<String key="CpuNoAvx2Chosen">This processor has no AVX2 and the chosen simulator {0} needs it: it will not start. The game folder has a build without AVX2: {1}. The automatic choice takes that one.</String>
|
||||||
|
<String key="CpuNoAvx2UseIt">Choose automatically</String>
|
||||||
<String key="DontShowAgain">Don't show again</String>
|
<String key="DontShowAgain">Don't show again</String>
|
||||||
<String key="SettingsPath">Settings loaded from:</String>
|
<String key="SettingsPath">Settings loaded from:</String>
|
||||||
|
|
||||||
@@ -813,7 +815,6 @@
|
|||||||
<String key="SyntaxVehicleOutsideTrainset">Vehicle {0} stands outside a trainset: header missing?</String>
|
<String key="SyntaxVehicleOutsideTrainset">Vehicle {0} stands outside a trainset: header missing?</String>
|
||||||
<String key="SyntaxNotANumber">{0}: “{1}” instead of a number</String>
|
<String key="SyntaxNotANumber">{0}: “{1}” instead of a number</String>
|
||||||
<String key="SyntaxMissingInclude">File {1} not found (include)</String>
|
<String key="SyntaxMissingInclude">File {1} not found (include)</String>
|
||||||
<String key="SyntaxIncludeLetterCase">File {1} is on disk as {0}: the Linux eu07 will not load it</String>
|
|
||||||
<String key="SyntaxIncludeNotClosed">include {1} without end</String>
|
<String key="SyntaxIncludeNotClosed">include {1} without end</String>
|
||||||
<String key="SyntaxTrainsetUnreadable">Trainset {0} could not be read</String>
|
<String key="SyntaxTrainsetUnreadable">Trainset {0} could not be read</String>
|
||||||
<String key="SyntaxVehicleUnreadable">Vehicle {0} could not be read</String>
|
<String key="SyntaxVehicleUnreadable">Vehicle {0} could not be read</String>
|
||||||
|
|||||||
@@ -633,8 +633,10 @@
|
|||||||
<String key="About">Névjegy</String>
|
<String key="About">Névjegy</String>
|
||||||
<String key="Close">Bezárás</String>
|
<String key="Close">Bezárás</String>
|
||||||
<String key="CpuNoAvx2Title">AVX2 nélküli processzor</String>
|
<String key="CpuNoAvx2Title">AVX2 nélküli processzor</String>
|
||||||
<String key="CpuNoAvx2">Ez a processzor nem tudja az AVX2-t, a hivatalos szimulátornak pedig kell: nem indul el. A szimulátor lefordítható AVX2 nélkül (CMake -DENABLE_AVX2=OFF). Útmutató: {0}</String>
|
<String key="CpuNoAvx2">Ez a processzor nem tudja az AVX2-t, a hivatalos szimulátornak pedig kell: nem indul el. Van AVX2 nélküli szimulátor-változat - a fájl neve _noavx2-re végződik. Tegye a játék mappájába, és az indító magától azt használja. A szimulátor saját maga is lefordítható (CMake -DENABLE_AVX2=OFF). Útmutató: {0}</String>
|
||||||
<String key="CpuNoAvx2Open">Útmutató megnyitása</String>
|
<String key="CpuNoAvx2Open">Útmutató megnyitása</String>
|
||||||
|
<String key="CpuNoAvx2Chosen">Ez a processzor nem tudja az AVX2-t, a kiválasztott {0} szimulátornak pedig kell: nem indul el. A játék mappájában van AVX2 nélküli változat: {1}. Az automatikus választás ezt veszi.</String>
|
||||||
|
<String key="CpuNoAvx2UseIt">Automatikus választás</String>
|
||||||
<String key="DontShowAgain">Ne mutasd többé</String>
|
<String key="DontShowAgain">Ne mutasd többé</String>
|
||||||
<String key="SettingsPath">Beállítások betöltve innen:</String>
|
<String key="SettingsPath">Beállítások betöltve innen:</String>
|
||||||
|
|
||||||
@@ -783,7 +785,6 @@
|
|||||||
<String key="SyntaxVehicleOutsideTrainset">A(z) {0} jármű szerelvényen kívül áll: hiányzik a trainset fejléc?</String>
|
<String key="SyntaxVehicleOutsideTrainset">A(z) {0} jármű szerelvényen kívül áll: hiányzik a trainset fejléc?</String>
|
||||||
<String key="SyntaxNotANumber">{0}: „{1}” szám helyett</String>
|
<String key="SyntaxNotANumber">{0}: „{1}” szám helyett</String>
|
||||||
<String key="SyntaxMissingInclude">A(z) {1} fájl nem található (include)</String>
|
<String key="SyntaxMissingInclude">A(z) {1} fájl nem található (include)</String>
|
||||||
<String key="SyntaxIncludeLetterCase">A(z) {1} fájl a lemezen {0} néven van: a linuxos eu07 nem tölti be</String>
|
|
||||||
<String key="SyntaxIncludeNotClosed">include {1} end nélkül</String>
|
<String key="SyntaxIncludeNotClosed">include {1} end nélkül</String>
|
||||||
<String key="SyntaxTrainsetUnreadable">A(z) {0} szerelvényt nem sikerült beolvasni</String>
|
<String key="SyntaxTrainsetUnreadable">A(z) {0} szerelvényt nem sikerült beolvasni</String>
|
||||||
<String key="SyntaxVehicleUnreadable">A(z) {0} járművet nem sikerült beolvasni</String>
|
<String key="SyntaxVehicleUnreadable">A(z) {0} járművet nem sikerült beolvasni</String>
|
||||||
|
|||||||
@@ -659,8 +659,10 @@
|
|||||||
<String key="About">O programie</String>
|
<String key="About">O programie</String>
|
||||||
<String key="Close">Zamknij</String>
|
<String key="Close">Zamknij</String>
|
||||||
<String key="CpuNoAvx2Title">Procesor bez AVX2</String>
|
<String key="CpuNoAvx2Title">Procesor bez AVX2</String>
|
||||||
<String key="CpuNoAvx2">Ten procesor nie ma AVX2, a oficjalny symulator go wymaga: nie uruchomi się. Można zbudować symulator bez AVX2 (CMake -DENABLE_AVX2=OFF). Instrukcja: {0}</String>
|
<String key="CpuNoAvx2">Ten procesor nie ma AVX2, a oficjalny symulator go wymaga: nie uruchomi się. Istnieje wersja symulatora bez AVX2 - nazwa jej pliku kończy się na _noavx2. Umieść ją w folderze gry, a starter sam jej użyje. Można też zbudować symulator samemu (CMake -DENABLE_AVX2=OFF). Instrukcja: {0}</String>
|
||||||
<String key="CpuNoAvx2Open">Otwórz instrukcję</String>
|
<String key="CpuNoAvx2Open">Otwórz instrukcję</String>
|
||||||
|
<String key="CpuNoAvx2Chosen">Ten procesor nie ma AVX2, a wybrany symulator {0} go wymaga: nie uruchomi się. W folderze gry jest wersja bez AVX2: {1}. Wybór automatyczny weźmie właśnie ją.</String>
|
||||||
|
<String key="CpuNoAvx2UseIt">Wybieraj automatycznie</String>
|
||||||
<String key="DontShowAgain">Nie pokazuj więcej</String>
|
<String key="DontShowAgain">Nie pokazuj więcej</String>
|
||||||
<String key="SettingsPath">Lokalizacja wczytanych ustawień:</String>
|
<String key="SettingsPath">Lokalizacja wczytanych ustawień:</String>
|
||||||
|
|
||||||
@@ -810,7 +812,6 @@
|
|||||||
<String key="SyntaxVehicleOutsideTrainset">Pojazd {0} stoi poza składem: brak nagłówka trainset?</String>
|
<String key="SyntaxVehicleOutsideTrainset">Pojazd {0} stoi poza składem: brak nagłówka trainset?</String>
|
||||||
<String key="SyntaxNotANumber">{0}: „{1}” zamiast liczby</String>
|
<String key="SyntaxNotANumber">{0}: „{1}” zamiast liczby</String>
|
||||||
<String key="SyntaxMissingInclude">Brak pliku {1} (include)</String>
|
<String key="SyntaxMissingInclude">Brak pliku {1} (include)</String>
|
||||||
<String key="SyntaxIncludeLetterCase">Plik {1} jest na dysku jako {0}: linuksowy eu07 go nie wczyta</String>
|
|
||||||
<String key="SyntaxIncludeNotClosed">include {1} bez end</String>
|
<String key="SyntaxIncludeNotClosed">include {1} bez end</String>
|
||||||
<String key="SyntaxTrainsetUnreadable">Nie udało się odczytać składu {0}</String>
|
<String key="SyntaxTrainsetUnreadable">Nie udało się odczytać składu {0}</String>
|
||||||
<String key="SyntaxVehicleUnreadable">Nie udało się odczytać pojazdu {0}</String>
|
<String key="SyntaxVehicleUnreadable">Nie udało się odczytać pojazdu {0}</String>
|
||||||
|
|||||||
@@ -633,8 +633,10 @@
|
|||||||
<String key="About">О программе</String>
|
<String key="About">О программе</String>
|
||||||
<String key="Close">Закрыть</String>
|
<String key="Close">Закрыть</String>
|
||||||
<String key="CpuNoAvx2Title">Процессор без AVX2</String>
|
<String key="CpuNoAvx2Title">Процессор без AVX2</String>
|
||||||
<String key="CpuNoAvx2">Этот процессор не поддерживает AVX2, а официальному симулятору он нужен: симулятор не запустится. Можно собрать симулятор без AVX2 (CMake -DENABLE_AVX2=OFF). Инструкция: {0}</String>
|
<String key="CpuNoAvx2">Этот процессор не поддерживает AVX2, а официальному симулятору он нужен: симулятор не запустится. Есть версия симулятора без AVX2 - имя её файла оканчивается на _noavx2. Положите её в папку игры, и стартер сам её использует. Симулятор можно также собрать самому (CMake -DENABLE_AVX2=OFF). Инструкция: {0}</String>
|
||||||
<String key="CpuNoAvx2Open">Открыть инструкцию</String>
|
<String key="CpuNoAvx2Open">Открыть инструкцию</String>
|
||||||
|
<String key="CpuNoAvx2Chosen">Этот процессор не поддерживает AVX2, а выбранному симулятору {0} он нужен: он не запустится. В папке игры есть версия без AVX2: {1}. Автоматический выбор возьмёт именно её.</String>
|
||||||
|
<String key="CpuNoAvx2UseIt">Выбирать автоматически</String>
|
||||||
<String key="DontShowAgain">Больше не показывать</String>
|
<String key="DontShowAgain">Больше не показывать</String>
|
||||||
<String key="SettingsPath">Настройки загружены из:</String>
|
<String key="SettingsPath">Настройки загружены из:</String>
|
||||||
|
|
||||||
@@ -783,7 +785,6 @@
|
|||||||
<String key="SyntaxVehicleOutsideTrainset">Транспорт {0} стоит вне состава: нет заголовка trainset?</String>
|
<String key="SyntaxVehicleOutsideTrainset">Транспорт {0} стоит вне состава: нет заголовка trainset?</String>
|
||||||
<String key="SyntaxNotANumber">{0}: «{1}» вместо числа</String>
|
<String key="SyntaxNotANumber">{0}: «{1}» вместо числа</String>
|
||||||
<String key="SyntaxMissingInclude">Файл {1} не найден (include)</String>
|
<String key="SyntaxMissingInclude">Файл {1} не найден (include)</String>
|
||||||
<String key="SyntaxIncludeLetterCase">Файл {1} на диске назван {0}: eu07 на Linux его не загрузит</String>
|
|
||||||
<String key="SyntaxIncludeNotClosed">include {1} без end</String>
|
<String key="SyntaxIncludeNotClosed">include {1} без end</String>
|
||||||
<String key="SyntaxTrainsetUnreadable">Не удалось прочитать состав {0}</String>
|
<String key="SyntaxTrainsetUnreadable">Не удалось прочитать состав {0}</String>
|
||||||
<String key="SyntaxVehicleUnreadable">Не удалось прочитать единицу {0}</String>
|
<String key="SyntaxVehicleUnreadable">Не удалось прочитать единицу {0}</String>
|
||||||
|
|||||||
Reference in New Issue
Block a user