0
Commit Graph

368 Commits

Author SHA1 Message Date
Alex Jurkiewicz
22db7bb3cd clean up biome code 2010-11-23 00:31:35 -05:00
Alex Jurkiewicz
89d8e3653a Ignore cachedirs
Remove old Biiome.java file
2010-11-23 00:29:04 -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 Chin
859341008a Some minor signpost UI improvements
* Opening a sign infowindow will close the previously opened window.
 * The use of "Other" and "All" signpost categories are now more
   reasonable.
2010-11-20 18:20:20 -05: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
Aaron Griffith
e4b5a10b9a some fixes to setup.py for Mac OS X, and .gitignore additions 2010-11-09 21:34:05 -05:00
Morlok8k
9196736325 shell scripts have been added to .gitignore casue it was bugging me 2010-11-08 23:06:06 -08:00
Andrew Chin
d0267d4e78 new contrib script to help re-rendering specific parts of a map
See the top of the file for usage details
2010-11-08 20:38:27 -05:00
Andrew Chin
914a3073f0 Fixed --chunklist
This bug was introduced by the signpost code which required a queue
object to be passed to the chunk rendered.  This wasn't done with
--chunklist
2010-11-08 20:36:02 -05:00
Aaron Griffith
80b1cab81c changed new grass/leaf block code to use alpha_over 2010-11-07 17:45:06 -05:00
Andrew Brown
605811bf0c Merge remote branch 'eminence/master' 2010-11-07 09:08:56 -05:00
Andrew Brown
a2918f5a56 now finds textures when using interactive console 2010-11-07 08:45:40 -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
1af7287b8f Add a compass rose overlay to indicate which direction is north 2010-11-06 23:21:17 -04: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
57a9e8123d New findSigns.py contrib script
This can be used to create an complete overviewer.dat file without
having to re-render your entire world.  See the top of the script for
usage details
2010-11-06 15:29:04 -04: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
0b6461083b Modified tintTexture() to look more like the original grass color 2010-11-03 22:57:47 -04:00
Andrew Chin
290269f8fe Corrected pumpkin rendering, Hacky tinting for grass, leaves
* Pumpkins and Jack-o-lanterns now face the correct direction
 * Pumpkins and jack-o-lanterns now have different textures (thanks
   alexjurkiewicz).  one is lit, the other is not
 * a bad looking green tint is applied to grass and to leaves
   Someone please make this better
2010-11-02 20:46:56 -04:00
Andrew Chin
2c49113bd2 Render the new blocks from the Boo update.
The following are now rendered:
 * Pumpkins
 * Jack-O-Lanterns (look identical to pumpkins at the moment, to match
   the ingame rendering)
 * Bloodstone
 * Slow Sand
 * Lightstone
2010-11-02 19:39:22 -04:00
Andrew Chin
d01fb1f520 Merge remote branch 'upstream/master' 2010-11-02 18:59:58 -04:00
Andrew Brown
366a56603b Merge remote branch 'emjay/master' 2010-10-31 13:27:47 -04:00
Andrew Brown
32552c50d6 only render overworld. Still renders grayscale though 2010-10-31 13:19:58 -04:00
arrai
ffe92f7db8 prevent scrollbar 2010-10-31 12:31:22 +01:00
arrai
af6fec3026 Added link to current view 2010-10-30 22:50:40 +02:00
Aaron Griffith
759a9663af shuffled around the code a bit to make it C89 compliant
On my machine, the code now compiles with "-std=c89 -pedantic -Wall",
with no warnings (except for those emitted by the Python headers,
grr...)
2010-10-28 16:56:10 -04:00
Aaron Griffith
169d553360 added note to README about missing Imaging.h on some platforms 2010-10-26 07:56:07 -04:00
Alex Jurkiewicz
8dfeccc141 explicitly mentioning python headers in extension section in README 2010-10-26 07:55:42 -04:00
Andrew Chin
f2b34dff7a Improved handling of signposts 2010-10-24 00:19:27 -04:00
Aaron Griffith
d01244a7d8 added note to README about compiling the extension (marked optional) 2010-10-23 18:30:03 -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
Aaron Griffith
8120bcd455 added a wrapper for alpha_over that falls back on PIL paste() if needed 2010-10-23 13:42:15 -04:00
Aaron Griffith
5a19b8b375 Added a PIL alpha_over extension in C, and code to setup.py to build it
I needed a way to let py2exe options be provided only when py2exe is
available. My solution (maybe not the best) was to put all the
arguments for the final setup() call into a dictionary, that is filled
in conditionally during the script's execution. This is why the file
is completely changed; however, it still does what it used to do (when
py2exe is available).
2010-10-23 13:17:56 -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
Michael Jensen
82f931e373 Merge remote branch 'upstream/master' 2010-10-20 23:51:47 +11:00
Andrew Brown
32ba6c4424 clarified -z option in readme 2010-10-19 21:26:59 -04:00
Andrew Brown
a10688132a moved directory creation to quadtree initialization 2010-10-19 21:16:13 -04:00
Michael Jensen
eba27f6dd0 Merge remote branch 'upstream/master' 2010-10-19 16:43:55 +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
ea179118bd added an option to skip generating region.js and marker.js 2010-10-15 22:23:15 -04:00
Andrew Brown
324ac5d28d updates mtime on chunk images that match the hash 2010-10-15 22:07:46 -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
Aaron Griffith
35e664a32c updated README to reflect new lighting options 2010-10-14 21:04:41 -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