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

Disabled chunk mesh sorting for now

Browse Source
This commit is contained in:
Joshua Barretto 2020-04-20 16:41:04 +01:00
parent 77d0292e91
commit 58874803a3
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
voxygen/src/mesh/terrain.rs
View File

@ -298,9 +298,10 @@ impl<V: RectRasterableVol<Vox = Block> + ReadVol + Debug> Meshable<TerrainPipeli
}
.min(range.size().d - 1);
// We use multiple meshes and then combine them later such that we can group similar z
// levels together (better rendering performance)
let mut opaque_meshes = vec![Mesh::new(); ((z_end + 1 - z_start).clamped(1, 60) as usize / 10).max(1)];
// // We use multiple meshes and then combine them later such that we can group similar z
// // levels together (better rendering performance)
// let mut opaque_meshes = vec![Mesh::new(); ((z_end + 1 - z_start).clamped(1, 60) as usize / 10).max(1)];
let mut opaque_mesh = Mesh::new();
let mut fluid_mesh = Mesh::new();
for x in 1..range.size().w - 1 {
@ -379,12 +380,12 @@ impl<V: RectRasterableVol<Vox = Block> + ReadVol + Debug> Meshable<TerrainPipeli
[[[get_color(blocks[1][1][1].as_ref(), false); 3]; 3]; 3]
};
let opaque_mesh_index = ((z - z_start) * opaque_meshes.len() as i32 / (z_end + 1 - z_start).max(1)) as usize;
let selected_opaque_mesh = &mut opaque_meshes[opaque_mesh_index];
// let opaque_mesh_index = ((z - z_start) * opaque_meshes.len() as i32 / (z_end + 1 - z_start).max(1)) as usize;
// let selected_opaque_mesh = &mut opaque_meshes[opaque_mesh_index];
// Create mesh polygons
if block.map_or(false, |vox| vox.is_opaque()) {
vol::push_vox_verts(
selected_opaque_mesh,
&mut opaque_mesh,//selected_opaque_mesh,
faces_to_make(&blocks, false, |vox| !vox.is_opaque()),
offs,
&colors,
@ -419,17 +420,17 @@ impl<V: RectRasterableVol<Vox = Block> + ReadVol + Debug> Meshable<TerrainPipeli
}
}
let opaque_mesh = opaque_meshes
.into_iter()
.rev()
.fold(Mesh::new(), |mut opaque_mesh, m: Mesh<Self::Pipeline>| {
m.verts().chunks_exact(3).rev().for_each(|vs| {
opaque_mesh.push(vs[0]);
opaque_mesh.push(vs[1]);
opaque_mesh.push(vs[2]);
});
opaque_mesh
});
// let opaque_mesh = opaque_meshes
// .into_iter()
// .rev()
// .fold(Mesh::new(), |mut opaque_mesh, m: Mesh<Self::Pipeline>| {
// m.verts().chunks_exact(3).rev().for_each(|vs| {
// opaque_mesh.push(vs[0]);
// opaque_mesh.push(vs[1]);
// opaque_mesh.push(vs[2]);
// });
// opaque_mesh
// });
(opaque_mesh, fluid_mesh)
}