Merge pull request #285 from StarArawn/bevy-0-13

Bevy 0.13 update

.github/workflows/rust.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
     - uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: 1.75.0
+        toolchain: 1.76.0
         components: clippy, rustfmt
     - uses: actions/checkout@v3
     - uses: actions/cache@v3
@@ -31,7 +31,7 @@ jobs:
           ~/.cargo/registry/cache/
           ~/.cargo/git/db/
           target/
-        key: ${{ runner.os }}-cargo-build-1.75.0-${{ hashFiles('**/Cargo.toml') }}
+        key: ${{ runner.os }}-cargo-build-1.76.0-${{ hashFiles('**/Cargo.toml') }}
     - name: Install alsa and udev
       run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
       if: runner.os == 'linux'

Cargo.toml

@@ -13,11 +13,14 @@ exclude = ["assets/*", "screenshots/*", "book"]
 [workspace]
 members = ["kayak_ui_macros", "kayak_font"]
 
+[features]
+svg = ["dep:bevy_svg"]
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = { version = "0.12", default-features = false, features = ["bevy_render", "bevy_asset", "bevy_winit", "bevy_core_pipeline"] }
-bevy_svg = { version="0.12", default-features = false }
+bevy = { version = "0.13", default-features = false, features = ["bevy_render", "bevy_asset", "bevy_core_pipeline"] }
+bevy_svg = { git = "https://github.com/arnfaldur/bevy_svg", rev="53a53e5af050a7b5b236068546be46c5729674e3", default-features = false, optional = true }
 bitflags = "1.3.2"
 bytemuck = "1.12"
 dashmap = "5.4"
@@ -33,11 +36,12 @@ reorder = "2.1"
 resources = "1.1"
 usvg = "0.27"
 uuid = { version = "1.3", features = ["v4"] }
+smol_str = {version = "0.2", default-features = false}
 
 [dev-dependencies]
 fastrand = "1.8"
-bevy-inspector-egui = "0.21"
-bevy = { version = "0.12", default-features = true }
+bevy-inspector-egui = "0.23"
+bevy = { version = "0.13", default-features = true }
 
 [[example]]
 name = "tabs"
@@ -47,5 +51,21 @@ path = "examples/tabs/tabs.rs"
 name = "todo"
 path = "examples/todo/todo.rs"
 
+[[example]]
+name = "svg"
+path = "examples/svg.rs"
+test = false
+doc = false
+bench = false
+required-features = ["svg"]
+
+[[example]]
+name = "accordion"
+path = "examples/accordion.rs"
+test = false
+doc = false
+bench = false
+required-features = ["svg"]
+
 [package.metadata.docs.rs]
 features = ["bevy/x11"]

examples/avsb.rs

@@ -202,7 +202,10 @@ fn startup(
     commands.spawn((widget_context, EventDispatcher::default()));
 }
 
-fn swap(input: Res<Input<KeyCode>>, mut query: Query<&mut AvsBState, Without<PreviousWidget>>) {
+fn swap(
+    input: Res<ButtonInput<KeyCode>>,
+    mut query: Query<&mut AvsBState, Without<PreviousWidget>>,
+) {
     if input.just_pressed(KeyCode::Space) {
         for mut avsb in query.iter_mut() {
             avsb.is_a = !avsb.is_a;

examples/bevy_scene.rs

@@ -38,7 +38,7 @@ struct WorldCamera;
 /// to filter out clicks that occur over the UI
 fn set_active_tile_target(
     mut tile: Query<&mut ActiveTile>,
-    cursor: Res<Input<MouseButton>>,
+    cursor: Res<ButtonInput<MouseButton>>,
     event_context: Query<&EventDispatcher, With<GameUI>>,
     camera_transform: Query<&GlobalTransform, With<WorldCamera>>,
     window: Query<&Window, With<PrimaryWindow>>,

examples/demo.rs

@@ -57,7 +57,7 @@ fn startup(mut commands: Commands) {
 // Note this example shows prop changing not state changing which is quite different.
 // For state changes please see simple_state example.
 fn update_resource(
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<ButtonInput<KeyCode>>,
     mut query: Query<&mut MyWidget, Without<PreviousWidget>>,
 ) {
     if keyboard_input.just_pressed(KeyCode::Space) {

examples/main_menu.rs

@@ -22,7 +22,7 @@ impl Default for MenuButtonBundle {
             button: Default::default(),
             styles: KStyle {
                 bottom: Units::Pixels(20.0).into(),
-                cursor: KCursorIcon(CursorIcon::Hand).into(),
+                cursor: KCursorIcon(CursorIcon::Pointer).into(),
                 ..Default::default()
             },
             on_event: OnEvent::default(),

examples/render_target.rs

@@ -62,11 +62,10 @@ fn startup(
             camera: Camera {
                 order: -1,
                 target: RenderTarget::Image(image_handle.clone()),
+                clear_color: ClearColorConfig::None,
                 ..Camera::default()
             },
-            camera_2d: Camera2d {
-                clear_color: bevy::core_pipeline::clear_color::ClearColorConfig::Default,
-            },
+            camera_2d: Camera2d,
             ..Default::default()
         })
         .insert(CameraUIKayak)
@@ -107,7 +106,7 @@ fn startup(
     });
 
     let cube_size = 4.0;
-    let cube_handle = meshes.add(Mesh::from(shape::Box::new(cube_size, cube_size, cube_size)));
+    let cube_handle = meshes.add(Mesh::from(Cuboid::from_size(Vec3::splat(cube_size))));
 
     // This material has the texture that has been rendered.
     let material_handle = materials.add(StandardMaterial {
@@ -169,7 +168,7 @@ fn cube_rotator_system(time: Res<Time>, mut query: Query<&mut Transform, With<Ma
 
 fn depsawn_ui(
     mut commands: Commands,
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<ButtonInput<KeyCode>>,
     ui_query: Query<(Entity, &KayakRootContext), With<MainUI>>,
 ) {
     if keyboard_input.pressed(KeyCode::Escape) {

examples/test_no_startup.rs

@@ -45,7 +45,7 @@ fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
         .add_plugins((KayakContextPlugin, KayakWidgets))
-        .add_state::<GameState>()
+        .init_state::<GameState>()
         .add_systems(OnEnter(GameState::First), first_sys)
         .add_systems(OnEnter(GameState::Second), second_sys)
         .run();

examples/text.rs

@@ -100,7 +100,7 @@ fn startup(
     commands.spawn((widget_context, EventDispatcher::default()));
 }
 
-fn update_resource(keyboard_input: Res<Input<KeyCode>>, mut my_resource: ResMut<MyResource>) {
+fn update_resource(keyboard_input: Res<ButtonInput<KeyCode>>, mut my_resource: ResMut<MyResource>) {
     if keyboard_input.just_pressed(KeyCode::Space) {
         my_resource.0 += 1;
     }

examples/texture_atlas.rs

@@ -18,8 +18,7 @@ fn startup(
     let tile_size = 16;
     let columns = 272 / tile_size;
     let rows = 128 / tile_size;
-    let atlas = bevy::sprite::TextureAtlas::from_grid(
-        image_handle.clone(),
+    let atlas = bevy::sprite::TextureAtlasLayout::from_grid(
         bevy::prelude::Vec2::splat(tile_size as f32),
         columns,
         rows,

kayak_font/Cargo.toml

@@ -28,10 +28,10 @@ image = "0.24"
 # Provides UAX #14 line break segmentation
 xi-unicode = "0.3"
 
-bevy = { version = "0.12", optional = true, default-features = false, features = ["bevy_asset", "bevy_render", "bevy_core_pipeline"] }
+bevy = { version = "0.13", optional = true, default-features = false, features = ["bevy_asset", "bevy_render", "bevy_core_pipeline"] }
 
 [dev-dependencies]
-bevy = { version = "0.12" }
+bevy = { version = "0.13", default-features = false }
 bytemuck = "1.12.0"
 
 [package.metadata.docs.rs]

kayak_font/src/bevy/renderer/extract.rs

@@ -46,6 +46,7 @@ pub(crate) fn extract_fonts(
                 let id = asset_server.get_id_handle(*id).unwrap();
                 changed_assets.insert(id.clone_weak());
             }
+            AssetEvent::Unused { id: _ } => {}
         }
     }
 

kayak_font/src/ttf/loader.rs

@@ -4,7 +4,10 @@ use bevy::{
         io::{AssetSourceBuilders, Reader},
         AssetLoader, AssetServer, AsyncReadExt, LoadContext,
     },
-    render::render_resource::{Extent3d, TextureFormat},
+    render::{
+        render_asset::RenderAssetUsages,
+        render_resource::{Extent3d, TextureFormat},
+    },
     utils::{BoxedFuture, HashMap},
 };
 
@@ -263,6 +266,7 @@ impl AssetLoader for TTFLoader {
                 bevy::render::render_resource::TextureDimension::D2,
                 image_bytes,
                 TextureFormat::Rgba8Unorm,
+                RenderAssetUsages::all(),
             );
             image.reinterpret_stacked_2d_as_array(char_count);
             let labeled_asset = load_context.begin_labeled_asset();

src/camera/mod.rs

@@ -7,11 +7,11 @@ use bevy::{
 #[derive(Component, Default, Debug, Clone, Copy)]
 pub struct CameraUIKayak;
 impl ExtractComponent for CameraUIKayak {
-    type Query = &'static Self;
-    type Filter = With<Camera>;
+    type QueryData = &'static Self;
+    type QueryFilter = With<Camera>;
     type Out = CameraUIKayak;
 
-    fn extract_component(item: QueryItem<Self::Query>) -> Option<Self::Out> {
+    fn extract_component(item: QueryItem<Self::QueryData>) -> Option<Self::Out> {
         Some(*item)
     }
 }

src/event.rs

@@ -55,8 +55,8 @@ impl KEvent {
         Self {
             target,
             current_target: target,
-            event_type,
             should_propagate: event_type.propagates(),
+            event_type,
             default_prevented: false,
             on_change_systems: Vec::new(),
         }
@@ -108,7 +108,7 @@ impl KEvent {
 /// __Note:__ This type implements `PartialEq` and `Hash` in a way that only considers the variant itself,
 /// not the underlying data. If full comparisons are needed, they should be done with the inner data or
 /// with a custom wrapper.
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone)]
 pub enum EventType {
     /// An event that occurs when the user clicks a widget
     Click(CursorEvent),
@@ -129,7 +129,7 @@ pub enum EventType {
     /// An event that occurs when a widget loses focus
     Blur,
     /// An event that occurs when the user types in a character within a _focused_ widget
-    CharInput { c: char },
+    CharInput { c: smol_str::SmolStr },
     /// An event that occurs when the user releases a key within a _focused_ widget
     KeyUp(KeyboardEvent),
     /// An event that occurs when the user presses a key down within a _focused_ widget

src/event_dispatcher.rs

@@ -217,7 +217,7 @@ impl EventDispatcher {
                 };
 
                 // --- Update State --- //
-                Self::insert_event(&mut next_events, &index, node_event.event_type);
+                Self::insert_event(&mut next_events, &index, node_event.event_type.clone());
 
                 // --- Call Event --- //
                 if let Some(mut entity) = world.get_entity_mut(index.0) {
@@ -450,7 +450,7 @@ impl EventDispatcher {
             // These events are ones that require a specific target and need the tree to be evaluated before selecting the best match
             for (event_type, state) in states {
                 if let Some(node) = state.best_match {
-                    event_stream.push(KEvent::new(node.0, event_type));
+                    event_stream.push(KEvent::new(node.0, event_type.clone()));
 
                     match event_type {
                         EventType::Focus => {
@@ -692,9 +692,10 @@ impl EventDispatcher {
         let mut event_stream = Vec::new();
         if let Some(current_focus) = focus_tree.current() {
             match input_event {
-                InputEvent::CharEvent { c } => {
-                    event_stream.push(KEvent::new(current_focus, EventType::CharInput { c: *c }))
-                }
+                InputEvent::CharEvent { c } => event_stream.push(KEvent::new(
+                    current_focus,
+                    EventType::CharInput { c: c.clone() },
+                )),
                 InputEvent::Keyboard { key, is_pressed } => {
                     // === Modifers === //
                     match key {

src/input.rs

@@ -78,16 +78,16 @@ pub(crate) fn process_events(world: &mut World) {
             }
 
             for event in custom_event_char_input.0.read(&char_input_events) {
-                input_events.push(InputEvent::CharEvent { c: event.char });
+                input_events.push(InputEvent::CharEvent {
+                    c: event.char.clone(),
+                });
             }
 
             for event in custom_event_keyboard.0.read(&keyboard_input_events) {
-                if let Some(key_code) = event.key_code {
-                    input_events.push(InputEvent::Keyboard {
-                        key: key_code,
-                        is_pressed: matches!(event.state, ButtonState::Pressed),
-                    });
-                }
+                input_events.push(InputEvent::Keyboard {
+                    key: event.key_code,
+                    is_pressed: matches!(event.state, ButtonState::Pressed),
+                });
             }
         },
         world,

src/input_event.rs

@@ -12,7 +12,7 @@ pub enum InputEvent {
     /// An event that occurs when the user scrolls
     Scroll { dx: f32, dy: f32, is_line: bool },
     /// An event that occurs when the user types in a character
-    CharEvent { c: char },
+    CharEvent { c: smol_str::SmolStr },
     /// An event that occurs when the user presses or releases a key
     Keyboard { key: KeyCode, is_pressed: bool },
 }

src/lib.rs

@@ -53,8 +53,8 @@ pub mod prelude {
     pub use crate::on_change::OnChange;
     pub use crate::on_event::OnEvent;
     pub use crate::on_layout::OnLayout;
-    pub use crate::render::draw_ui_graph;
     pub use crate::render::font::FontMapping;
+    pub use crate::render::{DrawUiGraph, KayakUiPass};
     pub use crate::styles::*;
     pub use crate::tree::*;
     pub use crate::widget::*;

src/render/extract.rs

@@ -62,7 +62,7 @@ pub fn extract(
         let dpi = if let Ok(camera) = cameras.get(context.camera_entity) {
             if let bevy::render::camera::RenderTarget::Window(WindowRef::Primary) = &camera.target {
                 if let Ok(window) = primary_window.get_single() {
-                    window.scale_factor() as f32
+                    window.scale_factor()
                 } else {
                     1.0
                 }
@@ -219,7 +219,7 @@ pub fn prepare_view_uniforms(
         let frustum = [Vec4::ZERO; 6];
 
         let view_uniforms = UIViewUniformOffset {
-            offset: view_uniforms.uniforms.push(UIViewUniform {
+            offset: view_uniforms.uniforms.push(&UIViewUniform {
                 view_proj: camera
                     .view_projection
                     .unwrap_or_else(|| projection * inverse_view),