SENSORS

src/testing/mod.rs

@@ -5,39 +5,44 @@ use gui::*;
 use render::Renderer;
 use winit::{event::WindowEvent, event_loop::ActiveEventLoop, window::Window};
 
+use crate::testing::input::Input;
+
 mod app;
+mod input;
 mod render;
 
 pub fn main() {
     App::run();
 }
 
-struct Data {
-    x: u32,
-}
-
 pub struct Client {
     renderer: Renderer,
-    ui: Ui<Data>,
+    input: Input,
+    ui: UiIds,
+}
+
+pub struct UiIds {
     test: WidgetId<Span>,
 }
 
 impl Client {
-    pub fn new(window: Arc<Window>) -> Self {
-        let renderer = Renderer::new(window);
+    pub fn create_ui() -> (Ui<Self>, UiIds) {
+        let mut ui = Ui::new();
+        let test = ui.id();
         let rect = Rect {
             color: UiColor::WHITE,
             radius: 20.0,
             thickness: 0.0,
             inner_radius: 0.0,
         };
-        let mut ui = Ui::new();
-        let test = ui.id();
         ui.set_base(
             (
                 (
                     rect.color(UiColor::BLUE)
-                        .sense(|d: &mut Data| println!("{}", d.x)),
+                        .sense(Sense::Click, |id, ui, client| {
+                            println!("hello!");
+                            ui[id].color.a -= 1;
+                        }),
                     (
                         rect.color(UiColor::RED).center((100.0, 100.0)),
                         (
@@ -75,26 +80,33 @@ impl Client {
                 .span(Dir::DOWN, [3, 1, 1])
                 .pad(10),
         );
-        Self { renderer, ui, test }
+        (ui, UiIds { test })
     }
 
-    pub fn event(&mut self, event: WindowEvent, event_loop: &ActiveEventLoop) {
+    pub fn new(window: Arc<Window>, ui: UiIds) -> Self {
+        let renderer = Renderer::new(window);
+        Self {
+            renderer,
+            ui,
+            input: Input::default(),
+        }
+    }
+
+    pub fn event(&mut self, event: WindowEvent, event_loop: &ActiveEventLoop, ui: &mut Ui<Self>) {
+        self.input.event(&event);
+        ui.run_sensors(self);
         match event {
             WindowEvent::CloseRequested => event_loop.exit(),
             WindowEvent::RedrawRequested => {
-                let primitives = self.ui.update(&mut Data { x: 39 });
+                let primitives = ui.update(self);
                 self.renderer.update(primitives);
                 self.renderer.draw()
             }
             WindowEvent::Resized(size) => self.renderer.resize(&size),
-            WindowEvent::KeyboardInput { event, .. } => {
-                if event.state.is_pressed() {
-                    let child = self.ui.add(Rect::new(Color::YELLOW)).erase_type();
-                    self.ui[&self.test].children.push((child, fixed(20.0)));
-                    self.renderer.window().request_redraw();
-                }
-            }
             _ => (),
         }
+        if ui.needs_redraw() {
+            self.renderer.window().request_redraw();
+        }
     }
 }