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

Merge branch 'view_dist_crash_fix' into 'master'

Browse Source 
View dist crash fix

See merge request veloren/veloren!167

Former-commit-id: 3e697387bbbe781e28edcdb2d6ef2057d276fc24
This commit is contained in:
Joshua Barretto 2019-05-23 09:55:06 +00:00
commit d67efe56eb
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
voxygen/src/hud/mod.rs
View File

@ -89,6 +89,11 @@ font_ids! {
}
}
pub struct DebugInfo {
pub tps: f64,
pub ping_ms: f64,
}
pub enum Event {
SendMessage(String),
AdjustViewDistance(u32),
@ -248,7 +253,7 @@ impl Hud {
}
}
fn update_layout(&mut self, tps: f64, ping_ms: f64, global_state: &GlobalState) -> Vec<Event> {
fn update_layout(&mut self, global_state: &GlobalState, debug_info: DebugInfo) -> Vec<Event> {
let mut events = Vec::new();
let ref mut ui_widgets = self.ui.set_widgets();
let version = env!("CARGO_PKG_VERSION");
@ -267,13 +272,13 @@ impl Hud {
.font_id(self.fonts.opensans)
.color(TEXT_COLOR)
.set(self.ids.version, ui_widgets);
Text::new(&format!("FPS: {:.1}", tps))
Text::new(&format!("FPS: {:.1}", debug_info.tps))
.color(TEXT_COLOR)
.down_from(self.ids.version, 5.0)
.font_id(self.fonts.opensans)
.font_size(14)
.set(self.ids.fps_counter, ui_widgets);
Text::new(&format!("Ping: {:.1}ms", ping_ms))
Text::new(&format!("Ping: {:.1}ms", debug_info.ping_ms))
.color(TEXT_COLOR)
.down_from(self.ids.fps_counter, 5.0)
.font_id(self.fonts.opensans)
@ -576,13 +581,12 @@ impl Hud {
pub fn maintain(
&mut self,
global_state: &mut GlobalState,
tps: f64,
ping_ms: f64,
debug_info: DebugInfo,
) -> Vec<Event> {
if let Some(maybe_id) = self.to_focus.take() {
self.ui.focus_widget(maybe_id);
}
let events = self.update_layout(tps, ping_ms, &global_state);
let events = self.update_layout(&global_state, debug_info);
self.ui.maintain(&mut global_state.window.renderer_mut());
events
}

16
voxygen/src/session.rs
View File

@ -1,5 +1,5 @@
use crate::{
hud::{Event as HudEvent, Hud},
hud::{DebugInfo, Event as HudEvent, Hud},
key_state::KeyState,
render::Renderer,
scene::Scene,
@ -176,12 +176,16 @@ impl PlayState for SessionState {
&self.client.borrow_mut(),
);
// Maintain the UI.
for event in self.hud.maintain(
// extract HUD events ensuring the client borrow gets dropped
let hud_events = self.hud.maintain(
global_state,
clock.get_tps(),
self.client.borrow().get_ping_ms(),
) {
DebugInfo {
tps: clock.get_tps(),
ping_ms: self.client.borrow().get_ping_ms(),
},
);
// Maintain the UI.
for event in hud_events {
match event {
HudEvent::SendMessage(msg) => {
// TODO: Handle result