OPENWORM GAMAING (can send messages to server)

src/client/mod.rs

@@ -5,7 +5,10 @@ use iris::prelude::*;
 use render::Renderer;
 use winit::{event::WindowEvent, event_loop::ActiveEventLoop};
 
-use crate::client::ui::{Submit, UiData};
+use crate::{
+    client::ui::{Submit, main_view},
+    net::client::NetSender,
+};
 
 mod app;
 mod input;
@@ -16,7 +19,7 @@ pub use app::AppHandle;
 
 #[derive(Debug)]
 pub enum ClientEvent {
-    Connect,
+    Connect(NetSender),
 }
 
 pub struct Client {
@@ -24,7 +27,6 @@ pub struct Client {
     input: Input,
     ui: Ui,
     focus: Option<WidgetId<TextEdit>>,
-    ui_data: UiData,
     clipboard: Clipboard,
 }
 
@@ -32,13 +34,12 @@ impl Client {
     pub fn new(handle: AppHandle) -> Self {
         let renderer = Renderer::new(handle.window.clone());
 
-        let (ui, ui_data) = ui::ui(handle);
+        let ui = ui::ui(handle);
 
         Self {
             renderer,
             input: Input::default(),
             ui,
-            ui_data,
             focus: None,
             clipboard: Clipboard::new().unwrap(),
         }
@@ -46,8 +47,8 @@ impl Client {
 
     pub fn event(&mut self, event: ClientEvent, _: &ActiveEventLoop) {
         match event {
-            ClientEvent::Connect => {
-                self.ui.set_root(self.ui_data.main_view.clone());
+            ClientEvent::Connect(send) => {
+                main_view(&mut self.ui, send).set_root(&mut self.ui);
             }
         }
     }