0
Commit Graph

81 Commits

Author SHA1 Message Date
Andrew Chin
d2252acfe6 Signs should be working again 2011-03-28 15:07:49 -04:00
Xon
729141d426 Initial chunk cache commit mk2 2011-03-26 13:27:33 +08:00
Xon
c7920ce61e Fixed multi-world support in multi-layer renderer 2011-03-26 02:37:11 +08:00
Xon
ca36c98641 Initial commit for multi-layer rendering.
Hardwired to use all 4 render modes at once. Todo: add config file/commandline argument support.
2011-03-26 02:37:11 +08:00
Xon
8cfa50087a Removed filting chunks from render_worldtile since _get_chunks_in_range can do it trivially before constructing the list 2011-03-25 20:51:57 +08:00
Xon
c1b7b12592 Add reporting of scanning/indexing regions. Shortened paths being sent to the worker processes, and removed os.path.join from _apply_render_worldtiles's inner loop. 2011-03-25 17:50:37 +08:00
Xon
059492b3a1 Drain the processing queue every second by ~1000 to give more consistant feedback and reduce stalls when draining the queue from 10000->500 2011-03-25 17:50:37 +08:00
Aaron Griffith
ff464bde3c removed lighting/night/spawn bools, now we just reference rendermode directly 2011-03-23 00:13:17 -04:00
Aaron Griffith
0e87368a06 moved google map related code int googlemap.py (from quadtree.py)
basic support in googlemap.py for handling multiple QuadtreeGens
2011-03-20 21:43:18 -04:00
Andrew Chin
29dc98ce2a Fix a -p 1 regression 2011-03-19 23:49:56 -04:00
Aaron Griffith
346ee004e8 fixed some things left over from configfile merge 2011-03-19 21:25:04 -04:00
Aaron Griffith
ebc043b95c Merge branch 'master' into dtt-master-merge
Conflicts:
	gmap.py
	quadtree.py
2011-03-19 21:15:05 -04:00
Aaron Griffith
c286f840bb Merge remote branch 'upstream/configfile' into dtt-config-merge
Conflicts:
	chunk.py
	gmap.py
	world.py
2011-03-19 21:10:40 -04:00
Aaron Griffith
8ad7a29f6a Merge remote branch 'xon/dtt-c-render-region-cache' into dtt-c-render 2011-03-19 20:49:17 -04:00
Aaron Griffith
38deb98d5a added command line option for web_assets postprocessing hook 2011-03-19 20:45:40 -04:00
Xon
ac0055a6d7 Fix Windows compat with stashing the quadtree object into each worker process 2011-03-20 08:41:38 +08:00
Xon
cd7b9456a9 Fixed worker processes being passed the full quadtree object. Caused massive performance regressions when caching stuff in quadtree.world
Offloaded self._get_chunks_in_range into worker process.
2011-03-20 08:40:43 +08:00
Xon
1d666c7be7 Fixed render_innertile_batch 2011-03-20 08:40:30 +08:00
Xon
0046da5594 render_inntertile & render_inntertile now called in batches in the worker process,
speeds up update scan with a lot of tiles to skip.
2011-03-20 08:40:21 +08:00
Xon
ec255bf29b Added region cache invalidation & reloading. Cached region mtimes. 2011-03-20 08:24:43 +08:00
Xon
79d021279f Tweaked _get_chunks_in_range & related call tree.
~12% improvement by inlining self.world.get_region_path ina pure update scan.
2011-03-19 13:59:40 +08:00
Xon
1afb2b3d53 Addded intial region caching.
Loads all the offsets & timestamps @ start to share to worker proceses.
From
14609247 function calls (14608852 primitive calls) in 118.278 CPU seconds
to
12232301 function calls (12231906 primitive calls) in 75.825 CPU seconds
2011-03-19 13:36:40 +08:00
Aaron Griffith
b92dcd96ee increased max result queue size back to brownan/master normal 2011-03-18 16:22:48 -04:00
Xon
383e8197af Performance improvements on update scan 2011-03-19 02:50:44 +08:00
Aaron Griffith
5a05105b62 Merge branch 'master' into dtt-merge
Conflicts:
	chunk.py
2011-03-06 18:05:28 -05:00
Aaron Griffith
5cb599fabb added a more informative error if the map is too big for Overviewer to handle
From Issue #290:
https://github.com/brownan/Minecraft-Overviewer/issues/290
2011-03-06 15:35:40 -05:00
Aaron Griffith
be26dc702b added option to QuadtreeGen to specify tile output directory 2011-03-02 08:29:33 -05:00
Aaron Griffith
300d4ac53e added back lighting, night, and spawn support 2011-03-02 08:21:41 -05:00
Aaron Griffith
94c1fbfaa6 fixed typo in quadtree.py 2011-03-01 20:42:58 -05:00
Aaron Griffith
d813053329 removed lingering traces of the hash system 2011-03-01 20:28:31 -05:00
Aaron Griffith
4293851fcc fixed chunk double-render bug and artifacts at the top of each tile 2011-03-01 20:22:22 -05:00
Aaron Griffith
16bab9be3b less time between console messages for -p1 2011-03-01 18:40:06 -05:00
Aaron Griffith
33b10f7065 initial (and incorrect) drawing code 2011-03-01 16:45:04 -05:00
Aaron Griffith
83d7a36ef4 moved quadtree.py to mtime-based update checking, and added a stub direct-to-tile renderer 2011-03-01 13:18:25 -05:00
Andrew Chin
05ea562060 Working rendering with the new McRegion format.
Notes:
 * Currently only works with -p 1
 * Caching is mostly compatible with existing caches, but not completly.
   This needs more testing and more code reviews
 * There are probably many code paths that will throw exceptions.
 * Not ready for general use yet, but is OK for testing
2011-02-23 22:13:35 -05:00
Andrew Chin
409a66083e Merge branch 'master' of https://github.com/Evil-Code/Minecraft-Overviewer into Evil-Code-master
Conflicts:
	quadtree.py
2011-02-19 14:47:57 -05:00
Andrew Chin
c9722af8a4 modified method to copy web_assets 2011-02-18 20:27:37 -05:00
timwolla
27f722c3bd The date is written into the {time} variable in index.html 2011-02-07 22:06:06 +01:00
Andrew Chin
cd88d63ab3 New UI control to toggle signposts on/off based on their content.
Pretty substantial javascript refactoring:
 * All javascript is now in funtions.js.  There is no javascript at all
   in index.html
 * Configuration options moved from template.html to config.js
   template.html moved to web_assets/index.html

config.js allows you to specify pattern-label pairs.  Each label will be
added to an on-screen "signposts" control.  Clicking the checkbox by
each label will show/hide any signposts that match the pattern attached
to that label.  config.js has some examples.

TODO:
 * The signposts control needs better styling.
 * The new javascript needs testing in IE.  Seems ok in Chome and FF.

These large changes may be hard to merge if you have non-trivial JS
changes to template.html locally.  Apologies in advance
2010-11-11 21:05:24 -05:00
Andrew Brown
605811bf0c Merge remote branch 'eminence/master' 2010-11-07 09:08:56 -05:00
Andrew Chin
16aca4c093 Fancy icons for signposts and spawn, plus info windows for signposts
Thanks to gabrielcrowe for the signpost icon.
2010-11-06 22:04:38 -04:00
Andrew Chin
f2b34dff7a Improved handling of signposts 2010-10-24 00:19:27 -04:00
Aaron Griffith
395e26ef9c changed most PIL paste() calls into composite.alpha_over() calls
The ones I have not changed are those where paste() is really
preferred, and I've noted why in comments.

Calls to "dest.paste(src, rect, mask)" were converted to calls to
"composite.alpha_over(dest, src, rect, mask)".
2010-10-23 13:42:31 -04:00
Andrew Chin
cb363df3cd Initial work on generating markers.js from signposts
Details:
 * A queue object is passed to all renderers, allowing each process to
   avoid using shared memory when recording signpost data.
 * New overviewer.dat file that stores persistent data between runs.
   Currently used to store information on signs.  markers.js is
   generated by merging the stored POI list with the newly generated POI
   list.
 * POIs are tagged with their type (e.g. "spawn" or "sign").  This
   should be useful if different types of POIs needs to be
   handled/displayed differently

Known bugs:
 * If you delete the last sign in a chunk, it won't be removed from
   markers.js
2010-10-20 22:11:34 -04:00
Andrew Brown
a10688132a moved directory creation to quadtree initialization 2010-10-19 21:16:13 -04:00
Andrew Brown
ea179118bd added an option to skip generating region.js and marker.js 2010-10-15 22:23:15 -04:00
Andrew Brown
a2f37e0649 made exceptions during innter tile rendering when opening tile images non-fatal 2010-10-15 21:55:00 -04:00
Andrew Brown
a4c0e786a1 tabs -> 4 spaces 2010-10-11 21:03:50 -04:00
Andrew Brown
6d99c58296 Merge branch 'optimizeimg' of http://github.com/kbrantley/Minecraft-Overviewer 2010-10-11 20:58:26 -04:00
Andrew Brown
ea94bcc916 removed your crazy semicolons. This ain't java =) 2010-10-11 20:56:43 -04:00