Skip to content

Commit bfde083

Browse files
NthTensoraevyriealice-i-cecile
authored andcommitted
Upstream CorePlugin from bevy_mod_picking (bevyengine#13677)
This is the first of a series of PRs intended to begin the upstreaming process for `bevy_mod_picking`. The purpose of this PR is to: + Create the new `bevy_picking` crate + Upstream `CorePlugin` as `PickingPlugin` + Upstream the core pointer and backend abstractions. This code has been ported verbatim from the corresponding files in [bevy_picking_core](https://github.com/aevyrie/bevy_mod_picking/tree/main/crates/bevy_picking_core/src) with a few tiny naming and docs tweaks. The work here is only an initial foothold to get the up-streaming process started in earnest. We can do refactoring and improvements once this is in-tree. --------- Co-authored-by: Aevyrie <[email protected]> Co-authored-by: Alice Cecile <[email protected]>
1 parent 65aa6a4 commit bfde083

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

crates/bevy_internal/Cargo.toml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,9 @@ bevy_picking = ["dep:bevy_picking"]
186186
# Enable support for the Bevy Remote Protocol
187187
bevy_remote = ["dep:bevy_remote"]
188188

189+
# Provides a picking functionality
190+
bevy_picking = ["dep:bevy_picking"]
191+
189192
# Enable support for the ios_simulator by downgrading some rendering capabilities
190193
ios_simulator = ["bevy_pbr?/ios_simulator", "bevy_render?/ios_simulator"]
191194

@@ -227,19 +230,13 @@ bevy_gizmos = { path = "../bevy_gizmos", optional = true, version = "0.14.0-dev"
227230
bevy_gltf = { path = "../bevy_gltf", optional = true, version = "0.14.0-dev" }
228231
bevy_pbr = { path = "../bevy_pbr", optional = true, version = "0.14.0-dev" }
229232
bevy_picking = { path = "../bevy_picking", optional = true, version = "0.14.0-dev" }
233+
bevy_remote = { path = "../bevy_remote", optional = true, version = "0.14.0-dev" }
230234
bevy_render = { path = "../bevy_render", optional = true, version = "0.14.0-dev" }
231235
bevy_scene = { path = "../bevy_scene", optional = true, version = "0.14.0-dev" }
232236
bevy_sprite = { path = "../bevy_sprite", optional = true, version = "0.14.0-dev" }
233237
bevy_text = { path = "../bevy_text", optional = true, version = "0.14.0-dev" }
234238
bevy_ui = { path = "../bevy_ui", optional = true, version = "0.14.0-dev" }
235239
bevy_winit = { path = "../bevy_winit", optional = true, version = "0.14.0-dev" }
236-
<<<<<<< HEAD
237-
=======
238-
bevy_gilrs = { path = "../bevy_gilrs", optional = true, version = "0.14.0-dev" }
239-
bevy_gizmos = { path = "../bevy_gizmos", optional = true, version = "0.14.0-dev", default-features = false }
240-
bevy_dev_tools = { path = "../bevy_dev_tools", optional = true, version = "0.14.0-dev" }
241-
bevy_remote = { path = "../bevy_remote", optional = true, version = "0.14.0-dev" }
242-
>>>>>>> a1884a35c (Implement the Bevy Remote Protocol (BRP).)
243240

244241
[lints]
245242
workspace = true

0 commit comments

Comments
 (0)