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

Fix chunk loading delay

Browse Source 
Former-commit-id: b287ab5be22ae6e4d0b10b5010e592a7a514cacb
This commit is contained in:
timokoesters
2019-05-20 21:24:47 +02:00
parent f5751d65b1
commit e34a47d0d7
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/lib.rs
View File

@ -137,6 +137,13 @@ impl Client {
&mut self.state &mut self.state
} }
/// Remove all cached terrain
#[allow(dead_code)]
pub fn reset_terrain(&mut self) {
self.state.terrain_mut().clear();
self.pending_chunks.clear();
}
/// Get the player's entity. /// Get the player's entity.
#[allow(dead_code)] #[allow(dead_code)]
pub fn entity(&self) -> EcsEntity { pub fn entity(&self) -> EcsEntity {
@ -394,7 +401,7 @@ impl Client {
self.pending_state_request = false; self.pending_state_request = false;
} }
ServerMsg::ForceState(state) => { ServerMsg::ForceState(state) => {
self.client_state = Some(dbg!(state)); self.client_state = Some(state);
} }
ServerMsg::Disconnect => { ServerMsg::Disconnect => {
self.client_state = None; self.client_state = None;

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

@ -45,7 +45,7 @@ impl PlayState for CharSelectionState {
fn play(&mut self, _: Direction, global_state: &mut GlobalState) -> PlayStateResult { fn play(&mut self, _: Direction, global_state: &mut GlobalState) -> PlayStateResult {
// Set up an fps clock. // Set up an fps clock.
let mut clock = Clock::new(); let mut clock = Clock::new();
self.client.borrow_mut().state_mut().terrain_mut().clear(); self.client.borrow_mut().reset_terrain();
while self.client.borrow().is_request_pending() while self.client.borrow().is_request_pending()
|| self.client.borrow().get_client_state() == Some(ClientState::Registered) || self.client.borrow().get_client_state() == Some(ClientState::Registered)

2
voxygen/src/session.rs
View File

@ -115,7 +115,7 @@ impl PlayState for SessionState {
// Set up an fps clock. // Set up an fps clock.
let mut clock = Clock::new(); let mut clock = Clock::new();
self.client.borrow_mut().state_mut().terrain_mut().clear(); self.client.borrow_mut().reset_terrain();
// Load a few chunks. TODO: Remove this. // Load a few chunks. TODO: Remove this.
/* /*