LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity
1,351 Commits 3 Branches 0 Tags
9319fee138f424fc8407ddb7e5369a94d0b9ddb5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Brown 9319fee138 added processes option to command line and config file 
Also the config file parser now just looks for all Settings objects in
settingsDefinitions.py, not the items in __all__
 2012-02-08 21:05:02 -05:00
Andrew Brown 50ebdd7f2c clarified some comments and conformed some function names 2012-02-05 00:20:58 -05:00
Andrew Brown 324100206b changed the semantics of required and default in settings definitions. 
I think it makes more logical sense now. Essentially, the default is
always used if the user doesn't specify a value. If there is no user
specified value and the default is None, then the action depends on the
value of required. required=True means raise an error. required=False
means silently omit that setting.
 2012-02-04 22:06:29 -05:00
Andrew Brown 6d95d80a73 overhaul to configParser. Parsing config works now. 2012-02-04 21:23:44 -05:00
Andrew Brown ceb98c4441 removed classes that are no longer used 2012-02-04 12:50:50 -05:00
Andrew Brown d4379fff93 fixed up command line parsing to match what we discussed 
now supports --config= with no world/destdir on the command line, and no
--config but with specifying world/destdir on command line. Options are
validated accordingly.

Depricated and commented out options removed from option parser.

Config file mode currently broken due to the lack of "outputdir" parsing
from the config parser.
 2012-02-03 21:13:22 -05:00
Andrew Brown ba12cdf12e added some built-in rendermodes to rendermodes.py 2012-02-03 20:39:04 -05:00
Andrew Brown 68792d7015 updated usage text. Removed --display-config. 2012-01-29 12:21:47 -05:00
Andrew Brown f23872f06f added a docs link under getting started to the running and config pages 2012-01-29 12:01:33 -05:00
Andrew Brown b30ea281a1 updated bgcolor faq since --bg-color no longer exists 2012-01-29 12:01:09 -05:00
Andrew Brown 42d1b5049f RotatedRegionSet now works. Rotated renders now work. 
Changed the rotation constants so numpy.rot90 works.
 2012-01-28 18:26:37 -05:00
Andrew Brown 65c27d4c42 minor docs improvements 2012-01-28 15:11:19 -05:00
Andrew Brown 41e8546be6 Merge pull request #590 from contre/master 
Add MCPatcher compliant fire image loading
 2012-01-26 14:49:47 -08:00
Andrew Brown 9e278a0568 of course I fogot to add this file 2012-01-22 01:28:15 -05:00
Andrew Brown 8c71c802d2 docs update to Running page and new page Config. Removed Options. 
Added all about the new config file format. Needs checking for accuracy.
Also need to update the faq and other sections of the docs now that the
options page is gone.
 2012-01-22 01:26:04 -05:00
Andrew Brown 7def2894b6 Clarified docs for --stochastic-render 2012-01-19 21:10:02 -05:00
Andrew Brown c63029a14d Fixed potential nameerror in tileset.py do_preprocessing() 2012-01-18 10:09:59 -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 bbe105ead7 Fixes segfaults in the C extension 
This should have been part of 70ef0af0 but I didn't catch these.
 2012-01-16 22:00:44 -05:00
Andrew Brown 66295aabd9 Find the map size even in child processes 
Rendering needs to know self.treedepth, so this must be in child
processes and not just computed in do_preprocessing()
 2012-01-16 21:58:48 -05:00
Andrew Brown dafb659315 added __getstate__ and __setstate__ to TileSet to fix pickling 2012-01-16 02:19:34 -05:00
Andrew Brown 70ef0af00c modified C extension for get_chunk() raising exception on not found 2012-01-16 01:59:16 -05:00
Andrew Brown f9c24df769 Merge remote-tracking branch 'origin/rewrite-rendermodes' into rewrite 2012-01-16 00:50:57 -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 Brown 9e61407c67 fixed a bug in TileSet. Traversal now works according to tests. 2012-01-08 03:12:06 -05:00
Andrew Brown 3995a06c97 added TileSet tests, fixed several bugs. Still needs work. 2012-01-08 02:51:06 -05:00
Andrew Brown fb0a7b161e forgot another thing sorry 2012-01-08 00:07:39 -05:00
Andrew Brown ff418ba7c9 woops 2012-01-08 00:04:40 -05:00
Andrew Brown df035aa00d changed iteration algorithm for rendercheckmode 1 
UNTESTED
 2012-01-08 00:03:16 -05:00
Andrew Brown b31c4377ab fixed dependencies for TileSet 2012-01-06 21:28:01 -05:00
Andrew Brown da18f74338 Fixed some render-tiles not being rendered 
If a render-tile is only touched by chunks with blocks at the highest
point near the sky, then the render tile may not be rendered due to the
chunk scan's algorithm. Chunks in rows divisible by 4 were not
considering the tile above them, even though the chunk partially
overlaps. This is only seen for chunks with blocks at the very top of
them by the sky, and only when no other chunks would trigger that tile
for rendering.
 2012-01-03 23:42:39 -05:00
Andrew Brown 4d0acc72fd Fix tile range error in chunk scan 
The chunk scan should have been checking tile bounds using the treedepth
value, not the world boundary. This was causing some tiles near the edge
to not get rendered. In the old version, the row/col boundaries were set
to the treedepth calculated bounds, so this wasn't a problem there.
 2012-01-02 23:41:46 -05:00
Andrew Brown 3c1c962ed1 got this check backwards 2012-01-02 00:32:52 -05:00
Andrew Brown 948073fb9d Merge remote-tracking branch 'origin/rewrite' into rewrite 2012-01-02 00:30:29 -05:00
Andrew Brown 16df71b060 _render_compositetile() fixed 2012-01-02 00:29:48 -05:00
Andrew Brown 42f6b7b6ad forgot to save on my last commit 2012-01-01 23:31:27 -05:00
Andrew Brown 252e8ab33d filled in render call to tileset's render_rendertile() 2012-01-01 23:20:08 -05:00
Andrew Brown c866f2512b fixed typos, clarified comments in tileset.py 2012-01-01 20:08:25 -05:00
Andrew Brown b2da6d5b0a TileSet updated for new RegionSet API 
Except for a couple outstanding TODOs, TileSet is ready for action. One
of them is necessary: the call to the c renderer is not in yet.
 2012-01-01 19:55:08 -05:00
Andrew Brown 06dd78dc89 copied in rendering routines but haven't updated them yet. 
They still need to be updated for the new RegionSet interface
 2011-12-31 00:16:37 -05:00
Andrew Brown 054e502885 setup rendercheck mode 1 to go layer-by-layer 
Doesn't work yet.
 2011-12-29 02:03:57 -05:00
Andrew Brown 0351d8201b moved comments and added unimplemented methods. 
I think I'm going to erase them and go a different direction with this
implemention though. Creating a commit here incase I change my mind.
 2011-12-29 01:37:18 -05:00
Andrew Brown a2788cf84f removed an unneeded import 2011-12-28 16:10:17 -05:00
Andrew Brown 79356e4664 Implemented RendertileSet's posttraversal() routine 
May not be the most efficient implementation.
 2011-12-28 15:33:35 -05:00
Andrew Brown a7ac6f325c Updated comments with how the traversals will work 2011-12-28 15:12:58 -05:00
Andrew Brown 3d9603590b changed Tile to RenderTile 2011-12-28 14:53:47 -05:00
Andrew Brown cbd5a0e1cc Changed DirtyTiles to RendertileSet 2011-12-28 14:41:49 -05:00
Andrew Brown 0245ed104b more tileset code and comments on how the traversal will work 2011-12-22 05:00:16 -05:00
Andrew Brown fa18b26eb5 copied DirtyTiles and Tile objects to tileset.py 2011-12-22 02:00:50 -05:00
Andrew Brown 49a840c01b more of TileSet filled in 2011-12-22 02:00:50 -05:00
Andrew Brown 1933df32d6 Added comments about rendercheck option and dependency stuff 2011-12-21 01:21:59 -05:00
Andrew Brown 0b56ee0e4b started writing TileSet. put convert coords in util.py 2011-12-20 01:17:35 -05:00
Andrew Brown eed4110eec Added in documetation for what options are accepted 2011-12-19 22:41:57 -05:00
Andrew Brown 9163d8d0a3 skeleton outline of TileSet object and tileset.py created 2011-12-19 22:17:28 -05:00
Andrew Brown a078b46274 comments clarifications and whitespace adjustments 2011-12-17 21:51:32 -05:00
Andrew Brown 86c1b8ba15 dump markers json out in one shot. Added marker comments. 2011-12-17 21:51:32 -05:00
Andrew Brown e5fed90d04 fixed up comments in googlemap.py, moved region.js to web_assets 2011-12-17 21:49:08 -05:00
Andrew Brown 3bdf380b6f added screenshot to the front page. 
Also changed "Overviewer" to "The Overviewer"
 2011-12-17 13:46:36 -05:00
Andrew Brown 2c89cc645b bumped docs to 0.4. Also lots of docs changes 
Added faq entry about exorbitant memory usage

updated features section on the main page

Added a "what overviewer is not" section on main page

put new rendermodes on the options page

re-worded some things under the custom rendermodes section
 2011-12-17 01:39:13 -05:00
Andrew Brown 4b622b1333 issue #559: don't error if the map needs expanding but the tiledir was deleted 
Also changed from using a join on self.destdir and self.tiledir to just
using self.full_tiledir, which is the same thing but already computed.
 2011-12-11 11:27:07 -05:00
Andrew Brown d4c6e40d59 renamed innertile to uppertile (makes more sense) 
also changed a few "rendertile" to "worldtile"
 2011-12-10 17:44:07 -05:00
Andrew Brown 55b6ba32ee simplified centos build instructions. Thanks Gizmokid2005 2011-12-04 11:30:22 -05:00
Andrew Brown 4edc5e48b6 Set tile mtimes to the max of the chunk mtimes on render 
or in the case of inner-tiles, the max of its child tile mtimes
 2011-12-03 18:05:46 -05:00
Andrew Brown 73c2c1cfaf avoid zero division error if there are no tiles to render 2011-12-03 12:14:04 -05:00
Andrew Brown 647c73f52b fixed deprication warning on exception.message access 2011-12-03 12:10:18 -05:00
Andrew Brown 79060b6957 Merge branch 'master' of github.com:overviewer/Minecraft-Overviewer 2011-12-03 12:05:23 -05:00
Andrew Brown b439eef3c6 wrote a failing test for dirtytile post traversal 
For the to-be-implemented post traversal method to iterate over the
tiles in an order that will render correctly
 2011-12-01 10:54:22 -05:00
Andrew Brown ab321c949a render inner-tiles even if there are no render-tiles to render 2011-11-26 17:29:08 -05:00
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 a9bef297e7 added note about python3 compatibility 2011-11-25 09:52:39 -05:00
Andrew Brown 35890bb52c minor wording change (forgot to save for the last commit) 2011-11-25 00:46:50 -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
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 4473ee0673 Made comments in sample.settings even clearer 2011-11-19 13:53:29 -05:00
Andrew Brown 83663733af added tile rendering speed output for debug mode 2011-11-19 10:49:31 -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
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
Andrew Brown 95b4ec5922 wrote some unit tests! 2011-11-16 20:39:01 -05:00
Andrew Brown bd08dbc955 Minor comments adjustments 2011-11-15 13:56:39 -05: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
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
Andrew Brown a822cd1d3c added an index of command line options with brief descriptions 
Also added a warning to regionlist that it may be broken
 2011-11-10 00:03:30 -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
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
Andrew Brown d589369ea3 catch-all exceptions and print a more colorful message 2011-11-07 20:36:00 -05:00
Andrew Brown 49f8e1a09f configure_logger() takes a loglevel and verbose flag now 2011-11-07 20:11:10 -05:00