Commit Graph
100 Commits
Author SHA1 Message Date
Andrew Brown 9eb2e4a85e Added some more comments to the sample config. 2012-03-02 13:39:36 -05:00
Andrew Brown a83518bc97 fixed rotations 2012-03-01 22:09:01 -05:00
Andrew Brown 0d229a3888 don't complain if crop values go from high-low, just swap them 2012-03-01 22:05:17 -05:00
Andrew Brown 344639c0cf this option was implemented as "crop" 2012-03-01 22:02:28 -05:00
Andrew Brown e66e55484f declare this var at the beginning of the function 2012-02-27 23:40:31 -05:00
Andrew Brown 814ef86221 added disclaimer to the crop option 2012-02-26 21:46:25 -05:00
Andrew Brown 7d8bd00a84 Made the assetmanager initalize() and finalize() organization slightly clearer 2012-02-26 21:17:55 -05:00
Andrew Brown 62c537a95e Merge remote-tracking branch 'origin/rewrite' into anvil 2012-02-26 21:10:42 -05:00
Andrew Brown eede25d2e1 apparently xmin,zmin,xmax,zmax is more intuitive than xmin,zmin,xmax,zmax for some people 2012-02-26 21:08:03 -05:00
Andrew Brown f43498d033 Added a "crop" feature to render subsets of worlds 2012-02-26 20:19:26 -05:00
Andrew Brown e50cb2db88 Generalized regionset wrapper objects so they can be chained 2012-02-26 17:59:37 -05:00
Andrew Brown 19f6f136e4 Now writes images to temporary files and atomically moves in place*
* on systems with an atomic os.rename
2012-02-26 00:16:16 -05:00
Andrew Brown c759b20f8e added helpful notice about running into corrupted tiles 2012-02-25 21:44:21 -05:00
Andrew Brown 6d19ada4e4 accept ~ in paths by calling os.path.expanduser() 2012-02-25 21:37:58 -05:00
Andrew Brown c3c559fcd3 changed this_rendertime to be the max of all chunk mtimes 2012-02-25 21:26:50 -05:00
Andrew Brown 16ed65e019 Use zoom value from json to determine if maps should be expanded 2012-02-25 21:24:16 -05:00
Andrew Brown 195e08d4a1 Determine an appropriate rendercheck mode automatically 2012-02-25 20:07:07 -05:00
Andrew Brown f48f0445d1 Dump assets and "initial" data before rendering starts
Now does preprocessing off of main() instead of in the dispatcher
initializer.
2012-02-25 19:33:35 -05:00
Andrew Brown d1f13cadc5 Revert "Picks the right protocal based on what is being used. This fixes ssl errors on sites that use https."
Reason: breaks local viewing. Tries to access file://maps.google.com
etc.

This reverts commit da663dadb3.
2012-02-25 19:23:47 -05:00
Andrew Brown 0b34c7f1c3 changed JS to properly compute coords for anvil format 2012-02-25 16:17:49 -05:00
Andrew Brown 72f292104a fixed rotated renders for anvil-formatted worlds 2012-02-25 15:01:55 -05:00
Andrew Brown e4ab4696c9 Merge pull request #620 from duckman/https
Https
2012-02-23 18:55:13 -08:00
Andrew Brown 2957677e32 Merge remote-tracking branch 'origin/rewrite' into anvil 2012-02-23 19:48:38 -05:00
Andrew Brown db0f849e34 Fixed a couple minor things in design docs 2012-02-23 19:47:45 -05:00
Andrew Brown b98dcab2d9 Merge master changes into rewrite 2012-02-23 19:42:50 -05:00
Andrew Brown ae820079d1 Updated example to be more correct 2012-02-22 23:20:16 -05:00
Andrew Brown 6734e12a7a Updated chunk placement and tile rendering sectiosn of design docs 2012-02-20 23:02:05 -05:00
Andrew Brown dc50f6a044 updated "Assembling a chunk" section for anvil format 2012-02-19 21:55:47 -05:00
Andrew Brown 1d2f908cb6 Updated "Size of a chunk" section of design docs 2012-02-19 16:34:49 -05:00
Andrew Brown 4c21fb2e05 modified tileset.py for the new Anvil format 2012-02-19 00:04:26 -05:00
Andrew Brown 293e16e17f Started updating the design docs for the new format 2012-02-18 16:11:05 -05:00
Andrew Brown 6631460495 Fixed a typo 2012-02-18 11:35:18 -05:00
Andrew Brown 85b9ccd620 Merge remote-tracking branch 'origin/rewrite' into anvil
Conflicts:
	overviewer_core/world.py
2012-02-18 11:07:56 -05:00
Andrew Brown f7cc50fa9e Preliminary modifications to world.py for new format. Untested. 2012-02-18 11:04:19 -05:00
Andrew Brown d669034c4c corrected y to z in functions in nbt.py 2012-02-17 20:11:02 -05:00
Andrew Brown 5e0d0df719 Merge pull request #616 from contre/rewrite
Setup.py calls for wrong sample config file
2012-02-16 09:40:42 -08:00
Andrew Brown f8769c0a0d --forcerender, --check-tiles, and --no-tile-checks now work 2012-02-16 11:36:31 -05:00
Andrew Brown 1457bf1564 Added a good sample config that actually works 2012-02-15 22:41:22 -05:00
Andrew Brown 6c22e306ba removed texture_path global option from docs 2012-02-15 22:16:17 -05:00
Andrew Brown b99b2230be Merge branch 'rewrite' of github.com:overviewer/Minecraft-Overviewer into rewrite 2012-02-15 22:07:53 -05:00
Andrew Brown 2c412c3917 Added global defaults to config file which set renderdict defaults 2012-02-15 22:07:36 -05:00
Andrew Brown 9c0a8c01ee re-arranged config docs, relaxed validator for north direction 2012-02-15 19:18:51 -05:00
Andrew Brown 6b449da966 added int array support to nbt.py
(untested) Also removed an extra import that I forgot about earlier.
2012-02-15 18:20:57 -05:00
Andrew Brown 0b7e42110c Merge commit 'b2c3759' into rewrite 2012-02-15 18:13:01 -05:00
Andrew Brown f5d07fa597 Added a "did you mean" feature for config parsing 2012-02-14 21:12:15 -05:00
Andrew Brown aaf8e1d7cb Changed "worldname" to "world" in configfile
Also brought tests up to date. All tests pass now.
2012-02-14 20:39:05 -05:00
Andrew Brown 3868728eb8 fixed links related to the windows guide 2012-02-12 21:11:18 -05:00
Andrew Brown 8ec401fcf7 finished windows noob guide. 2012-02-12 21:08:16 -05:00
Andrew Brown 2796daf943 Added Michael Fallows to contributer list. Thanks for your contributions! 2012-02-12 17:49:26 -05:00
Andrew Brown 8edf2edfcd Merge remote-tracking branch 'redorkulated/patch-1' into rewrite 2012-02-12 17:22:25 -05:00
Andrew Brown 9c4de64a62 added the image extension to the outputted json metadata 2012-02-12 17:15:50 -05:00
Andrew Brown 5e2956f101 fixed error message raising an error of its own 2012-02-12 16:11:06 -05:00
Andrew Brown adc9151f44 fixed jpg rendering 2012-02-12 15:57:53 -05:00
Andrew Brown 9fc9c2a781 set a default image quality 2012-02-12 15:55:03 -05:00
Andrew Brown c94cc079c1 Merge remote-tracking branch 'origin/rewrite' into rewrite
Conflicts:
	overviewer.py
2012-02-12 15:35:37 -05:00
Andrew Brown ec2ae2ebfc added --rendermodes option 2012-02-12 15:30:05 -05:00
Andrew Brown 607bb329cf tileset objects now accept "jpg" or "jpeg" for jpeg format 2012-02-12 15:28:09 -05:00
Andrew Brown e7995e19b2 config parser ignores extra items in config files now 2012-02-11 16:02:15 -05:00
Andrew Brown 3f8ca75ee4 half of the windows newbie guide written 2012-02-09 23:29:42 -05:00
Andrew Brown 2b724e67ee Merge remote-tracking branch 'origin/master' into rewrite 2012-02-09 15:52:29 -05:00
Andrew Brown 38b985da3b Added a link to the update blog in the readme and docs 2012-02-09 15:49:06 -05:00
Andrew Brown fec8e28f5c Added error detection to overviewerConfig.js parsing. 2012-02-08 21:31:45 -05:00
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