Merge pull request #158 from schell/feature/shadow-mapping

feature: shadow mapping

Author: schell

.cargo/config.toml

@@ -1,5 +1,7 @@
 [alias]
 xtask = "run --package xtask --"
+shaders = "xtask compile-shaders"
+linkage = "xtask generate-linkage"
 
 [build]
 rustflags = ["--cfg=web_sys_unstable_apis"]

.github/workflows/push.yaml

@@ -10,13 +10,14 @@ on:
 env:
   # For setup-rust, see https://github.com/moonrepo/setup-rust/issues/22
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  CARGO_GPU_COMMITSH: adab62777abc06eb0e93518f480c70f6e5d816fe
 
 jobs:
-  # Installs `cargo-gpu` and sets the cache directory for subsequent jobs
+  # Installs cargo deps and sets the cache directory for subsequent jobs
   install-cargo-gpu:
     strategy:
       matrix: 
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     defaults:
       run: 
@@ -34,11 +35,12 @@ jobs:
         with:
           path: ~/.cargo
           # THIS KEY MUST MATCH BELOW
-          key: cargo-cache-1-${{ runner.os }}
+          key: cargo-cache-${{ env.CARGO_GPU_COMMITSH }}-${{ runner.os }}
       - uses: moonrepo/setup-rust@v1
       - run: rustup default stable 
       - run: rustup update
-      - run: cargo install --git https://github.com/rust-gpu/cargo-gpu cargo-gpu
+      - run: | 
+          cargo install --git https://github.com/rust-gpu/cargo-gpu --rev $CARGO_GPU_COMMITSH cargo-gpu 
       - run: cargo gpu show commitsh
       - id: cachepathstep
         run: |
@@ -66,7 +68,7 @@ jobs:
         with:
           path: ~/.cargo
           # THIS KEY MUST MATCH ABOVE
-          key: cargo-cache-1-${{ runner.os }}
+          key: cargo-cache-${{ env.CARGO_GPU_COMMITSH }}-${{ runner.os }}
       - uses: actions/cache@v4
         with:
           path: | 
@@ -77,7 +79,8 @@ jobs:
       - uses: moonrepo/setup-rust@v1
       - run: cargo gpu show commitsh
       - run: rm -rf crates/renderling/src/linkage/* crates/renderling/shaders
-      - run: cargo xtask compile-shaders
+      - run: cargo shaders
+      - run: cargo linkage
       - run: cargo build -p renderling
       - run: git diff --exit-code --no-ext-diff
 
@@ -98,72 +101,34 @@ jobs:
       - run: cargo build -p example
 
   # BAU tests
-  renderling-test-linux:
-    runs-on: ubuntu-latest 
-    steps: 
-      - uses: actions/checkout@v2
-      - uses: moonrepo/setup-rust@v1
-      - run: sudo apt-get -y install mesa-vulkan-drivers libvulkan1 vulkan-tools vulkan-validationlayers
-      - run: cargo test
-        env: 
-          RUST_BACKTRACE: 1
-      - uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: test-output-linux
-          path: test_output/**/*.png
-
-  renderling-test-macos:
-    runs-on: macos-latest        
+  renderling-test:
+    strategy:
+      matrix: 
+        os: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - uses: moonrepo/setup-rust@v1
-      - run: cargo test
-        env:
-          RUST_BACKTRACE: 1
-      - uses: actions/upload-artifact@v4
-        if: always()
+      - uses: actions/cache@v4
         with:
-          name: test-output-macos
-          path: test_output/**/*.png
+          path: ~/.cargo
+          key: ${{ runner.os }}-test-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: ${{ runner.os }}-cargo-
 
-  renderling-test-windows:
-    runs-on: macos-latest        
-    steps:
-      - uses: actions/checkout@v2
-      - uses: moonrepo/setup-rust@v1
-      - run: cargo test
-        env:
+      - name: Install linux deps 
+        if: runner.os == 'Linux'
+        run: sudo apt-get -y install mesa-vulkan-drivers libvulkan1 vulkan-tools vulkan-validationlayers
+
+      - name: Install cargo-nextest
+        run: cargo install --locked cargo-nextest || true
+
+      - name: Test 
+        run: cargo nextest run -j 1
+        env: 
           RUST_BACKTRACE: 1
+
       - uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: test-output-windows
-          path: test_output/**/*.png
-
-  # various linuxes w/ physical gpus
-  # renderling-test-linux-other:
-  #   continue-on-error: true
-  #   strategy:
-  #     matrix:
-  #       label: [intel, amd, pi4]
-  #   runs-on: ${{ matrix.label }}
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - uses: moonrepo/setup-rust@v1
-  #       with:
-  #         cache: false
-  #     - uses: Swatinem/rust-cache@v2
-  #       with:
-  #         cache-all-crates: "true"
-  #         cache-on-failure: "true"
-  #     - run: apt-get -q -y update && apt-get -q -y install mesa-vulkan-drivers libvulkan1 vulkan-tools vulkan-validationlayers
-  #     - run: cargo test -j 1 -- --test-threads=1 --nocapture
-  #       continue-on-error: ${{ matrix.label == 'pi4' }}
-  #       env:
-  #         RUST_BACKTRACE: 1
-  #     - uses: actions/upload-artifact@v4
-  #       if: always()
-  #       with:
-  #         name: test-output-${{ matrix.label }}
-  #         path: test_output/**/*.png
+          name: test-output-${{ runner.os }}
+          path: test_output  

.gitignore

@@ -19,3 +19,4 @@ test_output
 cmy_triangle_renderer.svg
 .aider*
 flamegraph.svg
+**/*.blend1