Bevy 0.13 by eerii · Pull Request #236 · vladbat00/bevy_egui

eerii · 2023-12-21T15:24:34Z

Draft

Update to stay in sync with bevy main branch. Some changes are:

Input has been renamed to ButtonInput
create_bind_group_layout now takes two parameters instead of a struct
World queries are revamped and now split into QueryData and QueryFilter
Image now has a new RenderAssetPersistencePolicy field
EguiSettings::scale_factor changed type from f64 to f32 to match bevy's window_size

This pr is updated and tested until bevyengine/bevy@ebf81c6 (2024/02/14)

bevy-inspector-egui fork: https://github.com/eerii/bevy-inspector-egui

Relevant prs

src/egui_node.rs

Shute052 · 2024-02-03T15:43:11Z

The changes of the upstream PR (Bevy #10644) breaks the compilation of render_systems::setup_new_windows_render_system() on the latest version of bevy after the merge.

Shute052 · 2024-02-03T16:11:12Z

The changes of the upstream PR (Bevy #10644) breaks the compilation of render_systems::setup_new_windows_render_system() on the latest version of bevy after the merge.

/// Sets up the pipeline for newly created windows.
pub fn setup_new_windows_render_system(
    windows: Extract<Query<Entity, Added<Window>>>,
    mut render_graph: ResMut<RenderGraph>,
) {
    #[derive(Debug, Hash, PartialEq, Eq, Clone, RenderLabel)]
    struct EguiPass(String);

    for window in windows.iter() {
        let egui_pass = EguiPass(format!("egui-{}-{}", window.index(), window.generation()));

        let new_node = EguiNode::new(window);

        render_graph.add_node(egui_pass.clone(), new_node);

        render_graph.add_node_edge(bevy::render::graph::CameraDriverLabel, egui_pass);
    }
}

This works and successfully passed all of four tests in bevy_egui, which have limited coverage. I'm not entirely certain that all behaviors are error-free.

Update:

    #[derive(Debug, Hash, PartialEq, Eq, Clone, RenderLabel)]
    struct EguiPass(u32, u32);
    let egui_pass = EguiPass(window.index(), window.generation());

DasLixou · 2024-02-03T16:38:28Z

The changes of the upstream PR (Bevy #10644) breaks the compilation of render_systems::setup_new_windows_render_system() on the latest version of bevy after the merge.

/// Sets up the pipeline for newly created windows.
pub fn setup_new_windows_render_system(
    windows: Extract<Query<Entity, Added<Window>>>,
    mut render_graph: ResMut<RenderGraph>,
) {
    #[derive(Debug, Hash, PartialEq, Eq, Clone, RenderLabel)]
    struct EguiPass(String);

    for window in windows.iter() {
        let egui_pass = EguiPass(format!("egui-{}-{}", window.index(), window.generation()));

        let new_node = EguiNode::new(window);

        render_graph.add_node(egui_pass.clone(), new_node);

        render_graph.add_node_edge(bevy::render::graph::CameraDriverLabel, egui_pass);
    }
}

This works and successfully passed all of four tests in bevy_egui, which have limited coverage. I'm not entirely certain that all behaviors are error-free.

I think it would be faster to make the label directly use index and generation, which would remove num to str conversion

ThierryBerger · 2024-02-03T21:02:40Z

updated to bevy main if that's useful: https://github.com/eerii/bevy_egui/pull/2

ThierryBerger · 2024-02-06T21:46:56Z

src/systems.rs

    #[cfg(all(feature = "manage_clipboard", not(target_os = "android")))]
    pub egui_clipboard: Res<'w, crate::EguiClipboard>,
-    pub keyboard_input: Res<'w, Input<KeyCode>>,
+    pub keyboard_input: Res<'w, ButtonInput<KeyCode>>,


We'll want to read the event KeyboardInput, as KeyCode in bevy is no longer layout dependant.

Maybe it could be done in a followup issue?

@Vrixyz do we want these inputs to be layout dependent? We are reading them only to check key modifiers (such as shift/ctrl/etc).

Modifiers aren't exempt from keyboard layout, prominently many layouts have AltGraph instead of AltRight. Less industry-standard but still out there Neo replaces capslock and the key right of left shift (that US layouts don't have) with modifiers.

It may not have a huge practical impact and people with those kinds of layout are already accustomed to additional pain (compared to say plain dvorak) but consistently using logical mappings sounds like a good idea.

@eerii you might be interested in parts of that diff: ThierryBerger@86650bb ; I think that's not the whole diff needed to use logical key everywhere, but it was enough to get me unlock on my particular issue.

I look forward to finally consolidate bevy_egui to non-qwerty layouts :D

(Just when I ordered a qwerty keyboard 🥲)

I updated the branch to match main and to track the latest bevy main, and added your diff. It seems to work and while I'm not sure where else to look to migrate logical input it seems an improvement! Thanks ^^
Edit: Not sure how to change the keycode into a keyboardinto yet, I will look into it

It's a bit of a shame that Bevy 0.13 doesn't have ButtonInput<Key> for logical keys

I've just re-implemented the modifiers logic with logical key codes, I'll keep this for review till the evening and then merge it. I also hope to tackle the other input-related issues shortly after and then release a new version.

…88fe69

examples/render_to_image_widget.rs

examples/side_panel.rs

Co-authored-by: Félix Lescaudey de Maneville <[email protected]>

vladbat00 · 2024-02-19T18:32:26Z

Thank you @eerii and everyone else involved! ❤️

Blocked on: * [x] vladbat00/bevy_egui#236 * [x] jakobhellermann/bevy-inspector-egui#185

Blocking: * [x] dimforge/bevy_rapier#479 * [x] avianphysics/avian#315 * [x] vladbat00/bevy_egui#236 * [x] jakobhellermann/bevy-inspector-egui#185

v-kat mentioned this pull request Jan 17, 2024

WASM Input (needs to be better) #246

Open

v-kat mentioned this pull request Jan 30, 2024

web clipboard handling #178

Closed

Shute052 reviewed Feb 3, 2024

View reviewed changes

src/egui_node.rs Outdated Show resolved Hide resolved

Shute052 reviewed Feb 3, 2024

View reviewed changes

src/egui_node.rs Outdated Show resolved Hide resolved

Shute052 mentioned this pull request Feb 3, 2024

Update the dependencies to bevy 0.13 and bevy_egui 0.25 Leafwing-Studios/leafwing-input-manager#463

Closed

3 tasks

This was referenced Feb 3, 2024

wasm clipboard continued ThierryBerger/bevy_egui#3

Open

Update winit dependency to 0.29 bevyengine/bevy#10702

Merged

ThierryBerger reviewed Feb 6, 2024

View reviewed changes

eerii and others added 8 commits February 14, 2024 12:40

Updates for bevy 0.13

4091e1e

using new render_asset::RenderAssetPersistencePolicy

6c64c06

Pass EguiTransform by reference

6821f85

Fix clear color and material colors

fb8aae6

Change scale_factor to f32 to match with bevy

42a4826

fix compilation to bevy main as of 55493a823eeda6bb43ea74975f2f484bfd…

4c7458e

…88fe69

Fix formatting

886395c

Fix deprecated shapes

e7701ac

Plonq mentioned this pull request Feb 17, 2024

Bevy 0.13 Plonq/bevy_panorbit_camera#52

Merged

1 task

StrikeForceZero mentioned this pull request Feb 18, 2024

Bevy 0.13 aevyrie/bevy_mod_picking#314

Merged

4 tasks

This was referenced Feb 18, 2024

Bevy 0.13 ManevilleF/hexx#149

Merged

Bevy 0.13 ManevilleF/bevy_silk#24

Merged

sclausen mentioned this pull request Feb 18, 2024

Bevy 0.13 #259

Closed

vladbat00 added 3 commits February 19, 2024 12:41

Update to Bevy 0.13

8cda13d

Read modifiers state from logical key codes

583710a

Fix lifetimes in InputResources

357822a

Shute052 mentioned this pull request Feb 19, 2024

Update for bevy 0.13 and bevy_egui 0.25 Leafwing-Studios/leafwing-input-manager#470

Merged

1 task

ManevilleF reviewed Feb 19, 2024

View reviewed changes

examples/render_to_image_widget.rs Outdated Show resolved Hide resolved

examples/render_to_image_widget.rs Outdated Show resolved Hide resolved

examples/side_panel.rs Outdated Show resolved Hide resolved

examples/side_panel.rs Outdated Show resolved Hide resolved

vladbat00 and others added 2 commits February 19, 2024 18:40

Simplify how meshes are created

aa1b23e

Co-authored-by: Félix Lescaudey de Maneville <[email protected]>

Fix comments, fields visibility and documentation

5a5d34c

vladbat00 marked this pull request as ready for review February 19, 2024 18:29

vladbat00 merged commit eb3959f into vladbat00:main Feb 19, 2024

ManevilleF added a commit to ManevilleF/hexx that referenced this pull request Feb 21, 2024

Bevy 0.13 (#149)

2d0a5c0

Blocked on: * [x] vladbat00/bevy_egui#236 * [x] jakobhellermann/bevy-inspector-egui#185

ManevilleF added a commit to ManevilleF/bevy_silk that referenced this pull request Feb 22, 2024

Bevy 0.13 (#24)

2b47288

Blocking: * [x] dimforge/bevy_rapier#479 * [x] avianphysics/avian#315 * [x] vladbat00/bevy_egui#236 * [x] jakobhellermann/bevy-inspector-egui#185

Uh oh!

Conversation

eerii commented Dec 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Relevant prs

Uh oh!

Uh oh!

Uh oh!

Shute052 commented Feb 3, 2024

Uh oh!

Shute052 commented Feb 3, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DasLixou commented Feb 3, 2024

Uh oh!

ThierryBerger commented Feb 3, 2024

Uh oh!

ThierryBerger Feb 6, 2024

Choose a reason for hiding this comment

Uh oh!

vladbat00 Feb 7, 2024

Choose a reason for hiding this comment

Uh oh!

ksf Feb 7, 2024

Choose a reason for hiding this comment

Uh oh!

ThierryBerger Feb 7, 2024

Choose a reason for hiding this comment

Uh oh!

eerii Feb 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vladbat00 Feb 19, 2024

Choose a reason for hiding this comment

Uh oh!

vladbat00 Feb 19, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

vladbat00 commented Feb 19, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

eerii commented Dec 21, 2023 •

edited

Loading

Shute052 commented Feb 3, 2024 •

edited

Loading

eerii Feb 14, 2024 •

edited

Loading