Bevy 0.13

[eerii]

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

• Split WorldQuery into WorldQueryData and WorldQueryFilter bevyengine/bevy#9918
• Rename WorldQueryData & WorldQueryFilter to QueryData & QueryFilter bevyengine/bevy#10779
• Update winit dependency to 0.29 bevyengine/bevy#10702
• Bind group layout entries bevyengine/bevy#10224
• Update to wgpu 0.18 bevyengine/bevy#10266
• Keep track of when a texture is first cleared bevyengine/bevy#10325
• Unload render assets from RAM bevyengine/bevy#10520
• Change Window scale factor to f32 (adopted) bevyengine/bevy#10897
• Deprecate shapes in bevy_render::mesh::shape bevyengine/bevy#11773

[Shute052]

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]

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]

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

[Vrixyz]

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

[Vrixyz]

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?

[vladbat00]

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

[ksf]

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.

[Vrixyz]

@eerii you might be interested in parts of that diff: Vrixyz@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 🥲)

[eerii]

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

[vladbat00]

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

[vladbat00]

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.

[vladbat00]

Thank you @eerii and everyone else involved! ❤️