From b41773129881a7bc1ed77cba8aa53ce0ee5f7db6 Mon Sep 17 00:00:00 2001 From: Connor King Date: Sun, 5 Nov 2023 19:51:47 -0500 Subject: [PATCH 1/4] bump Bevy version to 0.12 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 148519e..7cdf24a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ version = "0.9.0" bevy_egui = ["dep:bevy_egui"] [dependencies] -bevy = {version = "0.11", features = ["bevy_render"], default-features = false} +bevy = {version = "0.12", features = ["bevy_render"], default-features = false} bevy_egui = {version = "0.21", optional = true, default-features = false} [dev-dependencies] From 35a123bbd541bf939e95a22604be63544ec45bcb Mon Sep 17 00:00:00 2001 From: Connor King Date: Sun, 5 Nov 2023 20:17:02 -0500 Subject: [PATCH 2/4] update dependency versions for Bevy 0.12 --- Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7cdf24a..8e8e593 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,11 +14,11 @@ bevy_egui = ["dep:bevy_egui"] [dependencies] bevy = {version = "0.12", features = ["bevy_render"], default-features = false} -bevy_egui = {version = "0.21", optional = true, default-features = false} +bevy_egui = {version = "0.23", optional = true, default-features = false} [dev-dependencies] # bevy = {version = "0.9", default-features = false, features = [ -bevy = {version = "0.11", default-features = false, features = [ +bevy = {version = "0.12", default-features = false, features = [ "bevy_render", "bevy_asset", "bevy_sprite", @@ -27,7 +27,7 @@ bevy = {version = "0.11", default-features = false, features = [ "x11", # github actions runners don't have libxkbcommon installed, so can't use wayland ]} # bevy-inspector-egui = {version = "0.19", default-features = false} -bevy_egui = {version = "0.21", default-features = false, features = ["default_fonts"]} +bevy_egui = {version = "0.23", default-features = false, features = ["default_fonts"]} rand = "0.8" [[example]] From b382020bcf54b274f57e99974619888e62aab754 Mon Sep 17 00:00:00 2001 From: Connor King Date: Sun, 5 Nov 2023 20:19:09 -0500 Subject: [PATCH 3/4] change .iter() to .read() --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 7a4a158..ec36675 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -64,7 +64,7 @@ fn camera_zoom( ) { let pixels_per_line = 100.; // Maybe make configurable? let scroll = scroll_events - .iter() + .read() .map(|ev| match ev.unit { MouseScrollUnit::Pixel => ev.y, MouseScrollUnit::Line => ev.y * pixels_per_line, From 4243d8153c507722d4c3b5bc3e35610e36ce2a06 Mon Sep 17 00:00:00 2001 From: Connor King Date: Mon, 6 Nov 2023 00:32:06 -0500 Subject: [PATCH 4/4] bump version to 0.10 for bevy 0.12 --- Cargo.toml | 2 +- README.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8e8e593..9a0488f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ keywords = ["gamedev", "bevy"] license = "MIT OR Apache-2.0" name = "bevy_pancam" repository = "https://github.com/johanhelsing/bevy_pancam" -version = "0.9.0" +version = "0.10.0" [features] bevy_egui = ["dep:bevy_egui"] diff --git a/README.md b/README.md index 30784bc..d2cd52a 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,8 @@ I intend to support the `main` branch of Bevy in the `bevy-main` branch. |bevy|bevy_pancam| |----|-----------| -|0.11|0.9, main | +|0.12|0.10, main | +|0.11|0.9 | |0.10|0.8 | |0.9 |0.7, | |0.8 |0.5, 0.6 |