Merge branch 'main' of github.com:DBauer15/stage into HEAD

DBauer15 · Apr 22, 2024 · 124fbd3 · 124fbd3
2 parents d847fb6 + e11f656
commit 124fbd3
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 45 deletions.
diff --git 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:

diff --git 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)
 

diff --git 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);