Commit Graph
100 Commits
Author SHA1 Message Date
Aaron Griffith 143523e1dd Merge branch 'master' into anvil
The "Anvil currently in development" message was left out of the merge.
2012-03-02 19:12:54 -05:00
Aaron Griffith 3007099c44 fixed --version on debian 2012-03-02 19:09:40 -05:00
Aaron Griffith 9aee71b953 updated default max height on Depth render primitive 2012-03-01 21:09:17 -05:00
Aaron Griffith 137935801d bumped extension version after merge, just in case 2012-03-01 17:47:38 -05:00
Aaron Griffith dd7af69199 Merge branch 'rewrite' into anvil 2012-03-01 17:46:39 -05:00
Aaron Griffith 6f1ccb6a53 fixed clamping, jungles are now the proper shade of green 2012-03-01 17:25:45 -05:00
Aaron Griffith bcc1e61b0d data/textures is now checked *last*, updated biome colors 2012-03-01 16:46:23 -05:00
Aaron Griffith d1c5c14ff7 fixed huge memory leak when calling chunk_render on empty section 2012-03-01 15:55:47 -05:00
Aaron Griffith 8b28e42c8d Merge branch 'rewrite' into anvil
Conflicts:
	overviewer_core/src/overviewer.h
	overviewer_core/tileset.py
	overviewer_core/util.py
	overviewer_core/world.py
2012-02-26 19:39:58 -05:00
Aaron Griffith 4f0e844bb5 pickled signals now work as expected 2012-02-26 13:10:05 -05:00
Aaron Griffith f74769e988 updated MANIFEST to include primitive sources 2012-02-26 11:58:19 -05:00
Aaron Griffith 02e5ec17e5 added docs for overlay primitives 2012-02-26 11:57:44 -05:00
Aaron Griffith 5d50f35ac1 broke out background-clearing code from base overlay primitive 2012-02-26 11:52:43 -05:00
Aaron Griffith 2b7af1886a overlays converted into render primitives 2012-02-26 11:39:07 -05:00
Aaron Griffith 9f90c02297 removed another bit of code that assumes the ceiling is at 128 2012-02-26 09:18:39 -05:00
Aaron Griffith 414b754e24 biomes now work, still no swamp purple though 2012-02-22 04:14:44 -05:00
Aaron Griffith 4ac7c1222a lighting and smooth lighting updated for anvil 2012-02-21 15:51:34 -05:00
Aaron Griffith c5f2077d51 edge-lines and nether primitives in working order 2012-02-21 15:05:00 -05:00
Aaron Griffith a8c298fe4e depth-tinting, depth, and height-fading render primitives fixed for anvil 2012-02-21 14:49:37 -05:00
Aaron Griffith 136ea70281 all sections now loaded for each chunk, cave mode now works 2012-02-21 14:22:52 -05:00
Aaron Griffith 187b2690f4 added get_data for getting data across chunk boundaries, fixed PAD 2012-02-21 03:49:19 -05:00
Aaron Griffith a0d584bba6 Base render primitive now draws correctly (no biomes yet though) 2012-02-21 02:42:42 -05:00
Aaron Griffith b234301521 small, cargo-cult change to how tileset.py positions drawn chunk sections 2012-02-21 02:42:06 -05:00
Aaron Griffith f8140c8de0 block data is now correctly reshape'd 2012-02-21 02:02:25 -05:00
Aaron Griffith d17931c112 blog links now point to overviewer.org blog 2012-02-19 21:40:56 -05:00
Aaron Griffith e33241a973 fixed leaking block data for each rendered chunk 2012-02-15 21:38:45 -05:00
Aaron Griffith 6cf38d08b6 --processes=1 now correctly uses the vanilla dispatcher 2012-02-12 01:20:32 -05:00
Aaron Griffith 288dc20deb removed old MapGen code 2012-02-09 10:18:39 -05:00
Aaron Griffith 09c4e4cbf8 removed really old composite.py stub wrapper 2012-02-09 10:12:12 -05:00
Aaron Griffith c486c99387 removed old biome code 2012-02-09 09:45:08 -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
Aaron Griffith e5d6335d33 Merge pull request #596 from kraigu/master
Minor addition to building.rst
2012-02-04 15:41:48 -08: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
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
Aaron Griffith 624d6ba351 updated and cleaned up overviewer.py
- moved c_overviewer version checks into __init__.py
 - bare_console support (mostly) moved into util, slightly more sane
 - removed and updated a ton of old code
2012-01-14 01:11:05 -05:00
Aaron Griffith 16fec5085e converted smooth-lighting into a primitive
for the first time ever, smooth-lit cave mode is now possible \o/
2012-01-08 22:49:20 -05:00
Aaron Griffith ae88b6e27b converted lighting mode into a primitive 2012-01-08 22:31:41 -05:00
Aaron Griffith c93715ebfa migrated cave mode into cave and depth-tinting primitives 2012-01-08 18:29:32 -05:00
Aaron Griffith f1758a51a7 added netherbrick stairs to lighting estimator
Reported in Issue #581.
2012-01-08 16:22:06 -05:00
Aaron Griffith 30c4bb26c3 default values for options are now specified alongside their definitions 2012-01-08 01:09:43 -05:00
Aaron Griffith 7cacc59428 setup.py now auto-discovers available render primitives 2012-01-08 00:52:30 -05:00
Aaron Griffith a682b8a689 broke out nether, heightfading, depth, and edgelines from base primitive 2012-01-08 00:08:16 -05:00
Aaron Griffith e3610f8ac5 moved to a layer-based rendermode system, moved normal mode to base primitive
options are now handled partially in the python side, in rendermodes.py
2012-01-08 00:08:16 -05:00
Aaron Griffith 6f66a31738 ripped out all the rendermode option stuff, preparing to move it to python 2012-01-08 00:08:16 -05:00
Aaron Griffith 4d61e41f9f fixed crash when an option isn't recognized 2012-01-07 22:51:09 -05:00
Aaron Griffith 14f68ebeb7 import in __init__.py no longer prevents setup.py from working 2012-01-07 20:29:46 -05:00
Aaron Griffith 992f737984 fixed import loop and incorrect blockdata expansion 2012-01-07 20:23:39 -05:00
Aaron Griffith 1baf506a59 renders now work with the multiprocessing dispatcher 2012-01-06 21:56:26 -05:00
Aaron Griffith 1f2c1a281e the rest of the render modes are now working 2012-01-06 20:38:50 -05:00
Aaron Griffith 4eaf103213 fixes to get lighting mode working again 2012-01-06 20:23:15 -05:00
Aaron Griffith e1a6d96e87 changed last "import Image" to "from PIL import Image" 2012-01-04 00:22:05 -05:00
Aaron Griffith a1dc392526 c_overviewer is now auto-initialized, and some other minor fixes 2012-01-02 00:40:56 -05:00
Aaron Griffith c88bfa3adc almost-working full TileSet render 2012-01-01 23:58:18 -05:00
Aaron Griffith 31f894d4e9 removed: chunk.py, quadtree.py, rendernode.py 2012-01-01 23:12:05 -05:00
Aaron Griffith a69a78f412 c_overviewer.render_loop now works with normal render mode 2012-01-01 23:02:30 -05:00
Aaron Griffith 55e83e50da chunks are now loaded properly from the regionset 2012-01-01 22:44:11 -05:00
Aaron Griffith f9b0f8667b initial update of C code to work with textures object 2012-01-01 22:44:08 -05:00
Aaron Griffith c4a183b9b0 moved most global vars in textures.py into an instantiatable class 2012-01-01 22:43:37 -05:00
Aaron Griffith d0032ac9ff Merge remote-tracking branch 'ion1/master' 2011-12-30 13:22:54 -05:00
Aaron Griffith 5b13559235 added note about needing python2.6 for debian packages 2011-12-29 21:07:59 -05:00
Aaron Griffith 24d8dc4b99 dispatcher status callback
Right now it's called every 100 work items. This number is completely
arbitrary and should probably be tuned.
2011-12-26 10:36:52 -05:00
Aaron Griffith 740f5ee628 dispatcher.finish_jobs() has been removed
the other dispatcher functions can provide the same functionality, so
removing finish_jobs() only makes the dispatcher interface slimmer.
2011-12-26 10:05:57 -05:00
Aaron Griffith e6ccd79b1b blocks with invalid or unsupported data will now still draw *something*
it looks weird to just draw nothing, especially if the block is
opaque, since you can then see through the world.

fixes issue reported in Issue #563
2011-12-24 15:42:28 -05:00
Aaron Griffith e8683fd0bc saner timeout handling on MultiprocessingDispatcher
_handle_messages() now *doesn't* block if it's being called simply to
see what jobs are done, but still blocks and times out when it's
*waiting* on jobs to be done.
2011-12-21 06:32:55 -05:00
Aaron Griffith 2863876589 moved in signals from the gist
gist: https://gist.github.com/1479733
tracker: #564
2011-12-21 06:10:34 -05:00
Aaron Griffith 2717485031 dispatcher class now supports work-item dependencies
Thanks to ion in #overviewer for a particularly slick way to implement
this without using too much memory.

tracker: Issue #564
2011-12-21 04:43:17 -05:00
Aaron Griffith 77ae3e2cb6 some minor changes to allow multinode (!!!) dispatching
tracker: #564
2011-12-20 06:38:37 -05:00
Aaron Griffith 192591c2b0 comments and docstrings for the multiprocessing dispatcher 2011-12-20 05:39:41 -05:00
Aaron Griffith 8db7d37164 dispatcher docstrings and first multiprocessing dispatcher
tracker: Issue #564
2011-12-20 01:36:34 -05:00
Aaron Griffith 0029753c36 first version of single-process dispatcher
tracker: Issue #564
2011-12-19 23:20:59 -05:00
Aaron Griffith 581ee0906a nbt.py now simply *reads files*, nothing more 2011-12-19 02:03:57 -05:00
Aaron Griffith debb14c48b overviewer no longer trusts ancillary data from blocks that should have none 2011-12-18 04:51:53 -05:00
Aaron Griffith a690771253 --version now displays the correct (new-form) version number 2011-12-17 06:54:27 -05:00
Aaron Griffith 6fb96ca8ab fixed crash when strftime returns non-ascii characters
also generally better unicode handling on web_assets (all files are UTF-8)
2011-12-16 19:48:46 -05:00
Aaron Griffith cc95799d1a renamed uppertile to compositetile (makes more sense)
This reverts commit d4c6e40d59, and
re-applies it with a renamed uppertile.
2011-12-12 15:15:36 -05:00
Aaron Griffith 6cbcd73532 fix yet another zero-division error :/ 2011-12-08 14:48:19 -05:00
Aaron Griffith 8b55203d41 initial version of 'nether' option for normal render modes
based on eminence's gist https://gist.github.com/92b6dac4c2ed3cdcff10
2011-12-04 10:21:48 -05:00
Aaron Griffith 2ee33b9032 re-merged changes from c0d3700 that were lost in bb55547 2011-12-03 12:37:48 -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
Aaron Griffith e500a1ab26 Merge branch '19prep'
Conflicts:
	overviewer_core/src/overviewer.h
	overviewer_core/textures.py
2011-11-18 17:25:01 -05:00
Aaron Griffith f6651cd759 bumped extension number to prepare for likely merge tomorrow 2011-11-17 09:33:22 -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
Aaron Griffith 944edf4ef8 changed material property lookups to use a bit table, not python sets 2011-11-11 20:05:29 -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 bb55547b0d Merge textures rewrite into 19prep 2011-11-11 14:05:05 -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
Aaron Griffith ae651b87ec Merge branch 'texture-packs' 2011-11-09 13:59:11 -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
Aaron Griffith 0d656e274f added Jason Scheirer to CONTRIBUTORS.rst 2011-11-07 16:57:34 -05:00
Aaron Griffith 4de9ba3b6e added docs for lighting and smooth-lighting 2011-11-06 20:34:06 -05:00