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

Added voxel shadows

Browse Source 
Former-commit-id: 86f8d6f53073736a7036ad3371eb6f283cfdac3c
This commit is contained in:
Joshua Barretto 2019-05-29 12:01:02 +01:00
parent 09327914b5
commit 1e2f130ad6
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,13 +53,23 @@ impl<V: BaseVol<Vox = Block> + ReadVol, S: VolSize + Clone> Meshable for VolMap2
for x in range.min.x + 1..range.max.x - 1 {
for y in range.min.y + 1..range.max.y - 1 {
for z in range.min.z..range.max.z {
let pos = Vec3::new(x, y, z);
let offs = (pos - range.min * Vec3::new(1, 1, 0)).map(|e| e as f32)
- Vec3::new(1.0, 1.0, 0.0);
let mut neighbour_shade = [[1.0f32; 3]; 3];
for z in (range.min.z..range.max.z).rev() {
let pos = Vec3::new(x, y, z);
// Create mesh polygons
if let Some(col) = self.get(pos).ok().and_then(|vox| vox.get_color()) {
let col = col.map(|e| e as f32 / 255.0);
let avg_shade = neighbour_shade
.iter()
.map(|col| col.iter())
.flatten()
.fold(0.0, |a, x| a + x) / 9.0;
let col = col.map(|e| e as f32 / 255.0) * (0.05 + avg_shade * 0.95);
let offs = (pos - range.min * Vec3::new(1, 1, 0)).map(|e| e as f32)
- Vec3::new(1.0, 1.0, 0.0);
vol::push_vox_verts(
&mut mesh,
@ -71,6 +81,21 @@ impl<V: BaseVol<Vox = Block> + ReadVol, S: VolSize + Clone> Meshable for VolMap2
false,
);
}
// Accumulate shade under opaque blocks
for i in 0..3 {
for j in 0..3 {
neighbour_shade[i][j] = if self
.get(pos + Vec3::new(i as i32 - 1, j as i32 - 1, 0))
.map(|vox| !vox.is_empty())
.unwrap_or(false)
{
neighbour_shade[i][j] * 0.85
} else {
(neighbour_shade[i][j] * 1.05).min(1.0)
};
}
}
}
}
}