Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Ben Wallis 2021-05-04 20:51:08 +01:00
parent 8c57091401
commit ebcf59fb8c
5 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
voxygen/src/main.rs
View File

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

3
voxygen/src/menu/main/mod.rs
View File

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

4
voxygen/src/render/renderer.rs
View File

@ -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 // Consider reenabling at some time
// //
// /// Queue the rendering of the player silhouette in the upcoming frame. // /// Queue the rendering of the player silhouette in the upcoming frame.

1
voxygen/src/ui/egui/mod.rs
View File

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

2
voxygen/src/window.rs
View File

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