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 TODO (unnecessary mpsc clone)

Browse Source 
Former-commit-id: 6f6319fa6bf86ee4eec4778c6795f71beab21e89
This commit is contained in:
sxv20_ 2019-05-10 21:17:46 +01:00 committed by Joshua Barretto
parent c2a806910b
commit a5db1fd0a6
1 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
voxygen/src/scene/terrain.rs
View File

@ -93,7 +93,6 @@ impl Terrain {
let pos = pos + Vec3::new(i, j, k); let pos = pos + Vec3::new(i, j, k);
if client.state().terrain().get_key(pos).is_some() { if client.state().terrain().get_key(pos).is_some() {
// re-mesh loaded chunks that border new/changed chunks // re-mesh loaded chunks that border new/changed chunks
if self.chunks.contains_key(&pos) || (i, j, k) == (0, 0, 0) { if self.chunks.contains_key(&pos) || (i, j, k) == (0, 0, 0) {
self.mesh_todo.entry(pos).or_insert(ChunkMeshState { self.mesh_todo.entry(pos).or_insert(ChunkMeshState {
@ -113,15 +112,12 @@ impl Terrain {
self.mesh_todo.remove(pos); self.mesh_todo.remove(pos);
} }
// Clone the sender to the thread can send us the chunk data back for todo in self
// TODO: It's a bit hacky cloning it here and then cloning it again below. Fix this. .mesh_todo
let send = self.mesh_send_tmp.clone();
self.mesh_todo
.values_mut() .values_mut()
// Only spawn workers for meshing jobs without an active worker already // Only spawn workers for meshing jobs without an active worker already
.filter(|todo| !todo.active_worker) .filter(|todo| !todo.active_worker)
.for_each(|todo| { {
// Find the area of the terrain we want. Because meshing needs to compute things like // Find the area of the terrain we want. Because meshing needs to compute things like
// ambient occlusion and edge elision, we also need to borders of the chunk's // ambient occlusion and edge elision, we also need to borders of the chunk's
// neighbours too (hence the `- 1` and `+ 1`). // neighbours too (hence the `- 1` and `+ 1`).
@ -145,7 +141,7 @@ impl Terrain {
}; };
// Clone various things to that they can be moved into the thread // Clone various things to that they can be moved into the thread
let send = send.clone(); let send = self.mesh_send_tmp.clone();
let pos = todo.pos; let pos = todo.pos;
// Queue the worker thread // Queue the worker thread
@ -154,7 +150,7 @@ impl Terrain {
.expect("Failed to send chunk mesh to main thread"); .expect("Failed to send chunk mesh to main thread");
}); });
todo.active_worker = true; todo.active_worker = true;
}); }
// Receive a chunk mesh from a worker thread, upload it to the GPU and then store it // Receive a chunk mesh from a worker thread, upload it to the GPU and then store it
// Only pull out one chunk per frame to avoid an unacceptable amount of blocking lag due // Only pull out one chunk per frame to avoid an unacceptable amount of blocking lag due