0
Commit Graph

117 Commits

Author SHA1 Message Date
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
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
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
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
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
Andrew Chin
d01fb1f520 Merge remote branch 'upstream/master' 2010-11-02 18:59:58 -04:00
Andrew Brown
32552c50d6 only render overworld. Still renders grayscale though 2010-10-31 13:19:58 -04:00
Andrew Chin
f2b34dff7a Improved handling of signposts 2010-10-24 00:19:27 -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
Aaron Griffith
f8b516b360 Merge branch 'master' into lighting
Conflicts:
	chunk.py
2010-10-14 15:01:31 -04:00
Aaron Griffith
51e1721a6d Merge branch 'master' into lighting
Conflicts:
	chunk.py
	gmap.py
	textures.py
	world.py
2010-10-05 08:35:23 -04:00
Alex Jurkiewicz
05770468fb More useful error if invalid --chunklist specified. 2010-10-05 15:29:22 +11:00
Andrew Chin
86d5476234 use os.path.join to build the spawn chunk path 2010-10-01 19:45:41 -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
Andrew Brown
fd43331350 removed unused imports 2010-09-29 23:31:19 -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
8d145f2b58 added correct chunk boundary lighting 2010-09-27 19:59:41 -04:00
Andrew Brown
aa82a82f13 won't error when no worlds are found. Thanks jbergstroem 2010-09-27 09:03:24 -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 Chin
0a73d3af56 Merge remote branch 'origin/master' 2010-09-26 01:32:16 -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
c53070304f can now specify a chunk cache directory manually 2010-09-22 23:51:31 -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
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
6e323791e6 removed unneeded imports 2010-09-15 19:13:55 -04:00
Andrew Brown
2d4f0cc082 I believe I now have a usable program again 2010-09-14 23:53:28 -04:00
Andrew Brown
230e6ad480 Re-wrote most of the quad-tree tile code and world code.
Doesn't work yet.
2010-09-14 22:55:27 -04:00
Andrew Brown
206c8a4c41 Merge branch 'master' of github.com:brownan/Minecraft-Overviewer 2010-09-14 18:12:50 -04:00
Andrew Brown
44fc65d753 I think this should fix windows support 2010-09-14 18:12:02 -04:00
Andrew Brown
3ddd1d26e1 -p1 has fewer output lines for chunk process 2010-09-14 12:37:36 -04:00
Andrew Brown
51d30a77d0 how embarrassing, I left some debug code in 2010-09-12 10:10:16 -04:00
Andrew Brown
a3a4877e6a no longer validates images, runs MUCH faster to scan existing chunks.
If a chunk image can't be loaded, it re-generates it on the fly.
2010-09-12 01:04:31 -04:00
Andrew Brown
55d596fc26 chunk progress prints fewer lines. Made a perhaps insignificant
algorithm change
2010-09-11 22:34:07 -04:00
Andrew Brown
5726f7e23e chunk generation checks mtime before hashing block array 2010-09-11 22:07:46 -04:00
Andrew Brown
07d6df1cbe fixed minecraft.jar path on macs 2010-09-11 15:33:00 -04:00
Andrew Brown
9309fd6c96 Uses a shared semaphore to spawn new processes when needed.
This more effectively utilizes as many cores as you tell it. It should
now spawn a new process whenever an old branch of the recursive tree
finishes, to always use as many processes as you specify.
2010-09-11 13:21:13 -04:00
Andrew Brown
f9783d7a20 Tile rendering is now mostly parallel up to 4 procs.
The initial recursive call for tile generation will spawn up to 3 extra
processes to work on each quadrant. It's not perfect yet since some
quadrants may have more or less work to do, and only 4 total workers are
supported.

Also, it waits for all chunks are finished before it dives into the
tiles, to prevent it from using more resources than requested.
2010-09-11 00:15:59 -04:00
Andrew Brown
1e296e858a readme updates, texture code updates.
Re-factored the way the textures and blocks are being built. It should
be easier to understand and add new exceptions (sorta). Also fixed the
water and lava with other texture packs by putting a static water.png
and lava.png in with the code.
2010-09-10 00:04:02 -04:00
Andrew Brown
b6ceb536da removes tiles if they no longer exist 2010-09-07 21:52:56 -04:00
Andrew Brown
8382e6664a cleaned up some comments 2010-09-07 21:32:57 -04:00