Feature/texture packing (Synesthesias#182)

* テクスチャパッキング実装, submodule追加

* libjpeg-turboのcmake修正 (Synesthesias#179)

* texture_packingの実装、samplesの実行により、テクスチャ結合済みのOBJ,MTLファイルを出力

* texture_packingの実装、jpeg形式の画像に加えて、png形式、tiff形式の画像に対応しました。

* C#実装、不要ファイル削除

* バグ修正

* リファクタリング

* 最小地物単位で結合されない問題修正

* Mac, Ubuntu向け対応

* ThirdPartyNotice追加

* licensed追記

* Mac向け修正

* submeshが一部適用されないバグ修正

* test修正

* Mac, Ubuntu向け修正(fPIC)

* test修正

* マルチアーキテクチャ対応

* Update libcitygml

---------

Co-authored-by: 和正 崎山 <kazsakinotwen@gmail.com>

Author: rockepan

.github/actions/build/action.yml

@@ -8,6 +8,10 @@ inputs:
   visual_studio_version:
     description: "ビルドで利用する Visual Studio のバージョンです。Windowsでのみ利用します。"
     required: true
+  arch:
+    description: "ビルド対象のCPUアーキテクチャです。MacOSでのみ利用します。"
+    required: false
+    default: "x86_64"
 
 runs:
   using: Composite
@@ -58,6 +62,7 @@ runs:
         -D CMAKE_CXX_FLAGS="-w"
         -D BUILD_LIB_TYPE=dynamic
         -D RUNTIME_LIB_TYPE=MT
+        -D CMAKE_OSX_ARCHITECTURES:STRING="${{ inputs.arch }}"
         ${{ env.ADDITIONAL_CMAKE_OPTIONS }}
       shell: ${{ inputs.shell_type }}
     # 10万行超えの警告が出るので一時的な処置として警告を抑制しています。
@@ -78,6 +83,7 @@ runs:
         -D CMAKE_CXX_FLAGS="-w"
         -D BUILD_LIB_TYPE=static
         -D RUNTIME_LIB_TYPE=MD
+        -D CMAKE_OSX_ARCHITECTURES:STRING="${{ inputs.arch }}"
         ${{ env.ADDITIONAL_CMAKE_OPTIONS }}
       shell: ${{ inputs.shell_type }}
 

.github/actions/upload-dll/action.yml

@@ -7,6 +7,10 @@ inputs:
   visual_studio_version:
     description: "ビルドで利用する Visual Studio のバージョンです。Windowsでのみ利用します。"
     required: true
+  arch:
+    description: "ビルド対象のCPUアーキテクチャです。MacOSでのみ利用します。"
+    required: false
+    default: "x86_64"
 
 runs:
   using: Composite
@@ -53,18 +57,34 @@ runs:
         echo "HOME=$(echo $HOME)" >> $GITHUB_ENV
       shell: ${{ inputs.shell_type }}
 
-    - name: Copy Libraries for MacOS
-      if: runner.os == 'MacOS'
+    - name: Copy Libraries for MacOS(x86_64)
+      if: runner.os == 'MacOS' && inputs.arch == 'x86_64'
+      run: |
+        mkdir $HOME/output/
+        find ${{github.workspace}}/out/build/x64-Release-Unity -name *.dylib | xargs -I {} cp -v {} $HOME/output
+        find ${{github.workspace}}/out/build/x64-Release-Unreal -name libplateau_combined.a | xargs -I {} cp -v {} $HOME/output
+        echo "HOME=$(echo $HOME)" >> $GITHUB_ENV
+      shell: ${{ inputs.shell_type }}
+
+    - name: Copy Libraries for MacOS(arm64)
+      if: runner.os == 'MacOS' && inputs.arch == 'arm64'
       run: |
         mkdir $HOME/output/
         find ${{github.workspace}}/out/build/x64-Release-Unity -name *.dylib | xargs -I {} cp -v {} $HOME/output
         find ${{github.workspace}}/out/build/x64-Release-Unreal -name libplateau_combined.a | xargs -I {} cp -v {} $HOME/output
         echo "HOME=$(echo $HOME)" >> $GITHUB_ENV
       shell: ${{ inputs.shell_type }}
 
-    - name: Upload DLL(so, dylib) for Ubuntu and MacOS
-      if: runner.os != 'Windows'
+    - name: Upload DLL(so) for Ubuntu
+      if: runner.os == 'Linux'
       uses: actions/upload-artifact@v2
       with:
         name: libplateau-${{matrix.os}}
         path: ${{env.HOME}}/output/
+
+    - name: Upload DLL(dylib) for MacOS
+      if: runner.os == 'MacOS'
+      uses: actions/upload-artifact@v2
+      with:
+        name: libplateau-${{matrix.os}}-${{matrix.arch}}
+        path: ${{env.HOME}}/output/

.github/workflows/upload-dlls-older-visual-studio.yml

@@ -20,6 +20,10 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-2019, macos-latest, ubuntu-20.04]
+        arch: [x86_64]
+        include:
+          - os: macos-latest
+            arch: arm64
 
     steps:
 
@@ -81,13 +85,15 @@ jobs:
           mkdir -p ~/a/plateau-plugins/dynamic-libs/Windows/x86_64
           mkdir -p ~/a/plateau-plugins/dynamic-libs/Linux/x86_64
           mkdir -p ~/a/plateau-plugins/dynamic-libs/MacOS/x86_64
+          mkdir -p ~/a/plateau-plugins/dynamic-libs/MacOS/arm64
           mkdir -p ~/a/plateau-plugins/dynamic-libs/ManagedDLL
           mkdir -p ~/a/plateau-plugins/dynamic-libs/Android
           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-macos-latest/*.dylib ~/a/plateau-plugins/dynamic-libs/MacOS/x86_64
+          cp ~/a/libplateau-macos-latest-x86_64/*.dylib ~/a/plateau-plugins/dynamic-libs/MacOS/x86_64
+          cp ~/a/libplateau-macos-latest-arm64/*.dylib ~/a/plateau-plugins/dynamic-libs/MacOS/arm64
           cp ~/a/libplateau-android-dll/libplateau.so ~/a/plateau-plugins/dynamic-libs/Android
           cp ~/a/libplateau-ios-dll/* ~/a/plateau-plugins/dynamic-libs/iOS/plateau.framework
 
@@ -98,7 +104,8 @@ jobs:
           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-macos-latest/*.a ~/a/plateau-plugins/static-libs/macos
+          cp ~/a/libplateau-macos-latest-x86_64/*.a ~/a/plateau-plugins/static-libs/macos/x86_64
+          cp ~/a/libplateau-macos-latest-arm64/*.a ~/a/plateau-plugins/static-libs/macos/arm64
 
       - name: upload artifact
         uses: actions/upload-artifact@v3

.github/workflows/upload-dlls.yml

@@ -23,7 +23,10 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-2022, macos-latest, ubuntu-20.04]
-
+        arch: [x86_64]
+        include:
+          - os: macos-latest
+            arch: arm64
     steps:
 
       - uses: actions/checkout@v3
@@ -39,6 +42,7 @@ jobs:
         with:
           shell_type: ${{ (runner.os == 'Windows' && 'powershell') || 'bash' }}
           visual_studio_version: "17 2022"
+          arch: ${{ matrix.arch }}
 
   # 2つ目のジョブ。
   # AndroidとiOS用にライブラリをビルド。
@@ -84,24 +88,28 @@ jobs:
           mkdir -p ~/a/plateau-plugins/dynamic-libs/Windows/x86_64
           mkdir -p ~/a/plateau-plugins/dynamic-libs/Linux/x86_64
           mkdir -p ~/a/plateau-plugins/dynamic-libs/MacOS/x86_64
+          mkdir -p ~/a/plateau-plugins/dynamic-libs/MacOS/arm64
           mkdir -p ~/a/plateau-plugins/dynamic-libs/ManagedDLL
           mkdir -p ~/a/plateau-plugins/dynamic-libs/Android
           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-macos-latest/*.dylib ~/a/plateau-plugins/dynamic-libs/MacOS/x86_64
+          cp ~/a/libplateau-macos-latest-x86_64/*.dylib ~/a/plateau-plugins/dynamic-libs/MacOS/x86_64
+          cp ~/a/libplateau-macos-latest-arm64/*.dylib ~/a/plateau-plugins/dynamic-libs/MacOS/arm64
           cp ~/a/libplateau-android-dll/libplateau.so ~/a/plateau-plugins/dynamic-libs/Android
           cp ~/a/libplateau-ios-dll/* ~/a/plateau-plugins/dynamic-libs/iOS/plateau.framework
 
       - name: sum-up-static-libs
         run: |
           mkdir -p ~/a/plateau-plugins/static-libs/windows
           mkdir -p ~/a/plateau-plugins/static-libs/linux
-          mkdir -p ~/a/plateau-plugins/static-libs/macos
+          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-macos-latest/*.a ~/a/plateau-plugins/static-libs/macos
+          cp ~/a/libplateau-macos-latest-x86_64/*.a ~/a/plateau-plugins/static-libs/macos/x86_64
+          cp ~/a/libplateau-macos-latest-arm64/*.a ~/a/plateau-plugins/static-libs/macos/arm64
 
       - name: upload artifact
         uses: actions/upload-artifact@v3

.gitignore

@@ -29,3 +29,6 @@ bin
 *.DotSettings.user
 
 # Test data
+
+# Intermidiate build data
+3rdparty/*/*.tar.gz

.gitmodules

@@ -28,3 +28,9 @@
 [submodule "3rdparty/libxml2"]
 	path = 3rdparty/libxml2
 	url = https://github.com/GNOME/libxml2
+[submodule "3rdparty/libpng"]
+	path = 3rdparty/libpng
+	url = https://github.com/glennrp/libpng
+[submodule "3rdparty/libtiff"]
+	path = 3rdparty/libtiff
+	url = https://github.com/libsdl-org/libtiff

.licensed.yml

@@ -14,3 +14,6 @@ reviewed:
     - pybind11 # BSD-3ライセンスなのでOK
     - zlib # 再配布可能、要ライセンス表示
     - libcitygml # LGPLライセンス、改変部分をpublicリポジトリで公開しているのでOK
+    - libjpeg-turbo # 再配布可能、要ライセンス表示
+    - libpng # 再配布可能、要ライセンス表示
+    - libtiff # 再配布可能、要ライセンス表示

3rdparty/libjpeg-turbo/libjpeg-turbo.cmake

@@ -0,0 +1,78 @@
+include(ExternalProject)
+
+# Set compiler flags
+if (MSVC)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D_CRT_SECURE_NO_WARNINGS")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_CRT_SECURE_NO_WARNINGS")
+endif()
+
+# Set WITH_SIMD
+include(CheckLanguage)
+check_language(ASM_NASM)
+if (CMAKE_ASM_NASM_COMPILER)
+    if (APPLE)
+        # macOS might have /usr/bin/nasm but it cannot be used
+        # https://stackoverflow.com/q/53974320
+        # To fix this, run `brew install nasm`
+        execute_process(COMMAND nasm --version RESULT_VARIABLE return_code)
+        if("${return_code}" STREQUAL "0")
+            enable_language(ASM_NASM)
+            option(WITH_SIMD "" ON)
+        else()
+            message(STATUS "nasm found but can't be used, run `brew install nasm`")
+            option(WITH_SIMD "" OFF)
+        endif()
+    else()
+        enable_language(ASM_NASM)
+        option(WITH_SIMD "" ON)
+    endif()
+else()
+    option(WITH_SIMD "" OFF)
+endif()
+if (WITH_SIMD)
+    message(STATUS "NASM assembler enabled")
+else()
+    message(STATUS "NASM assembler not found - libjpeg-turbo performance may suffer")
+endif()
+
+if (STATIC_WINDOWS_RUNTIME)
+    set(WITH_CRT_DLL OFF)
+else()
+    set(WITH_CRT_DLL ON)
+endif()
+message(STATUS "libturbojpeg: WITH_CRT_DLL=${WITH_CRT_DLL}")
+
+# If MSVC, the OUTPUT_NAME was set to turbojpeg-static
+if(MSVC)
+    set(lib_name "turbojpeg-static")
+else()
+    set(lib_name "turbojpeg")
+endif()
+
+ExternalProject_Add(
+    libjpeg-turbo
+    URL https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/3.0.0.tar.gz
+    URL_HASH SHA256=171dae5d73560bc94006a7c0c3281bd9bfde6a34f7e41e66f930a1a9162bd7df
+    DOWNLOAD_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libjpeg-turbo"
+    INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/3rdparty/libjpeg-turbo"
+    UPDATE_COMMAND ""
+    LIST_SEPARATOR |
+    CMAKE_ARGS
+        -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+        -DWITH_CRT_DLL=${WITH_CRT_DLL}
+        -DENABLE_STATIC=ON
+        -DENABLE_SHARED=OFF
+        -DWITH_SIMD=${WITH_SIMD}
+        -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/3rdparty/libjpeg-turbo
+        -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+        -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+        -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
+        ${ExternalProject_CMAKE_ARGS_hidden}
+    BUILD_BYPRODUCTS
+        <INSTALL_DIR>/lib/${CMAKE_STATIC_LIBRARY_PREFIX}${lib_name}${CMAKE_STATIC_LIBRARY_SUFFIX}
+)
+
+ExternalProject_Get_Property(libjpeg-turbo INSTALL_DIR)
+set(JPEG_TURBO_INCLUDE_DIRS "${INSTALL_DIR}/include/") # "/" is critical.
+set(JPEG_TURBO_LIB_DIR "${INSTALL_DIR}/lib")
+set(JPEG_TURBO_LIBRARIES "${JPEG_TURBO_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${lib_name}${CMAKE_STATIC_LIBRARY_SUFFIX}")