LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Fixed lighting and rotation issues for new stairs

Browse Source
This commit is contained in:
Andrew Chin
2011-09-11 11:44:53 -04:00
parent d7bb11b2b4
commit 4701490c3e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
overviewer_core/src/rendermode-lighting.c
View File

@@ -117,7 +117,7 @@ estimate_blocklevel(RenderModeLighting *self, RenderState *state,
blocklevel = getArrayByte3D(blocklight, local_x, local_y, local_z); blocklevel = getArrayByte3D(blocklight, local_x, local_y, local_z);
/* no longer a guess */ /* no longer a guess */
if (!(block == 44 || block == 53 || block == 67) && authoratative) { if (!(block == 44 || block == 53 || block == 67 || block == 108 || block == 109) && authoratative) {
*authoratative = 1; *authoratative = 1;
} }
@@ -173,7 +173,7 @@ get_lighting_coefficient(RenderModeLighting *self, RenderState *state,
blocklevel = getArrayByte3D(blocklight, local_x, local_y, local_z); blocklevel = getArrayByte3D(blocklight, local_x, local_y, local_z);
/* special half-step handling */ /* special half-step handling */
if (block == 44 || block == 53 || block == 67) { if (block == 44 || block == 53 || block == 67 || block == 108 || block == 109) {
unsigned int upper_block; unsigned int upper_block;
/* stairs and half-blocks take the skylevel from the upper block if it's transparent */ /* stairs and half-blocks take the skylevel from the upper block if it's transparent */
@@ -183,7 +183,7 @@ get_lighting_coefficient(RenderModeLighting *self, RenderState *state,
do { do {
upper_counter++; upper_counter++;
upper_block = getArrayByte3D(blocks, local_x, local_y, local_z + upper_counter); upper_block = getArrayByte3D(blocks, local_x, local_y, local_z + upper_counter);
} while ((upper_block == 44 || upper_block == 54 || upper_block == 67) && local_z < 127); } while ((upper_block == 44 || upper_block == 53 || upper_block == 67 || upper_block == 108 || upper_block == 109) && local_z < 127);
if (is_transparent(upper_block)) { if (is_transparent(upper_block)) {
skylevel = getArrayByte3D(skylight, local_x, local_y, local_z + upper_counter); skylevel = getArrayByte3D(skylight, local_x, local_y, local_z + upper_counter);
} }

2
overviewer_core/textures.py
View File

@@ -1823,7 +1823,7 @@ def convert_data(blockID, data):
elif data == 2: data = 3 elif data == 2: data = 3
elif data == 3: data = 1 elif data == 3: data = 1
elif data == 4: data = 2 elif data == 4: data = 2
if blockID in (53,67): # wooden and cobblestone stairs. if blockID in (53,67,108,109): # wooden and cobblestone stairs.
if _north == 'upper-left': if _north == 'upper-left':
if data == 0: data = 2 if data == 0: data = 2
elif data == 1: data = 3 elif data == 1: data = 3