Merge commit 'xon/dtt-c-render' into dtt-c-render

Conflicts:
	nbt.py
	overviewer.py

overviewer.py

@@ -45,6 +45,7 @@ import composite
 import world
 import quadtree
 import googlemap
+import rendernode
 
 helptext = """
 %prog [OPTIONS] <World # / Name / Path to World> <tiles dest dir>
@@ -172,22 +173,32 @@ def main():
     useBiomeData = os.path.exists(os.path.join(worlddir, 'biomes'))
     if not useBiomeData:
         logging.info("Notice: Not using biome data for tinting")
-
+    
     # First do world-level preprocessing
     w = world.World(worlddir, useBiomeData=useBiomeData)
     w.go(options.procs)
 
     # create the quadtrees
     # TODO chunklist
-    # NOTE: options.rendermode is now a list of rendermodes.  for now, always use the first one
-    q = quadtree.QuadtreeGen(w, destdir, depth=options.zoom, imgformat=imgformat, optimizeimg=optimizeimg, rendermode=options.rendermode[0])
+    q = []
+    qtree_args = {'depth' : options.zoom, 'imgformat' : imgformat, 'optimizeimg' : optimizeimg}
+    for rendermode in options.rendermode:
+        if rendermode == 'normal':
+            qtree = quadtree.QuadtreeGen(w, destdir, rendermode=rendermode, tiledir='tiles', **qtree_args)
+        else:
+            qtree = quadtree.QuadtreeGen(w, destdir, rendermode=rendermode, **qtree_args)
+        q.append(qtree)
+
+    #create the distributed render
+    r = rendernode.RenderNode(q)
     
     # write out the map and web assets
-    m = googlemap.MapGen([q,], skipjs=options.skipjs, web_assets_hook=options.web_assets_hook)
+    m = googlemap.MapGen(q, skipjs=options.skipjs, web_assets_hook=options.web_assets_hook)
     m.go(options.procs)
     
     # render the tiles!
-    q.go(options.procs)
+    r.go(options.procs)
+
 
 def delete_all(worlddir, tiledir):
     # TODO should we delete tiledir here too?