Commit Graph
2271 Commits
Author SHA1 Message Date
Andrew Brown 0003950c5e tile generation works for -p1 2010-09-12 22:23:01 -04:00
Gregory Short c10f267041 Removed the scale control as it was completely wrong, dur. 2010-09-12 14:13:54 -05:00
Gregory Short 768a82cc13 Fixed the debug overlay to properly use config.tileSize instead of a hard-coded 384, also explicitly set which map controls will be displayed so that the map type controls allowing the user to switch back to the default google maps don't appear. 2010-09-12 14:12:49 -05:00
Gregory Short 70805f3a67 Added a debug option to the config options in template.html. Setting this to true displays a tile boundary overlay as well as x, y, and z values for each tile, and the tile's url. Defaults to false. 2010-09-12 14:05:36 -05:00
Andrew Brown 51d30a77d0 how embarrassing, I left some debug code in 2010-09-12 10:10:16 -04:00
Andrew Brown 8870e1d22a Merge remote branch 'munki/master' 2010-09-12 01:06:04 -04:00
Andrew Brown a3a4877e6a no longer validates images, runs MUCH faster to scan existing chunks.
If a chunk image can't be loaded, it re-generates it on the fly.
2010-09-12 01:04:31 -04:00
Andrew Brown 55d596fc26 chunk progress prints fewer lines. Made a perhaps insignificant
algorithm change
2010-09-11 22:34:07 -04:00
Andrew Brown 5726f7e23e chunk generation checks mtime before hashing block array 2010-09-11 22:07:46 -04:00
Gregory Short 699fe0889c Merge branch 'master' of http://github.com/brownan/Minecraft-Overviewer 2010-09-11 14:33:40 -05:00
Andrew Brown 07d6df1cbe fixed minecraft.jar path on macs 2010-09-11 15:33:00 -04:00
Gregory Short 7e5deed0f5 Merge branch 'master' of http://github.com/brownan/Minecraft-Overviewer 2010-09-11 14:27:23 -05:00
Andrew Brown 9309fd6c96 Uses a shared semaphore to spawn new processes when needed.
This more effectively utilizes as many cores as you tell it. It should
now spawn a new process whenever an old branch of the recursive tree
finishes, to always use as many processes as you specify.
2010-09-11 13:21:13 -04:00
Gregory Short 8bc789a4d0 Minor documentation update (alleged default was incorrect) 2010-09-11 11:13:57 -05:00
Andrew Brown be146385e4 readme updates 2010-09-11 00:36:43 -04:00
Andrew Brown f9783d7a20 Tile rendering is now mostly parallel up to 4 procs.
The initial recursive call for tile generation will spawn up to 3 extra
processes to work on each quadrant. It's not perfect yet since some
quadrants may have more or less work to do, and only 4 total workers are
supported.

Also, it waits for all chunks are finished before it dives into the
tiles, to prevent it from using more resources than requested.
2010-09-11 00:15:59 -04:00
Andrew Brown 1e296e858a readme updates, texture code updates.
Re-factored the way the textures and blocks are being built. It should
be easier to understand and add new exceptions (sorta). Also fixed the
water and lava with other texture packs by putting a static water.png
and lava.png in with the code.
2010-09-10 00:04:02 -04:00
Andrew Brown 0b77c02a62 Merge remote branch 'munki/master' 2010-09-09 22:43:35 -04:00
Andrew Brown 91440ec621 subprocesses catch keyboardinterrupt and raise a proper exception.
This causes the parent process to re-raise the exception when it
eventually tries to get() the result from the child, instead of hanging
forever on a ctrl-C. It doesn't happen immediately, which is not ideal,
but at least things will eventually exit on ctrl-C now.
2010-09-09 22:41:28 -04:00
Gregory Short f442c984c1 If -c or --cachelife option is <= 0, the ?c= parameter won't be appended to tile urls so that caching can be controlled server-side (or left to the whim of the browser) 2010-09-09 02:41:11 -05:00
Andrew Brown b6ceb536da removes tiles if they no longer exist 2010-09-07 21:52:56 -04:00
Andrew Brown b0b9a9a71a Merge remote branch 'munki/master'
Conflicts:
	gmap.py
2010-09-07 21:36:08 -04:00
Andrew Brown 8382e6664a cleaned up some comments 2010-09-07 21:32:57 -04:00
Andrew Brownandmunki 1ebde2ff55 readme updates, added a features section at the top 2010-09-08 09:23:45 +08:00
Andrew Brown dda682ce51 Merge remote branch 'munki/master' 2010-09-07 21:19:08 -04:00
Gregory Short 94f1b25777 Map is better centered now when initially loading the page. The latitude is an approximation of the center, since we're using a mercator projection with what should be a rotated euclidean one. It's close enough. 2010-09-07 20:02:25 -05:00
Gregory Short 32c2626b39 Added configurable option for controlling how long a tile will live in the browser's cache before being refetched. Good for configurations where the map will be automatically updated ona regular basis and the web browser's cache would get out of sync. Default is 24 hours. 2010-09-07 19:56:44 -05:00
Andrew Brown dddeb199d3 readme updates, added a features section at the top 2010-09-07 11:56:29 -04:00
Gregory Short 1b4a775f72 Merged and resolved conflicts. 2010-09-06 22:22:33 -05:00
Andrew Brown 41f5eab067 fixed template.html to use the right path 2010-09-06 22:53:16 -04:00
Andrew Brown dfc336e46a should still make the tiledir even if destdir exists 2010-09-06 22:17:10 -04:00
Andrew Brown 4bbdf17bd5 Merge commit 'bf07d3d10c2e00eba3371cff700c8f3cb4d8e3e8'
Note: now that the tiles directory has changed, anyone with existing
tiles should be sure to remove or move their old set of tiles

Conflicts:
	template.html
2010-09-06 22:13:21 -04:00
Andrew Brown 92724e2688 updated readme 2010-09-06 22:05:32 -04:00
Gregory Short 9e11071b35 Moved html generation to happen before quadtree generation. This way, you can open up the html file immediately and browse the map as it is being generated! This necessitated pulling the zoom-depth determination out into its own function. 2010-09-06 20:51:06 -05:00
Gregory Short bf07d3d10c Moved gmap tiles into a tiles/ subdirectory for a cleaner gmap final output (output directory contains just index.html and tiles/) 2010-09-06 19:58:56 -05:00
Gregory ShortandAndrew Brown 040e269331 Updated template.html to use google maps api v3. This also resolves the bug where double-clicking on the right side of the map to zoom in would zoom somewhere else entirely. 2010-09-07 07:19:56 +08:00
Gregory Short 56a8970bdc Updated template.html to use google maps api v3. This also resolves the bug where double-clicking on the right side of the map to zoom in would zoom somewhere else entirely. 2010-09-06 17:44:08 -05:00
Andrew Brown 2d7bd248ed fixed strangeness in tile caching code.
I believe the tile caching and hashing mechanisms are working now.
2010-09-06 12:58:30 -04:00
Andrew Brown 54fb6ace07 fixed typo. Thanks again alexjurkiewicz 2010-09-05 21:39:43 -04:00
Andrew Brown 06006c6202 added tile caching. A tile will only be re-rendered if the underlying
chunks changed.

The next time a set of tiles is generated, a series of has files will be
written along side the image files. These keep track of whether the file
has changed.
2010-09-05 18:11:47 -04:00
Andrew Brown ed8ea421fc won't render tiles that would otherwise be blank.
This cuts down on the number of files outputted and the total size.
2010-09-05 13:58:50 -04:00
Andrew Brown e5edfcbac8 readme update 2010-09-05 12:34:47 -04:00
Andrew Brown 956e72dda1 fixed headers in wrong order 2010-09-04 22:57:36 -04:00
Andrew Brown e15e05ab70 changed readme name so github will format it 2010-09-04 22:54:38 -04:00
Andrew Brown 60ed1e91ea updated readme 2010-09-04 19:38:31 -04:00
Andrew Brown a31810957f added gmap command line interface file 2010-09-04 19:22:32 -04:00
Andrew Brown 1e08406dff quadtree generation works. Changed scaling algorithm 2010-09-04 19:22:04 -04:00
Andrew Brown 8afeb05cc8 disabled rendering torches and minetracks for now 2010-09-04 19:20:04 -04:00
Andrew Brown 4201889941 added a block totaling function 2010-09-02 23:21:09 -04:00
Andrew Brown 2005976248 I think the quadtree works now. Comments for it are inaccurate though 2010-09-02 23:19:32 -04:00