From 6ad427ee959282fbe5c05329e903e4b3b7c5811f Mon Sep 17 00:00:00 2001 From: Ben Wallis Date: Sun, 26 Jul 2020 10:28:10 +0100 Subject: [PATCH] before refactor --- voxygen/src/main.rs | 3 --- voxygen/src/render/renderer.rs | 3 +-- voxygen/src/run.rs | 3 --- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/voxygen/src/main.rs b/voxygen/src/main.rs index f097e0c152..d119fdb788 100644 --- a/voxygen/src/main.rs +++ b/voxygen/src/main.rs @@ -3,9 +3,6 @@ #![feature(bool_to_option)] #![recursion_limit = "2048"] -#[macro_use] -extern crate imgui; - use veloren_voxygen::{ audio::{self, AudioFrontend}, i18n::{self, i18n_asset_key, VoxygenLocalization}, diff --git a/voxygen/src/render/renderer.rs b/voxygen/src/render/renderer.rs index 3587e4beb9..2791e627f2 100644 --- a/voxygen/src/render/renderer.rs +++ b/voxygen/src/render/renderer.rs @@ -18,10 +18,9 @@ use gfx::{ use glsl_include::Context as IncludeContext; use tracing::error; use vek::*; -use imgui::{DrawData, Context, im_str, Window, Condition, ConfigFlags}; +use imgui::{Context, im_str, Window, Condition, ConfigFlags}; use imgui_winit_support::WinitPlatform; use winit::event::Event; -use imgui::sys::ImGuiConfigFlags_NoMouseCursorChange; /// Represents the format of the pre-processed color target. pub type TgtColorFmt = gfx::format::Srgba8; diff --git a/voxygen/src/run.rs b/voxygen/src/run.rs index bb458039b7..f6ff477936 100644 --- a/voxygen/src/run.rs +++ b/voxygen/src/run.rs @@ -141,10 +141,7 @@ fn handle_main_events_cleared( if let Some(last) = states.last_mut() { global_state.window.renderer_mut().clear(); - // Render the game last.render(global_state.window.renderer_mut(), &global_state.settings); - - // Render imgui on top global_state.window.render_imgui(); global_state.window.renderer_mut().flush();