LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

removed rendering code from WorldRenderer (now just World)

Browse Source
This commit is contained in:
Aaron Griffith
2011-03-01 11:16:20 -05:00
parent 5485e684b5
commit f34d9739e9
2 changed files with 53 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gmap.py
View File

@@ -132,10 +132,9 @@ def main():
if not useBiomeData: if not useBiomeData:
logging.info("Notice: Not using biome data for tinting") logging.info("Notice: Not using biome data for tinting")
# First generate the world's chunk images # First do world-level preprocessing
#w = world.WorldRenderer(worlddir, cachedir, chunklist=chunklist, lighting=options.lighting, night=options.night, spawn=options.spawn, useBiomeData=useBiomeData) w = world.World(worlddir, useBiomeData=useBiomeData)
w.go(options.procs)
#w.go(options.procs)
# Now generate the tiles # Now generate the tiles
#q = quadtree.QuadtreeGen(w, destdir, depth=options.zoom, imgformat=imgformat, optimizeimg=optimizeimg) #q = quadtree.QuadtreeGen(w, destdir, depth=options.zoom, imgformat=imgformat, optimizeimg=optimizeimg)

294
world.py
View File

@@ -31,8 +31,7 @@ import nbt
import textures import textures
""" """
This module has routines related to generating all the chunks for a world This module has routines for extracting information about available worlds
and for extracting information about available worlds
""" """
@@ -40,34 +39,14 @@ base36decode = functools.partial(int, base=36)
cached = collections.defaultdict(dict) cached = collections.defaultdict(dict)
def _convert_coords(chunks): def _convert_coords(chunkx, chunky):
"""Takes the list of (chunkx, chunky, chunkfile) where chunkx and chunky """Takes a coordinate (chunkx, chunky) where chunkx and chunky are
are in the chunk coordinate system, and figures out the row and column in in the chunk coordinate system, and figures out the row and column
the image each one should be. in the image each one should be. Returns (col, row)."""
returns mincol, maxcol, minrow, maxrow, chunks_translated
chunks_translated is a list of (col, row, (chunkX, chunkY))
The (chunkX, chunkY) tuple is the chunkCoords, used to identify the
chunk file
"""
chunks_translated = []
# columns are determined by the sum of the chunk coords, rows are the # columns are determined by the sum of the chunk coords, rows are the
# difference # difference (TODO: be able to change direction of north)
item = chunks[0] return (chunkx + chunky, chunky - chunkx)
mincol = maxcol = item[0] + item[1]
minrow = maxrow = item[1] - item[0]
for c in chunks:
col = c[0] + c[1]
mincol = min(mincol, col)
maxcol = max(maxcol, col)
row = c[1] - c[0]
minrow = min(minrow, row)
maxrow = max(maxrow, row)
chunks_translated.append((col, row, (c[0],c[1])))
return mincol, maxcol, minrow, maxrow, chunks_translated
def base36encode(number, alphabet='0123456789abcdefghijklmnopqrstuvwxyz'): def base36encode(number, alphabet='0123456789abcdefghijklmnopqrstuvwxyz'):
''' '''
@@ -91,33 +70,19 @@ def base36encode(number, alphabet='0123456789abcdefghijklmnopqrstuvwxyz'):
return "-" + base36 return "-" + base36
return base36 return base36
class FakeAsyncResult: class World(object):
def __init__(self, string): """Does world-level preprocessing to prepare for QuadtreeGen
self.string = string
def get(self):
return self.string
class WorldRenderer(object):
"""Renders a world's worth of chunks.
worlddir is the path to the minecraft world worlddir is the path to the minecraft world
cachedir is the path to a directory that should hold the resulting images.
It may be the same as worlddir (which used to be the default).
If chunklist is given, it is assumed to be an iterator over paths to chunk
files to update. If it includes a trailing newline, it is stripped, so you
can pass in file handles just fine.
""" """
def __init__(self, worlddir, cachedir, chunklist=None, lighting=False, night=False, spawn=False, useBiomeData=False):
mincol = maxcol = minrow = maxrow = 0
def __init__(self, worlddir, useBiomeData=False):
self.worlddir = worlddir self.worlddir = worlddir
self.caves = False
self.lighting = lighting or night or spawn
self.night = night or spawn
self.spawn = spawn
self.cachedir = cachedir
self.useBiomeData = useBiomeData self.useBiomeData = useBiomeData
# figure out chunk format is in use # figure out chunk format is in use
# if mcregion, error out early until we can add support # if not mcregion, error out early
data = nbt.load(os.path.join(self.worlddir, "level.dat"))[1]['Data'] data = nbt.load(os.path.join(self.worlddir, "level.dat"))[1]['Data']
#print data #print data
if not ('version' in data and data['version'] == 19132): if not ('version' in data and data['version'] == 19132):
@@ -127,22 +92,6 @@ class WorldRenderer(object):
if self.useBiomeData: if self.useBiomeData:
textures.prepareBiomeData(worlddir) textures.prepareBiomeData(worlddir)
self.chunklist = chunklist
# In order to avoid having to look up the cache file names in
# ChunkRenderer, get them all and store them here
# TODO change how caching works
for root, dirnames, filenames in os.walk(cachedir):
for filename in filenames:
if not filename.endswith('.png') or not filename.startswith("img."):
continue
dirname, dir_b = os.path.split(root)
_, dir_a = os.path.split(dirname)
_, x, z, cave, _ = filename.split('.', 4)
dir = '/'.join((dir_a, dir_b))
bits = '.'.join((x, z, cave))
cached[dir][bits] = os.path.join(root, filename)
# stores Points Of Interest to be mapped with markers # stores Points Of Interest to be mapped with markers
# a list of dictionaries, see below for an example # a list of dictionaries, see below for an example
self.POI = [] self.POI = []
@@ -151,7 +100,8 @@ class WorldRenderer(object):
# info self.persistentData. This dictionary can hold any information # info self.persistentData. This dictionary can hold any information
# that may be needed between runs. # that may be needed between runs.
# Currently only holds into about POIs (more more details, see quadtree) # Currently only holds into about POIs (more more details, see quadtree)
self.pickleFile = os.path.join(self.cachedir,"overviewer.dat") # TODO maybe store this with the tiles, not with the world?
self.pickleFile = os.path.join(self.worlddir, "overviewer.dat")
if os.path.exists(self.pickleFile): if os.path.exists(self.pickleFile):
with open(self.pickleFile,"rb") as p: with open(self.pickleFile,"rb") as p:
self.persistentData = cPickle.load(p) self.persistentData = cPickle.load(p)
@@ -159,42 +109,6 @@ class WorldRenderer(object):
# some defaults # some defaults
self.persistentData = dict(POI=[]) self.persistentData = dict(POI=[])
def _get_chunk_renderset(self):
"""Returns a set of (col, row) chunks that should be rendered. Returns
None if all chunks should be rendered"""
if not self.chunklist:
return None
raise Exception("not yet working") ## TODO correctly reimplement this for mcregion
# Get a list of the (chunks, chunky, filename) from the passed in list
# of filenames
chunklist = []
for path in self.chunklist:
if path.endswith("\n"):
path = path[:-1]
f = os.path.basename(path)
if f and f.startswith("c.") and f.endswith(".dat"):
p = f.split(".")
chunklist.append((base36decode(p[1]), base36decode(p[2]),
path))
if not chunklist:
logging.error("No valid chunks specified in your chunklist!")
logging.error("HINT: chunks are in your world directory and have names of the form 'c.*.*.dat'")
sys.exit(1)
# Translate to col, row coordinates
_, _, _, _, chunklist = _convert_coords(chunklist)
# Build a set from the col, row pairs
inclusion_set = set()
for col, row, filename in chunklist:
inclusion_set.add((col, row))
return inclusion_set
def get_region_path(self, chunkX, chunkY): def get_region_path(self, chunkX, chunkY):
"""Returns the path to the region that contains chunk (chunkX, chunkY) """Returns the path to the region that contains chunk (chunkX, chunkY)
""" """
@@ -239,20 +153,41 @@ class WorldRenderer(object):
msg="Spawn", type="spawn", chunk=(inChunkX,inChunkZ))) msg="Spawn", type="spawn", chunk=(inChunkX,inChunkZ)))
def go(self, procs): def go(self, procs):
"""Starts the render. This returns when it is finished""" """Scan the world directory, to fill in
self.{min,max}{col,row} for use later in quadtree.py. This
also does other world-level processing."""
logging.info("Scanning chunks") logging.info("Scanning chunks")
raw_chunks = self._get_chunklist() # find the dimensions of the map, in region files
minx = maxx = miny = maxy = 0
found_regions = False
for x, y, regionfile in self._iterate_regionfiles():
found_regions = True
minx = min(minx, x)
maxx = max(maxx, x)
miny = min(miny, y)
maxy = max(maxy, y)
if not found_regions:
logging.error("Error: No chunks found!")
sys.exit(1)
logging.debug("Done scanning chunks") logging.debug("Done scanning chunks")
# turn our region coordinates into chunk coordinates
minx = minx * 32
miny = miny * 32
maxx = maxx * 32 + 32
maxy = maxy * 32 + 32
# Translate chunks to our diagonal coordinate system # Translate chunks to our diagonal coordinate system
# TODO mincol = maxcol = minrow = maxrow = 0
mincol, maxcol, minrow, maxrow, chunks = _convert_coords(raw_chunks) for chunkx, chunky in [(minx, miny), (minx, maxy), (maxx, miny), (maxx, maxy)]:
del raw_chunks # Free some memory col, row = _convert_coords(chunkx, chunky)
mincol = min(mincol, col)
self.chunkmap = self._render_chunks_async(chunks, procs) maxcol = max(maxcol, col)
logging.debug("world chunkmap has len %d", len(self.chunkmap)) minrow = min(minrow, row)
maxrow = max(maxrow, row)
#logging.debug("map size: (%i, %i) to (%i, %i)" % (mincol, minrow, maxcol, maxrow))
self.mincol = mincol self.mincol = mincol
self.maxcol = maxcol self.maxcol = maxcol
@@ -261,147 +196,18 @@ class WorldRenderer(object):
self.findTrueSpawn() self.findTrueSpawn()
def _find_regionfiles(self): def _iterate_regionfiles(self):
"""Returns a list of all of the region files, along with their """Returns an iterator of all of the region files, along with their
coordinates coordinates
Returns (regionx, regiony, filename)""" Returns (regionx, regiony, filename)"""
all_chunks = []
for dirpath, dirnames, filenames in os.walk(os.path.join(self.worlddir, 'region')): for dirpath, dirnames, filenames in os.walk(os.path.join(self.worlddir, 'region')):
if not dirnames and filenames and "DIM-1" not in dirpath: if not dirnames and filenames and "DIM-1" not in dirpath:
for f in filenames: for f in filenames:
if f.startswith("r.") and f.endswith(".mcr"): if f.startswith("r.") and f.endswith(".mcr"):
p = f.split(".") p = f.split(".")
all_chunks.append((int(p[1]), int(p[2]), yield (int(p[1]), int(p[2]), os.path.join(dirpath, f))
os.path.join(dirpath, f)))
return all_chunks
def _get_chunklist(self):
"""Returns a list of all possible chunk coordinates, based on the
available regions files. Note that not all chunk coordinates will
exists. The chunkrender will know how to ignore non-existant chunks
returns a list of (chunkx, chunky, regionfile) where regionfile is
the region file that contains this chunk
TODO, a --cachedir implemetation should involved thie method
"""
all_chunks = []
regions = self._find_regionfiles()
logging.debug("Found %d regions",len(regions))
for region in regions:
these_chunks = list(itertools.product(
range(region[0]*32,region[0]*32 + 32),
range(region[1]*32,region[1]*32 + 32)
))
these_chunks = map(lambda x: (x[0], x[1], region[2]), these_chunks)
assert(len(these_chunks) == 1024)
all_chunks += these_chunks
if not all_chunks:
logging.error("Error: No chunks found!")
sys.exit(1)
logging.debug("Total possible chunks: %d", len(all_chunks))
return all_chunks
def _render_chunks_async(self, chunks, processes):
"""Starts up a process pool and renders all the chunks asynchronously.
chunks is a list of (col, row, (chunkX, chunkY)). Use chunkX,chunkY
to find the chunk data in a region file
Returns a dictionary mapping (col, row) to the file where that
chunk is rendered as an image
"""
# The set of chunks to render, or None for all of them. The logic is
# slightly more compliated than it should seem, since we still need to
# build the results dict out of all chunks, even if they're not being
# rendered.
inclusion_set = self._get_chunk_renderset()
results = {}
manager = multiprocessing.Manager()
q = manager.Queue()
if processes == 1:
# Skip the multiprocessing stuff
logging.debug("Rendering chunks synchronously since you requested 1 process")
for i, (col, row, chunkXY) in enumerate(chunks):
##TODO##/if inclusion_set and (col, row) not in inclusion_set:
##TODO##/ # Skip rendering, just find where the existing image is
##TODO##/ _, imgpath = chunk.find_oldimage(chunkfile, cached, self.caves)
##TODO##/ if imgpath:
##TODO##/ results[(col, row)] = imgpath
##TODO##/ continue
oldimg = chunk.find_oldimage(chunkXY, cached, self.caves)
# TODO remove this shortcircuit
if chunk.check_cache(self, chunkXY, oldimg):
result = oldimg[1]
else:
#logging.debug("check cache failed, need to render (could be ghost chunk)")
result = chunk.render_and_save(chunkXY, self.cachedir, self, oldimg, queue=q)
if result:
results[(col, row)] = result
if i > 0:
try:
item = q.get(block=False)
if item[0] == "newpoi":
self.POI.append(item[1])
elif item[0] == "removePOI":
self.persistentData['POI'] = filter(lambda x: x['chunk'] != item[1], self.persistentData['POI'])
except Queue.Empty:
pass
if 1000 % i == 0 or i % 1000 == 0:
logging.info("{0}/{1} chunks rendered".format(i, len(chunks)))
else:
logging.debug("Rendering chunks in {0} processes".format(processes))
pool = multiprocessing.Pool(processes=processes)
asyncresults = []
for col, row, chunkXY in chunks:
##TODO/if inclusion_set and (col, row) not in inclusion_set:
##TODO/ # Skip rendering, just find where the existing image is
##TODO/ _, imgpath = chunk.find_oldimage(chunkfile, cached, self.caves)
##TODO/ if imgpath:
##TODO/ results[(col, row)] = imgpath
##TODO/ continue
oldimg = chunk.find_oldimage(chunkXY, cached, self.caves)
if chunk.check_cache(self, chunkXY, oldimg):
result = FakeAsyncResult(oldimg[1])
else:
result = pool.apply_async(chunk.render_and_save,
args=(chunkXY,self.cachedir,self, oldimg),
kwds=dict(cave=self.caves, queue=q))
asyncresults.append((col, row, result))
pool.close()
for i, (col, row, result) in enumerate(asyncresults):
results[(col, row)] = result.get()
try:
item = q.get(block=False)
if item[0] == "newpoi":
self.POI.append(item[1])
elif item[0] == "removePOI":
self.persistentData['POI'] = filter(lambda x: x['chunk'] != item[1], self.persistentData['POI'])
except Queue.Empty:
pass
if i > 0:
if 1000 % i == 0 or i % 1000 == 0:
logging.info("{0}/{1} chunks rendered".format(i, len(asyncresults)))
pool.join()
logging.info("Done!")
return results
def get_save_dir(): def get_save_dir():
"""Returns the path to the local saves directory """Returns the path to the local saves directory