add keys to stylesheet

This commit is contained in:
Konstantin Käfer
2014-05-23 12:40:15 +02:00
parent ce2270eafc
commit 7d767f518b
3 changed files with 20 additions and 0 deletions

View File

@@ -155,6 +155,8 @@ struct FillClass {
boost::optional<FunctionProperty> opacity;
boost::optional<PropertyTransition> opacity_transition;
boost::optional<std::string> image;
boost::optional<FunctionProperty> prerendered;
boost::optional<FunctionProperty> blur;
};
struct FillProperties {
@@ -166,6 +168,8 @@ struct FillProperties {
Color fill_color = {{ 0, 0, 0, 1 }};
Color stroke_color = {{ 0, 0, 0, 1 }};
float opacity = 1.0;
bool prerendered = false;
float blur = 0.0f;
std::string image;
};

View File

@@ -114,6 +114,14 @@ void Style::cascade(float z) {
if (layer.image) {
fill.image = layer.image.get();
}
if (layer.prerendered) {
fill.prerendered = layer.prerendered.get().evaluate<bool>(z);
}
if (layer.blur) {
fill.blur = layer.blur.get().evaluate<float>(z);
}
}
// Cascade line classes.

View File

@@ -537,6 +537,14 @@ FillClass StyleParser::parseFillClass(JSVal value) {
klass.antialias = parseBoolean(value["antialias"]);
}
if (value.HasMember("prerendered")) {
klass.prerendered = parseBoolean(value["prerendered"]);
}
if (value.HasMember("blur")) {
klass.blur = parseFunction(value["blur"]);
}
if (value.HasMember("image")) {
klass.image = parseString(value["image"]);
}