0
Commit Graph

2837 Commits

Author SHA1 Message Date
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
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
8479e9d2b1 Merge remote branch 'munki/master' 2010-10-12 10:26:31 -04:00
Andrew Brown
8b7eddf2bf moved iteration code to its own function 2010-10-12 00:45:40 -04:00
Gregory Short
33b6230bab Google released an update to v3 of the gmap api which enables streetview by default. This change explicitly disables it. 2010-10-11 23:41:59 -05:00
Andrew Brown
a4c0e786a1 tabs -> 4 spaces 2010-10-11 21:03:50 -04:00
Andrew Brown
6d99c58296 Merge branch 'optimizeimg' of http://github.com/kbrantley/Minecraft-Overviewer 2010-10-11 20:58:26 -04:00
Andrew Brown
ea94bcc916 removed your crazy semicolons. This ain't java =) 2010-10-11 20:56:43 -04:00
Kyle Brantley
20e124b778 Added license to optimizeimages.py 2010-10-09 23:52:54 -06:00
Kyle Brantley
bcb423ace4 Add --optimize-img={1,2} -- performs postprocessing on images
This adds basic post-processing to images. At the moment, it only
performs actions for the png output type, but changes to work for
jpeg will be exceptionall minimal.
2010-10-09 22:57:20 -06:00
Aaron Griffith
a5ae703258 added support for ploylines and polygons on the google map
Polygons and polylines are read from the new file "regions.js". Polylines
(entries with "closed" set to false) are just lines drawn on the map.
Polygons (entries with "closed" set to true) are closed loops that are
filled in with a transparent color.
2010-10-09 15:44:48 -04:00
Aaron Griffith
4c58d28854 fixed remaining function renames from merge 2010-10-05 08:55:35 -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 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
Andrew Chin
86d5476234 use os.path.join to build the spawn chunk path 2010-10-01 19:45:41 -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
Andrew Brown
5de70db7fe Merged in new logging, fixed markers, and minetracks 2010-09-30 23:39:18 -04:00
Andrew Brown
d366cf9da3 Merge branch 'logging' of git://github.com/alexjurkiewicz/Minecraft-Overviewer 2010-09-30 22:50:23 -04: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
Sam Steele
110240b53a Ignore .pyc files 2010-09-30 18:35:46 -07:00
Alex Jurkiewicz
c14740cbc6 Merge branch 'master' of git://github.com/brownan/Minecraft-Overviewer into logging 2010-10-01 09:51:49 +10:00