[core] Polymorphic layout and paint parsing

This commit is contained in:
John Firebaugh
2015-10-20 16:40:34 -07:00
parent b39501ba59
commit 7821dccae5
22 changed files with 810 additions and 821 deletions

View File

@@ -1,7 +1,19 @@
#include <mbgl/layer/circle_layer.hpp>
#include <mbgl/style/property_parsing.hpp>
namespace mbgl {
void CircleLayer::parsePaints(const JSVal& layer) {
paints.parseEach(layer, [&] (ClassProperties& paint, const JSVal& value) {
parseProperty<Function<float>>("circle-radius", PropertyKey::CircleRadius, paint, value);
parseProperty<Function<Color>>("circle-color", PropertyKey::CircleColor, paint, value);
parseProperty<Function<float>>("circle-opacity", PropertyKey::CircleOpacity, paint, value);
parseProperty<Function<std::array<float,2>>>("circle-translate", PropertyKey::CircleTranslate, paint, value);
parseProperty<Function<TranslateAnchorType>>("circle-translate-anchor", PropertyKey::CircleTranslateAnchor, paint, value);
parseProperty<Function<float>>("circle-blur", PropertyKey::CircleBlur, paint, value);
});
}
void CircleLayer::recalculate(const StyleCalculationParameters& parameters) {
paints.removeExpiredTransitions(parameters.now);