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

before refactor

Browse Source
This commit is contained in:
Ben Wallis 2020-07-26 10:28:10 +01:00
parent 452ac18dc0
commit 6ad427ee95
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
voxygen/src/main.rs
View File

@ -3,9 +3,6 @@
#![feature(bool_to_option)] #![feature(bool_to_option)]
#![recursion_limit = "2048"] #![recursion_limit = "2048"]
#[macro_use]
extern crate imgui;
use veloren_voxygen::{ use veloren_voxygen::{
audio::{self, AudioFrontend}, audio::{self, AudioFrontend},
i18n::{self, i18n_asset_key, VoxygenLocalization}, i18n::{self, i18n_asset_key, VoxygenLocalization},

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

@ -18,10 +18,9 @@ use gfx::{
use glsl_include::Context as IncludeContext; use glsl_include::Context as IncludeContext;
use tracing::error; use tracing::error;
use vek::*; 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 imgui_winit_support::WinitPlatform;
use winit::event::Event; use winit::event::Event;
use imgui::sys::ImGuiConfigFlags_NoMouseCursorChange;
/// Represents the format of the pre-processed color target. /// Represents the format of the pre-processed color target.
pub type TgtColorFmt = gfx::format::Srgba8; pub type TgtColorFmt = gfx::format::Srgba8;

3
voxygen/src/run.rs
View File

@ -141,10 +141,7 @@ fn handle_main_events_cleared(
if let Some(last) = states.last_mut() { if let Some(last) = states.last_mut() {
global_state.window.renderer_mut().clear(); global_state.window.renderer_mut().clear();
// Render the game
last.render(global_state.window.renderer_mut(), &global_state.settings); last.render(global_state.window.renderer_mut(), &global_state.settings);
// Render imgui on top
global_state.window.render_imgui(); global_state.window.render_imgui();
global_state.window.renderer_mut().flush(); global_state.window.renderer_mut().flush();