LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity
457 Commits 3 Branches 0 Tags
16a4abe84317269bacf144a3f3863a83f2dd636b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Griffith 16a4abe843 added my render timing script to contrib/ 2011-03-25 22:50:54 -04:00
Aaron Griffith 3c51253eba Merge commit 'xon/dtt-c-render' into dtt-c-render 
Conflicts:
	nbt.py
	overviewer.py
 2011-03-25 22:44:50 -04:00
Aaron Griffith 84988aa2f6 0-byte region files no longer crash the whole program 2011-03-25 19:48:55 -04:00
Aaron Griffith 8fcc0a993e Merge commit 'fenixin/dtt-c-render-fences-fix' into dtt-c-render 2011-03-25 19:29:00 -04:00
Aaron Griffith d84af9fa4b changed lighting rendermode to use new state variables 2011-03-24 19:44:21 -04:00
Aaron Griffith 2d64d2d84d changed 0b(...) constants into (1 << n) equivalents 
0b(...) isn't supported by GCC :(
 2011-03-24 19:41:08 -04:00
Aaron Griffith c18d6924ea fixed transparent block lighting 2011-03-23 03:27:42 -04:00
Aaron Griffith d36bd20e6a fixed lighting for half-step blocks 2011-03-23 02:52:19 -04:00
Aaron Griffith ccddba2d81 ported spawn render mode to C 2011-03-23 02:31:09 -04:00
Aaron Griffith 69bb56dcb4 added night rendermode 2011-03-23 00:33:59 -04:00
Aaron Griffith 19a2eafcd5 fixed black lines showing up on lit maps, at chunk boundaries 2011-03-23 00:19:54 -04:00
Aaron Griffith ff464bde3c removed lighting/night/spawn bools, now we just reference rendermode directly 2011-03-23 00:13:17 -04:00
Aaron Griffith f5264e9306 rewrote get_lighting_coefficient in C 2011-03-23 00:03:26 -04:00
Aaron Griffith 24950f6024 moved rendermode_normal into a separate file, like rendermode_lighting 2011-03-22 23:09:12 -04:00
Aaron Griffith 0e85f87fa7 removed NULL checks on render mode interface 
all the functions are required to exist, now
 2011-03-21 20:46:30 -04:00
Aaron Griffith e9b30cf780 changed PyArray_GETPTR3 to getByteArray3D 2011-03-21 20:34:48 -04:00
Aaron Griffith b312cef52e put lighting render mode in its own file; it's about to get *way* more complicated 2011-03-21 19:53:20 -04:00
Aaron Griffith 4a01a5fb7b separated normal and lighting render modes 2011-03-21 19:53:20 -04:00
Aaron Griffith b908c6e07c separated iterate and rendermode code, rendermodes are now defined by interface structs 2011-03-21 07:41:10 -04:00
Aaron Griffith 7b7f97d6c5 moved important render state into a struct, to prepare for modular render modes 
(making the code look worse, so it can look better!)
 2011-03-21 06:40:37 -04:00
Aaron Griffith da58be569f C code style fixes for lighting/normal code merge (woops...) 2011-03-21 06:21:55 -04:00
Aaron Griffith cd34d6052b renamed is_transparent (more like other function names), and exposed it to other C files 2011-03-21 06:18:51 -04:00
Aaron Griffith 88d5f15131 fixed blockid memory leak 2011-03-21 06:05:06 -04:00
Aaron Griffith 2881324084 merged lighting and non-lighting render code 2011-03-21 06:02:47 -04:00
Aaron Griffith fd0924a93b moved lighting check from world object to quadtree object, where it should be now 2011-03-21 05:35:11 -04:00
Aaron Griffith c603f2344f Merge branch 'dtt-c-render' into lighting 2011-03-21 05:32:10 -04:00
Aaron Griffith 56f6218ea8 updated .gitignore to include settings.py 2011-03-20 21:45:13 -04:00
Aaron Griffith 04ef95e4d6 renamed gmap.py to overviewer.py 2011-03-20 21:43:18 -04:00
Aaron Griffith 0e87368a06 moved google map related code int googlemap.py (from quadtree.py) 
basic support in googlemap.py for handling multiple QuadtreeGens
 2011-03-20 21:43:18 -04:00
Aaron Griffith 4e9985c611 changed web_assets_hook to use new config-file function support 2011-03-20 00:46:56 -04:00
Aaron Griffith 346ee004e8 fixed some things left over from configfile merge 2011-03-19 21:25:04 -04:00
Aaron Griffith ebc043b95c Merge branch 'master' into dtt-master-merge 
Conflicts:
	gmap.py
	quadtree.py
 2011-03-19 21:15:05 -04:00
Aaron Griffith c286f840bb Merge remote branch 'upstream/configfile' into dtt-config-merge 
Conflicts:
	chunk.py
	gmap.py
	world.py
 2011-03-19 21:10:40 -04:00
Aaron Griffith 0622ba9e72 Merge remote branch 'aheadley/region-validate-fixes' into dtt-c-render 
Conflicts:
	quadtree.py
 2011-03-19 20:53:34 -04:00
Aaron Griffith 8ad7a29f6a Merge remote branch 'xon/dtt-c-render-region-cache' into dtt-c-render 2011-03-19 20:49:17 -04:00
Aaron Griffith 38deb98d5a added command line option for web_assets postprocessing hook 2011-03-19 20:45:40 -04:00
Aaron Griffith d534e7137d Merge branch 'master' into dtt-c-render 
Conflicts:
	chunk.py
 2011-03-19 19:28:10 -04:00
Aaron Griffith 494caba598 added a nice error if c_overviewer is missing, simplified composite.py 
now that c_overviewer is required, we don't need to have a PIL paste()
fallback. The next step is to remove composite.py entirely!
 2011-03-19 19:07:47 -04:00
Aaron Griffith edf34f6d59 changed level data loader to retry up to twice before declaring a chunk corrupt 2011-03-19 18:23:23 -04:00
Aaron Griffith 28b750b694 changed block lookup to use numpy macros 
this fixes (probably all of) the errors we saw before, but not because
we're using the official numpy macro; it's because the old macro
messed up on coordinates like (x, y+1, z) due to operator precedence.
 2011-03-19 00:15:29 -04:00
Aaron Griffith b92dcd96ee increased max result queue size back to brownan/master normal 2011-03-18 16:22:48 -04:00
Aaron Griffith 6941bc3378 fixed up new C code to be (mostly) C89-compliant 
*mostly*, because the "inline" keyword isn't C standard until C99, but
I'm leaving it in because most compilers support it and it's really
handy. If it becomes an issue, we can deal with it later.
 2011-03-17 23:04:41 -04:00
Aaron Griffith b20e881c5e Merge branch 'direct-to-tiles' into dtt-c-render 2011-03-17 22:29:24 -04:00
Aaron Griffith ba83b6bf00 added contrib script to clean out old caches 2011-03-17 22:25:52 -04:00
Aaron Griffith 8c50addcdd Merge branch 'master' into direct-to-tiles 2011-03-17 21:47:04 -04:00
Aaron Griffith ad0899bb8a handle bad biome files on load, instead of waiting for an IndexError later 
related to <https://github.com/brownan/Minecraft-Overviewer/issues/301>
 2011-03-17 21:45:15 -04:00
Aaron Griffith 997c247d6c updated marker positioning code to jive with updated rendering code 2011-03-11 18:05:21 -05:00
Aaron Griffith 5852c17ec8 changed my code style to be more in line with eminence's (and PEP 7), added GPL notice 2011-03-08 20:04:23 -05:00
Aaron Griffith 07dd219d20 refactored c extensions into one 2011-03-08 17:43:50 -05:00
Aaron Griffith 7555bcf1af moved c extensions into src/ 2011-03-08 16:54:20 -05:00
Aaron Griffith 4e63e6e9fa Merge commit 'eminence/direct-to-tiles' into dtt-c-render 
Conflicts:
	chunk.py
 2011-03-08 16:34:26 -05:00
Aaron Griffith 5a05105b62 Merge branch 'master' into dtt-merge 
Conflicts:
	chunk.py
 2011-03-06 18:05:28 -05:00
Aaron Griffith a5612a1fa5 moved corrupt chunk handling to get_lvldata so it applies to all chunk loading 
brought up in Issue #286:
https://github.com/brownan/Minecraft-Overviewer/issues/286
 2011-03-06 15:48:48 -05:00
Aaron Griffith 5cb599fabb added a more informative error if the map is too big for Overviewer to handle 
From Issue #290:
https://github.com/brownan/Minecraft-Overviewer/issues/290
 2011-03-06 15:35:40 -05:00
Aaron Griffith 8b6b5df8ef handle get_worlds() returning None correctly 
Exposed by Issue #287:
https://github.com/brownan/Minecraft-Overviewer/issues/287
 2011-03-06 15:29:07 -05:00
Aaron Griffith 6a1ee964bf inlined 'iterate_chunkblocks' (backported from Xon's code) 
From the discussion in the massive Issue #271 discussion:
https://github.com/brownan/Minecraft-Overviewer/issues/#issue/271
 2011-03-06 01:57:05 -05:00
Aaron Griffith 48642e0e5b changed biome fix to be more consistent with the other region code 2011-03-03 20:48:32 -05:00
Aaron Griffith a6805c2e0c updated biome rendering to use latest Biome Extractor format 2011-03-03 12:27:47 -05:00
Aaron Griffith be26dc702b added option to QuadtreeGen to specify tile output directory 2011-03-02 08:29:33 -05:00
Aaron Griffith 5a043ab3d6 fixed -d flag, which now deletes just overviewer.dat 2011-03-02 08:28:55 -05:00
Aaron Griffith 300d4ac53e added back lighting, night, and spawn support 2011-03-02 08:21:41 -05:00
Aaron Griffith 94c1fbfaa6 fixed typo in quadtree.py 2011-03-01 20:42:58 -05:00
Aaron Griffith d813053329 removed lingering traces of the hash system 2011-03-01 20:28:31 -05:00
Aaron Griffith 4293851fcc fixed chunk double-render bug and artifacts at the top of each tile 2011-03-01 20:22:22 -05:00
Aaron Griffith 16bab9be3b less time between console messages for -p1 2011-03-01 18:40:06 -05:00
Aaron Griffith 33b10f7065 initial (and incorrect) drawing code 2011-03-01 16:45:04 -05:00
Aaron Griffith 83d7a36ef4 moved quadtree.py to mtime-based update checking, and added a stub direct-to-tile renderer 2011-03-01 13:18:25 -05:00
Aaron Griffith f34d9739e9 removed rendering code from WorldRenderer (now just World) 2011-03-01 12:28:37 -05:00
Aaron Griffith 5485e684b5 gutted gmap.py in preperation for direct-to-tile rendering 2011-03-01 10:34:34 -05:00
Aaron Griffith 5f5bda948e Merge remote branch 'eminence/mcregion' into mcregion 2011-02-23 18:01:09 -05:00
Aaron Griffith b40d84f92b fixed crash on worlds named "World[not int]", and made world list play nice with world names 2011-02-23 13:07:21 -05:00
Aaron Griffith dd01eae9e0 corrected world loading by name to handle renamed worlds 2011-02-23 12:52:21 -05:00
Aaron Griffith 3ce887162b support for opening worlds by name 2011-02-23 12:42:00 -05:00
Aaron Griffith 45dee1aa39 added MCRFileReader class to nbt.py, to handle new region files 2011-02-23 00:14:27 -05:00
Aaron Griffith c43e7c0dbf alpha_over warning will now only print once per run 2011-01-01 19:00:44 -05:00
Aaron Griffith 0ab56ce1d9 made sure biome color arrays are loaded in each thread 2011-01-01 15:45:36 -08:00
Aaron Griffith b2d8c415ca added check to textures.py prepareBiomeData so it will only run once per process 2011-01-01 15:43:45 -08:00
Aaron Griffith 0136cc1eba changed textures.py to use global declarations instead of sys.modules[__name__] 2010-12-31 17:59:14 -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
Aaron Griffith 80b1cab81c changed new grass/leaf block code to use alpha_over 2010-11-07 17:45:06 -05: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
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
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
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
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
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