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
Xon
ac0055a6d7
Fix Windows compat with stashing the quadtree object into each worker process
2011-03-20 08:41:38 +08:00
Xon
cd7b9456a9
Fixed worker processes being passed the full quadtree object. Caused massive performance regressions when caching stuff in quadtree.world
...
Offloaded self._get_chunks_in_range into worker process.
2011-03-20 08:40:43 +08:00
Xon
1d666c7be7
Fixed render_innertile_batch
2011-03-20 08:40:30 +08:00
Xon
0046da5594
render_inntertile & render_inntertile now called in batches in the worker process,
...
speeds up update scan with a lot of tiles to skip.
2011-03-20 08:40:21 +08:00
Xon
ec255bf29b
Added region cache invalidation & reloading. Cached region mtimes.
2011-03-20 08:24:43 +08: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
Alex Headley
5ae361824b
cleaned up contrib/validateRegionFile script
2011-03-19 17:45:20 -04:00
Andrew Chin
26d781f249
declaration tweak to make some compilers happy
2011-03-19 14:37:48 -04:00
Alex Headley
fae67de9f0
fixed some bugs in the validateRegion script
2011-03-19 14:28:19 -04:00
Xon
76f85d0d2c
Added ctrl-c handling, output is a single line (verbose reports what error occured), added optparsing, supports multipule files or a dir
2011-03-20 01:57:47 +08:00
Xon
cfabf16148
Clarify if opening the region file failed or if the headers are wonky
2011-03-20 01:22:34 +08:00
Xon
6f340dceee
New conrtib script to validate a region file
2011-03-20 01:19:23 +08:00
Xon
b9433173c9
Fixed worker processes being passed the full quadtree object. Caused massive performance regressions when caching stuff in quadtree.world
...
Offloaded self._get_chunks_in_range into worker process.
2011-03-19 23:36:26 +08:00
Xon
e113a24ae0
Fixed render_innertile_batch
2011-03-19 16:23:11 +08:00
Xon
2be64f2aa7
render_inntertile & render_inntertile now called in batches in the worker process,
...
speeds up update scan with a lot of tiles to skip.
2011-03-19 16:01:33 +08:00
Xon
79d021279f
Tweaked _get_chunks_in_range & related call tree.
...
~12% improvement by inlining self.world.get_region_path ina pure update scan.
2011-03-19 13:59:40 +08:00
Xon
6a52e5f796
Fix typo in file header
2011-03-19 13:39:59 +08:00
Xon
1afb2b3d53
Addded intial region caching.
...
Loads all the offsets & timestamps @ start to share to worker proceses.
From
14609247 function calls (14608852 primitive calls) in 118.278 CPU seconds
to
12232301 function calls (12231906 primitive calls) in 75.825 CPU seconds
2011-03-19 13:36:40 +08:00
Andrew Chin
1ac922983f
Use the list of transparent_blocks from chunk.py.
...
This fix is part 2 (of 2) of the graphical rendering glitch fix.
2011-03-19 00:38:30 -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
Andrew Chin
f9ae158457
removed log message in iterate.c
2011-03-18 16:37:47 -04:00
Aaron Griffith
b92dcd96ee
increased max result queue size back to brownan/master normal
2011-03-18 16:22:48 -04:00
Xon
383e8197af
Performance improvements on update scan
2011-03-19 02:50:44 +08:00
Xon
08597ab1c0
Fix performance regression caused by the lack of region/chunk cache at the world level
2011-03-19 02:48:57 +08: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
Alejandro Aguilera
c79b0b9b20
changed imgy calculation and moved "imgy -= 12" to start of loop
...
from discussion in
<https://github.com/agrif/Minecraft-Overviewer/commit/4e63e6#iterate.c-P282 >
2011-03-11 17:54:12 -05:00
Xon
6519d71eaa
changed setup.py to include numpy include paths
...
from <https://github.com/agrif/Minecraft-Overviewer/issues/2 >
2011-03-09 19:10:35 -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
Alejandro Aguilera
4aa7fff086
And also for double slabs.
2011-03-08 17:01:58 +01:00
Alejandro Aguilera
80027c7cc5
Add special case in textures.py for the different slabs.
2011-03-08 16:33:44 +01:00
Aaron Griffith
5a05105b62
Merge branch 'master' into dtt-merge
...
Conflicts:
chunk.py
2011-03-06 18:05:28 -05:00
Andrew Chin
9c7d6a184d
Print error messages after print_help
2011-03-06 17:54:18 -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
Andrew Chin
66a9306a29
Experimental code to provide a C implementation of chunk_render
...
Please see the TODO comments in iterate.c
None of the lighting, spawning, night, or cave modes work with this
version.
2011-03-06 00:30:40 -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