Merge pull request #24484 from Gymnasiast/refactor/split-g2-further

Split tracks.dat from g2.dat

.github/workflows/ci.yml

@@ -150,7 +150,7 @@ jobs:
       - name: Run check-changelog-formatting
         run: scripts/check-changelog-formatting
   g2dat:
-    name: g2.dat and fonts.dat
+    name: Graphics .dat files
     runs-on: ubuntu-latest
     needs: build_variables
     steps:
@@ -164,22 +164,19 @@ jobs:
           mkdir -p "$GITHUB_WORKSPACE/bin"
           tar -C "$GITHUB_WORKSPACE/bin" -xf tools.tar.gz
           echo "$GITHUB_WORKSPACE/bin" >> $GITHUB_PATH
-      - name: Build g2.dat
+      - name: Build graphics .dat files
         run: |
           gxc build g2.dat OpenRCT2/resources/g2/sprites.json
-      - name: Build fonts.dat
-        run: |
           gxc build fonts.dat OpenRCT2/resources/fonts/sprites.json
-      - name: Upload g2.dat
+          gxc build tracks.dat OpenRCT2/resources/tracks/sprites.json
+      - name: Upload graphics .dat files
         uses: actions/upload-artifact@v4
         with:
-          name: g2-${{ needs.build_variables.outputs.name }}.dat
-          path: g2.dat
-      - name: Upload fonts.dat
-        uses: actions/upload-artifact@v4
-        with:
-          name: fonts-${{ needs.build_variables.outputs.name }}.dat
-          path: fonts.dat
+          name: graphics-${{ needs.build_variables.outputs.name }}
+          path: |
+            g2.dat
+            fonts.dat
+            tracks.dat
   windows:
     name: Windows
     runs-on: windows-latest
@@ -237,17 +234,11 @@ jobs:
         run: |
           mv files-signed/openrct2.com bin/openrct2.com
           mv files-signed/openrct2.exe bin/openrct2.exe
-      - name: Download g2.dat on ARM64
+      - name: Download graphics .dat files on ARM64
         if: matrix.platform == 'arm64'
         uses: actions/download-artifact@v4
         with:
-          name: g2-${{ needs.build_variables.outputs.name }}.dat
-          path: bin/data
-      - name: Download fonts.dat on ARM64
-        if: matrix.platform == 'arm64'
-        uses: actions/download-artifact@v4
-        with:
-          name: fonts-${{ needs.build_variables.outputs.name }}.dat
+          name: graphics-${{ needs.build_variables.outputs.name }}
           path: bin/data
       - name: Build artifacts
         run: |

.gitignore

@@ -25,6 +25,7 @@ libversion
 # Downloaded or built data files
 data/g2.dat
 data/fonts.dat
+data/tracks.dat
 data/sequence
 data/object
 data/assetpack

CMakeLists.txt

@@ -393,7 +393,7 @@ endif()
 
 # graphics files (g2.dat and font.dat) 
 if (NOT CMAKE_CROSSCOMPILING)
-    set(graphics_files "g2" "fonts")
+    set(graphics_files "g2" "fonts" "tracks")
     
     foreach(graphics_file ${graphics_files})
         set(output_file "${graphics_file}.dat")
@@ -500,6 +500,7 @@ if (NOT MACOS_BUNDLE OR (MACOS_BUNDLE AND WITH_TESTS))
     endif ()
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/g2.dat" DESTINATION "${CMAKE_INSTALL_DATADIR}/openrct2")
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/fonts.dat" DESTINATION "${CMAKE_INSTALL_DATADIR}/openrct2")
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tracks.dat" DESTINATION "${CMAKE_INSTALL_DATADIR}/openrct2")
     install(DIRECTORY "data/" DESTINATION "${CMAKE_INSTALL_DATADIR}/openrct2")
 
     # even when building WITH_TESTS, none of the below install steps are required for OpenRCT2.app

distribution/changelog.txt

@@ -13,7 +13,7 @@
 - Improved: [#24467] Apply tweening only to on-screen entities when not zoomed out for better performance with uncapped FPS.
 - Improved: [#24474] More efficiently search viewports when playing Audio.
 - Improved: [#24479] More descriptive error messages for `set` commands in the in-game console.
-- Change: [#24342] g2.dat is now split into g2.dat and fonts.dat.
+- Change: [#24342, #24484] g2.dat is now split into g2.dat, fonts.dat and tracks.dat.
 - Change: [#24362] The Windows installer now prevents installing to the same folder as RollerCoaster Tycoon 2 or Classic.
 - Change: [#24418] Small & Large Zero G Rolls can now be built on the LIM Launched RC without cheats if vehicle sprites are available.
 - Fix: [#5269] Font bugs when using the Russian release of RCT2 as the base game.

openrct2.targets

@@ -8,8 +8,7 @@
     <!-- CLI Configuration -->
     <CLIProjectName Condition="'$(CLIProjectName)' == ''">openrct2-cli</CLIProjectName>
     <CLIProjectPath Condition="'$(CLIProjectPath)' == ''">$(SolutionDir)src\$(CLIProjectName)\$(CLIProjectName).vcxproj</CLIProjectPath>
-    <G2CLIPath Condition="'$(G2CLIPath)' == ''">$(OutDir)$(CLIProjectName).exe</G2CLIPath>
-    <FontsCLIPath Condition="'$(FontsCLIPath)' == ''">$(OutDir)$(CLIProjectName).exe</FontsCLIPath>
+    <GraphicsCLIPath Condition="'$(GraphicsCLIPath)' == ''">$(OutDir)$(CLIProjectName).exe</GraphicsCLIPath>
 
     <!-- Data Configuration -->
     <DataOutputPath Condition="'$(DataOutputPath)' == ''">$(OutDir)data\</DataOutputPath>
@@ -17,10 +16,10 @@
     <DataLanguagePath Condition="'$(DataLanguagePath)' == ''">$(SolutionDir)data\language\</DataLanguagePath>
     <DataShadersPath Condition="'$(DataShadersPath)' == ''">$(SolutionDir)data\shaders\</DataShadersPath>
     <DataScenarioPath Condition="'$(DataScenarioPath)' == ''">$(SolutionDir)data\scenario_patches\</DataScenarioPath>
-    <ResourcesG2Path Condition="'$(ResourcesG2Path)' == ''">$(SolutionDir)resources\g2\</ResourcesG2Path>
-    <G2InputFile Condition="'$(G2InputFile)' == ''">$(ResourcesG2Path)sprites.json</G2InputFile>
-    <ResourcesFontsPath Condition="'$(ResourcesFontsPath)' == ''">$(SolutionDir)resources\fonts\</ResourcesFontsPath>
-    <FontsInputFile Condition="'$(FontsInputFile)' == ''">$(ResourcesFontsPath)sprites.json</FontsInputFile>
+    <ResourcesPath Condition="'$(ResourcesPath)' == ''">$(SolutionDir)resources\</ResourcesPath>
+    <G2InputFile Condition="'$(G2InputFile)' == ''">$(ResourcesPath)g2\sprites.json</G2InputFile>
+    <FontsInputFile Condition="'$(FontsInputFile)' == ''">$(ResourcesPath)fonts\sprites.json</FontsInputFile>
+    <TracksInputFile Condition="'$(TracksInputFile)' == ''">$(ResourcesPath)tracks\sprites.json</TracksInputFile>
     <DataOutputPath Condition="'$(DataOutputPath)' == ''">$(OutDir)data\</DataOutputPath>
   </PropertyGroup>
     
@@ -28,6 +27,7 @@
   <ItemGroup>
     <G2Input Include="$(G2InputFile)" />
     <FontsInput Include="$(FontsInputFile)" />
+    <TracksInput Include="$(TracksInputFile)" />
     
     <LanguageFiles Include="$(DataLanguagePath)**\*"
                    Exclude="$(DataLanguagePath)*.bak;
@@ -111,7 +111,7 @@
 
     <MakeDir Directories="$(DataOutputPath)" />
     
-    <Exec Command="&quot;$(G2CLIPath)&quot; sprite build &quot;$(DataOutputPath)g2.dat&quot; &quot;%(G2Input.FullPath)&quot;"
+    <Exec Command="&quot;$(GraphicsCLIPath)&quot; sprite build &quot;$(DataOutputPath)g2.dat&quot; &quot;%(G2Input.FullPath)&quot;"
           ConsoleToMSBuild="true"
           IgnoreExitCode="false">
       <Output TaskParameter="ConsoleOutput" PropertyName="G2BuildOutput" />
@@ -131,7 +131,7 @@
   
       <MakeDir Directories="$(DataOutputPath)" />
       
-      <Exec Command="&quot;$(FontsCLIPath)&quot; sprite build &quot;$(DataOutputPath)fonts.dat&quot; &quot;%(FontsInput.FullPath)&quot;"
+      <Exec Command="&quot;$(GraphicsCLIPath)&quot; sprite build &quot;$(DataOutputPath)fonts.dat&quot; &quot;%(FontsInput.FullPath)&quot;"
             ConsoleToMSBuild="true"
             IgnoreExitCode="false">
         <Output TaskParameter="ConsoleOutput" PropertyName="FontsBuildOutput" />
@@ -142,4 +142,24 @@
              AlwaysCreate="true" />
     </Target>
   <Target Name="fonts" DependsOnTargets="BuildFonts" />
+  
+  <Target Name="BuildTracks"
+          AfterTargets="Build"
+          Inputs="@(TracksInput)"
+          Outputs="$(DataOutputPath)tracks.dat"
+          Condition="'$(TestConfig)' != 'true' and ('$(Platform)' != 'ARM64' or '$(PROCESSOR_ARCHITECTURE)' == 'ARM64')">
+
+    <MakeDir Directories="$(DataOutputPath)" />
+    
+    <Exec Command="&quot;$(GraphicsCLIPath)&quot; sprite build &quot;$(DataOutputPath)tracks.dat&quot; &quot;%(TracksInput.FullPath)&quot;"
+          ConsoleToMSBuild="true"
+          IgnoreExitCode="false">
+      <Output TaskParameter="ConsoleOutput" PropertyName="TracksBuildOutput" />
+    </Exec>
+
+    <Touch Files="$(DataOutputPath)tracks.dat"
+           ForceTouch="true"
+           AlwaysCreate="true" />
+  </Target>
+  <Target Name="tracks" DependsOnTargets="BuildTracks" />
 </Project>