Futuray-pgm
/
voxelands
forked from oerkki/voxelands
1
1
Fork 0
Code Pull Requests Activity

Merge branch 'fix_lighting' into 'master' 

Fix dirtlike lighting (ambient occlusion)

Currently:
![screenshot_32031240](/uploads/5b13e8372b71bc7321d95a0f8f03fea1/screenshot_32031240.png)

Fixed (not including the 2nd commit):
![screenshot_32086839](/uploads/802108b73c8e520e1399e6bbe9470d0f/screenshot_32086839.png)

See merge request !69
This commit is contained in:
Menche 2016-08-27 23:36:03 +00:00
parent f887e27b8a 4bb3da36da
commit f18d82abd4
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/mapblock_mesh.cpp
View File

@ -385,7 +385,7 @@ TileSpec getMetaTile(MapNode mn, v3s16 p, v3s16 face_dir, SelectedNode &select)
return spec; return spec;
} }
v3s16 dirs8[8] = { static const v3s16 dirs8[8] = {
v3s16(0,0,0), v3s16(0,0,0),
v3s16(0,0,1), v3s16(0,0,1),
v3s16(0,1,0), v3s16(0,1,0),
@ -411,20 +411,19 @@ u8 getSmoothLight(v3s16 p, v3s16 corner, VoxelManipulator &vmanip)
if (corner.Z == 1) if (corner.Z == 1)
p.Z += 1; p.Z += 1;
for (u32 i=0; i<8; i++) { for (u8 i = 0; i < 8; i++) {
MapNode n = vmanip.getNodeRO(p - dirs8[i]); MapNode n = vmanip.getNodeRO(p - dirs8[i]);
if ( ContentFeatures &f = content_features(n);
content_features(n).param_type == CPT_LIGHT if (f.param_type == CPT_LIGHT) {
) {
dl += n.getLight(LIGHTBANK_DAY); dl += n.getLight(LIGHTBANK_DAY);
nl += n.getLight(LIGHTBANK_NIGHT); nl += n.getLight(LIGHTBANK_NIGHT);
light_count++; light_count++;
if (content_features(n).light_source > 0) if (f.light_source > 0)
ambient_occlusion -= 2.0; ambient_occlusion -= 1.0;
}else if (content_features(n).draw_type == CDT_CUBELIKE) { } else if (f.draw_type == CDT_CUBELIKE || f.draw_type == CDT_DIRTLIKE) {
ambient_occlusion += 1.0;
}else if (n.getContent() != CONTENT_IGNORE) {
ambient_occlusion += 0.5; ambient_occlusion += 0.5;
} else if (n.getContent() != CONTENT_IGNORE) {
ambient_occlusion += 0.25;
} }
} }
@ -434,8 +433,8 @@ u8 getSmoothLight(v3s16 p, v3s16 corner, VoxelManipulator &vmanip)
dl /= light_count; dl /= light_count;
nl /= light_count; nl /= light_count;
if (ambient_occlusion > 4.0) { if (ambient_occlusion > 2.0) {
ambient_occlusion = (ambient_occlusion-4) * 0.4 + 1.0; ambient_occlusion = (ambient_occlusion-2) * 0.4 + 1.0;
dl /= ambient_occlusion; dl /= ambient_occlusion;
nl /= ambient_occlusion; nl /= ambient_occlusion;
} }