LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge remote-tracking branch 'fabiann/remote-tiles' into devel

Browse Source
This commit is contained in:
Aaron Griffith
2012-05-06 12:52:42 -04:00
parent 08b0ed17e6 9caa94eacf
commit 7ef5f8c5e3
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/config.rst
View File

@@ -432,6 +432,13 @@ values. The valid configuration keys are listed below.
**Default:** ``#1a1a1a`` **Default:** ``#1a1a1a``
``base``
Allows you to specify a remote location for the tile folder, useful if you
rsync your map's images to a remote server. Leave a trailing slash and point
to the location that contains the tile folders for each render, not the
tiles folder itself. For example, if the tile images start at
http://domain.com/map/world_day/ you want to set this to http://domain.com/map/
.. _option_texture_pack: .. _option_texture_pack:
``texturepath`` ``texturepath``

2
overviewer.py
View File

@@ -421,7 +421,7 @@ dir but you forgot to put quotes around the directory, since it contains spaces.
# only pass to the TileSet the options it really cares about # only pass to the TileSet the options it really cares about
render['name'] = render_name # perhaps a hack. This is stored here for the asset manager render['name'] = render_name # perhaps a hack. This is stored here for the asset manager
tileSetOpts = util.dict_subset(render, ["name", "imgformat", "renderchecks", "rerenderprob", "bgcolor", "imgquality", "optimizeimg", "rendermode", "worldname_orig", "title", "dimension", "changelist","showspawn", "overlay"]) tileSetOpts = util.dict_subset(render, ["name", "imgformat", "renderchecks", "rerenderprob", "bgcolor", "imgquality", "optimizeimg", "rendermode", "worldname_orig", "title", "dimension", "changelist","showspawn", "overlay","base"])
tileSetOpts.update({"spawn": w.find_true_spawn()}) # TODO find a better way to do this tileSetOpts.update({"spawn": w.find_true_spawn()}) # TODO find a better way to do this
tset = tileset.TileSet(rset, assetMrg, tex, tileSetOpts, tileset_dir) tset = tileset.TileSet(rset, assetMrg, tex, tileSetOpts, tileset_dir)
tilesets.append(tset) tilesets.append(tset)

1
overviewer_core/settingsDefinition.py
View File

@@ -81,6 +81,7 @@ renders = Setting(required=True, default=util.OrderedDict(),
"markers": Setting(required=False, validator=validateMarkers, default=[]), "markers": Setting(required=False, validator=validateMarkers, default=[]),
"overlay": Setting(required=False, validator=validateOverlays, default=[]), "overlay": Setting(required=False, validator=validateOverlays, default=[]),
"showspawn": Setting(required=False, validator=validateBool, default=True), "showspawn": Setting(required=False, validator=validateBool, default=True),
"base": Setting(required=False, validator=validateStr, default=""),
# Remove this eventually (once people update their configs) # Remove this eventually (once people update their configs)
"worldname": Setting(required=False, default=None, "worldname": Setting(required=False, default=None,

2
overviewer_core/tileset.py
View File

@@ -516,7 +516,7 @@ class TileSet(object):
defaultZoom = 1, defaultZoom = 1,
maxZoom = self.treedepth, maxZoom = self.treedepth,
path = self.options.get('name'), path = self.options.get('name'),
base = '', base = self.options.get('base'),
bgcolor = bgcolorformat(self.options.get('bgcolor')), bgcolor = bgcolorformat(self.options.get('bgcolor')),
world = self.options.get('worldname_orig') + world = self.options.get('worldname_orig') +
(" - " + self.options.get('dimension') if self.options.get('dimension') != 'default' else ''), (" - " + self.options.get('dimension') if self.options.get('dimension') != 'default' else ''),