Merge remote-tracking branch 'upstream/main' into ReplaceColorWithPal…

…ette

.github/workflows/action-on-PR-labeled.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.label.name == 'C-Breaking-Change' && !contains(github.event.pull_request.body, '## Migration Guide')
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         with:
           script: |
             await github.rest.issues.createComment({

.github/workflows/ci-comment-failures.yml

@@ -23,7 +23,7 @@ jobs:
     steps:
       - name: 'Download artifact'
         id: find-artifact
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           result-encoding: string
           script: |
@@ -50,7 +50,7 @@ jobs:
         if: ${{ steps.find-artifact.outputs.result == 'true' }}
       - name: 'Comment on PR'
         if: ${{ steps.find-artifact.outputs.result == 'true' }}
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
@@ -81,7 +81,7 @@ jobs:
     steps:
       - name: 'Download artifact'
         id: find-artifact
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           result-encoding: string
           script: |
@@ -108,7 +108,7 @@ jobs:
         if: ${{ steps.find-artifact.outputs.result == 'true' }}
       - name: 'Comment on PR'
         if: ${{ steps.find-artifact.outputs.result == 'true' }}
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
@@ -139,7 +139,7 @@ jobs:
     steps:
       - name: 'Download artifact'
         id: find-artifact
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           result-encoding: string
           script: |
@@ -166,7 +166,7 @@ jobs:
         if: ${{ steps.find-artifact.outputs.result == 'true' }}
       - name: 'Comment on PR'
         if: ${{ steps.find-artifact.outputs.result == 'true' }}
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |

.github/workflows/ci.yml

@@ -163,6 +163,26 @@ jobs:
           VALIDATE_MARKDOWN: true
           DEFAULT_BRANCH: main
 
+  toml:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install taplo
+        run: | 
+          curl -fsSL https://github.com/tamasfe/taplo/releases/latest/download/taplo-full-linux-x86_64.gz \
+          | gzip -d - \
+          | install -m 755 /dev/stdin /usr/local/bin/taplo
+      - name: Run Taplo
+        id: taplo
+        run: taplo fmt --check --diff
+      - name: Taplo info
+        if: failure()
+        run: |
+          echo 'To fix toml fmt, please run `taplo fmt`'
+          echo 'Or if you use VSCode, use the Even Better Toml extension'
+
+
   run-examples-on-windows-dx12:
     runs-on: windows-latest
     timeout-minutes: 60

.github/workflows/welcome.yml

@@ -12,7 +12,7 @@ jobs:
   welcome:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         with:
           script: |
             // Get a list of all issues created by the PR opener

CONTRIBUTING.md

@@ -339,9 +339,14 @@ If you're new to Bevy, here's the workflow we use:
 To locally lint your files using the same workflow as our CI:
    1. Install [markdownlint-cli](https://github.com/igorshubovych/markdownlint-cli).
    2. Run `markdownlint -f -c .github/linters/.markdown-lint.yml .` in the root directory of the Bevy project.
-5. Push your changes to your fork on Github and open a Pull Request.
-6. Respond to any CI failures or review feedback. While CI failures must be fixed before we can merge your PR, you do not need to *agree* with all feedback from your reviews, merely acknowledge that it was given. If you cannot come to an agreement, leave the thread open and defer to a Maintainer or Project Lead's final judgement.
-7. When your PR is ready to merge, a Maintainer or Project Lead will review it and suggest final changes. If those changes are minimal they may even apply them directly to speed up merging.
+
+5. When working with Toml (`.toml`) files, Bevy's CI will check toml files using [taplo](https://taplo.tamasfe.dev/): `taplo fmt --check --diff`
+   1. If you use VSCode, install [Even better toml](https://marketplace.visualstudio.com/items?itemName=tamasfe.even-better-toml) and format your files.
+   2. If you want to use the cli tool, install [taplo-cli](https://taplo.tamasfe.dev/cli/installation/cargo.html) and run `taplo fmt --check --diff` to check for the formatting. Fix any issues by running `taplo fmt` in the root directory of the Bevy project.
+
+6. Push your changes to your fork on Github and open a Pull Request.
+7. Respond to any CI failures or review feedback. While CI failures must be fixed before we can merge your PR, you do not need to *agree* with all feedback from your reviews, merely acknowledge that it was given. If you cannot come to an agreement, leave the thread open and defer to a Maintainer or Project Lead's final judgement.
+8. When your PR is ready to merge, a Maintainer or Project Lead will review it and suggest final changes. If those changes are minimal they may even apply them directly to speed up merging.
 
 If you end up adding a new official Bevy crate to the `bevy` repo:
 

Cargo.toml

@@ -10,7 +10,7 @@ keywords = ["game", "engine", "gamedev", "graphics", "bevy"]
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/bevyengine/bevy"
-rust-version = "1.70.0"
+rust-version = "1.74.0"
 
 [workspace]
 exclude = [
@@ -29,6 +29,19 @@ members = [
   "errors",
 ]
 
+[workspace.lints.clippy]
+type_complexity = "allow"
+doc_markdown = "warn"
+manual_let_else = "warn"
+undocumented_unsafe_blocks = "warn"
+redundant_else = "warn"
+match_same_arms = "warn"
+semicolon_if_nothing_returned = "warn"
+map_flatten = "warn"
+
+[lints]
+workspace = true
+
 [features]
 default = [
   "animation",
@@ -282,10 +295,11 @@ bevy_internal = { path = "crates/bevy_internal", version = "0.12.0", default-fea
 [dev-dependencies]
 rand = "0.8.0"
 ron = "0.8.0"
+flate2 = "1.0"
 serde = { version = "1", features = ["derive"] }
 bytemuck = "1.7"
 # Needed to poll Task examples
-futures-lite = "1.11.3"
+futures-lite = "2.0.1"
 crossbeam-channel = "0.5.0"
 argh = "0.1.12"
 
@@ -1077,6 +1091,17 @@ description = "Demonstrates various methods to load assets"
 category = "Assets"
 wasm = false
 
+[[example]]
+name = "asset_decompression"
+path = "examples/asset/asset_decompression.rs"
+doc-scrape-examples = true
+
+[package.metadata.example.asset_decompression]
+name = "Asset Decompression"
+description = "Demonstrates loading a compressed asset"
+category = "Assets"
+wasm = false
+
 [[example]]
 name = "custom_asset"
 path = "examples/asset/custom_asset.rs"
@@ -1109,7 +1134,7 @@ required-features = ["file_watcher"]
 name = "Hot Reloading of Assets"
 description = "Demonstrates automatic reloading of assets when modified on disk"
 category = "Assets"
-wasm = true
+wasm = false
 
 [[example]]
 name = "asset_processing"
@@ -1767,6 +1792,17 @@ description = "A shader and a material that uses it"
 category = "Shaders"
 wasm = true
 
+[[example]]
+name = "shader_material_2d"
+path = "examples/shader/shader_material_2d.rs"
+doc-scrape-examples = true
+
+[package.metadata.example.shader_material_2d]
+name = "Material"
+description = "A shader and a material that uses it on a 2d mesh"
+category = "Shaders"
+wasm = true
+
 [[example]]
 name = "extended_material"
 path = "examples/shader/extended_material.rs"

assets/scenes/load_scene_example.scn.ron

@@ -13,7 +13,12 @@
             y: 0.0,
             z: 0.0
           ),
-          rotation: (0.0, 0.0, 0.0, 1.0),
+          rotation: (
+            x: 0.0,
+            y: 0.0,
+            z: 0.0,
+            w: 1.0,
+          ),
           scale: (
             x: 1.0,
             y: 1.0,

assets/shaders/array_texture.wgsl

@@ -6,8 +6,8 @@
 }
 #import bevy_core_pipeline::tonemapping::tone_mapping
 
-@group(1) @binding(0) var my_array_texture: texture_2d_array<f32>;
-@group(1) @binding(1) var my_array_texture_sampler: sampler;
+@group(2) @binding(0) var my_array_texture: texture_2d_array<f32>;
+@group(2) @binding(1) var my_array_texture_sampler: sampler;
 
 @fragment
 fn fragment(

assets/shaders/circle_shader.wgsl

@@ -12,10 +12,9 @@ var<uniform> input: CustomUiMaterial;
 fn fragment(in: UiVertexOutput) -> @location(0) vec4<f32> {
     // the UVs are now adjusted around the middle of the rect.
     let uv = in.uv * 2.0 - 1.0;
-    
+
     // circle alpha, the higher the power the harsher the falloff.
     let alpha = 1.0 - pow(sqrt(dot(uv, uv)), 100.0);
 
     return vec4<f32>(input.color.rgb, alpha);
 }
-

assets/shaders/cubemap_unlit.wgsl

@@ -1,12 +1,12 @@
 #import bevy_pbr::forward_io::VertexOutput
 
 #ifdef CUBEMAP_ARRAY
-@group(1) @binding(0) var base_color_texture: texture_cube_array<f32>;
+@group(2) @binding(0) var base_color_texture: texture_cube_array<f32>;
 #else
-@group(1) @binding(0) var base_color_texture: texture_cube<f32>;
+@group(2) @binding(0) var base_color_texture: texture_cube<f32>;
 #endif
 
-@group(1) @binding(1) var base_color_sampler: sampler;
+@group(2) @binding(1) var base_color_sampler: sampler;
 
 @fragment
 fn fragment(

assets/shaders/custom_material.frag

@@ -3,18 +3,16 @@ layout(location = 0) in vec2 v_Uv;
 
 layout(location = 0) out vec4 o_Target;
 
-layout(set = 1, binding = 0) uniform CustomMaterial {
-    vec4 Color;
-};
+layout(set = 2, binding = 0) uniform vec4 CustomMaterial_color;
 
-layout(set = 1, binding = 1) uniform texture2D CustomMaterial_texture;
-layout(set = 1, binding = 2) uniform sampler CustomMaterial_sampler;
+layout(set = 2, binding = 1) uniform texture2D CustomMaterial_texture;
+layout(set = 2, binding = 2) uniform sampler CustomMaterial_sampler;
 
 // wgsl modules can be imported and used in glsl
 // FIXME - this doesn't work any more ...
 // #import bevy_pbr::pbr_functions as PbrFuncs
 
 void main() {
     // o_Target = PbrFuncs::tone_mapping(Color * texture(sampler2D(CustomMaterial_texture,CustomMaterial_sampler), v_Uv));
-    o_Target = Color * texture(sampler2D(CustomMaterial_texture,CustomMaterial_sampler), v_Uv);
+    o_Target = CustomMaterial_color * texture(sampler2D(CustomMaterial_texture,CustomMaterial_sampler), v_Uv);
 }

assets/shaders/custom_material.vert

@@ -23,9 +23,9 @@ struct Mesh {
 };
 
 #ifdef PER_OBJECT_BUFFER_BATCH_SIZE
-layout(set = 2, binding = 0) uniform Mesh Meshes[#{PER_OBJECT_BUFFER_BATCH_SIZE}];
+layout(set = 1, binding = 0) uniform Mesh Meshes[#{PER_OBJECT_BUFFER_BATCH_SIZE}];
 #else
-layout(set = 2, binding = 0) readonly buffer _Meshes {
+layout(set = 1, binding = 0) readonly buffer _Meshes {
     Mesh Meshes[];
 };
 #endif // PER_OBJECT_BUFFER_BATCH_SIZE

assets/shaders/custom_material.wgsl

@@ -2,17 +2,13 @@
 // we can import items from shader modules in the assets folder with a quoted path
 #import "shaders/custom_material_import.wgsl"::COLOR_MULTIPLIER
 
-struct CustomMaterial {
-    color: vec4<f32>,
-};
-
-@group(1) @binding(0) var<uniform> material: CustomMaterial;
-@group(1) @binding(1) var base_color_texture: texture_2d<f32>;
-@group(1) @binding(2) var base_color_sampler: sampler;
+@group(2) @binding(0) var<uniform> material_color: vec4<f32>;
+@group(2) @binding(1) var material_color_texture: texture_2d<f32>;
+@group(2) @binding(2) var material_color_sampler: sampler;
 
 @fragment
 fn fragment(
     mesh: VertexOutput,
 ) -> @location(0) vec4<f32> {
-    return material.color * textureSample(base_color_texture, base_color_sampler, mesh.uv) * COLOR_MULTIPLIER;
+    return material_color * textureSample(material_color_texture, material_color_sampler, mesh.uv) * COLOR_MULTIPLIER;
 }

assets/shaders/custom_material_2d.wgsl

@@ -0,0 +1,12 @@
+#import bevy_sprite::mesh2d_vertex_output::VertexOutput
+// we can import items from shader modules in the assets folder with a quoted path
+#import "shaders/custom_material_import.wgsl"::COLOR_MULTIPLIER
+
+@group(1) @binding(0) var<uniform> material_color: vec4<f32>;
+@group(1) @binding(1) var base_color_texture: texture_2d<f32>;
+@group(1) @binding(2) var base_color_sampler: sampler;
+
+@fragment
+fn fragment(mesh: VertexOutput) -> @location(0) vec4<f32> {
+    return material_color * textureSample(base_color_texture, base_color_sampler, mesh.uv) * COLOR_MULTIPLIER;
+}

assets/shaders/custom_material_screenspace_texture.wgsl

@@ -4,8 +4,8 @@
     utils::coords_to_viewport_uv,
 }
 
-@group(1) @binding(0) var texture: texture_2d<f32>;
-@group(1) @binding(1) var texture_sampler: sampler;
+@group(2) @binding(0) var texture: texture_2d<f32>;
+@group(2) @binding(1) var texture_sampler: sampler;
 
 @fragment
 fn fragment(

assets/shaders/custom_vertex_attribute.wgsl

@@ -3,7 +3,7 @@
 struct CustomMaterial {
     color: vec4<f32>,
 };
-@group(1) @binding(0) var<uniform> material: CustomMaterial;
+@group(2) @binding(0) var<uniform> material: CustomMaterial;
 
 struct Vertex {
     @builtin(instance_index) instance_index: u32,

assets/shaders/extended_material.wgsl

@@ -19,7 +19,7 @@ struct MyExtendedMaterial {
     quantize_steps: u32,
 }
 
-@group(1) @binding(100)
+@group(2) @binding(100)
 var<uniform> my_extended_material: MyExtendedMaterial;
 
 @fragment

assets/shaders/fallback_image_test.wgsl

@@ -1,22 +1,22 @@
 #import bevy_pbr::forward_io::VertexOutput
 
-@group(1) @binding(0) var test_texture_1d: texture_1d<f32>;
-@group(1) @binding(1) var test_texture_1d_sampler: sampler;
+@group(2) @binding(0) var test_texture_1d: texture_1d<f32>;
+@group(2) @binding(1) var test_texture_1d_sampler: sampler;
 
-@group(1) @binding(2) var test_texture_2d: texture_2d<f32>;
-@group(1) @binding(3) var test_texture_2d_sampler: sampler;
+@group(2) @binding(2) var test_texture_2d: texture_2d<f32>;
+@group(2) @binding(3) var test_texture_2d_sampler: sampler;
 
-@group(1) @binding(4) var test_texture_2d_array: texture_2d_array<f32>;
-@group(1) @binding(5) var test_texture_2d_array_sampler: sampler;
+@group(2) @binding(4) var test_texture_2d_array: texture_2d_array<f32>;
+@group(2) @binding(5) var test_texture_2d_array_sampler: sampler;
 
-@group(1) @binding(6) var test_texture_cube: texture_cube<f32>;
-@group(1) @binding(7) var test_texture_cube_sampler: sampler;
+@group(2) @binding(6) var test_texture_cube: texture_cube<f32>;
+@group(2) @binding(7) var test_texture_cube_sampler: sampler;
 
-@group(1) @binding(8) var test_texture_cube_array: texture_cube_array<f32>;
-@group(1) @binding(9) var test_texture_cube_array_sampler: sampler;
+@group(2) @binding(8) var test_texture_cube_array: texture_cube_array<f32>;
+@group(2) @binding(9) var test_texture_cube_array_sampler: sampler;
 
-@group(1) @binding(10) var test_texture_3d: texture_3d<f32>;
-@group(1) @binding(11) var test_texture_3d_sampler: sampler;
+@group(2) @binding(10) var test_texture_3d: texture_3d<f32>;
+@group(2) @binding(11) var test_texture_3d_sampler: sampler;
 
 @fragment
 fn fragment(in: VertexOutput) {}

assets/shaders/line_material.wgsl

@@ -4,7 +4,7 @@ struct LineMaterial {
     color: vec4<f32>,
 };
 
-@group(1) @binding(0) var<uniform> material: LineMaterial;
+@group(2) @binding(0) var<uniform> material: LineMaterial;
 
 @fragment
 fn fragment(