Commit Graph
100 Commits
Author SHA1 Message Date
Aaron Griffith 82aa172dcc Merge branch 'master' into dtt-c-render
Conflicts:
	setup.py
2011-04-18 18:14:41 -04:00
Aaron Griffith 3edc152ea3 Merge remote branch 'rfinnie/master' 2011-04-18 18:12:00 -04:00
Aaron Griffith f30a5db2a1 destination directory will now be created recursively, if needed 2011-04-16 11:20:35 -04:00
Aaron Griffith af559f6b88 bumped extension version for cave mode 2011-04-15 09:02:39 -07:00
Aaron Griffith 8fa515fa59 fixes for building cave mode on windows 2011-04-14 15:12:18 -04:00
Aaron Griffith bbf52a77ae added CONTRIBUTORS.rst 2011-04-13 11:15:19 -04:00
Aaron Griffith 70bf8a7fb2 README update for settings.py, --rendermodes 2011-04-13 09:14:27 -04:00
Aaron Griffith 485db7ef73 Merge branch 'master' into dtt-c-render 2011-04-10 05:57:39 -04:00
Aaron Griffith b9a21b98e0 fixed dumb boolean logic in optimizeimg check 2011-04-10 05:57:15 -04:00
Aaron Griffith cc6b4bc022 Merge branch 'master' into dtt-c-render 2011-04-10 04:43:02 -04:00
Aaron Griffith a2b1f238d9 changed markers.js to output one marker per line
this has been requested *many* times, because it makes it easier to
(1) learn what format markers.js uses, and
(2) write shell scripts that process markers.js.

It shouldn't break existing processors that use json loaders, and does
not drastically increase file size (just one extra byte per ~70).
2011-04-10 04:38:42 -04:00
Aaron Griffith dfe30a0d0f now checks for optimize-img programs with '.exe' as well as no suffix
fix for issue #314
<https://github.com/brownan/Minecraft-Overviewer/issues/314>
2011-04-10 04:11:33 -04:00
Aaron Griffith 22fc77308e fixed minor inlining error in commit d547727
fixes regression in issue #320
<https://github.com/brownan/Minecraft-Overviewer/issues/320>
2011-04-10 03:44:06 -04:00
Aaron Griffith b75fb04719 Merge branch 'dtt-c-render' of git@github.com:brownan/Minecraft-Overviewer into HEAD 2011-04-10 03:28:58 -04:00
Aaron Griffith cb8a17c448 fixed bug in sign groups js, for checked: true
related to issue #321
<https://github.com/brownan/Minecraft-Overviewer/issues/321>
2011-04-10 03:25:16 -04:00
Aaron Griffith c428fcbd70 changed testRender.py to work with ./overviewer.py and ./gmap.py (sorta) 2011-04-04 02:13:12 -04:00
Aaron Griffith e5660bf925 fixed snow/half-step edge lines 2011-04-03 00:15:48 -04:00
Aaron Griffith 3d78e21af7 fixed contrib/testRender.py crashing when -l isn't specified 2011-04-01 21:47:50 -04:00
Aaron Griffith 9c25c6259c added center to config.js, lets you set map center in world coords
By default, it is set to spawn. Also I changed defaultZoom to 2, which
looks better (the world used to show up as *tiny* by default).
2011-03-29 05:48:40 -04:00
Aaron Griffith 9b36d21c37 moved non-config, global variables out of config.js 2011-03-29 05:29:37 -04:00
Aaron Griffith 88d4ebe5ae added --list-rendermodes option 2011-03-29 05:24:25 -04:00
Aaron Griffith 5f0766839e added metadata to rendermodes, and python bindings for them 2011-03-29 05:13:25 -04:00
Aaron Griffith 862ee62cb9 fixed warning during compile about endian.c 2011-03-29 04:46:40 -04:00
Aaron Griffith d7af3d437b changing the C header files now correctly rebuilds whole extension 2011-03-29 04:33:41 -04:00
Aaron Griffith 0a64c00859 Merge remote branch 'xon/dtt-c-render' into dtt-c-render
Conflicts:
	rendernode.py
2011-03-29 04:20:17 -04:00
Aaron Griffith 4977ae8767 added exceptions for .DS_Store and Thumbs.db in mirror_dir 2011-03-27 21:24:25 -04:00
Aaron Griffith c738777839 Merge commit 'fenixin/dtt-c-render-newblocks' into dtt-c-render 2011-03-27 18:49:18 -04:00
Aaron Griffith e0e571971a added endianness helper functions, and reading biome data directly 2011-03-27 06:07:43 -04:00
Aaron Griffith fc176206ff initial C biome code 2011-03-27 05:49:57 -04:00
Aaron Griffith 310cb8a1f6 Merge commit 'fenixin/dtt-c-render-water-redstone' into dtt-c-render
Changed 0b0000 constants into 0x00 equivalents.
2011-03-26 23:34:42 -04:00
Aaron Griffith 1f27ccb9be added overall_alpha parameter to alpha_over, speeding up lighting 2011-03-26 21:52:16 -04:00
Aaron Griffith 0465787e6a fixed accidental revert of fenixin's fix 2011-03-26 02:03:13 -04:00
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