0
Commit Graph

90 Commits

Author SHA1 Message Date
Andrew Chin
feeb3283e0 New benchmarking script
Useful for examining how a code change affects performance
2011-01-08 01:21:41 -05:00
Andrew Chin
3d84e76d0e Merge branch 'grasscolor-fix' of https://github.com/agrif/Minecraft-Overviewer into agrif-grasscolor-fix 2011-01-01 20:57:24 -05:00
Aaron Griffith
0ab56ce1d9 made sure biome color arrays are loaded in each thread 2011-01-01 15:45:36 -08:00
Andrew Chin
97aa81311c Fixed empty sign handling, updated findSigns.py 2010-12-31 23:35:18 -05:00
Alex Cline
ee1e7c3aa9 Changed blank sign logic to use aheadley's suggestion. 2010-12-31 20:45:02 -05:00
Alex Cline
802cd30dc8 Added conditional to only add signs that are not blank to the POI list. 2010-12-30 15:31:03 -05:00
Andrew Chin
1a526bbba0 Merged in rmccue's cache checking changes
Conflicts:
	chunk.py
2010-12-23 02:01:58 -05:00
Andrew Chin
e9aa4b6228 Merge branch 'master' of https://github.com/jennytoo/Minecraft-Overviewer into jennytoo-master 2010-12-18 20:13:11 -05:00
Andrew Chin
334385951c Merge branch 'fences' of https://github.com/Fenixin/Minecraft-Overviewer into Fenixin-fences 2010-12-18 18:27:06 -05:00
Andrew Chin
ad5fa9b208 Merge branch 'master' of https://github.com/rmccue/Minecraft-Overviewer into rmccue-master 2010-12-18 15:30:12 -05:00
Alejandro Aguilera
daf7a68d38 Make chunk.py check for blocks that need pseudo ancil data and call generate_pseudo_ancildata. 2010-12-17 12:57:56 +01:00
Alejandro Aguilera
1ad82cf4b1 New function in chunk.py that generates false ancillary data for fence like blocks. 2010-12-17 12:52:47 +01:00
Alejandro Aguilera
598050ddf4 Chunk.pi now loads the 4 adjacent chunks (only blocks data). 2010-12-17 12:51:07 +01:00
Jenny
d210076479 Adds spawn output rendering (variant of night which shows dark areas in red) and support for multiple map types with buttons to switch between them. 2010-12-14 02:39:01 -08:00
Alejandro Aguilera
c5f21ba94a Don't render blocks of half covered chunks. 2010-12-14 09:30:23 +01:00
Alejandro Aguilera
07383f6d5d Optimization: Chunk.py checks in adjacents chunks to render or not blocks. 2010-12-13 23:17:56 +01:00
Ryan McCue
b3abb072c8 Use chunk.check_cache 2010-12-13 22:16:35 +10:00
Ryan McCue
72ec5469fa Fix order and naming of parameters 2010-12-13 22:04:52 +10:00
Ryan McCue
fcfaffffbb Check if the key exists first 2010-12-13 21:21:24 +10:00
Ryan McCue
8def0ffaef Check cache synchronously, to avoid async overhead.
This is starting to do my head in. Apologies if these don't make any
sense, but they do to me. :)
2010-12-13 21:16:21 +10:00
Ryan McCue
8ec7986353 Only pass the part of the dict we need to the chunk renderer 2010-12-13 20:34:17 +10:00
Andrew Chin
fcbff8af2a Improved marker titles and newlines
Primarily for browsers that don't render newlines in tooltips.
Thanks to ben0x539
2010-12-11 20:15:12 -05:00
Ryan McCue
211f489f66 Add logging regarding whether cached image is used or not 2010-12-11 21:32:36 +10:00
Ryan McCue
b7f4855ec6 Use logging instead of print statement 2010-12-11 21:31:20 +10:00
Ryan McCue
dff4f4aea8 Add debugging info 2010-12-11 21:22:58 +10:00
Ryan McCue
b94daab5a0 Use self.dirbits instead of dirbits 2010-12-11 21:21:08 +10:00
Ryan McCue
e7c19f9309 Use a more efficient checker for cached images 2010-12-11 21:10:59 +10:00
Andrew Chin
e96bb91b82 Better handling of the biome tinting images.
If they're not found with _find_file, then look in the EXTRACTEDBIOME
folder in the worlddir.
2010-12-05 01:35:12 -05:00
Andrew Chin
9125919d3e Give a more useful error if the biome color png files can't be found 2010-12-04 19:31:21 -05:00
Andrew Chin
c60180f793 Biome data from Biome Extractor is now used if it is present.
If the BIOMEEXTRACTOR data is not available, then non-biome aware
tinting will be used

Open biome data in binary mode (Windows requires this)
2010-11-23 00:48:39 -05:00
Alex Jurkiewicz
22db7bb3cd clean up biome code 2010-11-23 00:31:35 -05:00
Andrew Chin
dc80c88e94 Biome tinting uses now uses the Biome Extractor data files.
See:
http://www.minecraftforum.net/viewtopic.php?f=25&t=80902&view=unread
2010-11-23 00:26:07 -05:00
Andrew Chin
210e65730f Hacky work on biome tinting
Currently this requires python-gearman, gearman-java, and a java SDK.

This code will probably be all thrown away, but if you really want to
play, first compile Biome.java, then run the resulting Biome.class.
Note you'll probably need to hack the signatures out of minecraft.jar to
get it to run.

Then copy grasscolor.png into the cwd, and run gmap.py as usual.

It is slowwwww.  Perhaps running Biome.class on multiple machines might
speed things up?

Here's the kind of output produced: http://smp.em32.net/biome_test/
2010-11-23 00:26:07 -05:00
Andrew Brown
605811bf0c Merge remote branch 'eminence/master' 2010-11-07 09:08:56 -05:00
Andrew Brown
21ac6689e6 Merge branch 'blending' of https://github.com/agrif/Minecraft-Overviewer into agrif-blending 2010-11-07 08:09:25 -05:00
Andrew Chin
c96b3363b2 Fixed bug in signpost handling code
Two of the coordinates were flipped in markers.js
Also, overviewer.dat is now removed with -d
2010-11-06 15:27:52 -04:00
Andrew Chin
d01fb1f520 Merge remote branch 'upstream/master' 2010-11-02 18:59:58 -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
Michael Jensen
52fab49248 Fixed simple missing test that was causing index out of range exceptions
Now will not crash if the map being rendered in cave mode goes up to the height limit.
2010-10-20 23:52:33 +11:00
Andrew Brown
f4f415514c Merge branch 'lighting' of http://github.com/agrif/Minecraft-Overviewer into lighting 2010-10-15 22:55:15 -04:00
Andrew Brown
4c65271dd0 doesn't crash on a corrupt world chunk 2010-10-15 22:43:40 -04:00
Andrew Brown
324ac5d28d updates mtime on chunk images that match the hash 2010-10-15 22:07:46 -04:00
Aaron Griffith
f8b516b360 Merge branch 'master' into lighting
Conflicts:
	chunk.py
2010-10-14 15:01:31 -04:00
Aaron Griffith
66e39f8b4d made sure lava blocks are fully lit 2010-10-14 14:02:04 -04:00
Aaron Griffith
c11e23a18f added semi-correct lighting for half-blocks 2010-10-14 13:57:48 -04:00
Aaron Griffith
b44cb9c3f8 added proper occlusion tracking to lighting function 2010-10-14 13:36:20 -04:00
Aaron Griffith
e51556f314 moved lighting data into properties, and light logic into a function 2010-10-12 21:11:27 -04:00
Aaron Griffith
e4e52cee0b moved get_lighting_coefficient into the ChunkRenderer class 2010-10-12 19:05:44 -04:00