Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to bevy main #368

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Update to bevy main #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
035a661
compiling without default features
Vrixyz Sep 23, 2024
87dfa25
local bevy_eventlistener
Vrixyz Sep 24, 2024
9b70e95
use git dependency
Vrixyz Sep 24, 2024
79b7edb
avoid local path in dependency
Vrixyz Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 46 additions & 13 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@ all-features = true
members = ["crates/*", "backends/*"]

[dependencies]
bevy_app = { version = "0.14.0", default-features = false }
bevy_core = { version = "0.14.0", default-features = false }
bevy_core_pipeline = { version = "0.14.0", optional = true, default-features = false }
bevy_ecs = { version = "0.14.0", default-features = false }
bevy_math = { version = "0.14.0", default-features = false }
bevy_reflect = { version = "0.14.0", default-features = false }
bevy_render = { version = "0.14.0", default-features = false }
bevy_text = { version = "0.14.0", optional = true, default-features = false, features = [
bevy_app = { version = "0.15.0-dev", default-features = false }
bevy_core = { version = "0.15.0-dev", default-features = false }
bevy_core_pipeline = { version = "0.15.0-dev", optional = true, default-features = false }
bevy_ecs = { version = "0.15.0-dev", default-features = false }
bevy_math = { version = "0.15.0-dev", default-features = false }
bevy_reflect = { version = "0.15.0-dev", default-features = false }
bevy_render = { version = "0.15.0-dev", default-features = false }
bevy_text = { version = "0.15.0-dev", optional = true, default-features = false, features = [
"default_font",
] }
bevy_utils = { version = "0.14.0", default-features = false }
bevy_window = { version = "0.14.0", default-features = false }
bevy_utils = { version = "0.15.0-dev", default-features = false }
bevy_window = { version = "0.15.0-dev", default-features = false }

# Optional
bevy_color = { version = "0.14.0", optional = true, default-features = false }
bevy_ui = { version = "0.14.0", optional = true, default-features = false }
bevy_color = { version = "0.15.0-dev", optional = true, default-features = false }
bevy_ui = { version = "0.15.0-dev", optional = true, default-features = false }

bevy_eventlistener = "0.8.0"
bevy_egui = { optional = true, version = "0.28.0" } # >=0.28, <=0.XX
Expand All @@ -55,7 +55,7 @@ bevy_picking_xpbd = { optional = true, path = "backends/bevy_picking_xpbd", vers
bevy_picking_avian = { optional = true, path = "backends/bevy_picking_avian", version = "0.20.0" }

[dev-dependencies]
bevy = { version = "0.14.0", default-features = false, features = [
bevy = { version = "0.15.0-dev", default-features = false, features = [
"bevy_winit",
"x11",
"bevy_gltf",
Expand Down Expand Up @@ -137,3 +137,36 @@ required-features = ["backend_xpbd"]
name = "avian"
path = "examples/avian.rs"
required-features = ["backend_avian"]

[patch.crates-io]
bevy_app = { git = "https://github.com/bevyengine/bevy.git", rev = "9386bd0114c44c9f00a2e9c41db1225aaa78d159" }
bevy_core = { git = "https://github.com/bevyengine/bevy.git", rev = "9386bd0114c44c9f00a2e9c41db1225aaa78d159" }
bevy_core_pipeline = { git = "https://github.com/bevyengine/bevy.git", rev = "9386bd0114c44c9f00a2e9c41db1225aaa78d159", optional = true }
bevy_ecs = { git = "https://github.com/bevyengine/bevy.git", rev = "9386bd0114c44c9f00a2e9c41db1225aaa78d159" }
bevy_math = { git = "https://github.com/bevyengine/bevy.git", rev = "9386bd0114c44c9f00a2e9c41db1225aaa78d159" }
bevy_reflect = { git = "https://github.com/bevyengine/bevy.git", rev = "9386bd0114c44c9f00a2e9c41db1225aaa78d159" }
bevy_render = { git = "https://github.com/bevyengine/bevy.git", rev = "9386bd0114c44c9f00a2e9c41db1225aaa78d159" }
bevy_text = { git = "https://github.com/bevyengine/bevy.git", rev = "9386bd0114c44c9f00a2e9c41db1225aaa78d159", optional = true }
bevy_utils = { git = "https://github.com/bevyengine/bevy.git", rev = "9386bd0114c44c9f00a2e9c41db1225aaa78d159" }
bevy_window = { git = "https://github.com/bevyengine/bevy.git", rev = "9386bd0114c44c9f00a2e9c41db1225aaa78d159" }

# transitive dependencies
bevy_derive = { git = "https://github.com/bevyengine/bevy.git", rev = "9386bd0114c44c9f00a2e9c41db1225aaa78d159" }
bevy_transform = { git = "https://github.com/bevyengine/bevy.git", rev = "9386bd0114c44c9f00a2e9c41db1225aaa78d159" }
bevy_asset = { git = "https://github.com/bevyengine/bevy.git", rev = "9386bd0114c44c9f00a2e9c41db1225aaa78d159" }
bevy_pbr = { git = "https://github.com/bevyengine/bevy.git", rev = "9386bd0114c44c9f00a2e9c41db1225aaa78d159" }
bevy_mod_raycast = { path = "../bevy_mod_raycast" }

# Optional
bevy_color = { git = "https://github.com/bevyengine/bevy.git", rev = "9386bd0114c44c9f00a2e9c41db1225aaa78d159", optional = true }
bevy_ui = { git = "https://github.com/bevyengine/bevy.git", rev = "9386bd0114c44c9f00a2e9c41db1225aaa78d159", optional = true }
bevy_input = { git = "https://github.com/bevyengine/bevy.git", rev = "9386bd0114c44c9f00a2e9c41db1225aaa78d159", optional = true }
bevy_sprite = { git = "https://github.com/bevyengine/bevy.git", rev = "9386bd0114c44c9f00a2e9c41db1225aaa78d159", optional = true }
bevy_hierarchy = { git = "https://github.com/bevyengine/bevy.git", rev = "9386bd0114c44c9f00a2e9c41db1225aaa78d159", optional = true }
bevy = { git = "https://github.com/bevyengine/bevy.git", rev = "9386bd0114c44c9f00a2e9c41db1225aaa78d159", optional = true }

bevy_eventlistener = { git = "https://github.com/vrixyz/bevy_eventlistener.git", branch = "bevy_main" }
# bevy_egui = { optional = true, version = "0.28.0" } # >=0.28, <=0.XX
# bevy_rapier3d = { optional = true, version = "0.27.0-rc.1" }
# bevy_xpbd_3d = { optional = true, version = "0.5.0" }
# avian3d = { optional = true, version = '0.1' }
16 changes: 8 additions & 8 deletions backends/bevy_picking_avian/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ resolver = "2"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
bevy_app = { version = "0.14.0", default-features = false }
bevy_ecs = { version = "0.14.0", default-features = false }
bevy_math = { version = "0.14.0", default-features = false }
bevy_reflect = { version = "0.14.0", default-features = false }
bevy_render = { version = "0.14.0", default-features = false }
bevy_transform = { version = "0.14.0", default-features = false }
bevy_utils = { version = "0.14.0", default-features = false }
bevy_window = { version = "0.14.0", default-features = false }
bevy_app = { version = "0.15.0-dev", default-features = false }
bevy_ecs = { version = "0.15.0-dev", default-features = false }
bevy_math = { version = "0.15.0-dev", default-features = false }
bevy_reflect = { version = "0.15.0-dev", default-features = false }
bevy_render = { version = "0.15.0-dev", default-features = false }
bevy_transform = { version = "0.15.0-dev", default-features = false }
bevy_utils = { version = "0.15.0-dev", default-features = false }
bevy_window = { version = "0.15.0-dev", default-features = false }

avian3d = "0.1"
# Local
Expand Down
8 changes: 4 additions & 4 deletions backends/bevy_picking_egui/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ resolver = "2"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
bevy_app = { version = "0.14.0", default-features = false }
bevy_ecs = { version = "0.14.0", default-features = false }
bevy_reflect = { version = "0.14.0", default-features = false }
bevy_render = { version = "0.14.0", default-features = false }
bevy_app = { version = "0.15.0-dev", default-features = false }
bevy_ecs = { version = "0.15.0-dev", default-features = false }
bevy_reflect = { version = "0.15.0-dev", default-features = false }
bevy_render = { version = "0.15.0-dev", default-features = false }

bevy_egui = "0.28"
# Local
Expand Down
12 changes: 6 additions & 6 deletions backends/bevy_picking_rapier/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ resolver = "2"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
bevy_app = { version = "0.14.0", default-features = false }
bevy_ecs = { version = "0.14.0", default-features = false }
bevy_reflect = { version = "0.14.0", default-features = false }
bevy_render = { version = "0.14.0", default-features = false }
bevy_transform = { version = "0.14.0", default-features = false }
bevy_window = { version = "0.14.0", default-features = false }
bevy_app = { version = "0.15.0-dev", default-features = false }
bevy_ecs = { version = "0.15.0-dev", default-features = false }
bevy_reflect = { version = "0.15.0-dev", default-features = false }
bevy_render = { version = "0.15.0-dev", default-features = false }
bevy_transform = { version = "0.15.0-dev", default-features = false }
bevy_window = { version = "0.15.0-dev", default-features = false }

bevy_rapier3d = "0.27.0-rc.0"
# Local
Expand Down
12 changes: 6 additions & 6 deletions backends/bevy_picking_raycast/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ resolver = "2"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
bevy_app = { version = "0.14.0", default-features = false }
bevy_ecs = { version = "0.14.0", default-features = false }
bevy_reflect = { version = "0.14.0", default-features = false }
bevy_render = { version = "0.14.0", default-features = false }
bevy_transform = { version = "0.14.0", default-features = false }
bevy_window = { version = "0.14.0", default-features = false }
bevy_app = { version = "0.15.0-dev", default-features = false }
bevy_ecs = { version = "0.15.0-dev", default-features = false }
bevy_reflect = { version = "0.15.0-dev", default-features = false }
bevy_render = { version = "0.15.0-dev", default-features = false }
bevy_transform = { version = "0.15.0-dev", default-features = false }
bevy_window = { version = "0.15.0-dev", default-features = false }

bevy_mod_raycast = { version = "0.18" }
# Local
Expand Down
16 changes: 8 additions & 8 deletions backends/bevy_picking_sprite/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ resolver = "2"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
bevy_app = { version = "0.14.0", default-features = false }
bevy_asset = { version = "0.14.0", default-features = false }
bevy_ecs = { version = "0.14.0", default-features = false }
bevy_math = { version = "0.14.0", default-features = false }
bevy_render = { version = "0.14.0", default-features = false }
bevy_sprite = { version = "0.14.0", default-features = false }
bevy_transform = { version = "0.14.0", default-features = false }
bevy_window = { version = "0.14.0", default-features = false }
bevy_app = { version = "0.15.0-dev", default-features = false }
bevy_asset = { version = "0.15.0-dev", default-features = false }
bevy_ecs = { version = "0.15.0-dev", default-features = false }
bevy_math = { version = "0.15.0-dev", default-features = false }
bevy_render = { version = "0.15.0-dev", default-features = false }
bevy_sprite = { version = "0.15.0-dev", default-features = false }
bevy_transform = { version = "0.15.0-dev", default-features = false }
bevy_window = { version = "0.15.0-dev", default-features = false }
# Local
bevy_picking_core = { path = "../../crates/bevy_picking_core", version = "0.20.0" }
18 changes: 9 additions & 9 deletions backends/bevy_picking_ui/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ resolver = "2"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
bevy_app = { version = "0.14.0", default-features = false }
bevy_ecs = { version = "0.14.0", default-features = false }
bevy_hierarchy = { version = "0.14.0", default-features = false }
bevy_render = { version = "0.14.0", default-features = false }
bevy_transform = { version = "0.14.0", default-features = false }
bevy_window = { version = "0.14.0", default-features = false }
bevy_ui = { version = "0.14.0", default-features = false }
bevy_utils = { version = "0.14.0", default-features = false }
bevy_math = { version = "0.14.0", default-features = false }
bevy_app = { version = "0.15.0-dev", default-features = false }
bevy_ecs = { version = "0.15.0-dev", default-features = false }
bevy_hierarchy = { version = "0.15.0-dev", default-features = false }
bevy_render = { version = "0.15.0-dev", default-features = false }
bevy_transform = { version = "0.15.0-dev", default-features = false }
bevy_window = { version = "0.15.0-dev", default-features = false }
bevy_ui = { version = "0.15.0-dev", default-features = false }
bevy_utils = { version = "0.15.0-dev", default-features = false }
bevy_math = { version = "0.15.0-dev", default-features = false }

# Local
bevy_picking_core = { path = "../../crates/bevy_picking_core", version = "0.20.0" }
16 changes: 8 additions & 8 deletions backends/bevy_picking_xpbd/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ resolver = "2"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
bevy_app = { version = "0.14.0", default-features = false }
bevy_ecs = { version = "0.14.0", default-features = false }
bevy_math = { version = "0.14.0", default-features = false }
bevy_reflect = { version = "0.14.0", default-features = false }
bevy_render = { version = "0.14.0", default-features = false }
bevy_transform = { version = "0.14.0", default-features = false }
bevy_utils = { version = "0.14.0", default-features = false }
bevy_window = { version = "0.14.0", default-features = false }
bevy_app = { version = "0.15.0-dev", default-features = false }
bevy_ecs = { version = "0.15.0-dev", default-features = false }
bevy_math = { version = "0.15.0-dev", default-features = false }
bevy_reflect = { version = "0.15.0-dev", default-features = false }
bevy_render = { version = "0.15.0-dev", default-features = false }
bevy_transform = { version = "0.15.0-dev", default-features = false }
bevy_utils = { version = "0.15.0-dev", default-features = false }
bevy_window = { version = "0.15.0-dev", default-features = false }

bevy_xpbd_3d = "0.5"
# Local
Expand Down
20 changes: 10 additions & 10 deletions crates/bevy_picking_core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ resolver = "2"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
bevy_app = { version = "0.14.0", default-features = false }
bevy_derive = { version = "0.14.0", default-features = false }
bevy_ecs = { version = "0.14.0", default-features = false }
bevy_math = { version = "0.14.0", default-features = false }
bevy_reflect = { version = "0.14.0", default-features = false }
bevy_render = { version = "0.14.0", default-features = false }
bevy_utils = { version = "0.14.0", default-features = false }
bevy_window = { version = "0.14.0", default-features = false }
bevy_transform = { version = "0.14.0", default-features = false }
bevy_app = { version = "0.15.0-dev", default-features = false }
bevy_derive = { version = "0.15.0-dev", default-features = false }
bevy_ecs = { version = "0.15.0-dev", default-features = false }
bevy_math = { version = "0.15.0-dev", default-features = false }
bevy_reflect = { version = "0.15.0-dev", default-features = false }
bevy_render = { version = "0.15.0-dev", default-features = false }
bevy_utils = { version = "0.15.0-dev", default-features = false }
bevy_window = { version = "0.15.0-dev", default-features = false }
bevy_transform = { version = "0.15.0-dev", default-features = false }

uuid = { version = "1.1", features = ["v4"] }

bevy_eventlistener = "0.8.0"
bevy_eventlistener = { git = "https://github.com/vrixyz/bevy_eventlistener.git", branch = "bevy_main" }
3 changes: 2 additions & 1 deletion crates/bevy_picking_core/src/backend.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ pub mod ray {
let viewport_logical = camera.to_logical(viewport.physical_position)?;
viewport_pos -= viewport_logical;
}
camera.viewport_to_world(camera_tfm, viewport_pos)
// TODO: Thierry: propagate the result?
camera.viewport_to_world(camera_tfm, viewport_pos).ok()
}
}
16 changes: 8 additions & 8 deletions crates/bevy_picking_highlight/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ resolver = "2"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
bevy_app = { version = "0.14.0", default-features = false }
bevy_asset = { version = "0.14.0", default-features = false }
bevy_color = { version = "0.14.0", default-features = false }
bevy_ecs = { version = "0.14.0", default-features = false }
bevy_reflect = { version = "0.14.0", default-features = false }
bevy_render = { version = "0.14.0", optional = true, default-features = false }
bevy_pbr = { version = "0.14.0", optional = true, default-features = false }
bevy_sprite = { version = "0.14.0", optional = true, default-features = false }
bevy_app = { version = "0.15.0-dev", default-features = false }
bevy_asset = { version = "0.15.0-dev", default-features = false }
bevy_color = { version = "0.15.0-dev", default-features = false }
bevy_ecs = { version = "0.15.0-dev", default-features = false }
bevy_reflect = { version = "0.15.0-dev", default-features = false }
bevy_render = { version = "0.15.0-dev", optional = true, default-features = false }
bevy_pbr = { version = "0.15.0-dev", optional = true, default-features = false }
bevy_sprite = { version = "0.15.0-dev", optional = true, default-features = false }

bevy_picking_core = { path = "../bevy_picking_core", version = "0.20.0" }
bevy_picking_selection = { optional = true, path = "../bevy_picking_selection", version = "0.20.0" }
Expand Down
18 changes: 9 additions & 9 deletions crates/bevy_picking_input/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ resolver = "2"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
bevy_app = { version = "0.14.0", default-features = false }
bevy_ecs = { version = "0.14.0", default-features = false }
bevy_hierarchy = { version = "0.14.0", default-features = false }
bevy_input = { version = "0.14.0", default-features = false }
bevy_math = { version = "0.14.0", default-features = false }
bevy_reflect = { version = "0.14.0", default-features = false }
bevy_render = { version = "0.14.0", default-features = false }
bevy_utils = { version = "0.14.0", default-features = false }
bevy_window = { version = "0.14.0", default-features = false }
bevy_app = { version = "0.15.0-dev", default-features = false }
bevy_ecs = { version = "0.15.0-dev", default-features = false }
bevy_hierarchy = { version = "0.15.0-dev", default-features = false }
bevy_input = { version = "0.15.0-dev", default-features = false }
bevy_math = { version = "0.15.0-dev", default-features = false }
bevy_reflect = { version = "0.15.0-dev", default-features = false }
bevy_render = { version = "0.15.0-dev", default-features = false }
bevy_utils = { version = "0.15.0-dev", default-features = false }
bevy_window = { version = "0.15.0-dev", default-features = false }

bevy_picking_core = { path = "../bevy_picking_core", version = "0.20.0" }
bevy_picking_selection = { optional = true, path = "../bevy_picking_selection", version = "0.20.0" }
Expand Down
10 changes: 5 additions & 5 deletions crates/bevy_picking_selection/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ resolver = "2"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
bevy_app = { version = "0.14.0", default-features = false }
bevy_ecs = { version = "0.14.0", default-features = false }
bevy_input = { version = "0.14.0", default-features = false }
bevy_reflect = { version = "0.14.0", default-features = false }
bevy_utils = { version = "0.14.0", default-features = false }
bevy_app = { version = "0.15.0-dev", default-features = false }
bevy_ecs = { version = "0.15.0-dev", default-features = false }
bevy_input = { version = "0.15.0-dev", default-features = false }
bevy_reflect = { version = "0.15.0-dev", default-features = false }
bevy_utils = { version = "0.15.0-dev", default-features = false }

bevy_eventlistener = "0.8.0"

Expand Down
2 changes: 1 addition & 1 deletion examples/debug.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ fn main() {
..default()
}),
)
.add_plugins(DefaultPickingPlugins)
.add_plugins(bevy_mod_picking::DefaultPickingPlugins)
.add_systems(Startup, setup)
// Set the value of the DebugPickingMode resource to change picking debugging settings
.insert_resource(DebugPickingMode::Normal)
Expand Down
2 changes: 1 addition & 1 deletion examples/minimal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ fn main() {
// All you need to do is add the picking plugin, with your backend of choice enabled in the
// cargo features. By default, the bevy_mod_raycast backend is enabled via the
// `backend_raycast` feature.
.add_plugins(DefaultPickingPlugins)
.add_plugins(bevy_mod_picking::DefaultPickingPlugins)
.insert_resource(DebugPickingMode::Normal)
.add_systems(Startup, setup)
.run();
Expand Down
Loading