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

Better static light propagation between translucent objects

Browse Source
This commit is contained in:
Joshua Barretto 2021-02-11 01:36:42 +00:00
parent 1b80bdd771
commit bed114900f
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/src/terrain/block.rs
View File

@ -194,13 +194,14 @@ impl Block {
}
}
// minimum block, attenuation
#[inline]
pub fn get_max_sunlight(&self) -> Option<u8> {
pub fn get_max_sunlight(&self) -> (u8, u8) {
match self.kind() {
BlockKind::Water => Some(4),
BlockKind::Leaves => Some(10),
_ if self.is_opaque() => Some(0),
_ => None,
BlockKind::Water => (1, 1),
BlockKind::Leaves => (10, 255),
_ if self.is_opaque() => (0, 255),
_ => (0, 0),
}
}

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

@ -71,20 +71,21 @@ fn calc_light<V: RectRasterableVol<Vox = Block> + ReadVol + Debug>(
for y in 0..outer.size().h {
let mut light = SUNLIGHT;
for z in (0..outer.size().d).rev() {
match vol_cached
let (min_light, attenuation) = vol_cached
.get(outer.min + Vec3::new(x, y, z))
.map_or(None, |b| b.get_max_sunlight())
{
None => {},
Some(0) => {
light_map[lm_idx(x, y, z)] = 0;
break;
},
Some(max_sunlight) => light = light.min(max_sunlight),
.map_or((0, 0), |b| b.get_max_sunlight());
if light > min_light {
light = light.saturating_sub(attenuation).max(min_light);
}
light_map[lm_idx(x, y, z)] = light;
prop_que.push_back((x as u8, y as u8, z as u16));
if light == 0 {
break;
} else {
prop_que.push_back((x as u8, y as u8, z as u16));
}
}
}
}