voxel/kubi
1
1
Fork 0
mirror of https://github.com/griffi-gh/kubi.git synced 2024-09-20 11:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

owo

Browse source
This commit is contained in:
griffi-gh 2023-01-16 19:58:08 +01:00
parent 2cc4b6f2e0
commit ded39c285e
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/game/world/thread.rs
View file

@ -4,7 +4,7 @@ use std::{
collections::HashMap, collections::HashMap,
mem mem
}; };
use super::chunk::{ChunkData, Chunk}; use super::chunk::{ChunkData, Chunk, DesiredState};
mod world_gen; mod world_gen;
mod mesh_gen; mod mesh_gen;
@ -35,9 +35,15 @@ impl WorldThreading {
log::warn!("load: discarded {}, reason: chunk no longer exists", position); log::warn!("load: discarded {}, reason: chunk no longer exists", position);
return false return false
} }
if !matches!(chunks.get(position).unwrap().desired, DesiredState::Loaded | DesiredState::Rendered) {
log::warn!("load: discarded {}, reason: state undesired", position);
return false
}
if !handle.as_ref().expect("Something went terribly wrong").is_finished() { if !handle.as_ref().expect("Something went terribly wrong").is_finished() {
//task not finished yet, keep it and wait
return true return true
} }
log::info!("load: done {}", position);
let handle = mem::take(handle).unwrap(); let handle = mem::take(handle).unwrap();
let data = handle.join().unwrap(); let data = handle.join().unwrap();
chunks.get_mut(position).unwrap().block_data = Some(data); chunks.get_mut(position).unwrap().block_data = Some(data);