Merge pull request #1788 from Auron956

overviewer · Jun 24, 2020 · 07e6be4 · 07e6be4
2 parents 98fe552 + ab0f6ab
commit 07e6be4
Show file tree

Hide file tree

Showing 5 changed files with 1,102 additions and 715 deletions.
diff --git a/overviewer_core/src/mc_id.h b/overviewer_core/src/mc_id.h
@@ -142,6 +142,7 @@ enum mc_block_id {
     block_jungle_stairs = 136,
     block_command_block = 137,
     block_beacon = 138,
+    block_mushroom_stem = 139,
     block_flower_pot = 140,
     block_carrots = 141,
     block_potatoes = 142,
@@ -257,6 +258,8 @@ enum mc_block_id {
     block_concrete = 251,
     block_concrete_powder = 252,
     block_structure_block = 255,
+    block_jigsaw = 256,
+    block_shulker_box = 257,
     block_prismarine_stairs = 11337,
     block_dark_prismarine_stairs = 11338,
     block_prismarine_brick_stairs = 11339,
@@ -332,6 +335,8 @@ enum mc_block_id {
     block_honeycomb_block = 11503,
     block_honey_block = 11504,
     block_sweet_berry_bush = 11505,
+    block_campfire = 11506,
+    block_bell = 11507,
     //  adding a gap in the numbering of walls to keep them all
     // in one numbering block starting at 21000
     block_andesite_wall = 21000,

diff --git a/overviewer_core/src/overviewer.h b/overviewer_core/src/overviewer.h
@@ -31,7 +31,7 @@
 
 // increment this value if you've made a change to the c extension
 // and want to force users to rebuild
-#define OVERVIEWER_EXTENSION_VERSION 84
+#define OVERVIEWER_EXTENSION_VERSION 85
 
 #include <stdbool.h>
 #include <stdint.h>

diff --git a/overviewer_core/src/primitives/lighting.c b/overviewer_core/src/primitives/lighting.c
@@ -316,9 +316,10 @@ lighting_draw(void* data, RenderState* state, PyObject* src, PyObject* mask, PyO
         if ((state->block_pdata & 4) == 4) { /* bottom right */
             do_shading_with_mask(self, state, x, y, z + 1, self->facemasks[2]);
         }
-        /* leaves and ice are transparent for occlusion calculations but they 
-         * per face-shading to look as in game */
-    } else if (is_transparent(state->block) && (state->block != 18) && (state->block != 79)) {
+        /* leaves, ice, and pistons are transparent for occlusion calculations
+         * but they need per face-shading to look as in game */
+    } else if (is_transparent(state->block) &&
+               !block_class_is_subset(state->block, (mc_block_t[]){block_leaves, block_ice, block_piston, block_sticky_piston}, 4)) {
         /* transparent: do shading on whole block */
         do_shading_with_mask(self, state, x, y, z, mask_light);
     } else {