Merge branch 'main' into render-target-component

Author: tychedelia

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

@@ -30,7 +30,7 @@ jobs:
         env:
           BASE_SHA: ${{ github.event.pull_request.base.sha }}
           HEAD_SHA: ${{ github.event.pull_request.head.sha }}
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v8
         if: steps.get_changes.outputs.found_changes == '0'
         with:
           script: |
@@ -60,7 +60,7 @@ jobs:
         env:
           BASE_SHA: ${{ github.event.pull_request.base.sha }}
           HEAD_SHA: ${{ github.event.pull_request.head.sha }}
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v8
         if: steps.get_changes.outputs.found_changes == '0'
         with:
           script: |

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

@@ -23,7 +23,7 @@ jobs:
     steps:
       - name: 'Download artifact'
         id: find-artifact
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           result-encoding: string
           script: |
@@ -63,7 +63,7 @@ jobs:
           fi
       - name: "Comment on PR"
         if: ${{ steps.find-artifact.outputs.result == 'true' && steps.check-last-comment.outputs.result == 'false' }}
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
@@ -94,7 +94,7 @@ jobs:
     steps:
       - name: 'Download artifact'
         id: find-artifact
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           result-encoding: string
           script: |
@@ -134,7 +134,7 @@ jobs:
           fi
       - name: "Comment on PR"
         if: ${{ steps.find-artifact.outputs.result == 'true' && steps.check-last-comment.outputs.result == 'false' }}
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
@@ -165,7 +165,7 @@ jobs:
     steps:
       - name: 'Download artifact'
         id: find-artifact
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           result-encoding: string
           script: |
@@ -205,7 +205,7 @@ jobs:
           fi
       - name: "Comment on PR"
         if: ${{ steps.find-artifact.outputs.result == 'true' && steps.check-last-comment.outputs.result == 'false' }}
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |

.github/workflows/ci.yml

@@ -305,7 +305,7 @@ jobs:
           # Full git history is needed to get a proper list of changed files within `super-linter`
           fetch-depth: 0
       - name: Run Markdown Lint
-        uses: super-linter/super-linter/slim@v8.0.0
+        uses: super-linter/super-linter/slim@v8.1.0
         env:
           MULTI_STATUS: false
           VALIDATE_ALL_CODEBASE: false

.github/workflows/example-run-report.yml

@@ -25,7 +25,7 @@ jobs:
     steps:
       - name: "Download artifact"
         id: find-artifact
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           result-encoding: string
           script: |

.github/workflows/welcome.yml

@@ -14,7 +14,7 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v8
         with:
           script: |
             // Get a list of all issues created by the PR opener

Cargo.toml

@@ -602,13 +602,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_render = { path = "crates/bevy_render", version = "0.17.0-dev", default-features = false }
-bevy_ecs = { path = "crates/bevy_ecs", version = "0.17.0-dev", default-features = false }
-bevy_state = { path = "crates/bevy_state", version = "0.17.0-dev", default-features = false }
+bevy_animation = { path = "crates/bevy_animation", version = "0.17.0-dev", default-features = false }
 bevy_asset = { path = "crates/bevy_asset", version = "0.17.0-dev", default-features = false }
-bevy_reflect = { path = "crates/bevy_reflect", version = "0.17.0-dev", default-features = false }
-bevy_image = { path = "crates/bevy_image", version = "0.17.0-dev", default-features = false }
+bevy_ecs = { path = "crates/bevy_ecs", version = "0.17.0-dev", default-features = false }
 bevy_gizmos = { path = "crates/bevy_gizmos", version = "0.17.0-dev", default-features = false }
+bevy_image = { path = "crates/bevy_image", version = "0.17.0-dev", default-features = false }
+bevy_reflect = { path = "crates/bevy_reflect", version = "0.17.0-dev", default-features = false }
+bevy_render = { path = "crates/bevy_render", version = "0.17.0-dev", default-features = false }
+bevy_state = { path = "crates/bevy_state", version = "0.17.0-dev", default-features = false }
 # Needed to poll Task examples
 futures-lite = "2.0.1"
 futures-timer = { version = "3", features = ["wasm-bindgen", "gloo-timers"] }
@@ -2719,6 +2720,17 @@ description = "Demonstrates how reflection in Bevy provides a way to dynamically
 category = "Reflection"
 wasm = false
 
+[[example]]
+name = "serialization"
+path = "examples/reflection/serialization.rs"
+doc-scrape-examples = true
+
+[package.metadata.example.serialization]
+name = "Serialization"
+description = "Demonstrates serialization and deserialization using reflection without serde's Serialize/Deserialize traits"
+category = "Reflection"
+wasm = false
+
 [[example]]
 name = "custom_attributes"
 path = "examples/reflection/custom_attributes.rs"
@@ -3877,6 +3889,15 @@ doc-scrape-examples = true
 [package.metadata.example.minimizing]
 hidden = true
 
+[[example]]
+name = "desktop_request_redraw"
+path = "tests/window/desktop_request_redraw.rs"
+doc-scrape-examples = true
+required-features = ["bevy_dev_tools"]
+
+[package.metadata.example.desktop_request_redraw]
+hidden = true
+
 [[example]]
 name = "window_resizing"
 path = "examples/window/window_resizing.rs"

…hes/benches/bevy_ecs/observers/simple.rs …hes/benches/bevy_ecs/observers/custom.rsbenches/benches/bevy_ecs/observers/simple.rs renamed to benches/benches/bevy_ecs/observers/custom.rs benches/benches/bevy_ecs/observers/simple.rs renamed to benches/benches/bevy_ecs/observers/custom.rs

@@ -1,8 +1,9 @@
 use core::hint::black_box;
 
 use bevy_ecs::{
-    event::EntityEvent,
-    observer::{On, TriggerTargets},
+    entity::Entity,
+    event::{EntityEvent, Event},
+    observer::On,
     world::World,
 };
 
@@ -13,43 +14,50 @@ fn deterministic_rand() -> ChaCha8Rng {
     ChaCha8Rng::seed_from_u64(42)
 }
 
-#[derive(Clone, EntityEvent)]
-struct EventBase;
+#[derive(Clone, Event)]
+struct A;
 
-pub fn observe_simple(criterion: &mut Criterion) {
+pub fn observer_custom(criterion: &mut Criterion) {
     let mut group = criterion.benchmark_group("observe");
     group.warm_up_time(core::time::Duration::from_millis(500));
     group.measurement_time(core::time::Duration::from_secs(4));
 
-    group.bench_function("trigger_simple", |bencher| {
+    group.bench_function("observer_custom", |bencher| {
         let mut world = World::new();
-        world.add_observer(empty_listener_base);
+        world.add_observer(on_a);
         bencher.iter(|| {
             for _ in 0..10000 {
-                world.trigger(EventBase);
+                world.trigger(A);
             }
         });
     });
 
-    group.bench_function("trigger_targets_simple/10000_entity", |bencher| {
+    group.bench_function("observer_custom/10000_entity", |bencher| {
         let mut world = World::new();
         let mut entities = vec![];
         for _ in 0..10000 {
-            entities.push(world.spawn_empty().observe(empty_listener_base).id());
+            entities.push(world.spawn_empty().observe(on_b).id());
         }
         entities.shuffle(&mut deterministic_rand());
         bencher.iter(|| {
-            send_base_event(&mut world, &entities);
+            for entity in entities.iter().copied() {
+                world.trigger(B { entity });
+            }
         });
     });
 
     group.finish();
 }
 
-fn empty_listener_base(event: On<EventBase>) {
+fn on_a(event: On<A>) {
     black_box(event);
 }
 
-fn send_base_event(world: &mut World, entities: impl TriggerTargets) {
-    world.trigger_targets(EventBase, entities);
+#[derive(Clone, EntityEvent)]
+struct B {
+    entity: Entity,
+}
+
+fn on_b(event: On<B>) {
+    black_box(event);
 }

benches/benches/bevy_ecs/observers/lifecycle.rs

@@ -0,0 +1,35 @@
+use bevy_ecs::{component::Component, lifecycle::Insert, observer::On, world::World};
+use core::hint::black_box;
+use criterion::Criterion;
+use rand::SeedableRng;
+use rand_chacha::ChaCha8Rng;
+
+fn deterministic_rand() -> ChaCha8Rng {
+    ChaCha8Rng::seed_from_u64(42)
+}
+
+pub fn observer_lifecycle(criterion: &mut Criterion) {
+    let mut group = criterion.benchmark_group("observe");
+    group.warm_up_time(core::time::Duration::from_millis(500));
+    group.measurement_time(core::time::Duration::from_secs(4));
+
+    group.bench_function("observer_lifecycle_insert", |bencher| {
+        let mut world = World::new();
+        world.add_observer(on_insert);
+        let mut entity = world.spawn(A);
+        bencher.iter(|| {
+            for _ in 0..10000 {
+                entity.insert(A);
+            }
+        });
+    });
+
+    group.finish();
+}
+
+#[derive(Component)]
+struct A;
+
+fn on_insert(event: On<Insert, A>) {
+    black_box(event);
+}

benches/benches/bevy_ecs/observers/mod.rs

@@ -1,8 +1,15 @@
+mod custom;
+mod lifecycle;
 mod propagation;
-mod simple;
 
 use criterion::criterion_group;
+use custom::*;
+use lifecycle::*;
 use propagation::*;
-use simple::*;
 
-criterion_group!(benches, event_propagation, observe_simple);
+criterion_group!(
+    benches,
+    event_propagation,
+    observer_custom,
+    observer_lifecycle
+);

benches/benches/bevy_ecs/observers/propagation.rs

@@ -62,14 +62,16 @@ pub fn event_propagation(criterion: &mut Criterion) {
 }
 
 #[derive(EntityEvent, Clone, Component)]
-#[entity_event(traversal = &'static ChildOf, auto_propagate)]
-struct TestEvent<const N: usize> {}
+#[entity_event(propagate, auto_propagate)]
+struct TestEvent<const N: usize> {
+    entity: Entity,
+}
 
 fn send_events<const N: usize, const N_EVENTS: usize>(world: &mut World, leaves: &[Entity]) {
-    let target = leaves.iter().choose(&mut rand::rng()).unwrap();
+    let entity = *leaves.iter().choose(&mut rand::rng()).unwrap();
 
     (0..N_EVENTS).for_each(|_| {
-        world.trigger_targets(TestEvent::<N> {}, *target);
+        world.trigger(TestEvent::<N> { entity });
     });
 }