LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Added defaultzoom config option

Browse Source
This commit is contained in:
CounterPillow
2012-07-15 05:53:15 +02:00
parent c79a646d10
commit 63b72aabaa
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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","base"]) tileSetOpts = util.dict_subset(render, ["name", "imgformat", "renderchecks", "rerenderprob", "bgcolor", "defaultzoom", "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(w, rset, assetMrg, tex, tileSetOpts, tileset_dir) tset = tileset.TileSet(w, rset, assetMrg, tex, tileSetOpts, tileset_dir)
tilesets.append(tset) tilesets.append(tset)

1
overviewer_core/settingsDefinition.py
View File

@@ -71,6 +71,7 @@ renders = Setting(required=True, default=util.OrderedDict(),
"imgformat": Setting(required=True, validator=validateImgFormat, default="png"), "imgformat": Setting(required=True, validator=validateImgFormat, default="png"),
"imgquality": Setting(required=False, validator=validateImgQuality, default=95), "imgquality": Setting(required=False, validator=validateImgQuality, default=95),
"bgcolor": Setting(required=True, validator=validateBGColor, default="1a1a1a"), "bgcolor": Setting(required=True, validator=validateBGColor, default="1a1a1a"),
"defaultzoom": Setting(required=True, validator=validateDefaultZoom, default=1),
"optimizeimg": Setting(required=True, validator=validateOptImg, default=0), "optimizeimg": Setting(required=True, validator=validateOptImg, default=0),
"nomarkers": Setting(required=False, validator=validateBool, default=None), "nomarkers": Setting(required=False, validator=validateBool, default=None),
"texturepath": Setting(required=False, validator=validateTexturePath, default=None), "texturepath": Setting(required=False, validator=validateTexturePath, default=None),

6
overviewer_core/settingsValidators.py
View File

@@ -208,6 +208,12 @@ def validateObserver(observer):
else: else:
raise ValidationException("%r does not look like an observer" % repr(observer)) raise ValidationException("%r does not look like an observer" % repr(observer))
def validateDefaultZoom(z):
if z > 0:
return int(z)
else:
raise ValidationException("The default zoom is set below 1")
def make_dictValidator(keyvalidator, valuevalidator): def make_dictValidator(keyvalidator, valuevalidator):
"""Compose and return a dict validator -- a validator that validates each """Compose and return a dict validator -- a validator that validates each
key and value in a dictionary. key and value in a dictionary.

3
overviewer_core/tileset.py
View File

@@ -517,7 +517,7 @@ class TileSet(object):
d = dict(name = self.options.get('title'), d = dict(name = self.options.get('title'),
zoomLevels = self.treedepth, zoomLevels = self.treedepth,
minZoom = 0, minZoom = 0,
defaultZoom = 1, defaultZoom = self.options.get('defaultzoom'),
maxZoom = self.treedepth, maxZoom = self.treedepth,
path = self.options.get('name'), path = self.options.get('name'),
base = self.options.get('base'), base = self.options.get('base'),
@@ -528,6 +528,7 @@ class TileSet(object):
imgextension = self.imgextension, imgextension = self.imgextension,
isOverlay = isOverlay isOverlay = isOverlay
) )
if isOverlay: if isOverlay:
d.update({"tilesets": self.options.get("overlay")}) d.update({"tilesets": self.options.get("overlay")})