LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

fixed auto-detection for forcerender on empty maps

Browse Source 
also re-arranged code so scan_chunks() returns the tree object
This commit is contained in:
Andrew Brown
2011-11-09 23:17:27 -05:00
parent f6b7e1b501
commit b9bca19cda
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
overviewer_core/quadtree.py
View File

@@ -117,7 +117,7 @@ class QuadtreeGen(object):
# --fullrender, which skips some mtime checks to speed things up # --fullrender, which skips some mtime checks to speed things up
if not os.path.exists(self.full_tiledir): if not os.path.exists(self.full_tiledir):
logging.debug("%s doesn't exist, doing a full render", self.full_tiledir) logging.debug("%s doesn't exist, doing a full render", self.full_tiledir)
self.fullrender = True self.forcerender = True
def _get_cur_depth(self): def _get_cur_depth(self):
"""How deep is the quadtree currently in the destdir? This glances in """How deep is the quadtree currently in the destdir? This glances in
@@ -276,7 +276,10 @@ class QuadtreeGen(object):
# This quadtree object gets replaced by the caller in rendernode.py, # This quadtree object gets replaced by the caller in rendernode.py,
# but we still have to let them know which quadtree this tile belongs # but we still have to let them know which quadtree this tile belongs
# to. Hence returning both self and the tile. # to. Hence returning both self and the tile.
return ([self, tile] for tile in self.scan_chunks())
dirty_tree = self.scan_chunks()
dirty_tiles = (Tile.from_path(tpath) for tpath in dirty_tree.iterate_dirty())
return ([self, tile] for tile in dirty_tiles)
def get_innertiles(self,zoom): def get_innertiles(self,zoom):
"""Same as get_worldtiles but for the inntertile routine. """Same as get_worldtiles but for the inntertile routine.
@@ -512,6 +515,8 @@ class QuadtreeGen(object):
# circuit checking mtimes of all chunks in a region # circuit checking mtimes of all chunks in a region
for chunkx, chunky, chunkmtime in self.world.iterate_chunk_metadata(): for chunkx, chunky, chunkmtime in self.world.iterate_chunk_metadata():
chunkcount += 1 chunkcount += 1
if chunkcount % 10000 == 0:
logging.debug("%s chunks scanned", chunkcount)
chunkcol, chunkrow = self.world.convert_coords(chunkx, chunky) chunkcol, chunkrow = self.world.convert_coords(chunkx, chunky)
#logging.debug("Looking at chunk %s,%s", chunkcol, chunkrow) #logging.debug("Looking at chunk %s,%s", chunkcol, chunkrow)
@@ -561,9 +566,8 @@ class QuadtreeGen(object):
logging.debug("Done. %s tiles need to be rendered. (count took %s seconds)", logging.debug("Done. %s tiles need to be rendered. (count took %s seconds)",
tilecount, int(time.time()-stime)) tilecount, int(time.time()-stime))
return dirty
# Now that we know which tiles need rendering, return an iterator over them
return (Tile.from_path(tpath) for tpath in dirty.iterate_dirty())
class DirtyTiles(object): class DirtyTiles(object):
"""This tree holds which tiles need rendering. """This tree holds which tiles need rendering.