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

Move global maintains above rendering

Browse Source 
Also moves the call to the AudioFrontend constructor to take place in the
GlobalState constructor


Former-commit-id: 0be9df5a7355b6a7d1ce758894568d67df7db11a
This commit is contained in:
Louis Pearson 2019-05-18 14:10:02 -06:00
parent 22286c24e6
commit 6b0fc57ce3
4 changed files with 11 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

@ -97,8 +97,6 @@ fn main() {
]) ])
.unwrap(); .unwrap();
let audio = AudioFrontend::new();
// Set up panic handler to relay swish panic messages to the user // Set up panic handler to relay swish panic messages to the user
let settings_clone = settings.clone(); let settings_clone = settings.clone();
let default_hook = panic::take_hook(); let default_hook = panic::take_hook();
@ -164,7 +162,7 @@ fn main() {
let mut global_state = GlobalState { let mut global_state = GlobalState {
settings, settings,
window, window,
audio, audio: AudioFrontend::new(),
}; };
// Set up the initial play state. // Set up the initial play state.

6
voxygen/src/menu/char_selection/mod.rs
View File

@ -90,6 +90,9 @@ impl PlayState for CharSelectionState {
} }
} }
// Mantain global state
global_state.maintain();
// Maintain the scene. // Maintain the scene.
self.scene self.scene
.maintain(global_state.window.renderer_mut(), &self.client.borrow()); .maintain(global_state.window.renderer_mut(), &self.client.borrow());
@ -119,9 +122,6 @@ impl PlayState for CharSelectionState {
.swap_buffers() .swap_buffers()
.expect("Failed to swap window buffers"); .expect("Failed to swap window buffers");
// Mantain global state
global_state.maintain();
// Wait for the next tick. // Wait for the next tick.
clock.tick(Duration::from_millis(1000 / FPS)); clock.tick(Duration::from_millis(1000 / FPS));
} }

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

@ -86,6 +86,9 @@ impl PlayState for MainMenuState {
None => {} None => {}
} }
// Maintain global_state
global_state.maintain();
// Maintain the UI. // Maintain the UI.
for event in self.main_menu_ui.maintain(global_state) { for event in self.main_menu_ui.maintain(global_state) {
match event { match event {
@ -124,9 +127,6 @@ impl PlayState for MainMenuState {
.swap_buffers() .swap_buffers()
.expect("Failed to swap window buffers!"); .expect("Failed to swap window buffers!");
// Maintain global_state
global_state.maintain();
// Wait for the next tick // Wait for the next tick
clock.tick(Duration::from_millis(1000 / FPS)); clock.tick(Duration::from_millis(1000 / FPS));
} }

7
voxygen/src/session.rs
View File

@ -167,11 +167,15 @@ impl PlayState for SessionState {
self.tick(clock.get_last_delta()) self.tick(clock.get_last_delta())
.expect("Failed to tick the scene!"); .expect("Failed to tick the scene!");
// Maintain global state
global_state.maintain();
// Maintain the scene. // Maintain the scene.
self.scene.maintain( self.scene.maintain(
global_state.window.renderer_mut(), global_state.window.renderer_mut(),
&mut self.client.borrow_mut(), &mut self.client.borrow_mut(),
); );
// Maintain the UI. // Maintain the UI.
for event in self for event in self
.hud .hud
@ -198,9 +202,6 @@ impl PlayState for SessionState {
.swap_buffers() .swap_buffers()
.expect("Failed to swap window buffers!"); .expect("Failed to swap window buffers!");
// Maintain global state
global_state.maintain();
// Wait for the next tick. // Wait for the next tick.
clock.tick(Duration::from_millis(1000 / FPS)); clock.tick(Duration::from_millis(1000 / FPS));