0
Commit Graph

584 Commits

Author SHA1 Message Date
Michael Jensen
783c91adff Merge branches 'documentation' and 'master' 2010-09-30 10:16:07 +10:00
Michael Jensen
971f33e763 Fixed a documentation mistake, the chunkdir option is actually cachedir 2010-09-30 09:31:57 +10: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
fec7f1b8e4 Added a setup.py for py2exe 2010-09-28 23:13:13 -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
Andrew Brown
dd088e192b Merged in half block and cactus rendering fixes
Merge remote branch 'eminence/master'
2010-09-28 22:53:01 -04:00
Andrew Brown
2d50b2e5f5 Merging in JPEG rendering code
Merge remote branch 'alexjurkiewicz/master'
2010-09-28 22:45:34 -04:00
Andrew Brown
ac7908e815 readme update with parallel pngcrush recipe 2010-09-28 22:35:13 -04:00
Aaron Griffith
8dccf4162c added run-time flags to enable lighting or nighttime rendering 2010-09-28 16:57:23 -04:00
Aaron Griffith
d6fc49e1d9 store less data at once, and chunk boundary lighting occlusion checks
I also changed the default light level to be based off the light
calculation function, so night renders have a reasonable default light
level now.
2010-09-28 10:47:19 -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
Andrew Chin
6240f40226 Half blocks (step/#44) should be rendered reasonably well.
Tested 1 half block (44), 2 half blocks (43), a 3 half blocks (43,44)
and all seem to look OK.
2010-09-28 00:09:50 -04:00
Andrew Chin
aa8a369aa8 Better cacti rendering 2010-09-27 21:32:26 -04:00
Aaron Griffith
27e9b1cb15 added (commented out, for now) night render code 2010-09-27 20:31:31 -04:00
Aaron Griffith
8d145f2b58 added correct chunk boundary lighting 2010-09-27 19:59:41 -04:00
Aaron Griffith
db62ad94ee correct (though chunk-local only) per-face lighting 2010-09-27 19:04:35 -04:00
Aaron Griffith
a15390cc47 initial stab at lighting support 2010-09-27 14:55:16 -04:00
Aaron Griffith
a5cc2e3ae2 more accurate marker positioning on map, and a reasonable custom projection 2010-09-27 14:54:10 -04:00
Benjamin Herr
e83796c102 Deal with higher-resolution textures 2010-09-27 20:20:31 +02:00
Alex Jurkiewicz
59481969a9 Disable chroma subsampling when saving JPEGs. 2010-09-27 23:47:03 +10:00
Andrew Brown
aa82a82f13 won't error when no worlds are found. Thanks jbergstroem 2010-09-27 09:03:24 -04:00
Alex Jurkiewicz
157eed9893 Fix typo in template.html 2010-09-27 22:11:17 +10:00
Alex Jurkiewicz
e6bfcc3033 Write HTML file with appropriate extension config. 2010-09-27 22:10:23 +10:00
Alex Jurkiewicz
244679a877 Update README with --imgformat details. 2010-09-27 22:09:58 +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
d637ddbbe1 added the option to specify a list of chunks to update. 2010-09-27 00:52:11 -04:00
Andrew Brown
58202bd779 Fixed this 2010-09-26 23:29:06 -04:00
Andrew Brown
458870510c Merge remote branch 'eminence/master' 2010-09-26 23:05:34 -04:00
Andrew Brown
a957d0b097 clarified texture issue in readme. Misc changes
Added check for python >=2.6
Added current directory and program directory to paths to search for
minecraft.jar
2010-09-26 23:04:12 -04:00
Andrew Chin
18040d96b4 Add support for some non-block textures
The following textures now no longer render as blocks:
 * Flowers
 * Mushrooms
 * Saplings
 * Reeds
 * Torches

Note that torches attached to wall are still rendered incorrectly
2010-09-26 01:33:24 -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 Brown
3c75c60f61 overhauled options descriptions in readme 2010-09-25 01:33:39 -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
c53070304f can now specify a chunk cache directory manually 2010-09-22 23:51:31 -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
95f6342154 added a link to the world examples in the readme.
Also clarified an error message
2010-09-21 22:37:45 -04:00
Andrew Brown
7278286599 get_worlds only considers world dirs of length 6
(I like to store backups of my worlds in the same dir as World1.tar and
it was trying to open up world number 'r')
2010-09-21 22:36:06 -04:00
Ryan Hitchman
07145bef3b make it easier for the user to use a map in an expected location, show some information about found saves 2010-09-21 15:09:11 -05: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
7e62ab355f readme update 2010-09-18 00:32:59 -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