tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refs #253: support blur function property values

Browse Source
This commit is contained in:
Justin R. Miller
2014-05-26 23:48:50 -07:00
parent 3e2fb7a7f1
commit 34b90476b4
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/llmr/style/properties.hpp
View File

@@ -92,9 +92,9 @@ struct GenericClass {
boost::optional<FunctionProperty> opacity;
boost::optional<PropertyTransition> opacity_transition;
boost::optional<bool> prerender;
boost::optional<float> prerenderBuffer;
boost::optional<uint16_t> prerenderSize;
boost::optional<uint16_t> prerenderBlur;
boost::optional<FunctionProperty> prerenderBuffer;
boost::optional<FunctionProperty> prerenderSize;
boost::optional<FunctionProperty> prerenderBlur;
};
struct GenericProperties {

6
src/style/style.cpp
View File

@@ -56,15 +56,15 @@ void Style::cascadeProperties(GenericProperties &properties, const GenericClass&
}
if (klass.prerenderBuffer) {
properties.prerenderBuffer = klass.prerenderBuffer.get();
properties.prerenderBuffer = klass.prerenderBuffer.get().evaluate<double>(z);
}
if (klass.prerenderSize) {
properties.prerenderSize = klass.prerenderSize.get();
properties.prerenderSize = klass.prerenderSize.get().evaluate<uint64_t>(z);
}
if (klass.prerenderBlur) {
properties.prerenderBlur = klass.prerenderBlur.get();
properties.prerenderBlur = klass.prerenderBlur.get().evaluate<uint64_t>(z);
}
}

6
src/style/style_parser.cpp
View File

@@ -525,15 +525,15 @@ void StyleParser::parseGenericClass(GenericClass &klass, JSVal value) {
}
if (value.HasMember("prerender-buffer")) {
klass.prerenderBuffer = toNumber<double>(parseValue(value["prerender-buffer"]));
klass.prerenderBuffer = parseFunction(value["prerender-buffer"]);
}
if (value.HasMember("prerender-size")) {
klass.prerenderBuffer = toNumber<uint64_t>(parseValue(value["prerender-size"]));
klass.prerenderBuffer = parseFunction(value["prerender-size"]);
}
if (value.HasMember("prerender-blur")) {
klass.prerenderBlur = toNumber<uint64_t>(parseValue(value["prerender-blur"]));
klass.prerenderBlur = parseFunction(value["prerender-blur"]);
}
}