From e39f7cababd1fc53876ef89bed136d746b205424 Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Wed, 11 Oct 2023 20:58:37 +0000 Subject: [PATCH 1/3] Bump bevy to 0.12 --- Cargo.toml | 6 +++--- README.md | 8 +++++++- crates/bevy_eventlistener_core/Cargo.toml | 10 +++++----- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 48685be..a0a07dd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ resolver = "2" [package] name = "bevy_eventlistener" -version = "0.5.1" +version = "0.6.0" edition = "2021" description = "Event listeners and callbacks for bevy" license = "MIT OR Apache-2.0" @@ -15,11 +15,11 @@ keywords = ["gamedev", "bevy", "eventlistener", "callbacks"] categories = ["game-engines", "rendering"] [dependencies] -bevy_eventlistener_core = { path = "crates/bevy_eventlistener_core", version = "0.5.1" } +bevy_eventlistener_core = { path = "crates/bevy_eventlistener_core", version = "0.6.0" } bevy_eventlistener_derive = { path = "crates/bevy_eventlistener_derive", version = "0.5.1" } [dev-dependencies] -bevy = { version = "0.11", default-features = false, features = [ +bevy = { version = "0.12", default-features = false, features = [ "bevy_winit", "x11", ] } diff --git a/README.md b/README.md index 1563860..572d0c0 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,13 @@ The blue line can be read as "how long does it take all of these events to bubbl The runtime cost of each event decreases as the total number of events increase, this is because graph construction is a fixed cost for each type of event. Adding more events simply amortizes that cost across more events. At 50 events the runtime cost is only ~500ns/event, and about 25us total. To reiterate, this is using an entity hierarchy similar to the most complex websites I could find. +# Bevy version support + +|bevy|bevy\_eventlistener| +|----|---| +|0.12|0.6| +|0.11|0.5| + # License All code in this repository is dual-licensed under either: @@ -83,4 +90,3 @@ at your option. This means you can select the license you prefer. Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions. - diff --git a/crates/bevy_eventlistener_core/Cargo.toml b/crates/bevy_eventlistener_core/Cargo.toml index 0d56526..3a42a35 100644 --- a/crates/bevy_eventlistener_core/Cargo.toml +++ b/crates/bevy_eventlistener_core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bevy_eventlistener_core" -version = "0.5.1" +version = "0.6.0" edition = "2021" description = "Event listeners and callbacks for bevy" license = "MIT OR Apache-2.0" @@ -9,10 +9,10 @@ keywords = ["gamedev", "bevy", "eventlistener", "callbacks"] categories = ["game-engines", "rendering"] [dependencies] -bevy_ecs = "0.11" -bevy_app = "0.11" -bevy_utils = "0.11" -bevy_hierarchy = "0.11" +bevy_ecs = "0.12" +bevy_app = "0.12" +bevy_utils = "0.12" +bevy_hierarchy = "0.12" [features] default = ["trace"] From 939552bfd09aec065f8fbd7684c22f1de0625107 Mon Sep 17 00:00:00 2001 From: Aevyrie Date: Sun, 5 Nov 2023 17:13:15 -0600 Subject: [PATCH 2/3] use event `read` instead of `iter` --- crates/bevy_eventlistener_core/src/event_dispatcher.rs | 2 +- examples/event_listeners.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/bevy_eventlistener_core/src/event_dispatcher.rs b/crates/bevy_eventlistener_core/src/event_dispatcher.rs index 14c381d..52d922d 100644 --- a/crates/bevy_eventlistener_core/src/event_dispatcher.rs +++ b/crates/bevy_eventlistener_core/src/event_dispatcher.rs @@ -50,7 +50,7 @@ impl EventDispatcher { dead_branch_nodes.clear(); target_cache.clear(); - for event in events.iter() { + for event in events.read() { // if the target belongs to a dead branch, exit early. if dead_branch_nodes.contains(&event.target()) { continue; diff --git a/examples/event_listeners.rs b/examples/event_listeners.rs index 169f015..4126869 100644 --- a/examples/event_listeners.rs +++ b/examples/event_listeners.rs @@ -137,7 +137,7 @@ impl From>> for DoSomethingComplex { /// Unlike the [`some_simple_system`], this one can run in parallel with other systems because it is /// scheduled. fn some_complex_system(mut events: EventReader) { - for event in events.iter() { + for event in events.read() { info!("Doing complex things with data: {}", event.important_data) } } @@ -159,7 +159,7 @@ fn keyboard_events( ) { let target = target.0; for input in inputs - .iter() + .read() .filter(|input| !input.state.is_pressed()) .filter_map(|input| input.key_code) { From 98171b71485afd5067849e3f699efa02801bb935 Mon Sep 17 00:00:00 2001 From: Aevyrie Date: Sun, 5 Nov 2023 17:20:43 -0600 Subject: [PATCH 3/3] bump derive version to keep in lockstep with workspace --- Cargo.toml | 2 +- crates/bevy_eventlistener_derive/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a0a07dd..715c71a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ categories = ["game-engines", "rendering"] [dependencies] bevy_eventlistener_core = { path = "crates/bevy_eventlistener_core", version = "0.6.0" } -bevy_eventlistener_derive = { path = "crates/bevy_eventlistener_derive", version = "0.5.1" } +bevy_eventlistener_derive = { path = "crates/bevy_eventlistener_derive", version = "0.6.0" } [dev-dependencies] bevy = { version = "0.12", default-features = false, features = [ diff --git a/crates/bevy_eventlistener_derive/Cargo.toml b/crates/bevy_eventlistener_derive/Cargo.toml index 8d658cb..577a93a 100644 --- a/crates/bevy_eventlistener_derive/Cargo.toml +++ b/crates/bevy_eventlistener_derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bevy_eventlistener_derive" -version = "0.5.1" +version = "0.6.0" edition = "2021" description = "Event listeners and callbacks for bevy" license = "MIT OR Apache-2.0"