Commit Graph
1351 Commits
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
Aaron Griffith a1dacfa994 added back biome colors, and misc. cleanup in world.py 2012-02-08 15:25:22 -05:00
Aaron Griffith 834598da0f fixed typo from master merge 2012-02-08 14:56:50 -05:00
Aaron Griffith ce214c19bc added color tables from biome extractor
Now, the textures loader doesn't have to know about the world path;
this works better in a multi-world environment.
2012-02-08 13:59:43 -05:00
Aaron Griffith 6c846ffefc Merge branch 'master' into rewrite 2012-02-06 21:45:33 -05:00
Aaron Griffith 302e1d592a Merge branch 'master' into rewrite 2012-02-06 21:41:11 -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
Aaron Griffith e5d6335d33 Merge pull request #596 from kraigu/master
Minor addition to building.rst
2012-02-04 15:41:48 -08:00
Mike e06bdb6baa minor spelling fix in Windows section
add small FreeBSD section
2012-02-04 13:36:36 -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
Aaron Griffith 6c647f3161 texturepath setting now works 2012-01-29 17:33:21 -05:00
Aaron Griffith 9dc9e1e952 textures now appropriately handle north direction 2012-01-29 17:18:21 -05:00
Aaron Griffith b88e636728 changed settings to emit correct north values, north values now represent rotations
each north value is an integer representing how many times to rotate
the map by 90 degrees counterclockwise.
2012-01-29 16:45:23 -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 Chin 2497a8a806 Part of an attempt to make config parser a little more generic 2012-01-28 18:57:12 -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 Chin 96602a48d4 Specifying a dimension in a config file now works 2012-01-27 20:30:58 -05:00
Andrew Chin c29c983a79 Print a more user friendly error message on validation failure 2012-01-27 19:37:16 -05:00
Andrew Chin 1297385148 Validate the rendermode option as a list of primitives 2012-01-27 19:36:55 -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
Richard Pastrick cef0606642 Remove commented out code 2012-01-24 11:36:23 -08:00
Richard Pastrick b9bbe6d4ef Add ignores for all variations of settings.py file names as well as ignores for the MCPatcher compliant pngs 2012-01-24 11:20:59 -08:00
Richard Pastrick 413e3933a2 Add support for MCPatcher compliant HD animated fire. 2012-01-24 11:19:50 -08:00
Aaron Griffith 426f3d9915 Merge pull request #588 from contre/master
Add support for MCPatcher compliant portal textures
2012-01-23 13:20:36 -08:00
Andrew Chin a69a13159c Merge remote-tracking branch 'origin/rewrite' into rewrite 2012-01-22 23:26:23 -05:00
Andrew Chin 8297f4c0a3 northdirection glue 2012-01-22 23:25:56 -05: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 Chin 39e5793634 No longer require an import from rendermodes in config file 2012-01-21 20:02:06 -05:00
Andrew Chin 163dd66a38 Create RegionSets via the World object 2012-01-21 19:04:21 -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 Chin 0d23adb237 Avoid digging into the tileset when writing out config.js 2012-01-16 22:54:35 -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
Richard Pastrick dca755e9db Add special case for MCPatcher custom portal images 2012-01-16 17:41:36 -08:00
Andrew Chin aa34853664 Only pass to TileSet the options it required 2012-01-16 20:35:13 -05:00
Andrew Chin 728351f9a3 Display the coord box on index.html 2012-01-16 19:50:50 -05:00
Alejandro Aguilera 2339cc54b8 Revert textures optimization. At least, in the case of water it messed up water transparency.
It would be a good idea to check transparency for all the other optimized pngs.
2012-01-16 13:34:39 +01: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