Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
@leezer3
leezer3 committed Jul 25, 2024
2 parents 6a72844 + e3d0fc6 commit 8e5ddfb
Show file tree
Hide file tree
Showing 87 changed files with 7,029 additions and 535 deletions.
102 changes: 59 additions & 43 deletions OpenBVE.sln
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29209.62
# Visual Studio Version 17
VisualStudioVersion = 17.9.34728.123
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{16553295-E70F-4596-AA78-848EEA576C4A}"
EndProject
Expand All @@ -17,67 +17,68 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Texture.Ace", "source\Plugi
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenBve", "source\OpenBVE\OpenBve.csproj", "{34743421-2EB8-4F68-9600-AEAE79AECFA5}"
ProjectSection(ProjectDependencies) = postProject
{4B775819-3574-443E-95AD-B40BC6EA6469} = {4B775819-3574-443E-95AD-B40BC6EA6469}
{D7561922-31A6-46DE-801F-C3C519B4B9C3} = {D7561922-31A6-46DE-801F-C3C519B4B9C3}
{F59F8030-A470-471E-AFBF-6E7816DCD11B} = {F59F8030-A470-471E-AFBF-6E7816DCD11B}
{ACAFCA35-01B7-479C-AD5F-9BCE0F8A597B} = {ACAFCA35-01B7-479C-AD5F-9BCE0F8A597B}
{67418D38-1E2E-4944-A1B0-09E00FC2D055} = {67418D38-1E2E-4944-A1B0-09E00FC2D055}
{081F5739-33DA-421A-B177-7B548D96646F} = {081F5739-33DA-421A-B177-7B548D96646F}
{06D89847-9C7A-47D5-8C7A-95AEBFFF5F1E} = {06D89847-9C7A-47D5-8C7A-95AEBFFF5F1E}
{081F5739-33DA-421A-B177-7B548D96646F} = {081F5739-33DA-421A-B177-7B548D96646F}
{0C73C749-FCAE-4254-A614-AE1B03AF45C9} = {0C73C749-FCAE-4254-A614-AE1B03AF45C9}
{F6FBD153-9D9F-4D6C-B08D-0C798F106B32} = {F6FBD153-9D9F-4D6C-B08D-0C798F106B32}
{A2FC4D71-1ED9-40D4-B746-FE6AB3C7D55E} = {A2FC4D71-1ED9-40D4-B746-FE6AB3C7D55E}
{E9B64673-65B7-4D77-A4DB-4B441A7C9197} = {E9B64673-65B7-4D77-A4DB-4B441A7C9197}
{7D0D7673-C77A-4140-A5C6-075D825AC11D} = {7D0D7673-C77A-4140-A5C6-075D825AC11D}
{7AE7D277-EFD8-4325-80ED-CAE7CDB94505} = {7AE7D277-EFD8-4325-80ED-CAE7CDB94505}
{15142E7B-35F5-4E81-AA18-79C4D60B4C26} = {15142E7B-35F5-4E81-AA18-79C4D60B4C26}
{3D833D81-4F14-4A68-B0DE-6469B8CF4E62} = {3D833D81-4F14-4A68-B0DE-6469B8CF4E62}
{EEC75E83-E284-44E0-B321-3F5C6512074F} = {EEC75E83-E284-44E0-B321-3F5C6512074F}
{D3710390-CD0E-4E14-8E4F-80302D797D5E} = {D3710390-CD0E-4E14-8E4F-80302D797D5E}
{F3C96DBE-12C6-4362-86B0-24371369A3E2} = {F3C96DBE-12C6-4362-86B0-24371369A3E2}
{4B775819-3574-443E-95AD-B40BC6EA6469} = {4B775819-3574-443E-95AD-B40BC6EA6469}
{67418D38-1E2E-4944-A1B0-09E00FC2D055} = {67418D38-1E2E-4944-A1B0-09E00FC2D055}
{678031C7-6D87-4F5F-9C4A-12F86B76342C} = {678031C7-6D87-4F5F-9C4A-12F86B76342C}
{B520B1D7-3889-4C88-9E0F-CB96802D5CD1} = {B520B1D7-3889-4C88-9E0F-CB96802D5CD1}
{7AE7D277-EFD8-4325-80ED-CAE7CDB94505} = {7AE7D277-EFD8-4325-80ED-CAE7CDB94505}
{7D0D7673-C77A-4140-A5C6-075D825AC11D} = {7D0D7673-C77A-4140-A5C6-075D825AC11D}
{8DAA1CF4-A29A-42CE-8649-34E0FBC0D97C} = {8DAA1CF4-A29A-42CE-8649-34E0FBC0D97C}
{A2FC4D71-1ED9-40D4-B746-FE6AB3C7D55E} = {A2FC4D71-1ED9-40D4-B746-FE6AB3C7D55E}
{ACAFCA35-01B7-479C-AD5F-9BCE0F8A597B} = {ACAFCA35-01B7-479C-AD5F-9BCE0F8A597B}
{B520B1D7-3889-4C88-9E0F-CB96802D5CD1} = {B520B1D7-3889-4C88-9E0F-CB96802D5CD1}
{D3710390-CD0E-4E14-8E4F-80302D797D5E} = {D3710390-CD0E-4E14-8E4F-80302D797D5E}
{D7561922-31A6-46DE-801F-C3C519B4B9C3} = {D7561922-31A6-46DE-801F-C3C519B4B9C3}
{E9B64673-65B7-4D77-A4DB-4B441A7C9197} = {E9B64673-65B7-4D77-A4DB-4B441A7C9197}
{EEC75E83-E284-44E0-B321-3F5C6512074F} = {EEC75E83-E284-44E0-B321-3F5C6512074F}
{F3C96DBE-12C6-4362-86B0-24371369A3E2} = {F3C96DBE-12C6-4362-86B0-24371369A3E2}
{F59F8030-A470-471E-AFBF-6E7816DCD11B} = {F59F8030-A470-471E-AFBF-6E7816DCD11B}
{F6FBD153-9D9F-4D6C-B08D-0C798F106B32} = {F6FBD153-9D9F-4D6C-B08D-0C798F106B32}
{F714A9FA-1C4B-456B-BACF-D6763223A81C} = {F714A9FA-1C4B-456B-BACF-D6763223A81C}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenBveApi", "source\OpenBveApi\OpenBveApi.csproj", "{27134980-4415-4375-A564-40A9014DFA5F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteViewer", "source\RouteViewer\RouteViewer.csproj", "{B34E2423-B8D0-405E-A970-1F135B6855C7}"
ProjectSection(ProjectDependencies) = postProject
{06D89847-9C7A-47D5-8C7A-95AEBFFF5F1E} = {06D89847-9C7A-47D5-8C7A-95AEBFFF5F1E}
{081F5739-33DA-421A-B177-7B548D96646F} = {081F5739-33DA-421A-B177-7B548D96646F}
{4B775819-3574-443E-95AD-B40BC6EA6469} = {4B775819-3574-443E-95AD-B40BC6EA6469}
{D7561922-31A6-46DE-801F-C3C519B4B9C3} = {D7561922-31A6-46DE-801F-C3C519B4B9C3}
{F59F8030-A470-471E-AFBF-6E7816DCD11B} = {F59F8030-A470-471E-AFBF-6E7816DCD11B}
{ACAFCA35-01B7-479C-AD5F-9BCE0F8A597B} = {ACAFCA35-01B7-479C-AD5F-9BCE0F8A597B}
{67418D38-1E2E-4944-A1B0-09E00FC2D055} = {67418D38-1E2E-4944-A1B0-09E00FC2D055}
{081F5739-33DA-421A-B177-7B548D96646F} = {081F5739-33DA-421A-B177-7B548D96646F}
{06D89847-9C7A-47D5-8C7A-95AEBFFF5F1E} = {06D89847-9C7A-47D5-8C7A-95AEBFFF5F1E}
{678031C7-6D87-4F5F-9C4A-12F86B76342C} = {678031C7-6D87-4F5F-9C4A-12F86B76342C}
{7AE7D277-EFD8-4325-80ED-CAE7CDB94505} = {7AE7D277-EFD8-4325-80ED-CAE7CDB94505}
{7D0D7673-C77A-4140-A5C6-075D825AC11D} = {7D0D7673-C77A-4140-A5C6-075D825AC11D}
{8DAA1CF4-A29A-42CE-8649-34E0FBC0D97C} = {8DAA1CF4-A29A-42CE-8649-34E0FBC0D97C}
{A2FC4D71-1ED9-40D4-B746-FE6AB3C7D55E} = {A2FC4D71-1ED9-40D4-B746-FE6AB3C7D55E}
{ACAFCA35-01B7-479C-AD5F-9BCE0F8A597B} = {ACAFCA35-01B7-479C-AD5F-9BCE0F8A597B}
{B520B1D7-3889-4C88-9E0F-CB96802D5CD1} = {B520B1D7-3889-4C88-9E0F-CB96802D5CD1}
{C4BE7A1F-9CCD-4E78-8341-741ABDA8E026} = {C4BE7A1F-9CCD-4E78-8341-741ABDA8E026}
{D7561922-31A6-46DE-801F-C3C519B4B9C3} = {D7561922-31A6-46DE-801F-C3C519B4B9C3}
{E9B64673-65B7-4D77-A4DB-4B441A7C9197} = {E9B64673-65B7-4D77-A4DB-4B441A7C9197}
{7D0D7673-C77A-4140-A5C6-075D825AC11D} = {7D0D7673-C77A-4140-A5C6-075D825AC11D}
{7AE7D277-EFD8-4325-80ED-CAE7CDB94505} = {7AE7D277-EFD8-4325-80ED-CAE7CDB94505}
{EEC75E83-E284-44E0-B321-3F5C6512074F} = {EEC75E83-E284-44E0-B321-3F5C6512074F}
{F3C96DBE-12C6-4362-86B0-24371369A3E2} = {F3C96DBE-12C6-4362-86B0-24371369A3E2}
{678031C7-6D87-4F5F-9C4A-12F86B76342C} = {678031C7-6D87-4F5F-9C4A-12F86B76342C}
{B520B1D7-3889-4C88-9E0F-CB96802D5CD1} = {B520B1D7-3889-4C88-9E0F-CB96802D5CD1}
{8DAA1CF4-A29A-42CE-8649-34E0FBC0D97C} = {8DAA1CF4-A29A-42CE-8649-34E0FBC0D97C}
{F59F8030-A470-471E-AFBF-6E7816DCD11B} = {F59F8030-A470-471E-AFBF-6E7816DCD11B}
{F714A9FA-1C4B-456B-BACF-D6763223A81C} = {F714A9FA-1C4B-456B-BACF-D6763223A81C}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrainEditor", "source\TrainEditor\TrainEditor.csproj", "{912A4369-C2D7-4A23-A3C5-42FED3E950D4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ObjectViewer", "source\ObjectViewer\ObjectViewer.csproj", "{F1E0F444-D09A-487E-8AFA-B8223E0D8671}"
ProjectSection(ProjectDependencies) = postProject
{4B775819-3574-443E-95AD-B40BC6EA6469} = {4B775819-3574-443E-95AD-B40BC6EA6469}
{D7561922-31A6-46DE-801F-C3C519B4B9C3} = {D7561922-31A6-46DE-801F-C3C519B4B9C3}
{F59F8030-A470-471E-AFBF-6E7816DCD11B} = {F59F8030-A470-471E-AFBF-6E7816DCD11B}
{ACAFCA35-01B7-479C-AD5F-9BCE0F8A597B} = {ACAFCA35-01B7-479C-AD5F-9BCE0F8A597B}
{06D89847-9C7A-47D5-8C7A-95AEBFFF5F1E} = {06D89847-9C7A-47D5-8C7A-95AEBFFF5F1E}
{4B775819-3574-443E-95AD-B40BC6EA6469} = {4B775819-3574-443E-95AD-B40BC6EA6469}
{678031C7-6D87-4F5F-9C4A-12F86B76342C} = {678031C7-6D87-4F5F-9C4A-12F86B76342C}
{7AE7D277-EFD8-4325-80ED-CAE7CDB94505} = {7AE7D277-EFD8-4325-80ED-CAE7CDB94505}
{EEC75E83-E284-44E0-B321-3F5C6512074F} = {EEC75E83-E284-44E0-B321-3F5C6512074F}
{ACAFCA35-01B7-479C-AD5F-9BCE0F8A597B} = {ACAFCA35-01B7-479C-AD5F-9BCE0F8A597B}
{D3710390-CD0E-4E14-8E4F-80302D797D5E} = {D3710390-CD0E-4E14-8E4F-80302D797D5E}
{D7561922-31A6-46DE-801F-C3C519B4B9C3} = {D7561922-31A6-46DE-801F-C3C519B4B9C3}
{EEC75E83-E284-44E0-B321-3F5C6512074F} = {EEC75E83-E284-44E0-B321-3F5C6512074F}
{F3C96DBE-12C6-4362-86B0-24371369A3E2} = {F3C96DBE-12C6-4362-86B0-24371369A3E2}
{678031C7-6D87-4F5F-9C4A-12F86B76342C} = {678031C7-6D87-4F5F-9C4A-12F86B76342C}
{F59F8030-A470-471E-AFBF-6E7816DCD11B} = {F59F8030-A470-471E-AFBF-6E7816DCD11B}
{F714A9FA-1C4B-456B-BACF-D6763223A81C} = {F714A9FA-1C4B-456B-BACF-D6763223A81C}
EndProjectSection
EndProject
Expand Down Expand Up @@ -125,8 +126,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Object.Msts", "source\Plugi
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrainEditor2", "source\TrainEditor2\TrainEditor2.csproj", "{0AE1C682-A15E-4880-925E-10F9EFD1CD49}"
ProjectSection(ProjectDependencies) = postProject
{67418D38-1E2E-4944-A1B0-09E00FC2D055} = {67418D38-1E2E-4944-A1B0-09E00FC2D055}
{081F5739-33DA-421A-B177-7B548D96646F} = {081F5739-33DA-421A-B177-7B548D96646F}
{67418D38-1E2E-4944-A1B0-09E00FC2D055} = {67418D38-1E2E-4944-A1B0-09E00FC2D055}
{A2FC4D71-1ED9-40D4-B746-FE6AB3C7D55E} = {A2FC4D71-1ED9-40D4-B746-FE6AB3C7D55E}
{B520B1D7-3889-4C88-9E0F-CB96802D5CD1} = {B520B1D7-3889-4C88-9E0F-CB96802D5CD1}
EndProjectSection
Expand All @@ -137,20 +138,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RouteManager2", "source\Rou
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Route.CsvRw", "source\Plugins\Route.CsvRw\Route.CsvRw.csproj", "{8DAA1CF4-A29A-42CE-8649-34E0FBC0D97C}"
ProjectSection(ProjectDependencies) = postProject
{90ABFA0C-ABCA-444E-ADEF-9A299AED6524} = {90ABFA0C-ABCA-444E-ADEF-9A299AED6524}
{06D89847-9C7A-47D5-8C7A-95AEBFFF5F1E} = {06D89847-9C7A-47D5-8C7A-95AEBFFF5F1E}
{081F5739-33DA-421A-B177-7B548D96646F} = {081F5739-33DA-421A-B177-7B548D96646F}
{4B775819-3574-443E-95AD-B40BC6EA6469} = {4B775819-3574-443E-95AD-B40BC6EA6469}
{D7561922-31A6-46DE-801F-C3C519B4B9C3} = {D7561922-31A6-46DE-801F-C3C519B4B9C3}
{F59F8030-A470-471E-AFBF-6E7816DCD11B} = {F59F8030-A470-471E-AFBF-6E7816DCD11B}
{ACAFCA35-01B7-479C-AD5F-9BCE0F8A597B} = {ACAFCA35-01B7-479C-AD5F-9BCE0F8A597B}
{67418D38-1E2E-4944-A1B0-09E00FC2D055} = {67418D38-1E2E-4944-A1B0-09E00FC2D055}
{081F5739-33DA-421A-B177-7B548D96646F} = {081F5739-33DA-421A-B177-7B548D96646F}
{06D89847-9C7A-47D5-8C7A-95AEBFFF5F1E} = {06D89847-9C7A-47D5-8C7A-95AEBFFF5F1E}
{A2FC4D71-1ED9-40D4-B746-FE6AB3C7D55E} = {A2FC4D71-1ED9-40D4-B746-FE6AB3C7D55E}
{678031C7-6D87-4F5F-9C4A-12F86B76342C} = {678031C7-6D87-4F5F-9C4A-12F86B76342C}
{7AE7D277-EFD8-4325-80ED-CAE7CDB94505} = {7AE7D277-EFD8-4325-80ED-CAE7CDB94505}
{90ABFA0C-ABCA-444E-ADEF-9A299AED6524} = {90ABFA0C-ABCA-444E-ADEF-9A299AED6524}
{A2FC4D71-1ED9-40D4-B746-FE6AB3C7D55E} = {A2FC4D71-1ED9-40D4-B746-FE6AB3C7D55E}
{ACAFCA35-01B7-479C-AD5F-9BCE0F8A597B} = {ACAFCA35-01B7-479C-AD5F-9BCE0F8A597B}
{B520B1D7-3889-4C88-9E0F-CB96802D5CD1} = {B520B1D7-3889-4C88-9E0F-CB96802D5CD1}
{D7561922-31A6-46DE-801F-C3C519B4B9C3} = {D7561922-31A6-46DE-801F-C3C519B4B9C3}
{EEC75E83-E284-44E0-B321-3F5C6512074F} = {EEC75E83-E284-44E0-B321-3F5C6512074F}
{F3C96DBE-12C6-4362-86B0-24371369A3E2} = {F3C96DBE-12C6-4362-86B0-24371369A3E2}
{678031C7-6D87-4F5F-9C4A-12F86B76342C} = {678031C7-6D87-4F5F-9C4A-12F86B76342C}
{B520B1D7-3889-4C88-9E0F-CB96802D5CD1} = {B520B1D7-3889-4C88-9E0F-CB96802D5CD1}
{F59F8030-A470-471E-AFBF-6E7816DCD11B} = {F59F8030-A470-471E-AFBF-6E7816DCD11B}
{F714A9FA-1C4B-456B-BACF-D6763223A81C} = {F714A9FA-1C4B-456B-BACF-D6763223A81C}
EndProjectSection
EndProject
Expand All @@ -175,6 +176,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Train.OpenBve", "source\Plu
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Win32PluginProxy", "source\Plugins\Win32PluginProxy\Win32PluginProxy.csproj", "{B9014791-7170-4DCD-B3F1-2B7518A85C83}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Route.Bve5", "source\Plugins\Route.Bve5\Route.Bve5.csproj", "{C4BE7A1F-9CCD-4E78-8341-741ABDA8E026}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -629,6 +632,18 @@ Global
{B9014791-7170-4DCD-B3F1-2B7518A85C83}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{B9014791-7170-4DCD-B3F1-2B7518A85C83}.Release|x86.ActiveCfg = Release|Any CPU
{B9014791-7170-4DCD-B3F1-2B7518A85C83}.Release|x86.Build.0 = Release|Any CPU
{C4BE7A1F-9CCD-4E78-8341-741ABDA8E026}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C4BE7A1F-9CCD-4E78-8341-741ABDA8E026}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C4BE7A1F-9CCD-4E78-8341-741ABDA8E026}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{C4BE7A1F-9CCD-4E78-8341-741ABDA8E026}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{C4BE7A1F-9CCD-4E78-8341-741ABDA8E026}.Debug|x86.ActiveCfg = Debug|Any CPU
{C4BE7A1F-9CCD-4E78-8341-741ABDA8E026}.Debug|x86.Build.0 = Debug|Any CPU
{C4BE7A1F-9CCD-4E78-8341-741ABDA8E026}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C4BE7A1F-9CCD-4E78-8341-741ABDA8E026}.Release|Any CPU.Build.0 = Release|Any CPU
{C4BE7A1F-9CCD-4E78-8341-741ABDA8E026}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{C4BE7A1F-9CCD-4E78-8341-741ABDA8E026}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{C4BE7A1F-9CCD-4E78-8341-741ABDA8E026}.Release|x86.ActiveCfg = Release|Any CPU
{C4BE7A1F-9CCD-4E78-8341-741ABDA8E026}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -664,6 +679,7 @@ Global
{7D0D7673-C77A-4140-A5C6-075D825AC11D} = {D75531B7-000E-432E-A168-51846256A9D1}
{D3710390-CD0E-4E14-8E4F-80302D797D5E} = {F49789F2-97F3-45B3-BC85-F4E09C0D120D}
{B9014791-7170-4DCD-B3F1-2B7518A85C83} = {F49789F2-97F3-45B3-BC85-F4E09C0D120D}
{C4BE7A1F-9CCD-4E78-8341-741ABDA8E026} = {D75531B7-000E-432E-A168-51846256A9D1}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {50B52A67-69B1-4B19-A59C-FF058FD9EBDF}
Expand Down
Binary file added assets/Menu/icon_bve5.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion azure-pipelines-1.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- job: AppleMakeBuild
displayName: 'Build on Apple OS-X (makefile)'
pool:
vmImage: 'macos-11'
vmImage: 'macos-12'

variables:
solution: 'OpenBVE.sln'
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines-release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
- job: AppleMakeBuild
displayName: 'Build on Apple OS-X (makefile)'
pool:
vmImage: 'macos-11'
vmImage: 'macos-12'

variables:
solution: 'OpenBVE.sln'
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- job: AppleMakeBuild
displayName: 'Build on Apple OS-X (makefile)'
pool:
vmImage: 'macos-11'
vmImage: 'macos-12'

variables:
solution: 'OpenBVE.sln'
Expand Down
8 changes: 6 additions & 2 deletions source/AssimpParser/X/XFileParser.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,10 @@ protected void ParseDataObjectMesh(out Mesh mesh)
case "skinweights":
ParseDataObjectSkinWeights(ref mesh);
break;
case "fvfdata":
ParseUnknownDataObject(true);
// ignore
break;
default:
Debug.WriteLine("Unknown data object in mesh in x file");
ParseUnknownDataObject();
Expand Down Expand Up @@ -1120,13 +1124,13 @@ protected void ParseDataObjectTextureFilename(out string name)
name = name.Replace("\\\\", "\\");
}

protected void ParseUnknownDataObject()
protected void ParseUnknownDataObject(bool allowEmptyName = false)
{
// find opening delimiter
while (true)
{
string t = GetNextToken();
if (t.Length == 0)
if (t.Length == 0 && !allowEmptyName) // fvfdata allows empty name
{
ThrowException("Unexpected end of file while parsing unknown segment.");
}
Expand Down
Loading

0 comments on commit 8e5ddfb

Please sign in to comment.