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

Merge branch 'ao-artifact-fix' into 'master'

Browse Source 
Fix ambient occlusion artifact

See merge request veloren/veloren!89

Former-commit-id: b529f9df722d8b174b0c8e5ce9ef2d32965d7294
This commit is contained in:
Forest Anderson 2019-04-29 17:00:56 +00:00
commit 3c45d3c996
1 changed files with 183 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
voxygen/src/mesh/vol.rs
View File

@ -15,24 +15,28 @@ fn get_ao_quad<V: ReadVol>(vol: &V, pos: Vec3<i32>, dirs: &[Vec3<i32>]) -> Vec4<
.map(|offs| { .map(|offs| {
let (s1, s2) = ( let (s1, s2) = (
vol.get(pos + offs[0]) vol.get(pos + offs[0])
.map(|v| v.is_empty() as i32) .map(|v| !v.is_empty())
.unwrap_or(1), .unwrap_or(false),
vol.get(pos + offs[1]) vol.get(pos + offs[1])
.map(|v| v.is_empty() as i32) .map(|v| !v.is_empty())
.unwrap_or(1), .unwrap_or(false),
); );
if s1 == 0 && s2 == 0 { if s1 && s2 {
0 0.0
} else { } else {
let corner = vol let corner = vol
.get(pos + offs[0] + offs[1]) .get(pos + offs[0] + offs[1])
.map(|v| v.is_empty() as i32) .map(|v| !v.is_empty())
.unwrap_or(1); .unwrap_or(false);
s1 + s2 + corner // Map both 1 and 2 neighbors to 0.5 occlusion
if s1 || s2 || corner {
0.5
} else {
1.0
}
} }
}) })
.map(|i| i as f32 / 3.0)
.collect::<Vec4<f32>>() .collect::<Vec4<f32>>()
} }