LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Set tile mtimes to the max of the chunk mtimes on render

Browse Source 
or in the case of inner-tiles, the max of its child tile mtimes
This commit is contained in:
Andrew Brown
2011-12-03 18:05:13 -05:00
parent 74ad1e8ea5
commit 4edc5e48b6
1 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
overviewer_core/quadtree.py
View File

@@ -285,9 +285,21 @@ class QuadtreeGen(object):
imgpath = os.path.join(dest, name) + "." + imgformat imgpath = os.path.join(dest, name) + "." + imgformat
if name == "base": if name == "base":
quadPath = [[(0,0),os.path.join(dest, "0." + imgformat)],[(192,0),os.path.join(dest, "1." + imgformat)], [(0, 192),os.path.join(dest, "2." + imgformat)],[(192,192),os.path.join(dest, "3." + imgformat)]] # Special case for the base tile. Its children are in the same
# directory instead of in a sub-directory
quadPath = [
((0,0),os.path.join(dest, "0." + imgformat)),
((192,0),os.path.join(dest, "1." + imgformat)),
((0, 192),os.path.join(dest, "2." + imgformat)),
((192,192),os.path.join(dest, "3." + imgformat)),
]
else: else:
quadPath = [[(0,0),os.path.join(dest, name, "0." + imgformat)],[(192,0),os.path.join(dest, name, "1." + imgformat)],[(0, 192),os.path.join(dest, name, "2." + imgformat)],[(192,192),os.path.join(dest, name, "3." + imgformat)]] quadPath = [
((0,0),os.path.join(dest, name, "0." + imgformat)),
((192,0),os.path.join(dest, name, "1." + imgformat)),
((0, 192),os.path.join(dest, name, "2." + imgformat)),
((192,192),os.path.join(dest, name, "3." + imgformat)),
]
#stat the tile, we need to know if it exists and its mtime #stat the tile, we need to know if it exists and its mtime
try: try:
@@ -298,19 +310,21 @@ class QuadtreeGen(object):
tile_mtime = None tile_mtime = None
#check mtimes on each part of the quad, this also checks if they exist #check mtimes on each part of the quad, this also checks if they exist
max_mtime = 0
needs_rerender = (tile_mtime is None) or self.forcerender needs_rerender = (tile_mtime is None) or self.forcerender
quadPath_filtered = [] quadPath_filtered = []
for path in quadPath: for path in quadPath:
try: try:
quad_mtime = os.stat(path[1])[stat.ST_MTIME]; quad_mtime = os.stat(path[1])[stat.ST_MTIME]
quadPath_filtered.append(path) quadPath_filtered.append(path)
if quad_mtime > tile_mtime: if quad_mtime > tile_mtime:
needs_rerender = True needs_rerender = True
max_mtime = max(max_mtime, quad_mtime)
except OSError: except OSError:
# We need to stat all the quad files, so keep looping # We need to stat all the quad files, so keep looping
pass pass
# do they all not exist? # do they all not exist?
if quadPath_filtered == []: if not quadPath_filtered:
if tile_mtime is not None: if tile_mtime is not None:
os.unlink(imgpath) os.unlink(imgpath)
return return
@@ -346,6 +360,8 @@ class QuadtreeGen(object):
if self.optimizeimg: if self.optimizeimg:
optimize_image(imgpath, self.imgformat, self.optimizeimg) optimize_image(imgpath, self.imgformat, self.optimizeimg)
os.utime(imgpath, (max_mtime, max_mtime))
def render_worldtile(self, tile, check_tile=False): def render_worldtile(self, tile, check_tile=False):
"""Renders the given tile. All the other relevant information is """Renders the given tile. All the other relevant information is
already stored in this quadtree object or in self.world. already stored in this quadtree object or in self.world.
@@ -412,6 +428,15 @@ class QuadtreeGen(object):
# directory at the same time # directory at the same time
if e.errno != errno.EEXIST: if e.errno != errno.EEXIST:
raise raise
# Compute the maximum mtime of all the chunks that go into this tile.
# At the end, we'll set the tile's mtime to this value.
max_chunk_mtime = 0
for col,row,chunkx,chunky,region in chunks:
max_chunk_mtime = max(
max_chunk_mtime,
region.get_chunk_timestamp(chunkx, chunky)
)
if check_tile: if check_tile:
# Look at all the chunks that touch this tile and their mtimes to # Look at all the chunks that touch this tile and their mtimes to
@@ -483,12 +508,14 @@ class QuadtreeGen(object):
if self.optimizeimg: if self.optimizeimg:
optimize_image(imgpath, self.imgformat, self.optimizeimg) optimize_image(imgpath, self.imgformat, self.optimizeimg)
os.utime(imgpath, (max_chunk_mtime, max_chunk_mtime))
def scan_chunks(self): def scan_chunks(self):
"""Scans the chunks of the world object and return the dirty tree object """Scans the chunks of the world object and generates a dirty tree
holding the tiles that need to be rendered. object holding the tiles that need to be rendered.
Checks mtimes of tiles in the process, unless forcerender is set on the Checks mtimes of tiles in the process, unless forcerender is set on the
object. object, in which case all tiles that exist are marked as dirty.
""" """