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
Andrew Chin
61819a7f30
Merged in dtt-c-render
...
Conflicts:
src/overviewer.h
2011-03-20 21:29:05 -04:00
Andrew Chin
329c7557f6
Move some code out of the render_loop function and into a 1-time init
...
routine
2011-03-20 21:13:17 -04:00
Aaron Griffith
4e9985c611
changed web_assets_hook to use new config-file function support
2011-03-20 00:46:56 -04:00
Andrew Chin
6f60439f14
accept callables in the configFile with type="function"
2011-03-20 00:37:34 -04:00
Andrew Chin
29dc98ce2a
Fix a -p 1 regression
2011-03-19 23:49:56 -04:00
Andrew Chin
e096eb45ff
Initial version of C lighting code
...
Needs *lots* of performance work
2011-03-19 22:55:59 -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
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
