0
Commit Graph

1538 Commits

Author SHA1 Message Date
Andrew Brown
dc3938f504 removed un-needed imports in rendernode and quadtree 2011-11-26 17:05:13 -05:00
Andrew Brown
f2a465c559 Merge remote-tracking branch 'origin/master' into brownan-chunkscan
Conflicts:
	overviewer.py
2011-11-26 16:58:27 -05:00
Andrew Brown
5ef2a785fd added comment explaining the use of a separate pool 2011-11-25 22:40:51 -05:00
Andrew Brown
82864a1622 added an faq entry on copying tiles to another destionation
also added a link to the faq under help on the index page
also clarified the faq entry about adding new features or changing
texture packs
also fixed a typo
2011-11-24 23:30:33 -05:00
Aaron Griffith
bca7867b86 pushed exception setting into the relevant function, removed redundant exceptions
The following functions set exceptions automatically:
PyImport_ImportModule, PyObject_GetAttrString, PyArg_ParseTuple. All
the exception setting functions in c_overviewer should act the same
way and set their own exceptions before returning.

Notably, PyDict_GetItemString does *not* set exceptions, so it is
handled specially in render_mode_find_interface.
2011-11-22 17:32:47 -05:00
Andrew Chin
4739f4af93 More specific rendermode error messages 2011-11-22 12:25:02 -05:00
Andrew Chin
9b36dfc237 Fix reference leak 2011-11-22 11:33:11 -05:00
Andrew Chin
1a96b89e78 Properly set exceptions, instead of simply returning NULL 2011-11-22 11:30:48 -05:00
Andrew Brown
4de8acd1ee chunk scans are now done in parallel for multiple rendermodes 2011-11-20 12:49:44 -05:00
Andrew Brown
435c8ee1cb Merged master into brownan-chunkscan
This pulls in all the 1.9prep and textures.py updates into
brownan-chunkscan
2011-11-20 10:53:48 -05:00
Andrew Brown
cd360c3c60 comments adjustment in nbt.py 2011-11-20 10:52:04 -05:00
Andrew Brown
c6b56030ec dirtytile trees can now iterate at any level
Fixed some broken tests too.
2011-11-20 10:50:37 -05:00
Andrew Brown
83663733af added tile rendering speed output for debug mode 2011-11-19 10:49:31 -05:00
Aaron Griffith
e500a1ab26 Merge branch '19prep'
Conflicts:
	overviewer_core/src/overviewer.h
	overviewer_core/textures.py
2011-11-18 17:25:01 -05:00
Andrew Brown
0be4e8664b added bounds checking for tiles during scan
fixes the problem where tiles outside the bounds (which can happen with
-z) would cause tiles to be rendered along the border even though they
have no chunks, causing a warning.
2011-11-18 10:01:22 -05:00
Aaron Griffith
f6651cd759 bumped extension number to prepare for likely merge tomorrow 2011-11-17 09:33:22 -05:00
Andrew Brown
4c34e413ab renamed "level" to "depth" in DirtyTilesTree. Also...
iterate_dirty() yields tuples, not reverseiterators
added another level to test_iterate_level()
2011-11-16 20:53:52 -05:00
Aaron Griffith
eac7561ed1 redirecting output to a log file now works on Python 2.6 (Issue #535) 2011-11-15 15:47:33 -05:00
Andrew Brown
bd08dbc955 Minor comments adjustments 2011-11-15 13:56:39 -05:00
Alejandro Aguilera
b08b15c84f Fix rail north rotation. 2011-11-15 09:48:30 +01:00
Alejandro Aguilera
6f0b8f74ce Added buttons. 2011-11-15 09:32:24 +01:00
Andrew Brown
142166ef8e Failing to delete a corrupt tile should really be an error in the log. 2011-11-13 11:36:27 -05:00
Andrew Brown
0a5c90ba98 delete a tile if the innertile routine can't open it
This makes corrupt tiles self-correcting on subsequent runs. Before,
the warning is printed but the tile remains. Worse, the warning won't be
printed again.
2011-11-13 11:23:49 -05:00
Andrew Brown
04a2f05d1c implemented stochhastic check with chunk scanning
Also changed uniform(0,1) to random()
2011-11-13 09:39:49 -05:00
Andrew Brown
866b499142 Lots of rearranging and comments touchups
fixes progress updates for first level tiles
fixed long-standing typo inntertile -> innertile
2011-11-13 09:22:19 -05:00
Aaron Griffith
944edf4ef8 changed material property lookups to use a bit table, not python sets 2011-11-11 20:05:29 -05:00
Andrew Brown
3cc22bc13c Two chunkscan optimizations implemented
Checks a path in the tree to see if it's already dirty before
calculating its filepath and checking its mtime

Changed Tile.get_filepath() to use str.join instead of os.path.join
2011-11-11 17:44:16 -05:00
Aaron Griffith
afd3ad639b textures are now stored in a continuous array in memory, instead of a dict 2011-11-11 15:49:08 -05:00
Aaron Griffith
dc0110ee73 unknown blocks are no longer assumed to be transparent 2011-11-10 09:51:25 -05:00
Aaron Griffith
74e0ef2ad6 brought solid_blocks (etc.) sets back in line with old values 2011-11-10 09:42:21 -05:00
Andrew Brown
b9bca19cda fixed auto-detection for forcerender on empty maps
also re-arranged code so scan_chunks() returns the tree object
2011-11-09 23:17:27 -05:00
Aaron Griffith
ae651b87ec Merge branch 'texture-packs' 2011-11-09 13:59:11 -05:00
Andrew Brown
f6b7e1b501 implemented forcerender and auto-detection of empty tiledirs
Also added a few debug lines during chunkscanning with timing info
2011-11-08 16:02:15 -05:00
Andrew Brown
14ed48f975 misc cleanup and minor optimizations 2011-11-08 15:31:01 -05:00
Andrew Brown
75070f817f fixes so the last commit runs on maps that need work 2011-11-07 23:18:38 -05:00
Andrew Brown
13f3ba90ab preliminary chunk-scan algorithm activated.
forcerender and stochastic are currently broken.
2011-11-07 22:18:51 -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
Aaron Griffith
acbf87db3f bumped extension version for new smooth-lighting mode 2011-11-07 19:50:55 -05:00
Aaron Griffith
9b39a96fef Merge branch 'smooth-lighting' 2011-11-07 19:46:10 -05:00
Aaron Griffith
c0d37004cc now using MCPatcher animated water/lava textures, if present 2011-11-07 16:57:34 -05:00
Aaron Griffith
bca4b9b011 added support for loading textures directly out of texture packs 2011-11-07 16:57:34 -05:00
Alejandro Aguilera
e2dde5e6e0 Add lily pads to biome tinting. Fix pumpkin and melon stem. 2011-11-07 16:21:03 +01:00
Alejandro Aguilera
29bc7fa0ba Update iterate.c for nether brick fences and update the way glass panes and iron bars stick. 2011-11-07 15:41:55 +01:00
Alejandro Aguilera
25493c071f Add place holders for levers and buttons so the block is transparent. 2011-11-07 15:20:43 +01:00
Alejandro Aguilera
6dbac888d2 Fix holes in stairs. 2011-11-07 13:26:22 +01:00
Alejandro Aguilera
3f628dcc1b Add all the 1.9 pre-release blocks. 2011-11-07 13:16:35 +01:00
Alejandro Aguilera
1cfe21153a All blocks before 1.9pre added. 2011-11-07 11:56:35 +01:00
Andrew Brown
b1c38a56f2 scan_chunks() works according to preliminary tests \o/ 2011-11-06 23:25:47 -05:00
Andrew Brown
6c0ab7e48c moved tile filepath calculation to Tile object 2011-11-06 21:12:11 -05:00
Andrew Brown
2e28375786 damn semicolons! 2011-11-06 20:58:50 -05:00