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

Addressed MR comments

Browse Source
This commit is contained in:
Ben Wallis 2021-05-09 22:38:23 +01:00
parent 24134af4a7
commit 0296bbe696
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
voxygen/egui/src/lib.rs
View File

@ -15,6 +15,7 @@ use egui::{
use egui_winit_platform::Platform; use egui_winit_platform::Platform;
#[cfg(feature = "use-dyn-lib")] #[cfg(feature = "use-dyn-lib")]
use lazy_static::lazy_static; use lazy_static::lazy_static;
#[cfg(feature = "use-dyn-lib")]
use std::ffi::CStr; use std::ffi::CStr;
#[cfg(feature = "use-dyn-lib")] #[cfg(feature = "use-dyn-lib")]
use std::sync::Arc; use std::sync::Arc;

1
voxygen/src/main.rs
View File

@ -19,6 +19,7 @@ use common::{
clock::Clock, clock::Clock,
}; };
use std::panic; use std::panic;
#[cfg(feature = "hot-anim")] use std::sync::Arc;
use tracing::{error, info, warn}; use tracing::{error, info, warn};
use veloren_voxygen::ui::egui::EguiState; use veloren_voxygen::ui::egui::EguiState;

14
voxygen/src/render/renderer/drawer.rs
View File

@ -266,16 +266,10 @@ impl<'frame> Drawer<'frame> {
} }
} }
pub fn draw_egui( pub fn draw_egui(&mut self, platform: &mut Platform, scale_factor: f32) {
&mut self,
platform: &mut Platform,
scale_factor: f32,
) {
let (_output, paint_commands) = platform.end_frame(); let (_output, paint_commands) = platform.end_frame();
let paint_jobs = platform let paint_jobs = platform.context().tessellate(paint_commands);
.context()
.tessellate(paint_commands);
let screen_descriptor = ScreenDescriptor { let screen_descriptor = ScreenDescriptor {
physical_width: self.borrow.sc_desc.width, physical_width: self.borrow.sc_desc.width,
@ -300,7 +294,9 @@ impl<'frame> Drawer<'frame> {
self.borrow.egui_render_pass.execute( self.borrow.egui_render_pass.execute(
&mut self.encoder.as_mut().unwrap(), &mut self.encoder.as_mut().unwrap(),
&self.swap_tex.view, self.taking_screenshot
.as_ref()
.map_or(&self.swap_tex.view, |s| s.texture_view()),
&paint_jobs, &paint_jobs,
&screen_descriptor, &screen_descriptor,
None, None,

1
voxygen/src/window.rs
View File

@ -14,6 +14,7 @@ use serde::{Deserialize, Serialize};
use tracing::{error, warn}; use tracing::{error, warn};
use vek::*; use vek::*;
use winit::monitor::VideoMode; use winit::monitor::VideoMode;
/// Represents a key that the game recognises after input mapping. /// Represents a key that the game recognises after input mapping.
#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Deserialize, Serialize)] #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Deserialize, Serialize)]
pub enum GameInput { pub enum GameInput {