From 6b1233ce66a35c8a6ba8948688a884b2bf28cc7d Mon Sep 17 00:00:00 2001 From: David Bauer Date: Wed, 3 Apr 2024 13:19:52 -0700 Subject: [PATCH 1/3] Fix FBX translation component --- src/backstage/scene.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backstage/scene.cpp b/src/backstage/scene.cpp index 4e3c33d..a23bc0a 100644 --- a/src/backstage/scene.cpp +++ b/src/backstage/scene.cpp @@ -1081,7 +1081,7 @@ void FBXScene::loadFBX(std::string scene) { stage_vec4f(stage_vec3f(fbx_instance->node_to_world.cols[0].x, fbx_instance->node_to_world.cols[0].y, fbx_instance->node_to_world.cols[0].z), 0.f), stage_vec4f(stage_vec3f(fbx_instance->node_to_world.cols[1].x, fbx_instance->node_to_world.cols[1].y, fbx_instance->node_to_world.cols[1].z), 0.f), stage_vec4f(stage_vec3f(fbx_instance->node_to_world.cols[2].x, fbx_instance->node_to_world.cols[2].y, fbx_instance->node_to_world.cols[2].z), 0.f), - stage_vec4f(0.f, 0.f, 0.f, 1.f) + stage_vec4f(stage_vec3f(fbx_instance->node_to_world.cols[3].x, fbx_instance->node_to_world.cols[3].y, fbx_instance->node_to_world.cols[3].z), 1.f) ); m_instances.push_back(instance); From 8243f449e28b505a4fb120daee6e0e5e62d77570 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 4 Apr 2024 11:38:09 -0700 Subject: [PATCH 2/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5aea1e5..b449339 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 🎭 Stage: A universal 3D Scene Loader +# 🎭 Stage: A Universal 3D Scene Loader [![Linux](https://github.com/DBauer15/stage/actions/workflows/linux.yml/badge.svg)](https://github.com/DBauer15/stage/actions/workflows/linux.yml) [![MacOS](https://github.com/DBauer15/stage/actions/workflows/macos.yml/badge.svg)](https://github.com/DBauer15/stage/actions/workflows/macos.yml) From e11f6561a116684a43eb808e8b19e8269f5977ca Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 12 Apr 2024 20:40:26 -0700 Subject: [PATCH 3/3] Update macos.yml --- .github/workflows/macos.yml | 86 ++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index a593a0e..6bdb220 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -12,49 +12,49 @@ env: TBB_VERSION: 2021.11.0 jobs: - macos-arm64: - env: - PACKAGE_NAME: stage-macos-arm64 - - runs-on: self-hosted - - steps: - - uses: actions/checkout@v4 - with: - submodules: recursive - - - name: Setup Env - run: | - mkdir -p ${{github.workspace}}/dependencies - mkdir -p ${{github.workspace}}/build - mkdir -p ${{github.workspace}}/install/${PACKAGE_NAME} - - - name: Download TBB - working-directory: ${{github.workspace}}/dependencies - run: | - arch -arm64 brew update - arch -arm64 brew install tbb - - - name: Configure - working-directory: ${{github.workspace}}/build - run: > - cmake $GITHUB_WORKSPACE - -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/install/${PACKAGE_NAME} - -DCMAKE_BUILD_TYPE=$BUILD_TYPE - -DCMAKE_OSX_ARCHITECTURES="arm64" - -DSTAGE_LOGGING_OFF=ON - -DBUILD_SHARED_LIBS=ON - -DTBB_DIR=${{github.workspace}}/dependencies/oneapi-tbb-${TBB_VERSION}/lib/cmake/tbb/ - - - name: Build - working-directory: ${{github.workspace}}/build - run: cmake --build . -j --target install - - - name: Upload - uses: actions/upload-artifact@v4 - with: - name: ${{env.PACKAGE_NAME}} - path: ${{github.workspace}}/install + # macos-arm64: + # env: + # PACKAGE_NAME: stage-macos-arm64 + + # runs-on: self-hosted + + # steps: + # - uses: actions/checkout@v4 + # with: + # submodules: recursive + + # - name: Setup Env + # run: | + # mkdir -p ${{github.workspace}}/dependencies + # mkdir -p ${{github.workspace}}/build + # mkdir -p ${{github.workspace}}/install/${PACKAGE_NAME} + + # - name: Download TBB + # working-directory: ${{github.workspace}}/dependencies + # run: | + # arch -arm64 brew update + # arch -arm64 brew install tbb + + # - name: Configure + # working-directory: ${{github.workspace}}/build + # run: > + # cmake $GITHUB_WORKSPACE + # -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/install/${PACKAGE_NAME} + # -DCMAKE_BUILD_TYPE=$BUILD_TYPE + # -DCMAKE_OSX_ARCHITECTURES="arm64" + # -DSTAGE_LOGGING_OFF=ON + # -DBUILD_SHARED_LIBS=ON + # -DTBB_DIR=${{github.workspace}}/dependencies/oneapi-tbb-${TBB_VERSION}/lib/cmake/tbb/ + + # - name: Build + # working-directory: ${{github.workspace}}/build + # run: cmake --build . -j --target install + + # - name: Upload + # uses: actions/upload-artifact@v4 + # with: + # name: ${{env.PACKAGE_NAME}} + # path: ${{github.workspace}}/install macos-x86_64: env: