Merge branch 'main' into par-mesh-collection

Author: aevyrie

.github/dependabot.yml

@@ -11,6 +11,9 @@ updates:
         patterns:
           - "*wgpu*"
           - "naga*"
+      accesskit:
+        patterns:
+          - "accesskit*"
   - package-ecosystem: github-actions
     directory: /
     schedule:

.github/workflows/ci.yml

@@ -367,7 +367,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Check for typos
-        uses: crate-ci/typos@5c19779cb52ea50e151f5a10333ccd269227b5ae # v1.41.0
+        uses: crate-ci/typos@bb4666ad77b539a6b4ce4eda7ebb6de553704021 # v1.42.0
       - name: Typos info
         if: failure()
         run: |

.github/workflows/post-release.yml

@@ -52,7 +52,12 @@ jobs:
             --exclude errors \
             --exclude bevy_mobile_example \
             --exclude build-wasm-example \
-            --exclude no_std_library
+            --exclude no_std_library \
+            --exclude export-content \
+            --exclude auto_register_static
+            --exclude mipmap_generator \
+            --exclude caldera_hotel \
+            --exclude bistro
 
       - name: Create PR
         uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v8.0.0

.github/workflows/security-static-analysis.yml

@@ -42,7 +42,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
+        uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
         with:
           languages: ${{ matrix.language }}
           build-mode: ${{ matrix.build-mode }}
@@ -70,7 +70,7 @@ jobs:
           exit 1
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
+        uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
         with:
           category: "/language:${{matrix.language}}"
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bevy"
-version = "0.18.0-dev"
+version = "0.19.0-dev"
 edition = "2024"
 categories = ["game-engines", "graphics", "gui", "rendering"]
 description = "A refreshingly simple data-driven game engine and app framework"
@@ -178,7 +178,7 @@ audio = ["bevy_audio", "vorbis"]
 # COLLECTION: Features used to compose Bevy scenes.
 scene = ["bevy_scene"]
 
-# COLLECTION: Enables picking functionality
+# COLLECTION: Enables picking functionality.
 picking = ["bevy_picking", "mesh_picking", "sprite_picking", "ui_picking"]
 
 # COLLECTION: The core pieces that most apps need. This serves as a baseline feature set for other higher level feature collections (such as "2d" and "3d"). It is also useful as a baseline feature set for scenarios like headless apps that require no rendering (ex: command line tools, servers, etc).
@@ -217,6 +217,7 @@ common_api = [
   "bevy_image",
   "bevy_mesh",
   "bevy_shader",
+  "bevy_material",
   "bevy_text",
   "hdr",
   "png",
@@ -272,7 +273,7 @@ ui_bevy_render = [
   "bevy_ui_render",
 ]
 
-# COLLECTION: Recommended defaults for no_std applications
+# COLLECTION: Recommended defaults for no_std applications.
 default_no_std = ["libm", "critical-section", "bevy_color", "bevy_state"]
 
 # Provides an implementation for picking meshes
@@ -374,6 +375,9 @@ bevy_light = ["bevy_internal/bevy_light"]
 # Provides shaders usable through asset handles.
 bevy_shader = ["bevy_internal/bevy_shader"]
 
+# Provides materials.
+bevy_material = ["bevy_internal/bevy_material"]
+
 # Adds support for gizmos
 bevy_gizmos = ["bevy_internal/bevy_gizmos"]
 
@@ -716,12 +720,12 @@ hotpatching = ["bevy_internal/hotpatching"]
 debug = ["bevy_internal/debug"]
 
 [dependencies]
-bevy_internal = { path = "crates/bevy_internal", version = "0.18.0-dev", default-features = false }
+bevy_internal = { path = "crates/bevy_internal", version = "0.19.0-dev", default-features = false }
 tracing = { version = "0.1", default-features = false, optional = true }
 
 # Wasm does not support dynamic linking.
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
-bevy_dylib = { path = "crates/bevy_dylib", version = "0.18.0-dev", default-features = false, optional = true }
+bevy_dylib = { path = "crates/bevy_dylib", version = "0.19.0-dev", default-features = false, optional = true }
 
 [dev-dependencies]
 rand = "0.9.0"
@@ -732,14 +736,14 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1.0.140"
 bytemuck = "1"
 # The following explicit dependencies are needed for proc macros to work inside of examples as they are part of the bevy crate itself.
-bevy_animation = { path = "crates/bevy_animation", version = "0.18.0-dev", default-features = false }
-bevy_asset = { path = "crates/bevy_asset", version = "0.18.0-dev", default-features = false }
-bevy_ecs = { path = "crates/bevy_ecs", version = "0.18.0-dev", default-features = false }
-bevy_gizmos = { path = "crates/bevy_gizmos", version = "0.18.0-dev", default-features = false }
-bevy_image = { path = "crates/bevy_image", version = "0.18.0-dev", default-features = false }
-bevy_reflect = { path = "crates/bevy_reflect", version = "0.18.0-dev", default-features = false }
-bevy_render = { path = "crates/bevy_render", version = "0.18.0-dev", default-features = false }
-bevy_state = { path = "crates/bevy_state", version = "0.18.0-dev", default-features = false }
+bevy_animation = { path = "crates/bevy_animation", version = "0.19.0-dev", default-features = false }
+bevy_asset = { path = "crates/bevy_asset", version = "0.19.0-dev", default-features = false }
+bevy_ecs = { path = "crates/bevy_ecs", version = "0.19.0-dev", default-features = false }
+bevy_gizmos = { path = "crates/bevy_gizmos", version = "0.19.0-dev", default-features = false }
+bevy_image = { path = "crates/bevy_image", version = "0.19.0-dev", default-features = false }
+bevy_reflect = { path = "crates/bevy_reflect", version = "0.19.0-dev", default-features = false }
+bevy_render = { path = "crates/bevy_render", version = "0.19.0-dev", default-features = false }
+bevy_state = { path = "crates/bevy_state", version = "0.19.0-dev", default-features = false }
 # Needed to poll Task examples
 futures-lite = "2.0.1"
 futures-timer = { version = "3", features = ["wasm-bindgen", "gloo-timers"] }
@@ -748,7 +752,7 @@ argh = "0.1.12"
 thiserror = "2.0"
 event-listener = "5.3.0"
 anyhow = "1"
-accesskit = "0.21"
+accesskit = "0.22"
 nonmax = "0.5"
 gltf = "1.4"
 
@@ -1250,6 +1254,19 @@ description = "Showcases different blend modes"
 category = "3D Rendering"
 wasm = true
 
+[[example]]
+name = "contact_shadows"
+path = "examples/3d/contact_shadows.rs"
+# Causes an ICE on docs.rs
+doc-scrape-examples = false
+required-features = ["bluenoise_texture"]
+
+[package.metadata.example.contact_shadows]
+name = "Contact Shadows"
+description = "Showcases how contact shadows add shadow detail"
+category = "3D Rendering"
+wasm = true
+
 [[example]]
 name = "lighting"
 path = "examples/3d/lighting.rs"
@@ -3180,6 +3197,17 @@ description = "A very simple compute shader that writes to a buffer that is read
 category = "Shaders"
 wasm = false
 
+[[example]]
+name = "compute_mesh"
+path = "examples/shader_advanced/compute_mesh.rs"
+doc-scrape-examples = true
+
+[package.metadata.example.compute_mesh]
+name = "Compute Shader Mesh"
+description = "A compute shader that generates a mesh that is controlled by a Handle"
+category = "Shaders"
+wasm = false
+
 [[example]]
 name = "array_texture"
 path = "examples/shader/array_texture.rs"
@@ -3860,6 +3888,18 @@ description = "Demonstrates how to display text with strikethrough and underline
 category = "UI (User Interface)"
 wasm = true
 
+[[example]]
+name = "generic_font_families"
+path = "examples/ui/generic_font_families.rs"
+# Causes an ICE on docs.rs
+doc-scrape-examples = false
+
+[package.metadata.example.generic_font_families]
+name = "Generic Font Families"
+description = "Demonstrates how to use generic font families"
+category = "UI (User Interface)"
+wasm = true
+
 [[example]]
 name = "text"
 path = "examples/ui/text.rs"
@@ -4499,7 +4539,7 @@ doc-scrape-examples = false
 name = "glTF extension AnimationGraph"
 description = "Uses glTF data to build an AnimationGraph via extension processing"
 category = "glTF"
-wasm = true
+wasm = false
 
 [[example]]
 name = "gltf_extension_mesh_2d"
@@ -4511,7 +4551,7 @@ doc-scrape-examples = false
 name = "glTF extension processing to build Mesh2ds from glTF data"
 description = "Uses glTF extension data to convert incoming Mesh3d/MeshMaterial3d assets to 2d"
 category = "glTF"
-wasm = true
+wasm = false
 
 [[example]]
 name = "query_gltf_primitives"
@@ -4662,6 +4702,7 @@ name = "ssr"
 path = "examples/3d/ssr.rs"
 # Causes an ICE on docs.rs
 doc-scrape-examples = false
+required-features = ["bluenoise_texture"]
 
 [package.metadata.example.ssr]
 name = "Screen Space Reflections"
@@ -5081,25 +5122,25 @@ wasm = true
 
 [[example]]
 name = "directional_navigation"
-path = "examples/ui/directional_navigation.rs"
+path = "examples/ui/navigation/directional_navigation.rs"
 # Causes an ICE on docs.rs
 doc-scrape-examples = false
 
 [package.metadata.example.directional_navigation]
 name = "Directional Navigation"
-description = "Demonstration of Directional Navigation between UI elements"
+description = "Demonstration of automatic directional navigation based on UI element positions"
 category = "UI (User Interface)"
 wasm = true
 
 [[example]]
-name = "auto_directional_navigation"
-path = "examples/ui/auto_directional_navigation.rs"
+name = "directional_navigation_overrides"
+path = "examples/ui/navigation/directional_navigation_overrides.rs"
 # Causes an ICE on docs.rs
 doc-scrape-examples = false
 
-[package.metadata.example.auto_directional_navigation]
-name = "Automatic Directional Navigation"
-description = "Demonstration of automatic directional navigation graph generation based on UI element positions"
+[package.metadata.example.directional_navigation_overrides]
+name = "Directional Navigation Overrides"
+description = "Demonstration of automatic directional navigation between UI elements with manual overrides"
 category = "UI (User Interface)"
 wasm = true
 
@@ -5243,6 +5284,17 @@ description = "Demonstrates use of core scrollbar in Bevy UI"
 category = "UI (User Interface)"
 wasm = true
 
+[[example]]
+name = "system_fonts"
+path = "examples/ui/system_fonts.rs"
+doc-scrape-examples = true
+
+[package.metadata.example.system_fonts]
+name = "system_fonts"
+description = "Demonstrates how to use system fonts"
+category = "UI (User Interface)"
+wasm = true
+
 [[example]]
 name = "feathers"
 path = "examples/ui/feathers.rs"

assets/shaders/compute_mesh.wgsl

@@ -0,0 +1,96 @@
+// This shader is used for the compute_mesh example
+// The actual work it does is not important for the example and
+// has been hardcoded to return a cube mesh
+
+// `vertex_start` is the starting offset of the mesh data in the *vertex_data* storage buffer
+// `index_start` is the starting offset of the index data in the *index_data* storage buffer
+struct DataRanges {
+    vertex_start: u32,
+    vertex_end: u32,
+    index_start: u32,
+    index_end: u32,
+}
+
+@group(0) @binding(0) var<uniform> data_range: DataRanges;
+@group(0) @binding(1) var<storage, read_write> vertex_data: array<f32>;
+@group(0) @binding(2) var<storage, read_write> index_data: array<u32>;
+
+@compute @workgroup_size(1)
+fn main(@builtin(global_invocation_id) global_id: vec3<u32>) {
+    // this loop is iterating over the full list of (position, normal, uv)
+    // data what we have in `vertices`.
+    // `192` is used because arrayLength on const arrays doesn't work
+    for (var i = 0u; i < 192; i++) {
+        // The vertex_data buffer is bigger than just the mesh we're
+        // processing because Bevy stores meshes in the mesh_allocator
+        // which allocates slabs that each can contain multiple meshes.
+        // This buffer is one slab, and data_range.vertex_start is the
+        // starting offset for the mesh we care about.
+        // So the 0 starting value in the for loop is added to 
+        // data_range.vertex_start which means we start writing at the
+        // correct offset.
+        //
+        // The "end" of the available space to write into is known by us
+        // ahead of time in this example, so we know this has enough space,
+        // but you may wish to also check to make sure you are not writing
+        // past the end of the range *because you should not write past the
+        // end of the range ever*. Doing this can overwrite a different
+        // mesh's data.
+        vertex_data[i + data_range.vertex_start] = vertices[i];
+    }
+    // `36` is the length of the `indices` array
+    for (var i = 0u; i < 36; i++) {
+        // This is doing the same as the vertex_data offset described above
+        index_data[i + data_range.index_start] = u32(indices[i]);
+    }
+}
+
+// hardcoded compute shader data.
+// half_size is half the size of the cube
+const half_size = vec3(1.5);
+const min = -half_size;
+const max = half_size;
+
+// Suppose Y-up right hand, and camera look from +Z to -Z
+const vertices = array(
+    // xyz, normal.xyz, uv.xy
+    // Front
+    min.x, min.y, max.z, 0.0, 0.0, 1.0, 0.0, 0.0,
+    max.x, min.y, max.z, 0.0, 0.0, 1.0, 1.0, 0.0,
+    max.x, max.y, max.z, 0.0, 0.0, 1.0, 1.0, 1.0,
+    min.x, max.y, max.z, 0.0, 0.0, 1.0, 0.0, 1.0,
+    // Back
+    min.x, max.y, min.z, 0.0, 0.0, -1.0, 1.0, 0.0,
+    max.x, max.y, min.z, 0.0, 0.0, -1.0, 0.0, 0.0,
+    max.x, min.y, min.z, 0.0, 0.0, -1.0, 0.0, 1.0,
+    min.x, min.y, min.z, 0.0, 0.0, -1.0, 1.0, 1.0,
+    // Right
+    max.x, min.y, min.z, 1.0, 0.0, 0.0, 0.0, 0.0,
+    max.x, max.y, min.z, 1.0, 0.0, 0.0, 1.0, 0.0,
+    max.x, max.y, max.z, 1.0, 0.0, 0.0, 1.0, 1.0,
+    max.x, min.y, max.z, 1.0, 0.0, 0.0, 0.0, 1.0,
+    // Left
+    min.x, min.y, max.z, -1.0, 0.0, 0.0, 1.0, 0.0,
+    min.x, max.y, max.z, -1.0, 0.0, 0.0, 0.0, 0.0,
+    min.x, max.y, min.z, -1.0, 0.0, 0.0, 0.0, 1.0,
+    min.x, min.y, min.z, -1.0, 0.0, 0.0, 1.0, 1.0,
+    // Top
+    max.x, max.y, min.z, 0.0, 1.0, 0.0, 1.0, 0.0,
+    min.x, max.y, min.z, 0.0, 1.0, 0.0, 0.0, 0.0,
+    min.x, max.y, max.z, 0.0, 1.0, 0.0, 0.0, 1.0,
+    max.x, max.y, max.z, 0.0, 1.0, 0.0, 1.0, 1.0,
+    // Bottom
+    max.x, min.y, max.z, 0.0, -1.0, 0.0, 0.0, 0.0,
+    min.x, min.y, max.z, 0.0, -1.0, 0.0, 1.0, 0.0,
+    min.x, min.y, min.z, 0.0, -1.0, 0.0, 1.0, 1.0,
+    max.x, min.y, min.z, 0.0, -1.0, 0.0, 0.0, 1.0
+);
+
+const indices = array(
+    0, 1, 2, 2, 3, 0, // front
+    4, 5, 6, 6, 7, 4, // back
+    8, 9, 10, 10, 11, 8, // right
+    12, 13, 14, 14, 15, 12, // left
+    16, 17, 18, 18, 19, 16, // top
+    20, 21, 22, 22, 23, 20, // bottom
+);

benches/benches/bevy_ecs/world/mod.rs

@@ -29,6 +29,7 @@ criterion_group!(
     world_query_iter,
     world_query_for_each,
     world_spawn,
+    world_spawn_batch,
     world_despawn,
     world_despawn_recursive,
     query_get,