Merge pull request #4 from PikminGuts92/dev

Dev merge

.github/workflows/audit.yml

@@ -34,11 +34,6 @@ jobs:
           sudo apt-get install pkg-config libx11-dev libasound2-dev libudev-dev
           sudo apt-get install libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev
       - uses: actions/checkout@v2
-      - name: Remove cargo and toolchain configurations
-        shell: bash
-        run: |
-          rm -rf .cargo
-          rm rust-toolchain.toml
       - uses: actions/cache@v3
         with:
           path: |

.github/workflows/ci.yml

@@ -20,11 +20,6 @@ jobs:
             ~/.cargo/
             target/
           key: ${{ runner.os }}-cargo-check-stable-${{ hashFiles('**/Cargo.toml', './Cargo.lock') }}
-      - name: Remove cargo and toolchain configurations
-        shell: bash
-        run: |
-          rm -rf .cargo
-          rm rust-toolchain.toml
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
@@ -45,11 +40,6 @@ jobs:
           sudo apt-get install pkg-config libx11-dev libasound2-dev libudev-dev
           sudo apt-get install libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev
       - uses: actions/checkout@v2
-      - name: Remove cargo and toolchain configurations
-        shell: bash
-        run: |
-          rm -rf .cargo
-          rm rust-toolchain.toml
       - uses: actions/cache@v3
         with:
           path: |
@@ -77,11 +67,6 @@ jobs:
           sudo apt-get install pkg-config libx11-dev libasound2-dev libudev-dev
           sudo apt-get install libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev
       - uses: actions/checkout@v2
-      - name: Remove cargo and toolchain configurations
-        shell: bash
-        run: |
-          rm -rf .cargo
-          rm rust-toolchain.toml
       - uses: actions/cache@v3
         with:
           path: |
@@ -132,11 +117,6 @@ jobs:
           sudo apt-get install pkg-config libx11-dev libasound2-dev libudev-dev
           sudo apt-get install libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev
       - uses: actions/checkout@v2
-      - name: Remove cargo and toolchain configurations
-        shell: bash
-        run: |
-          rm -rf .cargo
-          rm rust-toolchain.toml
       - uses: actions/cache@v3
         with:
           path: |
@@ -165,7 +145,6 @@ jobs:
             cp -f $exe $OUTPUT_PATH/$(basename $exe)
           done
       - uses: actions/upload-artifact@v3
-        if: ${{ false }} # Skip for now
         with:
           name: ${{ env.ZIP_NAME }}
           path: ${{ env.OUTPUT_PATH }}/*

.gitignore

@@ -1,4 +1,5 @@
 .env
+.rust-analyzer
 .vscode
 /target
 Cargo.lock

.vscode/settings.json

@@ -1,15 +1,16 @@
 {
     "rust-analyzer.cargo.features": [
         "audio",
-        //"bevy/dynamic"
-        "midi",
-        "model",
         "experimental",
         "midi",
+        "model",
         "python"
     ],
     "rust-analyzer.inlayHints.chainingHints.enable": false,
     "rust-analyzer.inlayHints.typeHints.enable": false,
     "rust-analyzer.inlayHints.closingBraceHints.enable": false,
     "rust-analyzer.inlayHints.parameterHints.enable": false,
+    "rust-analyzer.checkOnSave.extraArgs": [
+        "--target-dir", ".rust-analyzer"
+    ]
 }

Cargo.toml

@@ -1,13 +1,13 @@
 [workspace]
 members = [
     "apps/cli/*",
-    "apps/ui/*",
+    #"apps/ui/*",
     "core/*",
     "utils/*"
 ]
 default-members = [
     "apps/cli/*",
-    "apps/ui/*",
+    #"apps/ui/*",
     "core/*"
 ]
 resolver = "2" # Super duper important for bevy!
@@ -18,15 +18,17 @@ authors = ["PikminGuts92"]
 edition = "2021"
 
 [workspace.dependencies]
-clap = { version = "4.3.12", features = ["derive"] }
+clap = { version = "4.4.18", features = ["derive"] }
+gltf = { version = "=1.3.0", default-features = false, features = [ "import", "names", "utils" ] }
+gltf-json = { version = "=1.3.0", features = [ "names" ] }
 grim = { path = "core/grim" }
-itertools = "0.11.0"
+itertools = "0.12.0"
 lazy_static = "1.4.0"
-log = "0.4.19"
-serde = { version = "1.0.171", features = ["derive"] }
-serde_json = "1.0.103"
+log = "0.4.20"
+serde = { version = "1.0.195", features = ["derive"] }
+serde_json = "1.0.111"
 simplelog = "0.12.1"
-thiserror = "1.0.43"
+thiserror = "1.0.56"
 
 [profile.dev.package."*"]
 opt-level = 3

apps/cli/p9_scene_tool/Cargo.toml

@@ -7,7 +7,7 @@ edition.workspace = true
 [dependencies]
 build-time = "0.1.3"
 clap = { workspace = true }
-const_format = "0.2.31"
+const_format = "0.2.32"
 grim = { workspace = true, features = [ "midi" ] }
 log = { workspace = true }
 serde = { workspace = true }
@@ -17,4 +17,4 @@ thiserror = { workspace = true }
 
 [dev-dependencies]
 criterion = "0.5.1"
-rstest = "0.18.1"
+rstest = "0.18.2"