voxel/kubi
1
1
Fork 0
mirror of https://github.com/griffi-gh/kubi.git synced 2024-11-29 02:08:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chunk state downgrades

Browse source
This commit is contained in:
griffi-gh 2023-01-26 04:12:29 +01:00
parent 5c3ee1c4b6
commit a512fffcc4
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/camera.rs
View file

@ -1,4 +1,4 @@
use glam::{Mat4, Vec3, EulerRot}; use glam::{Mat4, Vec3};
use shipyard::{Component, ViewMut, View, IntoIter, Workload, IntoWorkload}; use shipyard::{Component, ViewMut, View, IntoIter, Workload, IntoWorkload};
use std::f32::consts::PI; use std::f32::consts::PI;
use crate::{transform::Transform, events::WindowResizedEvent}; use crate::{transform::Transform, events::WindowResizedEvent};

2
src/input.rs
View file

@ -37,7 +37,7 @@ pub fn process_events(
}; };
} }
}, },
DeviceEvent::Button { button, state } => { DeviceEvent::Button { button: _, state: _ } => {
//log::debug!("Button {button} {state:?}"); //log::debug!("Button {button} {state:?}");
}, },
_ => () _ => ()

18
src/world/loading.rs
View file

@ -16,7 +16,7 @@ use super::{
pub fn update_loaded_world_around_player() -> Workload { pub fn update_loaded_world_around_player() -> Workload {
( (
update_chunks_if_player_moved, update_chunks_if_player_moved,
unload_marked_chunks, unload_downgrade_chunks,
start_required_tasks, start_required_tasks,
process_completed_tasks, process_completed_tasks,
).into_workload() ).into_workload()
@ -76,13 +76,14 @@ pub fn update_chunks_if_player_moved(
} }
} }
fn unload_marked_chunks( fn unload_downgrade_chunks(
mut vm_world: UniqueViewMut<ChunkStorage>, mut vm_world: UniqueViewMut<ChunkStorage>,
mut vm_meshes: NonSendSync<UniqueViewMut<ChunkMeshStorage>> mut vm_meshes: NonSendSync<UniqueViewMut<ChunkMeshStorage>>
) { ) {
if !vm_world.is_modified() { if !vm_world.is_modified() {
return return
} }
//TODO refactor this
vm_world.chunks.retain(|_, chunk| { vm_world.chunks.retain(|_, chunk| {
if chunk.desired_state == DesiredChunkState::ToUnload { if chunk.desired_state == DesiredChunkState::ToUnload {
if let Some(mesh_index) = chunk.mesh_index { if let Some(mesh_index) = chunk.mesh_index {
@ -90,6 +91,16 @@ fn unload_marked_chunks(
} }
false false
} else { } else {
match chunk.desired_state {
DesiredChunkState::Loaded if matches!(chunk.current_state, CurrentChunkState::Rendered | CurrentChunkState::CalculatingMesh) => {
if let Some(mesh_index) = chunk.mesh_index {
vm_meshes.remove(mesh_index).unwrap();
}
chunk.mesh_index = None;
chunk.current_state = CurrentChunkState::Loaded;
},
_ => (),
}
true true
} }
}) })
@ -99,6 +110,9 @@ fn start_required_tasks(
task_manager: UniqueView<ChunkTaskManager>, task_manager: UniqueView<ChunkTaskManager>,
mut world: UniqueViewMut<ChunkStorage>, mut world: UniqueViewMut<ChunkStorage>,
) { ) {
if !world.is_modified() {
return
}
//HACK: cant iterate over chunks.keys() or chunk directly! //HACK: cant iterate over chunks.keys() or chunk directly!
let hashmap_keys: Vec<IVec3> = world.chunks.keys().copied().collect(); let hashmap_keys: Vec<IVec3> = world.chunks.keys().copied().collect();
for position in hashmap_keys { for position in hashmap_keys {