0
Commit Graph

103 Commits

Author SHA1 Message Date
Xon
729141d426 Initial chunk cache commit mk2 2011-03-26 13:27:33 +08:00
Xon
8cfa50087a Removed filting chunks from render_worldtile since _get_chunks_in_range can do it trivially before constructing the list 2011-03-25 20:51:57 +08:00
Xon
c1b7b12592 Add reporting of scanning/indexing regions. Shortened paths being sent to the worker processes, and removed os.path.join from _apply_render_worldtiles's inner loop. 2011-03-25 17:50:37 +08: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
Andrew Chin
61819a7f30 Merged in dtt-c-render
Conflicts:
	src/overviewer.h
2011-03-20 21:29:05 -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
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
Xon
ec255bf29b Added region cache invalidation & reloading. Cached region mtimes. 2011-03-20 08:24:43 +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
Xon
383e8197af Performance improvements on update scan 2011-03-19 02:50:44 +08: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
Andrew Chin
5f2f098d40 Better cache checking, now uses chunk timestamps
and possibly fixed a bug in check_cache?
2011-02-28 22:10:36 -05:00
Andrew Chin
caa1ef1f45 Catch proper exception in chunk.py
Also removed unnecessary check in world.py
2011-02-28 18:56:22 -05:00
Andrew Chin
1f8fb017a3 Check to ensure level.dat has been updated
Error out if level.dat has not been updated.  Also, cleaned up some
debugging print statements
2011-02-26 21:59:49 -05:00
Andrew Chin
a690ebbce5 some caching work
hashchecking needs to be checked to see if it's still OK
timestamp checking should involved the timestamps from inside the region
file, not of the region file itself.
2011-02-24 23:29:58 -05:00
Andrew Chin
6f060633ad Running with -p should be OK now 2011-02-24 23:06:36 -05:00
Andrew Chin
05ea562060 Working rendering with the new McRegion format.
Notes:
 * Currently only works with -p 1
 * Caching is mostly compatible with existing caches, but not completly.
   This needs more testing and more code reviews
 * There are probably many code paths that will throw exceptions.
 * Not ready for general use yet, but is OK for testing
2011-02-23 22:13:35 -05:00
Aaron Griffith
5f5bda948e Merge remote branch 'eminence/mcregion' into mcregion 2011-02-23 18:01:09 -05:00
Andrew Chin
0372aea4ac New _find_regionfiles function 2011-02-23 17:49:34 -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
Andrew Chin
391ba50aea Provide a nice error message when run on McRegion'd worlds 2011-02-22 19:08:58 -05:00
Andrew Chin
dc842874ed Merge remote branch 'upstream/master' 2011-01-08 01:03:58 -05:00
Alejandro Aguilera
ad9756fa8c Change to a better looking and better maintainable code. (thanks blixt) 2011-01-05 15:09:55 +01:00
Alejandro Aguilera
23b7e90c54 Fix findTrueSpawn for spawn in y = 128 2011-01-05 02:38:57 +01:00
Andrew Chin
bbeb0d1359 Merge remote branch 'origin/master' 2010-12-31 00:56:05 -05:00
Andrew Chin
e989e97c5e Added a new config file parser.
The new config file parser has an interface that's nearly identical to
the OptionParser of optparse.

Below is a sample settings.py config file:

$ cat settings.py
import multiprocessing

if 'rendermode' not in locals():
    rendermode="lighting"

cachedir = "cache.%s.cachedir" % rendermode

procs = multiprocessing.cpu_count() - 1
2010-12-31 00:53:57 -05:00
Andrew Chin
3ee93357b9 Check that level.dat exists before trying to nbt.load it 2010-12-30 21:04:36 -05:00
Andrew Chin
2bf7566b5a Ignore cache images that don't start with "img."
This fixes a bug introduced by the cache-checking changes
2010-12-23 02:21:54 -05:00
Andrew Chin
1a526bbba0 Merged in rmccue's cache checking changes
Conflicts:
	chunk.py
2010-12-23 02:01:58 -05:00
Jenny
d210076479 Adds spawn output rendering (variant of night which shows dark areas in red) and support for multiple map types with buttons to switch between them. 2010-12-14 02:39:01 -08:00
Ryan McCue
ae0b3dfedf check_cache() wants a full tuple, not just part 2010-12-14 11:54:26 +10:00
Ryan McCue
b3abb072c8 Use chunk.check_cache 2010-12-13 22:16:35 +10:00
Ryan McCue
439231d280 Pretend a string is an AsyncResult 2010-12-13 21:57:35 +10:00
Ryan McCue
810ecaf6db Use the proper find_oldimage() 2010-12-13 21:38:19 +10:00
Ryan McCue
fcfaffffbb Check if the key exists first 2010-12-13 21:21:24 +10:00
Ryan McCue
8def0ffaef Check cache synchronously, to avoid async overhead.
This is starting to do my head in. Apologies if these don't make any
sense, but they do to me. :)
2010-12-13 21:16:21 +10:00
Ryan McCue
c14c6d2bcc My typing is horrible tonight, use the proper variable name 2010-12-13 20:40:58 +10:00
Ryan McCue
ead41141bb Use a tuple properly, oops 2010-12-13 20:39:34 +10:00
Ryan McCue
ef82e657ee Use the right name 2010-12-13 20:38:11 +10:00
Ryan McCue
8ec7986353 Only pass the part of the dict we need to the chunk renderer 2010-12-13 20:34:17 +10:00
Ryan McCue
2eb85ae946 Use the proper directory to walk 2010-12-11 21:18:02 +10:00
Ryan McCue
e7c19f9309 Use a more efficient checker for cached images 2010-12-11 21:10:59 +10:00
Andrew Chin
e96bb91b82 Better handling of the biome tinting images.
If they're not found with _find_file, then look in the EXTRACTEDBIOME
folder in the worlddir.
2010-12-05 01:35:12 -05:00
Andrew Chin
c60180f793 Biome data from Biome Extractor is now used if it is present.
If the BIOMEEXTRACTOR data is not available, then non-biome aware
tinting will be used

Open biome data in binary mode (Windows requires this)
2010-11-23 00:48:39 -05:00
Andrew Chin
914a3073f0 Fixed --chunklist
This bug was introduced by the signpost code which required a queue
object to be passed to the chunk rendered.  This wasn't done with
--chunklist
2010-11-08 20:36:02 -05:00
Andrew Chin
d01fb1f520 Merge remote branch 'upstream/master' 2010-11-02 18:59:58 -04:00
Andrew Brown
32552c50d6 only render overworld. Still renders grayscale though 2010-10-31 13:19:58 -04:00