0
Commit Graph

307 Commits

Author SHA1 Message Date
Andrew Chin
163dd66a38 Create RegionSets via the World object 2012-01-21 19:04:21 -05:00
Andrew Brown
ff3bfceef7 more C code fixes. Activated caching.
Also removed some code that I accidentially left in.
Also added a traceback printing decorator around get_chunk() because the
C code can potentially swallow those exceptions.
2012-01-17 21:52:01 -05:00
Andrew Brown
dafb659315 added __getstate__ and __setstate__ to TileSet to fix pickling 2012-01-16 02:19:34 -05:00
Andrew Brown
ba87959e31 added caching to chunks in RegionSet() currently disabled
This build is broken due to the mismatch in expected and actual error
condition for get_chunk. The C code still expects it to return None.
2012-01-16 00:48:30 -05:00
Andrew Brown
a48077fe54 removed unused imports in world.py. More docstrings
Also added __getstate__ and __setstate__ for pickling RegionSet
2012-01-15 19:10:14 -05:00
Andrew Brown
5096bff521 Cleaned up world.py and fixed find_true_spawn()
Added docstrings to the top of World and RegionSet
Added docstrings to some other methods
Removed unused methods that aren't part of our API
Changed get_chunk() to raise error on nonexistant chunks
Changed get_region_path() to _get_region_path()

UNTESTED!
2012-01-15 17:02:58 -05:00
Andrew Chin
9aa3847068 Merge remote-tracking branch 'origin/rewrite' into rewrite 2012-01-07 21:25:19 -05:00
Aaron Griffith
992f737984 fixed import loop and incorrect blockdata expansion 2012-01-07 20:23:39 -05:00
Andrew Chin
cb2f0129bc Allow regionsets to be named in a settings.py file 2012-01-07 15:11:19 -05:00
Andrew Chin
f76fd28a82 Use the overworld as the default regionset 2012-01-05 00:27:41 -05:00
Aaron Griffith
31f894d4e9 removed: chunk.py, quadtree.py, rendernode.py 2012-01-01 23:12:05 -05:00
Aaron Griffith
55e83e50da chunks are now loaded properly from the regionset 2012-01-01 22:44:11 -05:00
Andrew Chin
319d444997 Fixed typos... they're not my fault! 2012-01-01 22:20:43 -05:00
Andrew Chin
6fa86d39bc Removed stupid north_dir, and fixed unpacking 2012-01-01 22:11:52 -05:00
Andrew Chin
92880c7c38 Use the right coordinate system 2012-01-01 22:03:43 -05:00
Andrew Chin
ecceaeeb35 Removed all old code from RegionSet. Added RotatedRegionSet
Nothing has been tested
2012-01-01 21:20:17 -05:00
Andrew Chin
c2a1d8487a Start of the new rewrite code flow. TileSet still needs work 2012-01-01 16:12:10 -05:00
Andrew Chin
9b06d980af More World->RegionSet conversions. still broken 2011-12-22 00:23:20 -05:00
Andrew Chin
fbdeb90f9f overviewer.py now runs without crashing
but still is broken
2011-12-20 23:17:28 -05:00
Andrew Chin
3aa9e49631 useBiomeData is a property of worlds
Rewrite Tracking Issue: ##568
2011-12-20 00:53:43 -05:00
Andrew Chin
119b6e1b54 Removed biome handling and north-direction
We'll have to figure out how/where to put it back in

Rewrite Tracking Issue: #568
2011-12-19 23:49:26 -05:00
Andrew Chin
8f69da86f4 Finished implemention of RegionSet. not yet tested
Rewrite Tracking Issue: #568
2011-12-19 23:05:29 -05:00
Andrew Chin
51babfef02 More work on RegionSet and World
Rewrite Tracking Issue: #568
2011-12-19 22:42:28 -05:00
Andrew Chin
a9dafa0d05 Moved some more stuff from World to RegionSet
Also, fixed some syntax errors and other minor issues

Rewrite Tracking Issue: #568
2011-12-19 22:10:46 -05:00
Andrew Chin
ad2399165a Scan the FS to find RegionSets
Rewrite Tracking Issue: #568
2011-12-19 21:25:24 -05:00
Andrew Chin
d332554ec2 Initial commit of the AssetManager
Mostly a blind copy/past from world.py and googlemap.py.  Not runnable

Rewrite Tracking Issue: #565
2011-12-19 19:48:27 -05:00
Andrew Brown
a078b46274 comments clarifications and whitespace adjustments 2011-12-17 21:51:32 -05:00
Alex Headley
350cc70749 add proper title to generated html 2011-12-07 11:17:39 -05:00
Andrew Brown
636913af57 Merge remote-tracking branch 'origin/master' into brownan-chunkscan
Conflicts:
	overviewer.py
	overviewer_core/quadtree.py
2011-11-07 21:04:01 -05:00
Andrew Brown
b1c38a56f2 scan_chunks() works according to preliminary tests \o/ 2011-11-06 23:25:47 -05:00
Andrew Brown
2e28375786 damn semicolons! 2011-11-06 20:58:50 -05:00
Andrew Brown
3f54347735 cleaned up some mess, clarified some things in comments 2011-11-06 18:27:37 -05:00
Andrew Brown
ab53a9bd3e added a tree class to keep track of dirty tiles 2011-11-01 17:10:41 -04:00
Andrew Brown
96cf62bd14 changed "go" methods in world and quadtree to something more descriptive 2011-11-01 17:10:41 -04:00
Andrew Brown
55adc75d31 minor cleanup, comments/docstring adjustment 2011-11-01 17:10:41 -04:00
Aaron Griffith
64e67cc827 fixed crash when SpawnY wasn't in [0, 128) 2011-10-30 18:06:28 -04:00
Thomas Lake
1db010a8aa Add --changelist and --changelist-format
Allow output of changed tiles to a file specified with --changelist. The
file contains the name of each tile on a line. The path can be relative
or absolute, chosen using --changelist-format.

The code assumes that all innertiles will have been updated when a
worldtile changes, and prints the corresponding filenames to the list
directly, rather than add message passing to the innertile methods.
2011-09-17 11:37:04 +01:00
Andrew Chin
e4af304e60 Another fix for #481 2011-09-15 13:13:22 -04:00
Andrew Chin
571ca49c18 Partial fix for #481
Fixed the try/except block in findTrueSpawn
2011-09-14 17:57:53 -04:00
Aaron Griffith
5c37bf1801 having both a world/overviewer.dat and a output/overviewer.dat now warns about the world version
old behaviour was to replace the output dat with the world dat
2011-08-18 11:24:06 -04:00
Andrew Chin
01bba80c54 If overviewer.dat doesn't exist, don't give a north-direction warning 2011-08-17 20:04:25 -04:00
Aaron Griffith
60649c85fd now defaults to the map's current north direction unless otherwise specified 2011-08-17 18:22:50 -04:00
Thomas Lake
3e1ae9dd17 Store north-direction in overviewer.dat
Check stored value at render time and abort if direction has changed and
--forcerender not specified.
Addresses concerns from pull request #458
2011-08-17 17:49:22 -04:00
Aaron Griffith
087d597ed0 Merge remote branch 'rmrector/configurable-north' into configurable-north
Conflicts:
	overviewer.py
	overviewer_core/world.py
2011-08-17 17:35:37 -04:00
Aaron Griffith
3e2828a3d9 fixed bug when overviewer.dat exists in world dir, but output dir does not exist 2011-08-16 15:07:21 -04:00
Thomas Lake
19f83a4a16 Edit scripts to move overviewer.dat to render dir
Overviewer.dat is moved on first run and a warning is issued
2011-08-16 13:02:09 +01:00
Ryan Rector
b442e7704e Merge remote-tracking branch 'upstream/master' into configurable-north 2011-08-13 10:58:22 -06:00
Thomas Lake
d767eb9d00 Explicitly pass regionlist to _iterate_regionfiles() in world.py 2011-08-11 19:02:02 +01:00
Ryan Rector
4ee15e8f44 Code cleanup to simplify upstream merge 2011-08-04 12:49:49 -06:00
Ryan Rector
9af931b4a3 Super performance fixer!
Rotations no longer have any significant performance hit.
Allocate rotated array once during rotation instead of
during every chunk render.
2011-08-03 22:47:25 -06:00