LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge PR #1826 from Auron956

Browse Source 
Resolve stair & stem rendering issues
This commit is contained in:
Nicolas F
2020-08-07 23:05:48 +02:00
committed by GitHub
parent 50b84e95b5 a839fa437d
commit 4c0a69dd28
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
overviewer_core/src/block_class.c
View File

@@ -62,7 +62,7 @@ bool block_class_is_wall(mc_block_t block) {
mc_block_t mask = 0b11111111; mc_block_t mask = 0b11111111;
mc_block_t prefix = 0b111 << 8; // 1792 is the starting offset mc_block_t prefix = 0b111 << 8; // 1792 is the starting offset
// if the xor zeroes all bits, the prefix must've matched. // if the xor zeroes all bits, the prefix must've matched.
return (block & ~mask) ^ prefix == 0; return ((block & ~mask) ^ prefix) == 0;
} }
const mc_block_t block_class_stair[] = { const mc_block_t block_class_stair[] = {

2
overviewer_core/src/overviewer.h
View File

@@ -31,7 +31,7 @@
// increment this value if you've made a change to the c extension // increment this value if you've made a change to the c extension
// and want to force users to rebuild // and want to force users to rebuild
#define OVERVIEWER_EXTENSION_VERSION 90 #define OVERVIEWER_EXTENSION_VERSION 91
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>

4
overviewer_core/world.py
View File

@@ -1053,7 +1053,9 @@ class RegionSet(object):
(key == 'minecraft:observer' and p.get('powered', 'false') == 'true')): (key == 'minecraft:observer' and p.get('powered', 'false') == 'true')):
data |= 0x08 data |= 0x08
elif (key.endswith('_log') or key.endswith('_wood') or elif (key.endswith('_log') or key.endswith('_wood') or
key == 'minecraft:bone_block' or key.endswith('_stem')): key in ['minecraft:bone_block', 'minecraft:warped_stem',
'minecraft:stripped_warped_stem', 'minecraft:crimson_stem',
'minecraft:stripped_crimson_stem']):
axis = palette_entry['Properties']['axis'] axis = palette_entry['Properties']['axis']
if axis == 'x': if axis == 'x':
data |= 4 data |= 4