0
Commit Graph

1898 Commits

Author SHA1 Message Date
Ryan McCue
ae0b3dfedf check_cache() wants a full tuple, not just part 2010-12-14 11:54:26 +10:00
Andrew Chin
5819ab60e0 Fix for optimize-img with spaces in the output_dir 2010-12-13 19:49:24 -05: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
439231d280 Pretend a string is an AsyncResult 2010-12-13 21:57:35 +10:00
Ryan McCue
810ecaf6db Use the proper find_oldimage() 2010-12-13 21:38:19 +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
c14c6d2bcc My typing is horrible tonight, use the proper variable name 2010-12-13 20:40:58 +10:00
Ryan McCue
ead41141bb Use a tuple properly, oops 2010-12-13 20:39:34 +10:00
Ryan McCue
ef82e657ee Use the right name 2010-12-13 20:38:11 +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
e70bafb453 Tweaked the viewstate link GUI
Moved it to the bottom of the screen, as it was in the way of the
existing controls on the top-right.  Added it as a map conrol instead of
a simple div.  Improved the styling a bit
2010-12-11 23:15:02 -05:00
Andrew Chin
33a03213c4 Merged in arrai's viewstate link code
Merge commit 'ffe92f7db84789436f53769df1099cd8a68e6097' into arrai-master

Conflicts:
	template.html
2010-12-11 22:19:28 -05: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
Andrew Chin
97c58212c3 Check for the optimization programs at the start of execution.
This prevents the annoying case where MCO will fail hours into a run if
pngcrush and friends are missing.
2010-12-11 19:44:59 -05:00
Andrew Chin
cebbf4b1b4 Added info on biome tinting to the README 2010-12-11 18:12:36 -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
2eb85ae946 Use the proper directory to walk 2010-12-11 21:18:02 +10:00
Ryan McCue
e7c19f9309 Use a more efficient checker for cached images 2010-12-11 21:10:59 +10:00
Andrew Chin
9bc7c10bd1 Improved flexibilty when specifying signGroups
Group membership is now determined with a function.  See config.js for
some examples.  If we want to include more information about markers in
markers.js, this model should be useful.
2010-12-08 22:04:53 -05:00
Andrew Chin
65264407f9 Merge branch 'signpost_ui' of git://github.com/eminence/Minecraft-Overviewer into signpost_ui 2010-12-06 20:23:55 -05: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
251a89b7dc Merged in agrif's blending fixes
Merge branch 'blending-fixes' of https://github.com/agrif/Minecraft-Overviewer
2010-12-04 20:33:56 -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
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