Skip to content

Commit

Permalink
Merge pull request #50 from SIGSTACKFAULT/main
Browse files Browse the repository at this point in the history
Bevy 0.12
  • Loading branch information
johanhelsing authored Nov 6, 2023
2 parents 8b6263d + 4243d81 commit 756cd5f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ 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"]

[dependencies]
bevy = {version = "0.11", features = ["bevy_render"], default-features = false}
bevy_egui = {version = "0.21", optional = true, default-features = false}
bevy = {version = "0.12", features = ["bevy_render"], 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",
Expand All @@ -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]]
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 756cd5f

Please sign in to comment.