stuff

src/bin/client/main.rs

@@ -1,7 +1,7 @@
 #![feature(async_fn_traits)]
 #![windows_subsystem = "windows"]
 
-use crate::{data::ClientData, state::ClientState};
+use crate::data::ClientData;
 use iris::prelude::*;
 use openworm::net::{ServerMsg, install_crypto_provider};
 use winit::{
@@ -9,11 +9,10 @@ use winit::{
     window::WindowAttributes,
 };
 
-mod account;
 mod data;
 mod debug;
 mod net;
-mod state;
+mod session;
 mod ui;
 
 fn main() {
@@ -25,10 +24,8 @@ fn main() {
 pub struct Client {
     ui_state: DefaultUiState,
     data: ClientData,
-    state: ClientState,
     main_ui: WeakWidget<WidgetPtr>,
     notif: WeakWidget<WidgetPtr>,
-    proxy: Proxy<ClientEvent>,
 }
 
 pub type Rsc = DefaultRsc<Client>;
@@ -44,7 +41,7 @@ impl DefaultAppState for Client {
     fn new(
         mut ui_state: DefaultUiState,
         rsc: &mut DefaultRsc<Self>,
-        proxy: Proxy<Self::Event>,
+        _: Proxy<Self::Event>,
     ) -> Self {
         let notif = WidgetPtr::default().add(rsc);
         let main_ui = WidgetPtr::default().add(rsc);
@@ -68,10 +65,8 @@ impl DefaultAppState for Client {
         Self {
             ui_state,
             data,
-            state: Default::default(),
             main_ui,
             notif,
-            proxy,
         }
     }
 
@@ -89,10 +84,6 @@ impl DefaultAppState for Client {
         }
     }
 
-    fn exit(&mut self, _rsc: &mut DefaultRsc<Self>, _render: &mut UiRenderState) {
-        self.state.exit();
-    }
-
     fn window_event(
         &mut self,
         event: WindowEvent,