Merge branch 'main' into main

.cargo/config_fast_builds.toml

@@ -30,7 +30,7 @@ rustflags = [
 [target.x86_64-pc-windows-msvc]
 linker = "rust-lld.exe" # Use LLD Linker
 rustflags = [
- "-Zshare-generics=n",
+ "-Zshare-generics=n", # (Nightly)
  "-Zthreads=0", # (Nightly) Use improved multithreading with the recommended amount of threads.
 ]
 

.github/FUNDING.yml

@@ -1,3 +1 @@
-# These are supported funding model platforms
-
-custom: https://bevyengine.org/community/donate/
+custom: https://bevyengine.org/donate/

.github/contributing/engine_style_guide.md

@@ -14,6 +14,7 @@ For more advice on contributing to the engine, see the [relevant section](../../
  4. Use \`variable_name\` code blocks in comments to signify that you're referring to specific types and variables.
  5. Start comments with capital letters. End them with a period if they are sentence-like.
 3. Use comments to organize long and complex stretches of code that can't sensibly be refactored into separate functions.
+4. When using [Bevy error codes](https://bevyengine.org/learn/errors/) include a link to the relevant error on the Bevy website in the returned error message `... See: https://bevyengine.org/learn/errors/#b0003`.
 
 ## Rust API guidelines
 

.github/workflows/ci.yml

@@ -189,7 +189,7 @@ jobs:
  steps:
  - uses: actions/checkout@v4
  - name: Check for typos
- uses: crate-ci/typos@v1.18.2
+ uses: crate-ci/typos@v1.19.0
  - name: Typos info
  if: failure()
  run: |

.github/workflows/validation-jobs.yml

@@ -286,3 +286,31 @@ jobs:
  run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
  - name: Run cargo udeps
  run: cargo udeps
+
+ check-example-showcase-patches-still-work:
+ if: ${{ github.event_name == 'merge_group' }}
+ runs-on: ubuntu-latest
+ timeout-minutes: 30
+ steps:
+ - uses: actions/checkout@v4
+ - uses: actions/cache@v4
+ with:
+ path: |
+ ~/.cargo/bin/
+ ~/.cargo/registry/index/
+ ~/.cargo/registry/cache/
+ ~/.cargo/git/db/
+ target/
+ key: ${{ runner.os }}-cargo-check-showcase-patches-${{ hashFiles('**/Cargo.toml') }}
+ - uses: dtolnay/rust-toolchain@stable
+ - name: Installs cargo-udeps
+ run: cargo install --force cargo-udeps
+ - name: Install alsa and udev
+ run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev
+ - name: Apply patches
+ run: |
+ for patch in tools/example-showcase/*.patch; do
+ git apply --ignore-whitespace $patch
+ done
+ - name: Build with patches
+ run: cargo build

Cargo.toml

@@ -155,6 +155,9 @@ bevy_winit = ["bevy_internal/bevy_winit"]
 # Adds support for rendering gizmos
 bevy_gizmos = ["bevy_internal/bevy_gizmos", "bevy_color"]
 
+# Provides a collection of developer tools
+bevy_dev_tools = ["bevy_internal/bevy_dev_tools"]
+
 # Tracing support, saving a file in Chrome Tracing format
 trace_chrome = ["trace", "bevy_internal/trace_chrome"]
 
@@ -318,6 +321,9 @@ embedded_watcher = ["bevy_internal/embedded_watcher"]
 # Enable stepping-based debugging of Bevy systems
 bevy_debug_stepping = ["bevy_internal/bevy_debug_stepping"]
 
+# Enable support for the ios_simulator by downgrading some rendering capabilities
+ios_simulator = ["bevy_internal/ios_simulator"]
+
 [dependencies]
 bevy_dylib = { path = "crates/bevy_dylib", version = "0.14.0-dev", default-features = false, optional = true }
 bevy_internal = { path = "crates/bevy_internal", version = "0.14.0-dev", default-features = false }
@@ -332,6 +338,7 @@ bytemuck = "1.7"
 futures-lite = "2.0.1"
 crossbeam-channel = "0.5.0"
 argh = "0.1.12"
+thiserror = "1.0"
 
 [[example]]
 name = "hello_world"
@@ -973,6 +980,17 @@ description = "Plays an animation from a skinned glTF"
 category = "Animation"
 wasm = true
 
+[[example]]
+name = "animation_graph"
+path = "examples/animation/animation_graph.rs"
+doc-scrape-examples = true
+
+[package.metadata.example.animation_graph]
+name = "Animation Graph"
+description = "Blends multiple animations together with a graph"
+category = "Animation"
+wasm = true
+
 [[example]]
 name = "morph_targets"
 path = "examples/animation/morph_targets.rs"
@@ -1105,6 +1123,16 @@ description = "Illustrate how to add custom log layers"
 category = "Application"
 wasm = false
 
+[[example]]
+name = "log_layers_ecs"
+path = "examples/app/log_layers_ecs.rs"
+
+[package.metadata.example.log_layers_ecs]
+name = "Advanced log layers"
+description = "Illustrate how to transfer data between log layers and Bevy's ECS"
+category = "Application"
+wasm = false
+
 [[example]]
 name = "plugin"
 path = "examples/app/plugin.rs"
@@ -1227,6 +1255,17 @@ description = "Embed an asset in the application binary and load it"
 category = "Assets"
 wasm = true
 
+[[example]]
+name = "extra_asset_source"
+path = "examples/asset/extra_source.rs"
+doc-scrape-examples = true
+
+[package.metadata.example.extra_asset_source]
+name = "Extra asset source"
+description = "Load an asset from a non-standard asset source"
+category = "Assets"
+wasm = true
+
 [[example]]
 name = "hot_asset_reloading"
 path = "examples/asset/hot_asset_reloading.rs"
@@ -1678,6 +1717,17 @@ description = "Displays each contributor as a bouncy bevy-ball!"
 category = "Games"
 wasm = true
 
+[[example]]
+name = "desk_toy"
+path = "examples/games/desk_toy.rs"
+doc-scrape-examples = true
+
+[package.metadata.example.desk_toy]
+name = "Desk Toy"
+description = "Bevy logo as a desk toy using transparent windows! Now with Googly Eyes!"
+category = "Games"
+wasm = false
+
 [[example]]
 name = "game_menu"
 path = "examples/games/game_menu.rs"
@@ -2234,6 +2284,17 @@ description = "Illustrates how to (constantly) rotate an object around an axis"
 category = "Transforms"
 wasm = true
 
+[[example]]
+name = "align"
+path = "examples/transforms/align.rs"
+doc-scrape-examples = true
+
+[package.metadata.example.align]
+name = "Alignment"
+description = "A demonstration of Transform's axis-alignment feature"
+category = "Transforms"
+wasm = true
+
 [[example]]
 name = "scale"
 path = "examples/transforms/scale.rs"
@@ -2500,6 +2561,17 @@ description = "Illustrates how to use 9 Slicing in UI"
 category = "UI (User Interface)"
 wasm = true
 
+[[example]]
+name = "ui_texture_atlas_slice"
+path = "examples/ui/ui_texture_atlas_slice.rs"
+doc-scrape-examples = true
+
+[package.metadata.example.ui_texture_atlas_slice]
+name = "UI Texture Atlas Slice"
+description = "Illustrates how to use 9 Slicing for TextureAtlases in UI"
+category = "UI (User Interface)"
+wasm = true
+
 [[example]]
 name = "viewport_debug"
 path = "examples/ui/viewport_debug.rs"
@@ -2680,6 +2752,40 @@ description = "A scene showcasing 3D gizmos"
 category = "Gizmos"
 wasm = true
 
+[[example]]
+name = "axes"
+path = "examples/gizmos/axes.rs"
+doc-scrape-examples = true
+
+[package.metadata.example.axes]
+name = "Axes"
+description = "Demonstrates the function of axes gizmos"
+category = "Gizmos"
+wasm = true
+
+[[example]]
+name = "light_gizmos"
+path = "examples/gizmos/light_gizmos.rs"
+doc-scrape-examples = true
+
+[package.metadata.example.light_gizmos]
+name = "Light Gizmos"
+description = "A scene showcasing light gizmos"
+category = "Gizmos"
+wasm = true
+
+[[example]]
+name = "fps_overlay"
+path = "examples/dev_tools/fps_overlay.rs"
+doc-scrape-examples = true
+required-features = ["bevy_dev_tools"]
+
+[package.metadata.example.fps_overlay]
+name = "FPS overlay"
+description = "Demonstrates FPS overlay"
+category = "Dev tools"
+wasm = true
+
 [profile.wasm-release]
 inherits = "release"
 opt-level = "z"
@@ -2693,3 +2799,4 @@ panic = "abort"
 
 [package.metadata.docs.rs]
 cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples"]
+all-features = true

README.md

@@ -96,7 +96,7 @@ This [list][cargo_features] outlines the different cargo features supported by B
 
 Bevy is the result of the hard work of many people. A huge thanks to all Bevy contributors, the many open source projects that have come before us, the [Rust gamedev ecosystem](https://arewegameyet.rs/), and the many libraries we build on.
 
-A huge thanks to Bevy's [generous sponsors](https://bevyengine.org). Bevy will always be free and open source, but it isn't free to make. Please consider [sponsoring our work](https://bevyengine.org/community/donate/) if you like what we're building.
+A huge thanks to Bevy's [generous sponsors](https://bevyengine.org). Bevy will always be free and open source, but it isn't free to make. Please consider [sponsoring our work](https://bevyengine.org/donate/) if you like what we're building.
 
 <!-- This next line need to stay exactly as is. It is required for BrowserStack sponsorship. -->
 This project is tested with BrowserStack.

assets/animation_graphs/Fox.animgraph.ron

@@ -0,0 +1,35 @@
+(
+ graph: (
+ nodes: [
+ (
+ clip: None,
+ weight: 1.0,
+ ),
+ (
+ clip: None,
+ weight: 0.5,
+ ),
+ (
+ clip: Some(AssetPath("models/animated/Fox.glb#Animation0")),
+ weight: 1.0,
+ ),
+ (
+ clip: Some(AssetPath("models/animated/Fox.glb#Animation1")),
+ weight: 1.0,
+ ),
+ (
+ clip: Some(AssetPath("models/animated/Fox.glb#Animation2")),
+ weight: 1.0,
+ ),
+ ],
+ node_holes: [],
+ edge_property: directed,
+ edges: [
+ Some((0, 1, ())),
+ Some((0, 2, ())),
+ Some((1, 3, ())),
+ Some((1, 4, ())),
+ ],
+ ),
+ root: 0,
+)

benches/benches/bevy_ecs/world/commands.rs

@@ -1,8 +1,8 @@
 use bevy_ecs::{
  component::Component,
  entity::Entity,
- system::{Command, CommandQueue, Commands},
- world::World,
+ system::Commands,
+ world::{Command, CommandQueue, World},
 };
 use criterion::{black_box, Criterion};
 

crates/bevy_animation/Cargo.toml

@@ -13,10 +13,12 @@ keywords = ["bevy"]
 bevy_app = { path = "../bevy_app", version = "0.14.0-dev" }
 bevy_asset = { path = "../bevy_asset", version = "0.14.0-dev" }
 bevy_core = { path = "../bevy_core", version = "0.14.0-dev" }
+bevy_derive = { path = "../bevy_derive", version = "0.14.0-dev" }
 bevy_log = { path = "../bevy_log", version = "0.14.0-dev" }
 bevy_math = { path = "../bevy_math", version = "0.14.0-dev" }
 bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev", features = [
  "bevy",
+ "petgraph",
 ] }
 bevy_render = { path = "../bevy_render", version = "0.14.0-dev" }
 bevy_time = { path = "../bevy_time", version = "0.14.0-dev" }
@@ -26,8 +28,14 @@ bevy_transform = { path = "../bevy_transform", version = "0.14.0-dev" }
 bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.14.0-dev" }
 
 # other
+fixedbitset = "0.5"
+petgraph = { version = "0.6", features = ["serde-1"] }
+ron = "0.8"
+serde = "1"
 sha1_smol = { version = "1.0" }
-uuid = { version = "1.7", features = ["v5"] }
+thiserror = "1"
+thread_local = "1"
+uuid = { version = "1.7", features = ["v4"] }
 
 [lints]
 workspace = true