LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Improve the lighting of the stairs and double-blocks using the skylevel value of the upper block when posible.

Browse Source
This commit is contained in:
Alejandro Aguilera
2011-06-08 16:20:50 +02:00
parent f8457957f8
commit bc51e6745f
1 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/rendermode-lighting.c
View File

@@ -93,27 +93,44 @@ get_lighting_coefficient(RenderModeLighting *self, RenderState *state,
passed in, which is a sign that we're recursing */ passed in, which is a sign that we're recursing */
if ((block == 44 || block == 53 || block == 67) && authoratative == NULL) { if ((block == 44 || block == 53 || block == 67) && authoratative == NULL) {
float average_gather = 0.0f; float average_gather = 0.0f;
unsigned int average_count = 0; unsigned int average_count = 0, upper_block;
int auth; int auth;
float coeff; float coeff;
/* iterate through all surrounding blocks to take an average */ if (local_z != 127) { /* stairs and half-blocks take the skylevel from the upper block if it's transparent */
int dx, dy, dz; upper_block = getArrayByte3D(blocks, local_x, local_y, local_z + 1);
for (dx = -1; dx <= 1; dx += 2) { if (is_transparent(upper_block)) {
for (dy = -1; dy <= 1; dy += 2) { skylevel = getArrayByte3D(skylight, local_x, local_y, local_z + 1);
for (dz = -1; dz <= 1; dz += 2) { }
coeff = get_lighting_coefficient(self, state, x+dx, y+dy, z+dz, &auth); blocklevel = getArrayByte3D(blocklight, local_x, local_y, local_z);
if (auth) { } else {
average_gather += coeff; upper_block = 0;
average_count++; skylevel = 15;
blocklevel = getArrayByte3D(blocklight, local_x, local_y, local_z);
}
if (skylevel) { /* if we have a good skylevel use it, if not iterate */
return calculate_darkness(skylevel, blocklevel);
} else {
/* iterate through all surrounding blocks to take an average */
int dx, dy, dz;
for (dx = -1; dx <= 1; dx += 2) {
for (dy = -1; dy <= 1; dy += 2) {
for (dz = -1; dz <= 1; dz += 2) {
coeff = get_lighting_coefficient(self, state, x+dx, y+dy, z+dz, &auth);
if (auth) {
average_gather += coeff;
average_count++;
}
} }
} }
} }
/* only return the average if at least one was authoratative */
if (average_count > 0)
return average_gather / average_count;
} }
/* only return the average if at least one was authoratative */
if (average_count > 0)
return average_gather / average_count;
} }
if (block == 10 || block == 11) { if (block == 10 || block == 11) {