Synesthesias · linoal · May 9, 2025 · May 9, 2025 · May 9, 2025 · May 9, 2025
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
@@ -89,14 +89,6 @@ runs:
         echo "ADDITIONAL_CMAKE_OPTIONS=-DCMAKE_CXX_COMPILER=cl.exe" >> $env:GITHUB_ENV
       shell: ${{ inputs.shell_type }}
 
-      # Linuxで使うコンパイラを明示
-    - name: Setup Additional Cmake Options in Linux
-      if: runner.os == 'Linux'
-      run: |
-        echo "ADDITIONAL_CMAKE_OPTIONS=-DCMAKE_CXX_COMPILER=\"/usr/bin/g++-9\"" >> $GITHUB_ENV
-      shell: ${{ inputs.shell_type }}
-      # Ubuntu 18 だとデフォルトでは g++-7 になりますが、std::filesystem を使う都合上 g++-9 を指定します。
-
     - name: Configure CMake for Unity
       run: >
         cmake

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -24,7 +24,7 @@ jobs:
             arch: x86_64
           - os: macos-14
             arch: arm64
-          - os: ubuntu-20.04
+          - os: ubuntu-24.04 # Unity LTSの対応バージョンに合わせておきます
             arch: x86_64
 
     steps:

diff --git a/.github/workflows/check-submodule-license.yml b/.github/workflows/check-submodule-license.yml
@@ -15,7 +15,7 @@ on:
 
 jobs:
   check-submodule-license:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
 

diff --git a/.github/workflows/upload-dlls-older-visual-studio.yml b/.github/workflows/upload-dlls-older-visual-studio.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2019, macos-14, ubuntu-20.04]
+        os: [windows-2019, macos-14, ubuntu-24.04] # UbuntuはUnity LTSの対応バージョンに合わせておきます
         arch: [x86_64]
         include:
           - os: macos-14
@@ -43,7 +43,7 @@ jobs:
         uses: ./.github/actions/upload-dll
         with:
           shell_type: ${{ (runner.os == 'Windows' && 'powershell') || 'bash' }}
-          visual_studio_version: "16 2019"
+          visual_studio_version: "17 2022"
 
   # 2つ目のジョブ。
   # AndroidとiOS用にライブラリをビルド。
@@ -98,7 +98,7 @@ jobs:
           mkdir -p ~/a/plateau-plugins/dynamic-libs/iOS/plateau.framework
           cp ~/a/libplateau-windows/plateau.dll ~/a/plateau-plugins/dynamic-libs/Windows/x86_64
           cp ~/a/libplateau-windows/CSharpPLATEAU.dll ~/a/plateau-plugins/dynamic-libs/ManagedDLL
-          cp ~/a/libplateau-ubuntu-20.04/*.so ~/a/plateau-plugins/dynamic-libs/Linux/x86_64
+          cp ~/a/libplateau-ubuntu-24.04/*.so ~/a/plateau-plugins/dynamic-libs/Linux/x86_64
           cp ~/a/libplateau-macos-14-x86_64/*.dylib ~/a/plateau-plugins/dynamic-libs/MacOS/x86_64
           cp ~/a/libplateau-macos-14-arm64/*.dylib ~/a/plateau-plugins/dynamic-libs/MacOS/arm64
           cp ~/a/libplateau-android-dll/libplateau.so ~/a/plateau-plugins/dynamic-libs/Android
@@ -110,7 +110,7 @@ jobs:
           mkdir -p ~/a/plateau-plugins/static-libs/linux
           mkdir -p ~/a/plateau-plugins/static-libs/macos
           cp ~/a/libplateau-windows/*.lib ~/a/plateau-plugins/static-libs/windows
-          cp ~/a/libplateau-ubuntu-20.04/*.a ~/a/plateau-plugins/static-libs/linux
+          cp ~/a/libplateau-ubuntu-24.04/*.a ~/a/plateau-plugins/static-libs/linux
           cp ~/a/libplateau-macos-14-x86_64/*.a ~/a/plateau-plugins/static-libs/macos/x86_64
           cp ~/a/libplateau-macos-14-arm64/*.a ~/a/plateau-plugins/static-libs/macos/arm64
 

diff --git a/.github/workflows/upload-dlls.yml b/.github/workflows/upload-dlls.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2022, macos-14, ubuntu-20.04]
+        os: [windows-2022, macos-14, ubuntu-24.04] # UbuntuはUnity LTSの対応バージョンに合わせておきます
         arch: [x86_64]
         include:
           - os: macos-14
@@ -101,7 +101,7 @@ jobs:
           mkdir -p ~/a/plateau-plugins/dynamic-libs/iOS/plateau.framework
           cp ~/a/libplateau-windows/plateau.dll ~/a/plateau-plugins/dynamic-libs/Windows/x86_64
           cp ~/a/libplateau-windows/CSharpPLATEAU.dll ~/a/plateau-plugins/dynamic-libs/ManagedDLL
-          cp ~/a/libplateau-ubuntu-20.04/*.so ~/a/plateau-plugins/dynamic-libs/Linux/x86_64
+          cp ~/a/libplateau-ubuntu-24.04/*.so ~/a/plateau-plugins/dynamic-libs/Linux/x86_64
           cp ~/a/libplateau-macos-14-x86_64/*.dylib ~/a/plateau-plugins/dynamic-libs/MacOS/x86_64
           cp ~/a/libplateau-macos-14-arm64/*.dylib ~/a/plateau-plugins/dynamic-libs/MacOS/arm64
           cp ~/a/libplateau-android-dll/libplateau.so ~/a/plateau-plugins/dynamic-libs/Android
@@ -114,7 +114,7 @@ jobs:
           mkdir -p ~/a/plateau-plugins/static-libs/macos/x86_64
           mkdir -p ~/a/plateau-plugins/static-libs/macos/arm64
           cp ~/a/libplateau-windows/*.lib ~/a/plateau-plugins/static-libs/windows
-          cp ~/a/libplateau-ubuntu-20.04/*.a ~/a/plateau-plugins/static-libs/linux
+          cp ~/a/libplateau-ubuntu-24.04/*.a ~/a/plateau-plugins/static-libs/linux
           cp ~/a/libplateau-macos-14-x86_64/*.a ~/a/plateau-plugins/static-libs/macos/x86_64
           cp ~/a/libplateau-macos-14-arm64/*.a ~/a/plateau-plugins/static-libs/macos/arm64
 

diff --git a/3rdparty/glTF-SDK/glTF-SDK b/3rdparty/glTF-SDK/glTF-SDK
diff --git a/README.md b/README.md
@@ -129,9 +129,9 @@ fbx_sdk は Autodesk社が公開するSDKです。これは自由に製品に組
 * C#ユニットテストも合わせて実行可能です。
 
 ### Linuxでの手動ビルド
-利用する Linux は、Unityの対応OSに合わせて Ubuntu 20.04 とします。
+利用する Linux は、Unityの対応OSに合わせて Ubuntu 24.04 とします。
 #### C++のビルド
-* Ubuntu 20 はデフォルトでは git lfs がないので、`sudo apt install git-lfs` します。
+* Ubuntuでgit lfsを使うために`sudo apt install git-lfs` します。
 * OpenGL API が必要なので、なければ以下のコマンドでインストールします。
 ```
 sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev

diff --git a/include/plateau/dataset/city_model_package.h b/include/plateau/dataset/city_model_package.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <string>
+#include <cstdint>
 
 namespace plateau::dataset {
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ on: @@
     jobs:
       check-submodule-license:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-24.04
         steps:
@@ Expand Down @@
+31 −0		.github/workflows/ci.yml
+36 −0		.github/workflows/ios.yml
+44 −0		.github/workflows/macos.yml
+46 −0		.github/workflows/windows.yml
+0 −255		Build/AzureDevOps/azure-pipelines.yml
+0 −13		Build/CMake/Android/FindGLTFSDK.android_arm64-v8a.cmake
+0 −13		Build/CMake/Android/FindGLTFSDK.android_armeabi-v7a.cmake
+0 −13		Build/CMake/Android/FindGLTFSDK.android_x86.cmake
+0 −13		Build/CMake/Android/FindGLTFSDK.android_x86_64.cmake
+0 −13		Build/CMake/FindGLTFSDK.iOS.cmake
+0 −13		Build/CMake/FindGLTFSDK.iOSSimulator64.cmake
+0 −13		Build/CMake/FindGLTFSDK.macOS.cmake
+0 −26		Build/Scripts/GetGitCommand.ps1
+0 −55		Build/Scripts/New-AnnotatedTag.ps1
+0 −168		Build/Scripts/ReleaseNotesHelper.psm1
+0 −140		Build/Scripts/ReleaseNotesPRChecker.ps1
+0 −6		Build/Scripts/ReleaseNotesTags.json
+0 −14		Build/Scripts/RestorePackages.ps1
+0 −36		Build/Scripts/SetBuildVariables.json
+0 −74		Build/Scripts/SetBuildVariables.ps1
+0 −11		Build/Scripts/Tests.Android.json
+0 −256		Build/Scripts/VersionGenerator.ps1
+0 −31		Build/Scripts/VersionGeneratorAndModifier.ps1
+0 −251		Build/Scripts/VersionModifier.ps1
+0 −98		Build/Scripts/winbuild.ps1
+0 −85		Build/Scripts/wininit.ps1
+0 −4		Build/macOSPackageRoot/packages.config
+4 −2		CMakeLists.txt
+1 −3		GLTFSDK.Samples/Deserialize/CMakeLists.txt
+0 −261		GLTFSDK.Samples/Deserialize/Deserialize.vcxproj
+0 −22		GLTFSDK.Samples/Deserialize/Deserialize.vcxproj.filters
+23 −10		GLTFSDK.Samples/Deserialize/Source/main.cpp
+1 −3		GLTFSDK.Samples/Serialize/CMakeLists.txt
+0 −261		GLTFSDK.Samples/Serialize/Serialize.vcxproj
+0 −22		GLTFSDK.Samples/Serialize/Serialize.vcxproj.filters
+21 −10		GLTFSDK.Samples/Serialize/Source/main.cpp
+0 −115		GLTFSDK.Shared.CPP/GLTFSDK.Shared.CPP.vcxitems
+0 −308		GLTFSDK.Shared.CPP/GLTFSDK.Shared.CPP.vcxitems.filters
+1 −3		GLTFSDK.Test/CMakeLists.txt
+10 −9		GLTFSDK.Test/Source/AnimationUtilsTests.cpp
+1 −1		GLTFSDK.Test/Source/PBRUtilsTests.cpp
+13 −1		GLTFSDK.Test/Source/TestUtils.h
+0 −112		GLTFSDK.sln
+17 −8		GLTFSDK/CMakeLists.txt
+0 −50		GLTFSDK/GLTFSDK.Android.CPP.nuspec
+0 −135		GLTFSDK/GLTFSDK.CPP.autopkg
+0 −135		GLTFSDK/GLTFSDK.Windows.CPP.autopkg
+0 −33		GLTFSDK/GLTFSDK.iOS.CPP.nuspec
+0 −35		GLTFSDK/GLTFSDK.macOS.CPP.nuspec
+0 −219		GLTFSDK/GLTFSDK.vcxproj
+0 −14		GLTFSDK/GLTFSDK.vcxproj.filters
+1 −1		GLTFSDK/GenerateSchemaJsonHeader.ps1
+3 −0		GLTFSDK/Inc/GLTFSDK/GLBResourceWriter.h
+1 −0		GLTFSDK/Inc/GLTFSDK/GLTFResourceWriter.h
+1 −0		GLTFSDK/Inc/GLTFSDK/PBRUtils.h
+1 −0		GLTFSDK/Inc/GLTFSDK/ResourceReaderUtils.h
+1 −0		GLTFSDK/Source/Deserialize.cpp
+10 −0		GLTFSDK/Source/ExtensionsKHR.cpp
+12 −2		GLTFSDK/Source/GLBResourceWriter.cpp
+2 −0		GLTFSDK/Source/Validation.cpp
+1 −0		GLTFSDK/Source/Version.cpp
+0 −4		GLTFSDK/packages.config
+1 −8		README.md
+41 −0		SECURITY.md
+0 −11		XPlatScripts/.gitrepo
+0 −2		XPlatScripts/NuGet.macOS/.gitignore
+0 −24		XPlatScripts/NuGet.macOS/CalculateNugetClosureAndUpdatePackages.ps1
+0 −224		XPlatScripts/NuGet.macOS/CalculateNugetPackageClosure.ps1
+0 −9		XPlatScripts/NuGet.macOS/CanvasCoreNugetPackages.config
+0 −42		XPlatScripts/NuGet.macOS/CreateAccessToken.ps1
+0 −10		XPlatScripts/NuGet.macOS/Find-Git.ps1
+0 −23		XPlatScripts/NuGet.macOS/Get-AppxDetailsFromFile.ps1
+0 −137		XPlatScripts/NuGet.macOS/Get-VstsArtifact.ps1
+0 −56		XPlatScripts/NuGet.macOS/Get-VstsRestAuthString.ps1
+0 −57		XPlatScripts/NuGet.macOS/GetNuGetCommand.ps1
+0 −70		XPlatScripts/NuGet.macOS/Install-AppxFiles.ps1
+0 −139		XPlatScripts/NuGet.macOS/Invoke-AndroidEmulatorTest.ps1
+0 −84		XPlatScripts/NuGet.macOS/Invoke-CommandWithRetries.ps1
+0 −745		XPlatScripts/NuGet.macOS/Invoke-Tests.ps1
+0 −118		XPlatScripts/NuGet.macOS/Invoke-VstsRestMethod.ps1
+0 −176		XPlatScripts/NuGet.macOS/Invoke-WackTests.ps1
+0 −224		XPlatScripts/NuGet.macOS/Invoke-iOSSimulatorTest.ps1
+0 −20		XPlatScripts/NuGet.macOS/New-ConfigFile.ps1
+0 −19		XPlatScripts/NuGet.macOS/NuGet.Config
+0 −93		XPlatScripts/NuGet.macOS/NuGetHelper.psm1
+0 −37		XPlatScripts/NuGet.macOS/NuGetPush.ps1
+0 −147		XPlatScripts/NuGet.macOS/NuGetRestore.ps1
+0 −223		XPlatScripts/NuGet.macOS/Publish-Tests.ps1
+0 −4		XPlatScripts/NuGet.macOS/RunPowershellScript.sh
+0 −138		XPlatScripts/NuGet.macOS/SerializeForPostbuild.ps1
+0 −184		XPlatScripts/NuGet.macOS/SummarizeTestFailures.ps1
+0 −124		XPlatScripts/NuGet.macOS/Uninstall-AppxFiles.ps1
+0 −175		XPlatScripts/NuGet.macOS/UpdateNugetPackages.ps1
+0 −29		XPlatScripts/NuGet.macOS/WinAppDeploy.ps1
+0 −145		androidbuild.ps1
+0 −130		macbuild.ps1
+0 −119		macinit.ps1