LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge remote-tracking branch 'origin/master' into brownan-chunkscan

Browse Source 
Conflicts:
	overviewer.py
	overviewer_core/quadtree.py
This commit is contained in:
Andrew Brown
2011-11-07 21:04:01 -05:00
parent b1c38a56f2 d59410123d
commit 636913af57
28 changed files with 20029 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
overviewer_core/quadtree.py
View File

@@ -28,6 +28,7 @@ import cPickle
import stat
import errno
import time
import random
from time import gmtime, strftime, sleep
from PIL import Image
@@ -49,7 +50,7 @@ def iterate_base4(d):
return itertools.product(xrange(4), repeat=d)
class QuadtreeGen(object):
def __init__(self, worldobj, destdir, bgcolor="#1A1A1A", depth=None, tiledir=None, forcerender=False, imgformat='png', imgquality=95, optimizeimg=None, rendermode="normal"):
def __init__(self, worldobj, destdir, bgcolor="#1A1A1A", depth=None, tiledir=None, forcerender=False, imgformat='png', imgquality=95, optimizeimg=None, rendermode="normal", rerender_prob=0.0):
"""Generates a quadtree from the world given into the
given dest directory
@@ -60,6 +61,7 @@ class QuadtreeGen(object):
"""
self.forcerender = forcerender
self.rerender_probability = rerender_prob
self.imgformat = imgformat
self.imgquality = imgquality
self.optimizeimg = optimizeimg
@@ -286,7 +288,7 @@ class QuadtreeGen(object):
#stat the tile, we need to know if it exists or it's mtime
try:
tile_mtime = os.stat(imgpath)[stat.ST_MTIME];
tile_mtime = os.stat(imgpath)[stat.ST_MTIME]
except OSError, e:
if e.errno != errno.ENOENT:
raise
@@ -371,7 +373,7 @@ class QuadtreeGen(object):
world = self.world
#stat the file, we need to know if it exists or it's mtime
try:
tile_mtime = os.stat(imgpath)[stat.ST_MTIME];
tile_mtime = os.stat(imgpath)[stat.ST_MTIME]
except OSError, e:
if e.errno != errno.ENOENT:
raise
@@ -399,6 +401,7 @@ class QuadtreeGen(object):
try:
needs_rerender = False
get_region_mtime = world.get_region_mtime
for col, row, chunkx, chunky, regionfile in chunks:
region, regionMtime = get_region_mtime(regionfile)
@@ -423,6 +426,10 @@ class QuadtreeGen(object):
needs_rerender = True
break
# stochastic render check
if not needs_rerender and self.rerender_probability > 0.0 and random.uniform(0, 1) < self.rerender_probability:
needs_rerender = True
# if after all that, we don't need a rerender, return
if not needs_rerender:
return None