cleanup

voxygen/src/main.rs

@@ -18,8 +18,6 @@ use common::{
     assets::{self},
     clock::Clock,
 };
-use egui::FontDefinitions;
-use egui_winit_platform::{Platform, PlatformDescriptor};
 use std::panic;
 use tracing::{error, info, warn};
 use veloren_voxygen::ui::egui::EguiState;
@@ -188,7 +186,7 @@ fn main() {
 
     let lazy_init = SpriteRenderContext::new(window.renderer_mut());
 
-    let mut egui_state = EguiState::new(&window);
+    let egui_state = EguiState::new(&window);
 
     let global_state = GlobalState {
         audio,

voxygen/src/menu/main/mod.rs

@@ -9,7 +9,6 @@ use crate::{
     i18n::LocalizationHandle, render::Renderer, settings::Settings, window::Event, Direction,
     GlobalState, PlayState, PlayStateResult,
 };
-use chrono::Timelike;
 #[cfg(feature = "singleplayer")]
 use client::addr::ConnectionArgs;
 use client::{
@@ -25,7 +24,6 @@ use std::sync::Arc;
 use tokio::runtime;
 use tracing::error;
 use ui::{Event as MainMenuEvent, MainMenuUi};
-use egui::CentralPanel;
 
 // TODO: show status messages for waiting on server creation, client init, and
 // pipeline creation (we can show progress of pipeline creation)
@@ -338,7 +336,6 @@ impl PlayState for MainMenuState {
         if let Some(mut ui_drawer) = third_pass.draw_ui() {
             self.main_menu_ui.render(&mut ui_drawer);
         };
-        drop(third_pass);
     }
 }
 

voxygen/src/render/renderer.rs

@@ -1138,10 +1138,6 @@ impl Renderer {
         }
     }
 
-    pub fn egui_renderpass_mut(&mut self) -> &mut egui_wgpu_backend::RenderPass {
-        &mut self.egui_renderpass
-    }
-
     // Consider reenabling at some time
     //
     // /// Queue the rendering of the player silhouette in the upcoming frame.

voxygen/src/ui/egui/mod.rs

@@ -1,7 +1,6 @@
 use egui_winit_platform::{Platform, PlatformDescriptor};
 use crate::window::Window;
 use egui::FontDefinitions;
-use winit::event::Event;
 use client::Client;
 use crate::hud::DebugInfo;
 

voxygen/src/window.rs

@@ -546,7 +546,7 @@ pub struct Window {
 
 impl Window {
     pub fn new(settings: &Settings) -> Result<(Window, EventLoop), Error> {
-        let event_loop = EventLoop::with_user_event();
+        let event_loop = EventLoop::new();
 
         let size = settings.graphics.window_size;