LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Fixed some render-tiles not being rendered

Browse Source 
If a render-tile is only touched by chunks with blocks at the highest
point near the sky, then the render tile may not be rendered due to the
chunk scan's algorithm. Chunks in rows divisible by 4 were not
considering the tile above them, even though the chunk partially
overlaps. This is only seen for chunks with blocks at the very top of
them by the sky, and only when no other chunks would trigger that tile
for rendering.
This commit is contained in:
Andrew Brown
2012-01-03 23:42:39 -05:00
parent 4d0acc72fd
commit da18f74338
1 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
overviewer_core/tileset.py
View File

@@ -584,24 +584,26 @@ class TileSet(object):
tilecol = chunkcol - chunkcol % 2
tilerow = chunkrow - chunkrow % 4
# Determine if this chunk is in a column that spans two columns of
# tiles, which are the even columns.
# If this chunk is in an /even/ column, then it spans two tiles.
if chunkcol % 2 == 0:
x_tiles = 2
colrange = (tilecol-2, tilecol)
else:
x_tiles = 1
colrange = (tilecol,)
# If this chunk is in a row divisible by 4, then it touches the
# tile above it as well. Also touches the next 4 tiles down (16
# rows)
if chunkrow % 4 == 0:
rowrange = xrange(tilerow-4, tilerow+16+1, 4)
else:
rowrange = xrange(tilerow, tilerow+16+1, 4)
# Loop over all tiles that this chunk potentially touches.
# The tile at tilecol,tilerow obviously contains the chunk, but so
# do the next 4 tiles down because chunks are very tall, and maybe
# the next column over too.
for i in xrange(x_tiles):
for j in xrange(5):
# This loop iteration is for the tile at this column and
# row:
c = tilecol - 2*i
r = tilerow + 4*j
for c in colrange:
for r in rowrange:
# Make sure the tile is in the boundary we're rendering.
# This can happen when rendering at lower treedepth than
@@ -828,6 +830,22 @@ class TileSet(object):
c_overviewer.render_loop(self.regionset, chunkx, chunkz, tileimg,
xpos, ypos, self.options['rendermode'], self.textures)
if 0:
# Draw the outline of the top of the chunk
import ImageDraw
draw = ImageDraw.Draw(tileimg)
# Draw top outline
draw.line([(192,0), (384,96)], fill='red')
draw.line([(192,0), (0,96)], fill='red')
draw.line([(0,96), (192,192)], fill='red')
draw.line([(384,96), (192,192)], fill='red')
# Draw side outline
draw.line([(0,96),(0,96+1536)], fill='red')
draw.line([(384,96),(384,96+1536)], fill='red')
# Which chunk this is:
draw.text((96,48), "C: %s,%s" % (chunkx, chunkz), fill='red')
draw.text((96,96), "c,r: %s,%s" % (col, row), fill='red')
# Save them
if self.imgextension == 'jpg':
tileimg.save(imgpath, quality=self.imgquality, subsampling=0)
@@ -848,6 +866,8 @@ class TileSet(object):
chunklist = []
# Chunks that are relevant to this tile: the 8 chunks directly in this
# tile, and the chunks from the previous 16 rows
rowstart = tile.row
rowend = rowstart+4
colstart = tile.col
@@ -871,7 +891,6 @@ class TileSet(object):
# The chunk exists
yield (col, row, chunkx, chunkz, mtime)
def get_dirdepth(outputdir):
"""Returns the current depth of the tree on disk