From 8d79c257654905a888e9d1a32e566293fda84455 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 21 Oct 2015 17:23:49 -0700 Subject: [PATCH] [core] Remove MapData dependency from StyleParser MapData was needed for two things: getting the default transition and fade durations, and detecting still rendering vs. continuous. The first is avoided by making transition durations optional, and supplying the default fallback value at evaluation time. The second did not fix the still rendering issue, and will be followed up with a different approach in a later commit. --- src/mbgl/style/class_properties.cpp | 4 +- src/mbgl/style/class_properties.hpp | 2 +- .../style/piecewisefunction_properties.cpp | 3 +- .../style/piecewisefunction_properties.hpp | 17 ++++++-- src/mbgl/style/property_transition.hpp | 10 ++--- src/mbgl/style/style.cpp | 7 +++- .../style/style_calculation_parameters.hpp | 9 ++++- src/mbgl/style/style_layer.cpp | 13 +++--- src/mbgl/style/style_parser.cpp | 40 +++++++------------ src/mbgl/style/style_parser.hpp | 7 +--- test/miscellaneous/style_parser.cpp | 10 +---- 11 files changed, 60 insertions(+), 62 deletions(-) diff --git a/src/mbgl/style/class_properties.cpp b/src/mbgl/style/class_properties.cpp index e7bf855bf..612207222 100644 --- a/src/mbgl/style/class_properties.cpp +++ b/src/mbgl/style/class_properties.cpp @@ -2,10 +2,10 @@ namespace mbgl { -const PropertyTransition &ClassProperties::getTransition(PropertyKey key, const PropertyTransition &defaultTransition) const { +PropertyTransition ClassProperties::getTransition(PropertyKey key) const { auto it = transitions.find(key); if (it == transitions.end()) { - return defaultTransition; + return PropertyTransition(); } else { return it->second; } diff --git a/src/mbgl/style/class_properties.hpp b/src/mbgl/style/class_properties.hpp index 0f147fdda..d115f14d5 100644 --- a/src/mbgl/style/class_properties.hpp +++ b/src/mbgl/style/class_properties.hpp @@ -19,7 +19,7 @@ public: transitions.emplace(key, transition); } - const PropertyTransition &getTransition(PropertyKey key, const PropertyTransition &defaultTransition) const; + PropertyTransition getTransition(PropertyKey key) const; // Route-through iterable interface so that you can iterate on the object as is. inline std::map::const_iterator begin() const { diff --git a/src/mbgl/style/piecewisefunction_properties.cpp b/src/mbgl/style/piecewisefunction_properties.cpp index 4efcba663..d74169829 100644 --- a/src/mbgl/style/piecewisefunction_properties.cpp +++ b/src/mbgl/style/piecewisefunction_properties.cpp @@ -21,7 +21,8 @@ T PiecewiseConstantFunction::evaluate(const StyleCalculationParameters& param float z = parameters.z; float fraction = std::fmod(z, 1.0f); - float t = std::min((Clock::now() - parameters.zoomHistory.lastIntegerZoomTime) / duration, 1.0f); + std::chrono::duration d = duration ? *duration : parameters.defaultFadeDuration; + float t = std::min((Clock::now() - parameters.zoomHistory.lastIntegerZoomTime) / d, 1.0f); float fromScale = 1.0f; float toScale = 1.0f; size_t from, to; diff --git a/src/mbgl/style/piecewisefunction_properties.hpp b/src/mbgl/style/piecewisefunction_properties.hpp index 8ea826fc1..d3a954395 100644 --- a/src/mbgl/style/piecewisefunction_properties.hpp +++ b/src/mbgl/style/piecewisefunction_properties.hpp @@ -2,6 +2,9 @@ #define MBGL_STYLE_FADEDFUNCTION_PROPERTIES #include +#include + +#include #include @@ -9,14 +12,22 @@ namespace mbgl { template struct PiecewiseConstantFunction { - inline PiecewiseConstantFunction(const std::vector> &values_, std::chrono::duration duration_) : values(values_), duration(duration_) {} - inline PiecewiseConstantFunction(T &value, std::chrono::duration duration_) : values({{ 0, value }}), duration(duration_) {} + PiecewiseConstantFunction(const std::vector>& values_, + mapbox::util::optional duration_) + : values(values_), + duration(duration_) { + } + + PiecewiseConstantFunction(T& value, mapbox::util::optional duration_) + : values({{ 0, value }}), + duration(duration_) { + } T evaluate(const StyleCalculationParameters&) const; private: const std::vector> values; - const std::chrono::duration duration; + const mapbox::util::optional duration; }; } diff --git a/src/mbgl/style/property_transition.hpp b/src/mbgl/style/property_transition.hpp index 4515fdc92..1cf1de093 100644 --- a/src/mbgl/style/property_transition.hpp +++ b/src/mbgl/style/property_transition.hpp @@ -3,15 +3,15 @@ #include +#include #include namespace mbgl { -struct PropertyTransition { - explicit inline PropertyTransition(const Duration& duration_, const Duration& delay_) - : duration(duration_), delay(delay_) {} - Duration duration = Duration::zero(); - Duration delay = Duration::zero(); +class PropertyTransition { +public: + mapbox::util::optional duration; + mapbox::util::optional delay; }; } diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index a1cd1bcbf..84640be25 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -42,7 +42,7 @@ void Style::setJSON(const std::string& json, const std::string&) { return; } - StyleParser parser(data); + StyleParser parser; parser.parse(doc); for (auto& source : parser.getSources()) { @@ -136,7 +136,10 @@ void Style::recalculate(float z) { zoomHistory.update(z, data.getAnimationTime()); - StyleCalculationParameters parameters(z, data.getAnimationTime(), zoomHistory); + StyleCalculationParameters parameters(z, + data.getAnimationTime(), + zoomHistory, + data.getDefaultFadeDuration()); for (const auto& layer : layers) { layer->updateProperties(parameters); diff --git a/src/mbgl/style/style_calculation_parameters.hpp b/src/mbgl/style/style_calculation_parameters.hpp index e25a5c590..3b54fd4bd 100644 --- a/src/mbgl/style/style_calculation_parameters.hpp +++ b/src/mbgl/style/style_calculation_parameters.hpp @@ -11,14 +11,19 @@ public: StyleCalculationParameters(float z_) : z(z_) {} - StyleCalculationParameters(float z_, const TimePoint& now_, const ZoomHistory& zoomHistory_) + StyleCalculationParameters(float z_, + const TimePoint& now_, + const ZoomHistory& zoomHistory_, + const Duration& defaultFadeDuration_) : z(z_), now(now_), - zoomHistory(zoomHistory_) {} + zoomHistory(zoomHistory_), + defaultFadeDuration(defaultFadeDuration_) {} float z; TimePoint now; ZoomHistory zoomHistory; + Duration defaultFadeDuration; }; } diff --git a/src/mbgl/style/style_layer.cpp b/src/mbgl/style/style_layer.cpp index e033287ae..5b8737760 100644 --- a/src/mbgl/style/style_layer.cpp +++ b/src/mbgl/style/style_layer.cpp @@ -73,8 +73,8 @@ void StyleLayer::setClasses(const std::vector &class_names, const T // This property key hasn't been set by a previous class, so we need to add a transition // to the fallback value for that key. - const TimePoint begin = now + defaultTransition.delay; - const TimePoint end = begin + defaultTransition.duration; + const TimePoint begin = now + *defaultTransition.delay; + const TimePoint end = begin + *defaultTransition.duration; const PropertyValue &value = PropertyFallbackValue::Get(key); appliedProperties.add(ClassID::Fallback, begin, end, value); } @@ -108,10 +108,11 @@ void StyleLayer::applyClassProperties(const ClassID class_id, // a transition. AppliedClassPropertyValues &appliedProperties = appliedStyle[key]; if (appliedProperties.mostRecent() != class_id) { - const PropertyTransition &transition = - class_properties.getTransition(key, defaultTransition); - const TimePoint begin = now + transition.delay; - const TimePoint end = begin + transition.duration; + PropertyTransition transition = class_properties.getTransition(key); + Duration delay = transition.delay ? *transition.delay : *defaultTransition.delay; + Duration duration = transition.duration ? *transition.duration : *defaultTransition.duration; + const TimePoint begin = now + delay; + const TimePoint end = begin + duration; const PropertyValue &value = property_pair.second; appliedProperties.add(class_id, begin, end, value); } diff --git a/src/mbgl/style/style_parser.cpp b/src/mbgl/style/style_parser.cpp index 538015ead..391f6b0e2 100644 --- a/src/mbgl/style/style_parser.cpp +++ b/src/mbgl/style/style_parser.cpp @@ -1,7 +1,6 @@ #include #include #include -#include #include #include #include @@ -21,10 +20,6 @@ namespace mbgl { using JSVal = const rapidjson::Value&; -StyleParser::StyleParser(MapData& data_) - : data(data_) { -} - void StyleParser::parse(JSVal document) { if (document.HasMember("version")) { version = document["version"].GetInt(); @@ -329,7 +324,12 @@ StyleParser::Result> StyleParser::parseFunction(JSVal value, const c } template -StyleParser::Result> StyleParser::parsePiecewiseConstantFunction(JSVal value, Duration duration) { +StyleParser::Result> StyleParser::parsePiecewiseConstantFunction(JSVal value, JSVal transition) { + mapbox::util::optional duration; + if (transition.HasMember("duration")) { + duration = std::chrono::milliseconds(transition["duration"].GetUint()); + } + if (!value.HasMember("stops")) { Log::Warning(Event::ParseStyle, "function must specify a function type"); return Result> { StyleParserFailure, { {}, duration } }; @@ -517,14 +517,14 @@ template<> StyleParser::Result StyleParser::parseProperty } template<> StyleParser::Result StyleParser::parseProperty(JSVal value, const char */*property_name*/) { - PropertyTransition transition { data.getDefaultTransitionDuration(), data.getDefaultTransitionDelay() }; + PropertyTransition transition; if (value.IsObject()) { bool parsed = false; - if (value.HasMember("duration") && value["duration"].IsNumber() && data.mode == MapMode::Continuous) { + if (value.HasMember("duration") && value["duration"].IsNumber()) { transition.duration = std::chrono::milliseconds(value["duration"].GetUint()); parsed = true; } - if (value.HasMember("delay") && value["delay"].IsNumber() && data.mode == MapMode::Continuous) { + if (value.HasMember("delay") && value["delay"].IsNumber()) { transition.delay = std::chrono::milliseconds(value["delay"].GetUint()); parsed = true; } @@ -593,39 +593,29 @@ template<> StyleParser::Result> StyleParser::parseProperty(JSVal } template<> StyleParser::Result>>> StyleParser::parseProperty(JSVal value, const char *property_name, JSVal transition) { - Duration duration = data.getDefaultFadeDuration(); - if (transition.HasMember("duration") && data.mode == MapMode::Continuous) { - duration = std::chrono::milliseconds(transition["duration"].GetUint()); - } - if (value.IsObject()) { - return parsePiecewiseConstantFunction>>(value, duration); + return parsePiecewiseConstantFunction>>(value, transition); } else if (value.IsArray()) { Faded> parsed; Result> floatarray = parseFloatArray(value); parsed.to = std::get<1>(floatarray); - return Result>>> { std::get<0>(floatarray), { parsed, duration } }; + return Result>>> { std::get<0>(floatarray), { parsed, {} } }; } else { Log::Warning(Event::ParseStyle, "value of '%s' must be an array of numbers, or a number array function", property_name); - return Result>>> { StyleParserFailure, { {}, duration } }; + return Result>>> { StyleParserFailure, { {}, {} } }; } } template<> StyleParser::Result>> StyleParser::parseProperty(JSVal value, const char *property_name, JSVal transition) { - Duration duration = data.getDefaultFadeDuration(); - if (transition.HasMember("duration") && data.mode == MapMode::Continuous) { - duration = std::chrono::milliseconds(transition["duration"].GetUint()); - } - if (value.IsObject()) { - return parsePiecewiseConstantFunction>(value, duration); + return parsePiecewiseConstantFunction>(value, transition); } else if (value.IsString()) { Faded parsed; parsed.to = { value.GetString(), value.GetStringLength() }; - return Result>> { StyleParserSuccess, { parsed, duration } }; + return Result>> { StyleParserSuccess, { parsed, {} } }; } else { Log::Warning(Event::ParseStyle, "value of '%s' must be string or a string function", property_name); - return Result>> { StyleParserFailure, { {}, duration } }; + return Result>> { StyleParserFailure, { {}, {} } }; } } diff --git a/src/mbgl/style/style_parser.hpp b/src/mbgl/style/style_parser.hpp index 2f6063e1f..9efa8a85e 100644 --- a/src/mbgl/style/style_parser.hpp +++ b/src/mbgl/style/style_parser.hpp @@ -31,8 +31,6 @@ public: template using Result = std::pair; - StyleParser(MapData& data); - void parse(JSVal document); std::vector>&& getSources() { @@ -87,7 +85,7 @@ private: template Result> parseFunction(JSVal value, const char *); template - Result> parsePiecewiseConstantFunction(JSVal value, Duration duration); + Result> parsePiecewiseConstantFunction(JSVal value, JSVal transition); template Result>> parseStops(JSVal value, const char *property_name); @@ -112,9 +110,6 @@ private: // URL template for glyph PBFs. std::string glyph_url; - - // Obtain default transition duration from map data. - MapData& data; }; } diff --git a/test/miscellaneous/style_parser.cpp b/test/miscellaneous/style_parser.cpp index cbb896bac..7a38ba054 100644 --- a/test/miscellaneous/style_parser.cpp +++ b/test/miscellaneous/style_parser.cpp @@ -3,9 +3,6 @@ #include #include -#include -#include - #include #include "../fixtures/fixture_log_observer.hpp" @@ -38,12 +35,7 @@ TEST_P(StyleParserTest, ParseStyle) { FixtureLogObserver* observer = new FixtureLogObserver(); Log::setObserver(std::unique_ptr(observer)); - MapMode mapMode = MapMode::Continuous; - GLContextMode contextMode = GLContextMode::Unique; - const float pixelRatio = 1.0f; - - MapData data(mapMode, contextMode, pixelRatio); - StyleParser parser(data); + StyleParser parser; parser.parse(styleDoc); for (auto it = infoDoc.MemberBegin(), end = infoDoc.MemberEnd(); it != end; it++) {