0
Commit Graph

53 Commits

Author SHA1 Message Date
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
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
Andrew Brown
8b7eddf2bf moved iteration code to its own function 2010-10-12 00:45:40 -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
Andrew Brown
4dc1f70acf Merge remote branch 'eminence/master' 2010-10-02 22:19:18 -04:00
Andrew Chin
60966ffa73 Improve efficiency of special textures by pre-computing them 2010-10-02 20:17:13 -04:00
Andrew Brown
759a38353d Merge branch 'master' of git://github.com/c99koder/Minecraft-Overviewer 2010-10-02 17:47:48 -04:00
Andrew Chin
6993f2159d Render iron and wood doors with correct orientation.
Note: iron doors need testing (they are currently broken in my test SMP
world)
2010-10-02 15:33:33 -04:00
Andrew Chin
cd97222a9b Render ladders (with correct orientation) 2010-10-01 23:19:53 -04:00
Andrew Chin
66a90bb411 Render furnaces with the correct texture (instead of smooth stone)
These are handled specially, since one side texture is different than the
other
2010-10-01 22:51:02 -04:00
Andrew Chin
78962cfbe5 Passable crop rendering 2010-10-01 22:33:25 -04:00
Sam Steele
93af1ef158 Add snow to the transparent_blocks array 2010-09-30 23:52:50 -07:00
Sam Steele
5d22e1cd6f Fix whitespace formatting, make snow 1/4th of block 2010-09-30 22:47:10 -07:00
Sam Steele
e54f375295 Merge branch 'master' of http://github.com/eminence/Minecraft-Overviewer 2010-09-30 18:44:04 -07:00
Andrew Chin
822dd75431 Render minetracks (with correct orientation)
Other things with direction (torches, ladders, stairs, etc) will be
handled in a similar fashion.  Note: minetracks on slopes are still
not rendered correctly
2010-09-30 21:38:14 -04:00
Sam Steele
cf971c17c6 Render snow as half-blocks 2010-09-30 18:36:10 -07: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
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
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
Andrew Brown
d637ddbbe1 added the option to specify a list of chunks to update. 2010-09-27 00:52:11 -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
612307ff15 implemented hack to fix water grids. Water looks okay now! 2010-09-15 21:52:57 -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
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
5726f7e23e chunk generation checks mtime before hashing block array 2010-09-11 22:07:46 -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
91440ec621 subprocesses catch keyboardinterrupt and raise a proper exception.
This causes the parent process to re-raise the exception when it
eventually tries to get() the result from the child, instead of hanging
forever on a ctrl-C. It doesn't happen immediately, which is not ideal,
but at least things will eventually exit on ctrl-C now.
2010-09-09 22:41:28 -04:00
Andrew Brown
ed8ea421fc won't render tiles that would otherwise be blank.
This cuts down on the number of files outputted and the total size.
2010-09-05 13:58:50 -04:00
Andrew Brown
1e08406dff quadtree generation works. Changed scaling algorithm 2010-09-04 19:22:04 -04:00
Andrew Brown
d86f158b9f re-render a chunk if the image is corrupt 2010-09-02 23:19:15 -04:00
Andrew Brown
ee6eaf0206 tile drawing function implemented. Still needs an interface 2010-08-30 21:05:22 -04:00
Andrew Brown
09392fe3b4 prints out a full traceback for exceptions in worker processes 2010-08-28 22:55:17 -04:00