Merge pull request #7 from kwblackstone/fbx

enable fbx
kwblackstone · May 16, 2024 · a694b90 · a694b90
2 parents c59e3d1 + d96ee24
commit a694b90
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -58,12 +58,12 @@ jobs:
 
       - name: Install dependencies on Windows
         if: runner.os == 'Windows'
-        run: choco install cmake
+        run: choco install cmake 7zip
 
       - name: Install dependencies on macOS
         if: runner.os == 'macOS'
         run: |
-          brew install cmake libheif libraw openjpeg || true
+          brew install libheif libraw openjpeg || true
 
       - name: Download release asset
         run: gh release download USD-${{ matrix.usd_version }}-Artifacts -p "usd-${{ matrix.usd_version }}-${{ matrix.os }}.zip" --repo ${{ github.repository }}
@@ -107,17 +107,81 @@ jobs:
           echo "USD_BUILD_PATH=$USD_BUILD_PATH" >> "$GITHUB_ENV"
           echo "PYTHONPATH=${{ github.workspace }}/usd_build/lib/python" >> "$GITHUB_ENV"
 
+      - name: Get latest successful run ID of the fbx sdk workflow
+        shell: bash
+        id: get-run-id
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          RUN_ID=$(gh run list --repo ${{ github.repository }} --workflow fbx-sdk.yml --limit 1 --json databaseId,status --jq '.[] | select(.status=="completed") | .databaseId')
+          echo "RUN_ID=$RUN_ID" >> $GITHUB_ENV
+          echo "Run ID: $RUN_ID"
+
+      - name: Download FBX SDK Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ runner.os }}-FBX-SDK
+          path: ${{ github.workspace }}/FBXSDK
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          repository: ${{ github.repository }}
+          run-id: ${{ env.RUN_ID }}
+
+      - name: Set up FBX
+        shell: bash
+        run: |
+          FBX_FOLDER=$(echo "${{ github.workspace }}/FBXSDK" | sed 's|\\|/|g')
+          echo "FBX_FOLDER=$FBX_FOLDER" >> $GITHUB_ENV
+          if [ "${{ runner.os }}" == "Windows" ]; then
+            echo "FBX_OUTFILE=$FBX_FOLDER/fbx202021_fbxsdk_vs2019_win.exe" >> $GITHUB_ENV
+          elif [ "${{ runner.os }}" == "macOS" ]; then
+            echo "FBX_OUTFILE=$FBX_FOLDER/fbx202021_fbxsdk_clang_mac.pkg" >> $GITHUB_ENV
+          else
+            echo "FBX_OUTFILE=$FBX_FOLDER/fbx202021_fbxsdk_linux" >> $GITHUB_ENV
+          fi
+
+      - name: Install FBX SDK Windows
+        if: runner.os == 'Windows'
+        shell: bash
+        run: |
+          mkdir -p ${{ env.FBX_FOLDER }}
+          FBX_INSTALL_DIR=$(echo "${{ github.workspace }}/FBX_SDK_INSTALL" | sed 's|\\|/|g')
+          mkdir -p $FBX_INSTALL_DIR
+          7z x "$FBX_OUTFILE" -o"$FBX_INSTALL_DIR" -y
+          echo "FBX_INSTALL_DIR=$FBX_INSTALL_DIR" >> $GITHUB_ENV
+
+      - name: Install FBX SDK Unix
+        if: runner.os != 'Windows'
+        run: |
+          mkdir -p ${{ env.FBX_FOLDER }}
+          if [ "${{ runner.os }}" == "macOS" ]; then
+            FBX_INSTALL_DIR="/Applications/Autodesk/FBXSDK/2020.2.1"
+            tar -xzf ${{ env.FBX_OUTFILE }}.tgz -C ${{ env.FBX_FOLDER }}
+            FBX_OUTFILE_CORRECTED=$(echo "${{ env.FBX_OUTFILE }}" | sed 's/_mac.pkg/_macos.pkg/')
+            sudo installer -pkg $FBX_OUTFILE_CORRECTED -target / -verboseR
+            sudo mv "/Applications/Autodesk/FBX SDK/" "/Applications/Autodesk/FBXSDK"
+          else  # Linux
+            FBX_INSTALL_DIR=${{ github.workspace }}/FBX_SDK_INSTALL
+            chmod +r ${{ env.FBX_OUTFILE }}.tar.gz
+            tar -xzf ${{ env.FBX_OUTFILE }}.tar.gz -C ${{ env.FBX_FOLDER }}
+            mkdir -p ${{ github.workspace }}/FBX_SDK_INSTALL
+            yes yes | ${{ env.FBX_OUTFILE }} ${{ github.workspace }}/FBX_SDK_INSTALL
+          fi
+          echo "FBX_INSTALL_DIR=$FBX_INSTALL_DIR" >> $GITHUB_ENV
+
       - name: Configure CMake (Cross-Platform)
         shell: bash
         run: |
           baseArgs="-S . -B build -G Ninja"
-
-          # Common arguments for all platforms
           commonArgs=(
             "-DCMAKE_INSTALL_PREFIX=bin"
             "-DCMAKE_BUILD_TYPE=Release"
             "-Dpxr_ROOT=${{ github.workspace }}/usd_build"
-            "-DUSD_FILEFORMATS_ENABLE_FBX=OFF"
+            "-DUSD_FILEFORMATS_ENABLE_GLTF=ON"
+            "-DUSD_FILEFORMATS_ENABLE_PLY=ON"
+            "-DUSD_FILEFORMATS_ENABLE_OBJ=ON"
+            "-DUSD_FILEFORMATS_ENABLE_STL=ON"
+            "-DUSD_FILEFORMATS_ENABLE_FBX=ON"
+            "-DFBXSDK_ROOT=${{ env.FBX_INSTALL_DIR }}"
             "-DUSD_FILEFORMATS_BUILD_TESTS=ON"
             "-DOpenImageIO_INCLUDE_DIR=${{ github.workspace }}/usd_build/include"
             "-DOpenImageIO_INCLUDES=${{ github.workspace }}/usd_build/include"
@@ -189,6 +253,8 @@ jobs:
     needs: [build, prepare-matrix]
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && always()
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v4
       - name: Download All Artifacts
@@ -227,5 +293,3 @@ jobs:
             sleep 5
             gh workflow run update-badge.yml -f NAME="$os_version" -f LABEL="$os_version" -f STATUS="$STATUS" -f COLOR="$COLOR"
           done
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/fbx-sdk.yml b/.github/workflows/fbx-sdk.yml
@@ -1,4 +1,4 @@
-name: FBX SDK Update
+name: FBX SDK
 
 on:
   schedule: