Upgrade to Bevy 0.14 & upgrade egui-gizmo dependency

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## Version 0.9
+- update to bevy 0.14
+
 ## Version 0.8
 - update to bevy 0.13
 

Cargo.toml

@@ -3,22 +3,23 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "0.8.1"
+version = "0.9.0"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/jakobhellermann/bevy_editor_pls"
 description = "In-App editor tools for bevy apps"
 readme = "README.md"
 
 [workspace.dependencies]
-bevy_editor_pls = { version = "0.8.0", path = "crates/bevy_editor_pls" }
-bevy_editor_pls_core = { version = "0.8.0", path = "crates/bevy_editor_pls_core" }
-bevy_editor_pls_default_windows = { version = "0.8.0", path = "crates/bevy_editor_pls_default_windows" }
+bevy_editor_pls = { version = "0.9.0", path = "crates/bevy_editor_pls" }
+bevy_editor_pls_core = { version = "0.9.0", path = "crates/bevy_editor_pls_core" }
+bevy_editor_pls_default_windows = { version = "0.9.0", path = "crates/bevy_editor_pls_default_windows" }
 
-bevy-inspector-egui = "0.23.0"
-egui = "0.26"
-egui_dock = "0.11"
-egui-gizmo = "0.16"
+bevy-inspector-egui = "0.25.0"
+egui = "0.28"
+egui_dock = "0.13"
+# used to be egui-gizmo 0.16
+transform-gizmo-bevy = "0.3"
 
 [profile.dev.package."*"]
 opt-level = 2

README.md

@@ -129,6 +129,7 @@ fn set_cam3d_controls(
 
 | bevy | bevy\_editor\_pls |
 | ---- | ----------------- |
+| 0.14 | 0.9               |
 | 0.13 | 0.8               |
 | 0.12 | 0.7               |
 | 0.12 | 0.6               |

crates/bevy_editor_pls/Cargo.toml

@@ -22,13 +22,13 @@ default = ["default_windows"]
 [dependencies]
 bevy_editor_pls_core.workspace = true
 bevy_editor_pls_default_windows = { workspace = true, optional = true }
-bevy = { version = "0.13", default-features = false, features = ["x11"] }
+bevy = { version = "0.14", default-features = false, features = ["x11"] }
 egui.workspace = true
-egui-gizmo.workspace = true
+transform-gizmo-bevy.workspace = true
 # bevy_framepace = { version = "0.12", default-features = false }
 
 [dev-dependencies]
-bevy = { version = "0.13", default-features = false, features = [
+bevy = { version = "0.14", default-features = false, features = [
     "bevy_winit",
     "bevy_core_pipeline",
     "x11",

crates/bevy_editor_pls/examples/2d_3d_mixed.rs

@@ -9,10 +9,13 @@ fn main() {
 }
 
 fn setup_2d(mut commands: Commands) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2dBundle {
+        camera: Camera { order: 1, ..Default::default() },
+        ..Default::default()
+    });
     commands.spawn(SpriteBundle {
         sprite: Sprite {
-            color: Color::rgb(0.25, 0.25, 0.75),
+            color: Color::srgb(0.25, 0.25, 0.75),
             custom_size: Some(Vec2::new(50.0, 50.0)),
             ..Default::default()
         },
@@ -26,13 +29,13 @@ fn setup_3d(
     mut materials: ResMut<Assets<StandardMaterial>>,
 ) {
     commands.spawn(PbrBundle {
-        mesh: meshes.add(Plane3d::new(Vec3::Y).mesh().size(0.5, 0.5)),
-        material: materials.add(Color::rgb(0.3, 0.5, 0.3)),
+        mesh: meshes.add(Plane3d::new(Vec3::Y, Vec2::new(0.25, 0.25)).mesh()),
+        material: materials.add(Color::srgb(0.3, 0.5, 0.3)),
         ..Default::default()
     });
     commands.spawn(PbrBundle {
         mesh: meshes.add(Mesh::from(Cuboid::from_size(Vec3::ONE))),
-        material: materials.add(Color::rgb(0.8, 0.7, 0.6)),
+        material: materials.add(Color::srgb(0.8, 0.7, 0.6)),
         transform: Transform::from_xyz(0.0, 0.5, 0.0),
         ..Default::default()
     });

crates/bevy_editor_pls/examples/basic.rs

@@ -36,15 +36,15 @@ fn setup(
 ) {
     // plane
     commands.spawn(PbrBundle {
-        // mesh: meshes.add(Mesh::from(Plane3d::new(Vec3::Y).mesh().size(5.0, 5.0))),
-        mesh: meshes.add(Plane3d::new(Vec3::Y).mesh().size(5.0, 5.0)),
-        material: materials.add(Color::rgb(0.3, 0.5, 0.3)),
+        // mesh: meshes.add(Mesh::from(Plane3d::new(Vec3::Y, Vec2::new(2.5, 2.5)).mesh())),
+        mesh: meshes.add(Plane3d::new(Vec3::Y, Vec2::new(2.5, 2.5)).mesh()),
+        material: materials.add(Color::srgb(0.3, 0.5, 0.3)),
         ..Default::default()
     });
     // cube
     commands.spawn(PbrBundle {
         mesh: meshes.add(Mesh::from(Cuboid::from_size(Vec3::ONE))),
-        material: materials.add(Color::rgb(0.8, 0.7, 0.6)),
+        material: materials.add(Color::srgb(0.8, 0.7, 0.6)),
         transform: Transform::from_xyz(0.0, 0.5, 0.0),
         ..Default::default()
     });

crates/bevy_editor_pls/examples/breakout.rs

@@ -39,13 +39,13 @@ const GAP_BETWEEN_BRICKS_AND_SIDES: f32 = 20.0;
 const SCOREBOARD_FONT_SIZE: f32 = 40.0;
 const SCOREBOARD_TEXT_PADDING: Val = Val::Px(5.0);
 
-const BACKGROUND_COLOR: Color = Color::rgb(0.9, 0.9, 0.9);
-const PADDLE_COLOR: Color = Color::rgb(0.3, 0.3, 0.7);
-const BALL_COLOR: Color = Color::rgb(1.0, 0.5, 0.5);
-const BRICK_COLOR: Color = Color::rgb(0.5, 0.5, 1.0);
-const WALL_COLOR: Color = Color::rgb(0.8, 0.8, 0.8);
-const TEXT_COLOR: Color = Color::rgb(0.5, 0.5, 1.0);
-const SCORE_COLOR: Color = Color::rgb(1.0, 0.5, 0.5);
+const BACKGROUND_COLOR: Color = Color::srgb(0.9, 0.9, 0.9);
+const PADDLE_COLOR: Color = Color::srgb(0.3, 0.3, 0.7);
+const BALL_COLOR: Color = Color::srgb(1.0, 0.5, 0.5);
+const BRICK_COLOR: Color = Color::srgb(0.5, 0.5, 1.0);
+const WALL_COLOR: Color = Color::srgb(0.8, 0.8, 0.8);
+const TEXT_COLOR: Color = Color::srgb(0.5, 0.5, 1.0);
+const SCORE_COLOR: Color = Color::srgb(1.0, 0.5, 0.5);
 
 fn main() {
     App::new()
@@ -63,7 +63,7 @@ fn main() {
                 // `chain`ing systems together runs them in order
                 .chain(),
         )
-        .add_systems(Update, (update_scoreboard, bevy::window::close_on_esc))
+        .add_systems(Update, (update_scoreboard, close_on_esc))
         .run();
 }
 
@@ -417,3 +417,19 @@ fn collide_with_side(ball: BoundingCircle, wall: Aabb2d) -> Option<Collision> {
 
     Some(side)
 }
+
+fn close_on_esc(
+    mut commands: Commands,
+    focused_windows: Query<(Entity, &Window)>,
+    input: Res<ButtonInput<KeyCode>>,
+) {
+    for (window, focus) in focused_windows.iter() {
+        if !focus.focused {
+            continue;
+        }
+
+        if input.just_pressed(KeyCode::Escape) {
+            commands.entity(window).despawn();
+        }
+    }
+}

crates/bevy_editor_pls/examples/controls.rs

@@ -43,14 +43,14 @@ fn setup(
 ) {
     // plane
     commands.spawn(PbrBundle {
-        mesh: meshes.add(Mesh::from(Plane3d::new(Vec3::Y).mesh().size(5.0, 5.0))),
-        material: materials.add(Color::rgb(0.3, 0.5, 0.3)),
+        mesh: meshes.add(Mesh::from(Plane3d::new(Vec3::Y, Vec2::new(2.5, 2.5)).mesh())),
+        material: materials.add(Color::srgb(0.3, 0.5, 0.3)),
         ..Default::default()
     });
     // cube
     commands.spawn(PbrBundle {
         mesh: meshes.add(Mesh::from(Cuboid::from_size(Vec3::ONE))),
-        material: materials.add(Color::rgb(0.8, 0.7, 0.6)),
+        material: materials.add(Color::srgb(0.8, 0.7, 0.6)),
         transform: Transform::from_xyz(0.0, 0.5, 0.0),
         ..Default::default()
     });

crates/bevy_editor_pls/examples/separate_window.rs

@@ -18,14 +18,14 @@ fn setup(
 ) {
     // plane
     commands.spawn(PbrBundle {
-        mesh: meshes.add(Mesh::from(Plane3d::new(Vec3::Y).mesh().size(5.0, 5.0))),
-        material: materials.add(Color::rgb(0.3, 0.5, 0.3)),
+        mesh: meshes.add(Mesh::from(Plane3d::new(Vec3::Y, Vec2::new(2.5, 2.5)).mesh())),
+        material: materials.add(Color::srgb(0.3, 0.5, 0.3)),
         ..Default::default()
     });
     // cube
     commands.spawn(PbrBundle {
         mesh: meshes.add(Mesh::from(Cuboid::from_size(Vec3::ONE))),
-        material: materials.add(Color::rgb(0.8, 0.7, 0.6)),
+        material: materials.add(Color::srgb(0.8, 0.7, 0.6)),
         transform: Transform::from_xyz(0.0, 0.5, 0.0),
         ..Default::default()
     });

crates/bevy_editor_pls/examples/ui.rs

@@ -43,7 +43,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                         border: UiRect::all(Val::Px(2.0)),
                         ..default()
                     },
-                    background_color: Color::rgb(0.65, 0.65, 0.65).into(),
+                    background_color: Color::srgb(0.65, 0.65, 0.65).into(),
                     ..default()
                 })
                 .with_children(|parent| {
@@ -55,7 +55,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                                 height: Val::Percent(100.0),
                                 ..default()
                             },
-                            background_color: Color::rgb(0.15, 0.15, 0.15).into(),
+                            background_color: Color::srgb(0.15, 0.15, 0.15).into(),
                             ..default()
                         })
                         .with_children(|parent| {
@@ -86,7 +86,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                         height: Val::Percent(100.0),
                         ..default()
                     },
-                    background_color: Color::rgb(0.15, 0.15, 0.15).into(),
+                    background_color: Color::srgb(0.15, 0.15, 0.15).into(),
                     ..default()
                 })
                 .with_children(|parent| {
@@ -122,7 +122,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                                 overflow: Overflow::clip(),
                                 ..default()
                             },
-                            background_color: Color::rgb(0.10, 0.10, 0.10).into(),
+                            background_color: Color::srgb(0.10, 0.10, 0.10).into(),
                             ..default()
                         })
                         .with_children(|parent| {
@@ -178,7 +178,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                         border: UiRect::all(Val::Px(20.0)),
                         ..default()
                     },
-                    background_color: Color::rgb(0.4, 0.4, 1.0).into(),
+                    background_color: Color::srgb(0.4, 0.4, 1.0).into(),
                     ..default()
                 })
                 .with_children(|parent| {
@@ -188,7 +188,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                             height: Val::Percent(100.0),
                             ..default()
                         },
-                        background_color: Color::rgb(0.8, 0.8, 1.0).into(),
+                        background_color: Color::srgb(0.8, 0.8, 1.0).into(),
                         ..default()
                     });
                 });
@@ -213,7 +213,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                                 height: Val::Px(100.0),
                                 ..default()
                             },
-                            background_color: Color::rgb(1.0, 0.0, 0.0).into(),
+                            background_color: Color::srgb(1.0, 0.0, 0.0).into(),
                             ..default()
                         })
                         .with_children(|parent| {
@@ -226,7 +226,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                                     bottom: Val::Px(20.0),
                                     ..default()
                                 },
-                                background_color: Color::rgb(1.0, 0.3, 0.3).into(),
+                                background_color: Color::srgb(1.0, 0.3, 0.3).into(),
                                 ..default()
                             });
                             parent.spawn(NodeBundle {
@@ -238,7 +238,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                                     bottom: Val::Px(40.0),
                                     ..default()
                                 },
-                                background_color: Color::rgb(1.0, 0.5, 0.5).into(),
+                                background_color: Color::srgb(1.0, 0.5, 0.5).into(),
                                 ..default()
                             });
                             parent.spawn(NodeBundle {
@@ -250,7 +250,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                                     bottom: Val::Px(60.0),
                                     ..default()
                                 },
-                                background_color: Color::rgb(1.0, 0.7, 0.7).into(),
+                                background_color: Color::srgb(1.0, 0.7, 0.7).into(),
                                 ..default()
                             });
                             // alpha test
@@ -263,7 +263,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
                                     bottom: Val::Px(80.0),
                                     ..default()
                                 },
-                                background_color: Color::rgba(1.0, 0.9, 0.9, 0.4).into(),
+                                background_color: Color::srgba(1.0, 0.9, 0.9, 0.4).into(),
                                 ..default()
                             });
                         });

crates/bevy_editor_pls/src/controls.rs

@@ -136,6 +136,8 @@ pub enum Action {
     PauseUnpauseTime,
     FocusSelected,
 
+    // maybe investigate [GizmoOptions].hotkeys
+    // https://docs.rs/transform-gizmo-bevy/latest/transform_gizmo_bevy/struct.GizmoHotkeys.html
     #[cfg(feature = "default_windows")]
     SetGizmoModeTranslate,
     #[cfg(feature = "default_windows")]
@@ -240,7 +242,7 @@ pub fn editor_controls_system(
             editor
                 .window_state_mut::<bevy_editor_pls_default_windows::gizmos::GizmoWindow>()
                 .unwrap()
-                .gizmo_mode = egui_gizmo::GizmoMode::Translate;
+                .gizmo_modes = transform_gizmo_bevy::GizmoMode::all_translate();
         }
         if controls.just_pressed(
             Action::SetGizmoModeRotate,
@@ -251,7 +253,7 @@ pub fn editor_controls_system(
             editor
                 .window_state_mut::<bevy_editor_pls_default_windows::gizmos::GizmoWindow>()
                 .unwrap()
-                .gizmo_mode = egui_gizmo::GizmoMode::Rotate;
+                .gizmo_modes = transform_gizmo_bevy::GizmoMode::all_rotate();
         }
         if controls.just_pressed(
             Action::SetGizmoModeScale,
@@ -262,7 +264,7 @@ pub fn editor_controls_system(
             editor
                 .window_state_mut::<bevy_editor_pls_default_windows::gizmos::GizmoWindow>()
                 .unwrap()
-                .gizmo_mode = egui_gizmo::GizmoMode::Scale;
+                .gizmo_modes = transform_gizmo_bevy::GizmoMode::all_scale();
         }
     }
 }
@@ -395,7 +397,7 @@ impl EditorWindow for ControlsWindow {
             ui.label(egui::RichText::new(action.to_string()).strong());
             let bindings = controls.get(action);
             for binding in bindings {
-                ui.add(egui::Label::new(format!("{}", binding)).wrap(false));
+                ui.add(egui::Label::new(format!("{}", binding)).extend());
             }
         }
     }

crates/bevy_editor_pls/src/lib.rs

@@ -85,7 +85,7 @@ impl Plugin for EditorPlugin {
                 if window.title == "Bevy App" {
                     window.title = "bevy_editor_pls".into();
                 }
-                let entity = app.world.spawn(window);
+                let entity = app.world_mut().spawn(window);
                 WindowRef::Entity(entity.id())
             }
             EditorWindowPlacement::Window(entity) => WindowRef::Entity(entity),
@@ -128,10 +128,15 @@ impl Plugin for EditorPlugin {
 
             app.add_plugins(bevy::pbr::wireframe::WireframePlugin);
 
+            // required for the GizmoWindow
+            if !app.is_plugin_added::<transform_gizmo_bevy::TransformGizmoPlugin>() {
+                app.add_plugins(transform_gizmo_bevy::TransformGizmoPlugin);
+            }
+
             app.insert_resource(controls::EditorControls::default_bindings())
                 .add_systems(Update, controls::editor_controls_system);
 
-            let mut internal_state = app.world.resource_mut::<editor::EditorInternalState>();
+            let mut internal_state = app.world_mut().resource_mut::<editor::EditorInternalState>();
 
             let [game, _inspector] =
                 internal_state.split_right::<InspectorWindow>(egui_dock::NodeIndex::root(), 0.75);

crates/bevy_editor_pls_core/Cargo.toml

@@ -8,7 +8,7 @@ description.workspace = true
 readme.workspace = true
 
 [dependencies]
-bevy = { version = "0.13", default-features = false }
+bevy = { version = "0.14", default-features = false }
 bevy-inspector-egui.workspace = true
 indexmap = "2"
 egui_dock.workspace = true

crates/bevy_editor_pls_core/src/editor.rs

@@ -457,7 +457,8 @@ impl Editor {
             }
             window.show(ctx, |ui| {
                 self.editor_window_inner(world, internal_state, floating_window.window, ui);
-                ui.allocate_space(ui.available_size() - (5.0, 5.0).into());
+                let desired_size = (ui.available_size() - (5.0, 5.0).into()).max((0.0, 0.0).into());
+                ui.allocate_space(desired_size);
             });
 
             if !open {