LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

fixed import loop and incorrect blockdata expansion

Browse Source
This commit is contained in:
Aaron Griffith
2012-01-07 20:23:39 -05:00
parent 1baf506a59
commit 992f737984
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
overviewer_core/__init__.py
View File

@@ -0,0 +1,5 @@
# c_overviewer must be imported first, because it imports other
# modules; leaving this out can lead to bad dependency loops
import c_overviewer

13
overviewer_core/world.py
View File

@@ -238,8 +238,6 @@ but may be several per invocation of the Overviewer in the case of multi-world.
level = data[1]['Level'] level = data[1]['Level']
chunk_data = level chunk_data = level
chunk_data['Blocks'] = numpy.frombuffer(level['Blocks'], dtype=numpy.uint8).reshape((16,16,128)) chunk_data['Blocks'] = numpy.frombuffer(level['Blocks'], dtype=numpy.uint8).reshape((16,16,128))
chunk_data['Data'] = numpy.frombuffer(level['Data'], dtype=numpy.uint8).reshape((16,16,64))
skylight = numpy.frombuffer(level['SkyLight'], dtype=numpy.uint8).reshape((16,16,64)) skylight = numpy.frombuffer(level['SkyLight'], dtype=numpy.uint8).reshape((16,16,64))
@@ -258,11 +256,12 @@ but may be several per invocation of the Overviewer in the case of multi-world.
blocklight_expanded[:,:,1::2] = (blocklight & 0xF0) >> 4 blocklight_expanded[:,:,1::2] = (blocklight & 0xF0) >> 4
chunk_data['BlockLight'] = blocklight_expanded chunk_data['BlockLight'] = blocklight_expanded
#chunk_data = {} # expand just like skylight
#chunk_data['skylight'] = chunk.get_skylight_array(level) blockdata = numpy.frombuffer(level['Data'], dtype=numpy.uint8).reshape((16,16,64))
#chunk_data['blocklight'] = chunk.get_blocklight_array(level) blockdata_expanded = numpy.empty((16,16,128), dtype=numpy.uint8)
#chunk_data['blockarray'] = chunk.get_blockdata_array(level) blockdata_expanded[:,:,::2] = blockdata & 0x0F
#chunk_data['TileEntities'] = chunk.get_tileentity_data(level) blockdata_expanded[:,:,1::2] = (blockdata & 0xF0) >> 4
chunk_data['Data'] = blockdata_expanded
return chunk_data return chunk_data