Merge pull request #3 from mintlu8/async

Added support for async systems, replacing event handlers and mutation.

.gitignore

@@ -15,4 +15,6 @@ Cargo.lock
 
 flamegraph.svg
 
-.vscode
+.vscode
+
+.idea

Cargo.toml

@@ -1,7 +1,7 @@
 [workspace]
 members = [
     "aoui",
-    "shapes",
+    # "shapes",
     "matui"
 ]
 resolver="2"

README.md

@@ -205,8 +205,9 @@ which is a combination of `Commands`, `AssetServer` and
 
 ### child
 
-`child:` is a special field that can be repeated, it accepts an `Entity`,
-an iterator of `Entity` or `&Entity` and inserts it/them as a child/children.
+`child:` is a special field that can be repeated, it accepts an `Entity`, `Option<Entity>`
+or an iterator of `Entity`/`&Entity`,
+and inserts it/them as a child/children.
 
 ```rust
 frame! (commands {

aoui/Cargo.toml

@@ -33,6 +33,8 @@ xi-unicode = "^0.3"
 thiserror = "^1"
 once_cell = "^1.19"
 atomic = "^0.6"
+futures = "^0.3.30"
+parking_lot = "^0.12"
 
 
 [features]

aoui/README.md

@@ -205,8 +205,9 @@ which is a combination of `Commands`, `AssetServer` and
 
 ### child
 
-`child:` is a special field that can be repeated, it accepts an `Entity`,
-an iterator of `Entity` or `&Entity` and inserts it/them as a child/children.
+`child:` is a special field that can be repeated, it accepts an `Entity`, `Option<Entity>`
+or an iterator of `Entity`/`&Entity`,
+and inserts it/them as a child/children.
 
 ```rust
 frame! (commands {

aoui/examples/anchor_offset.rs

@@ -8,7 +8,7 @@
 
 use std::f32::consts::PI;
 
-use bevy_aoui::{*, DimensionMut, dsl::AouiCommands};
+use bevy_aoui::{*, DimensionMut, util::AouiCommands};
 use bevy::prelude::*;
 use bevy_egui::{EguiContexts, egui::{self, Slider, ComboBox, Ui}, EguiPlugin};
 

aoui/examples/aspect.rs

@@ -1,6 +1,6 @@
 //! A simple test case for percentage size.
 use bevy::prelude::*;
-use bevy_aoui::{AouiPlugin, dsl::AouiCommands};
+use bevy_aoui::{AouiPlugin, util::AouiCommands};
 
 pub fn main() {
     App::new()

aoui/examples/atlas.rs

@@ -1,8 +1,8 @@
 use bevy::asset::AssetLoader;
 use bevy::{prelude::*, diagnostic::FrameTimeDiagnosticsPlugin};
-use bevy_aoui::WorldExtension;
+use bevy_aoui::util::WorldExtension;
 use bevy_aoui::AouiPlugin;
-use bevy_aoui::dsl::AouiCommands;
+use bevy_aoui::util::AouiCommands;
 
 pub fn main() {
     App::new()
@@ -72,9 +72,10 @@ pub fn init(mut commands: AouiCommands) {
         anchor: TopRight,
         text: "FPS: 0.00",
         color: color!(gold),
-        extra: fps_signal(|fps: f32, text: &mut Text| {
-            format_widget!(text, "FPS: {:.2}", fps);
-        })
+        system: |fps: Fps, text: Ac<Text>| {
+            let fps = fps.get().await;
+            text.set(move |text| format_widget!(text, "FPS: {:.2}", fps)).await?;
+        }
     });
 
     vstack!(commands  {

aoui/examples/bisection.rs

@@ -1,6 +1,6 @@
 //! A simple test case for percentage size.
 use bevy::prelude::*;
-use bevy_aoui::{AouiPlugin, dsl::AouiCommands};
+use bevy_aoui::{AouiPlugin, util::AouiCommands};
 
 pub fn main() {
     App::new()

aoui/examples/buttons.rs

@@ -2,11 +2,11 @@
 #![recursion_limit = "256"]
 use bevy::diagnostic::FrameTimeDiagnosticsPlugin;
 use bevy::prelude::*;
+use bevy_aoui::sync::Signal;
 use bevy_aoui::AouiPlugin;
-use bevy_aoui::WorldExtension;
-use bevy_aoui::dsl::AouiCommands;
-use bevy_aoui::signals::Invoke;
-use bevy_aoui::signals::ReceiveInvoke;
+use bevy_aoui::util::Object;
+use bevy_aoui::util::WorldExtension;
+use bevy_aoui::util::AouiCommands;
 
 pub fn main() {
     App::new()
@@ -26,15 +26,11 @@ pub fn main() {
 }
 
 #[derive(Debug, Component)]
-pub struct Listen(Invoke<Listen>);
-
-impl ReceiveInvoke for Listen {
-    type Type = ();
-}
+pub struct Listen(Signal<Object>);
 
 pub fn recv(query: Query<&Listen>) {
     for item in query.iter() {
-        if item.0.poll_any() {
+        if item.0.try_read().is_some() {
             println!("Signal is received!");
         }
     }
@@ -48,14 +44,14 @@ pub fn init(mut commands: AouiCommands) {
         anchor: TopRight,
         text: "FPS: 0.00",
         color: color!(gold),
-        extra: fps_signal(|fps: f32, text: &mut Text| {
-            format_widget!(text, "FPS: {:.2}", fps);
-        })
+        system: |fps: Fps, text: Ac<Text>| {
+            let fps = fps.get().await;
+            text.set(move |text| format_widget!(text, "FPS: {:.2}", fps)).await?;
+        }
     });
-
 
-    let (send1, recv1) = commands.signal();
-    let (send2, recv2) = commands.signal();
+    let (send1, recv1) = signal();
+    let (send2, recv2) = signal();
 
     vstack!(commands {
         offset: [0, 100],
@@ -108,24 +104,37 @@ pub fn init(mut commands: AouiCommands) {
         offset: [300, 120],
         color: color!(gold),
         text: "<= true!",
-        extra: recv1.recv0(|x: bool, text: &mut Text| format_widget!(text, "<= {}!", x))
+        signal: receiver::<ToggleChange>(recv1),
+        system: |toggle: SigRecv<ToggleChange>, text: Aeq<&mut Text>| {
+            let checked = toggle.recv().await;
+            text.set(move |mut text| format_widget!(text.as_mut(), "<= {}!", checked)).await;
+        }
     });
+
     text! (commands {
         offset: [300, 80],
         color: color!(gold),
         text: "<= false!",
-        extra: recv2.recv0(|x: bool, text: &mut Text| format_widget!(text, "<= {}!", x))
+        signal: receiver::<ToggleChange>(recv2),
+        system: |x: SigRecv<ToggleChange>, text: Aeq<&mut Text>| {
+            let checked = x.recv().await;
+            text.set(move |mut text| format_widget!(text.as_mut(), "<= {}!", checked)).await;
+        }
     });
-    
+
     let ctx = radio_button_group::<[_; 4]>("Fire");
     let sig = ctx[0].recv();
     let elements = ["Fire", "Water", "Earth", "Wind"];
 
     text! (commands {
         offset: [300, -100],
         color: color!(gold),
-        text: "<= This reflects the value of the radio button.",
-        extra: sig.recv0(|x: &str, text: &mut Text| format_widget!(text, "<= has value {}!", x))
+        text: "<= Click the radio button and this will change!",
+        signal: receiver::<FormatTextStatic>(sig),
+        system: |x: SigRecv<FormatTextStatic>, text: Ac<Text>| {
+            let checked = x.recv().await;
+            text.set(move |text| format_widget!(text, "<= {}!", checked)).await?;
+        }
     });
 
     vstack!(commands {
@@ -153,22 +162,29 @@ pub fn init(mut commands: AouiCommands) {
             },
         },
     });
-
-    let (send, recv, recv2) = commands.signal();
 
-    commands.spawn_bundle(Listen(recv2.invoke()));
+    let (send, recv, recv2) = signal::<Object, _>();
+
+    commands.spawn_bundle(Listen(Signal::from_typed(recv2)));
 
     text! (commands {
         offset: [300, 0],
         color: color!(gold),
         text: "<= Click this button.",
-        extra: recv.recv0(|text: &mut Text| format_widget!(text, "You clicked it!"))
+        signal: receiver::<Invocation>(recv),
+        system: |sig: SigRecv<Invocation>, text: Aeq<&mut Text>| {
+            sig.recv().await;
+            text
+                .set(|text| format_widget!(text, "You clicked it!"))
+                .await;
+        }
     });
 
     button! (commands {
         dimension: size2!(12 em, 2 em),
         font_size: em(2),
         cursor: CursorIcon::Hand,
+        on_click: send,
         child: rectangle!{
             dimension: size2!(100%, 100%),
             color: color!(blue500),
@@ -197,8 +213,9 @@ pub fn init(mut commands: AouiCommands) {
             extra: DisplayIf(EventFlags::LeftPressed),
             z: 0.1
         },
-        extra: Handlers::<EvLeftClick>::oneshot(&mut commands, ||println!("Clicked"))
-            .and(send),
-        extra: Handlers::<EvHover>::oneshot(&mut commands, ||println!("Hovering")),
+        system: |sender: SigSend<ButtonClick>| {
+            sender.recv().await;
+            println!("Clicked")
+        }
     });
 }

aoui/examples/chain.rs

@@ -1,6 +1,6 @@
 //! Showcases a simple skeletal system by chaining rectangles.
 
-use bevy_aoui::{*, bundles::*, dsl::AouiCommands};
+use bevy_aoui::{*, bundles::*, util::AouiCommands};
 use bevy::prelude::*;
 use bevy_egui::{EguiContexts, egui::{Slider, self}};
 pub fn main() {
@@ -34,10 +34,12 @@ pub fn init(mut commands: AouiCommands) {
         anchor: TopRight,
         text: "FPS: 0.00",
         color: color!(gold),
-        extra: fps_signal(|fps: f32, text: &mut Text| {
-            format_widget!(text, "FPS: {:.2}", fps);
+        extra: async_systems!(|fps: Fps, text: Ac<Text>| {
+            let fps = fps.get().await;
+            text.set(move |text| format_widget!(text, "FPS: {:.2}", fps)).await?;
         })
     });
+
     use rand::prelude::*;
     let mut rng = rand::thread_rng();
     let mut last = commands.spawn_bundle((AouiSpriteBundle {

aoui/examples/clipping.rs

@@ -1,5 +1,5 @@
 use bevy::{prelude::*, diagnostic::FrameTimeDiagnosticsPlugin};
-use bevy_aoui::{AouiPlugin, widgets::richtext::RichTextBuilder, dsl::AouiCommands};
+use bevy_aoui::{AouiPlugin, widgets::richtext::RichTextBuilder, util::AouiCommands};
 
 pub fn main() {
     App::new()
@@ -25,9 +25,10 @@ pub fn init(mut commands: AouiCommands) {
         anchor: TopRight,
         text: "FPS: 0.00",
         color: color!(gold),
-        extra: fps_signal(|fps: f32, text: &mut Text| {
-            format_widget!(text, "FPS: {:.2}", fps);
-        })
+        system: |fps: Fps, text: Ac<Text>| {
+            let fps = fps.get().await;
+            text.set(move |text| format_widget!(text, "FPS: {:.2}", fps)).await?;
+        }
     });
 
     let (target_in, target_out) = commands.render_target([800, 800]);

aoui/examples/counter.rs

@@ -1,7 +1,7 @@
 //! This is in fact a show case for `Mutation` and not how you typically implement a counter.
 
 use bevy::{prelude::*, diagnostic::FrameTimeDiagnosticsPlugin};
-use bevy_aoui::{AouiPlugin, widgets::button::Payload, WorldExtension, dsl::AouiCommands};
+use bevy_aoui::{signal_ids, util::{WorldExtension, AouiCommands}, widgets::button::Payload, AouiPlugin};
 
 pub fn main() {
     App::new()
@@ -29,30 +29,40 @@ pub fn init(mut commands: AouiCommands) {
         anchor: TopRight,
         text: "FPS: 0.00",
         color: color!(gold),
-        extra: fps_signal(|fps: f32, text: &mut Text| {
-            format_widget!(text, "FPS: {:.2}", fps);
-        })
+        system: |fps: Fps, text: Ac<Text>| {
+            let fps = fps.get().await;
+            text.set(move |text| format_widget!(text, "FPS: {:.2}", fps)).await?;
+        }
     });
 
-    let (sender, receiver) = commands.signal();
+    let (send, recv, recv2) = signal();
+
+    signal_ids!(SigI32: i32);
 
     hstack!(commands {
         margin: size2!(0.5 em, 0.5 em),
         font_size: em(2),
         child: text! {
             text: "0",
-            extra: receiver.recv0(|x: i32, text: &mut Text| format_widget!(text, "{}", x))
+            signal: receiver::<SigI32>(recv),
+            system: |x: SigRecv<SigI32>, text: Ac<Text>| {
+                let val = x.recv().await;
+                text.set(move |text|format_widget!(text, "{}", val)).await?;
+            }
         },
         child: button! {
             event: EventFlags::LeftClick,
             dimension: size2!(1 em, 1 em),
             payload: 1i32,
-            on_click: Handlers::new(
-                Mutation::dynamic::<i32, _, _>(|payload: i32, x: &mut Payload| x.mut_dyn(|_: &i32| payload + 1))
-            ).and(sender.type_erase()),
+            on_click: send.type_erase(),
             child: rectangle! {
                 dimension: Size2::FULL,
                 color: color!(red),
+            },
+            signal: receiver::<SigI32>(recv2),
+            system: |x: SigRecv<SigI32>, payload: Ac<Payload>| {
+                x.recv().await;
+                payload.set(|payload| payload.mut_dyn(|x: &i32| dbg!(*x + 1))).await?;
             }
         }
     });

aoui/examples/description.rs

@@ -1,7 +1,7 @@
 /// A simple example of rendering description using the paragraph layout.
 
 use bevy::prelude::*;
-use bevy_aoui::{AouiPlugin, dsl::AouiCommands};
+use bevy_aoui::{AouiPlugin, util::AouiCommands};
 
 pub fn main() {
     App::new()