0
Commit Graph

55 Commits

Author SHA1 Message Date
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
Kyle Brantley
bcb423ace4 Add --optimize-img={1,2} -- performs postprocessing on images
This adds basic post-processing to images. At the moment, it only
performs actions for the png output type, but changes to work for
jpeg will be exceptionall minimal.
2010-10-09 22:57:20 -06:00
Aaron Griffith
a5ae703258 added support for ploylines and polygons on the google map
Polygons and polylines are read from the new file "regions.js". Polylines
(entries with "closed" set to false) are just lines drawn on the map.
Polygons (entries with "closed" set to true) are closed loops that are
filled in with a transparent color.
2010-10-09 15:44:48 -04:00
Alex Jurkiewicz
c14740cbc6 Merge branch 'master' of git://github.com/brownan/Minecraft-Overviewer into logging 2010-10-01 09:51:49 +10:00
Alex Jurkiewicz
9f49bf3d77 Change logging to use the 'logging' module. 2010-09-30 14:35:37 +10:00
Stephen Fluin
5a14f1b486 Fixed scoping for imageformat 2010-09-29 21:17:22 -05:00
Andrew Chin
055e11719f Create the tiles dir, if necessary, before writing blank.png.
Otherwise an error is raised, since .save() won't create intermediate
directories
2010-09-29 10:05:46 -04:00
Andrew Brown
7a696fcee0 modified to support freezing 2010-09-28 23:04:21 -04:00
Andrew Brown
81d86d6b8b added the long awaited blank image to the output tiles. 2010-09-28 22:54:39 -04:00
Alex Jurkiewicz
1f8d8b1343 Disable jpeg image optimization to work around a PIL bug.
Ref: http://mail.python.org/pipermail/image-sig/1999-August/000816.html
2010-09-28 17:15:26 +10:00
Alex Jurkiewicz
59481969a9 Disable chroma subsampling when saving JPEGs. 2010-09-27 23:47:03 +10:00
Alex Jurkiewicz
e6bfcc3033 Write HTML file with appropriate extension config. 2010-09-27 22:10:23 +10:00
Alex Jurkiewicz
f0d6776ad9 Add JPEG output support. 2010-09-27 21:51:24 +10:00
Andrew Brown
c07ae135c1 catches all exceptions when loading a chunk image 2010-09-27 01:03:39 -04:00
Andrew Brown
458870510c Merge remote branch 'eminence/master' 2010-09-26 23:05:34 -04:00
Andrew Chin
0a73d3af56 Merge remote branch 'origin/master' 2010-09-26 01:32:16 -04:00
Andrew Brown
f5f572a92b fixed corrupt chunk handling code.
Instead of re-gening the chunk, it now removes it and leaves it alone.
The reason is that, now that the cache dir is separated from the chunk
data files, there's no way for that code to know where it came from. For
now, it's easier to just omit that one chunk, it'll be re-generated on
the next run anyways.
2010-09-25 23:10:49 -04:00
Andrew Brown
8d2c575758 properly loads the image and detects corrupted images 2010-09-25 15:07:41 -04:00
Andrew Chin
80c15a3910 Added initial work on a structure to allow map annocations
The spawn point is automatically added to the gmap as a marker.
Adding other markers (signs, mob spawners, etc) should be fairly
easy.  Note: the math that converts from in-game block coordinates
to pixel coordinates is iffy.  it requires a careful codereview
2010-09-24 23:26:43 -04:00
Andrew Brown
32b776e6cc Tile task pool gets a maximum of 10000 tasks at a time
This should help memory problems for really large maps. I haven't
extensively tested this yet, but I think it should do the trick.
2010-09-24 00:36:33 -04:00
Andrew Brown
b64ea5ad23 program is now completely single threaded/processed with -p1 2010-09-23 00:08:20 -04:00
Andrew Brown
0c803608f3 moved a bit of code to a generator function
This'll make it easier to incrementally add tasks to the queue. I would
have gone ahead and done that now, but I'm out of time for the night.
2010-09-22 00:06:48 -04:00
Andrew Brown
d6f5afc40f Added GPL license to all files.
If anyone is interested in using this software under different
conditions, contact me.
2010-09-21 22:51:12 -04:00
Andrew Brown
e0929d06f4 explicitly create dest dir to fix race condition 2010-09-18 11:37:03 -04:00
Andrew Brown
b12e2d1c8c fixed race condition in creating directories 2010-09-18 10:53:50 -04:00
Andrew Brown
430ee24830 added existance checks before moving dirs.
Also removed a debug print
2010-09-18 00:24:22 -04:00
Andrew Brown
c8c16d5fd3 big commits to a bunch of stuff. See expanded message
Added an option to enter your own zoom level. Use -z to set the map at a
particular zoom level. Zoom levels define the width and height in tiles
of the highest zoom level, each new zoom level is twice as wide and
tall. (z=6 -> 2^6 tiles wide and tall)

Implemented tile re-arrangement on map expansion. Now most tiles will
get re-used if your map needs another zoom level! No longer does it need
to re-generate everything.

No longer creates empty directories for tiles, only creates directories
if needed.

Fixed some minor off-by-one logic (and the code that canceled it out to
make it work)
2010-09-18 00:14:02 -04:00