LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge remote-tracking branch 'origin/rewrite' into rewrite

Browse Source
This commit is contained in:
Andrew Brown
2012-01-02 00:30:29 -05:00
parent 16df71b060 a098e5d01a
commit 948073fb9d
8 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
overviewer_core/configParser.py
View File

@@ -276,6 +276,7 @@ class MultiWorldParser(object):
definition = settingsDefinition.render[key]
try:
val = definition['validator'](world[key])
world[key] = val
except Exception as e:
print "Error: %r" % e
next

20
overviewer_core/settingsDefinition.py
View File

@@ -17,19 +17,19 @@ from settingsValidators import *
# note that all defaults go thought the validator
render = {
"world_path": dict(required=True, validator=validateWorldPath),
"worldpath": dict(required=True, validator=validateWorldPath),
"rendermode": dict(required=False, validator=validateRenderMode),
"north-direction": dict(required=False, validator=validateNorthDirection),
"render-range": dict(required=False, validator=validateRenderRange),
"force-render": dict(required=False, validator=bool),
"stochastic-render": dict(required=False, validator=validateStochastic),
"northdirection": dict(required=False, validator=validateNorthDirection),
"renderrange": dict(required=False, validator=validateRenderRange),
"forcerender": dict(required=False, validator=bool),
"stochasticrender": dict(required=False, validator=validateStochastic),
"imgformat": dict(required=False, validator=validateImgFormat, default="png"),
"imgquality": dict(required=False, validator=validateImgQuality),
"bg-color": dict(required=False, validator=validateBGColor),
"optimize-img": dict(required=False, validator=validateOptImg),
"no-markers": dict(required=False, validator=bool),
"texture-path": dict(required=False, validator=validateTexturePath),
"bgcolor": dict(required=False, validator=validateBGColor, default="1a1a1a"),
"optimizeimg": dict(required=False, validator=validateOptImg, default=0),
"nomarkers": dict(required=False, validator=bool),
"texturepath": dict(required=False, validator=validateTexturePath),
"renderchecks": dict(required=False, validator=int, default=0),
"rerender_prob": dict(required=False, validator=float, default=0),
"rerenderprob": dict(required=False, validator=float, default=0),
}

14
overviewer_core/settingsValidators.py
View File

@@ -59,7 +59,19 @@ def validateImgQuality(qual):
return intqual
def validateBGColor(color):
raise NotImplementedError("bg color")
"""BG color must be an HTML color, with an option leading # (hash symbol)
returns an (r,b,g) 3-tuple
"""
if color[0] != "#":
color = "#%s" % color
if len(color) != 7:
raise ValidationException("%r is not a valid color. Expected HTML color syntax (i.e. #RRGGBB)" % color)
r = int(color[1:3], 16)
g = int(color[3:5], 16)
b = int(color[5:7], 16)
return (r,g,b)
def validateOptImg(opt):
return bool(opt)

2
overviewer_core/tileset.py
View File

@@ -533,7 +533,7 @@ class TileSet(object):
stime = time.time()
rendercheck = self.options['renderchecks']
rerender_prob = self.options['rerender_prob']
rerender_prob = self.options['rerenderprob']
# XXX TODO:
last_rendertime = 0 # TODO