[core] Remove default transition duration

This commit is contained in:
Bruno de Oliveira Abinader
2016-03-06 16:15:27 +02:00
parent 15621b066c
commit 8f96dea822
5 changed files with 10 additions and 38 deletions

View File

@@ -75,9 +75,6 @@ public:
void setDefaultFadeDuration(const Duration&);
Duration getDefaultFadeDuration() const;
void setDefaultTransitionDuration(const Duration&);
Duration getDefaultTransitionDuration() const;
void setStyleURL(const std::string& url);
void setStyleJSON(const std::string& json, const std::string& base = "");
std::string getStyleURL() const;

View File

@@ -5,19 +5,18 @@
namespace mbgl {
enum class Update : uint32_t {
enum class Update : uint8_t {
Nothing = 0,
Dimensions = 1 << 1,
DefaultTransition = 1 << 2,
Classes = 1 << 3,
RecalculateStyle = 1 << 4,
RenderStill = 1 << 5,
Repaint = 1 << 6,
Annotations = 1 << 7,
Classes = 1 << 2,
RecalculateStyle = 1 << 3,
RenderStill = 1 << 4,
Repaint = 1 << 5,
Annotations = 1 << 6,
};
inline Update operator| (const Update& lhs, const Update& rhs) {
return Update(static_cast<uint32_t>(lhs) | static_cast<uint32_t>(rhs));
return Update(static_cast<uint8_t>(lhs) | static_cast<uint8_t>(rhs));
}
inline Update& operator|=(Update& lhs, const Update& rhs) {
@@ -26,7 +25,7 @@ inline Update& operator|=(Update& lhs, const Update& rhs) {
}
inline bool operator& (const Update& lhs, const Update& rhs) {
return static_cast<uint32_t>(lhs) & static_cast<uint32_t>(rhs);
return static_cast<uint8_t>(lhs) & static_cast<uint8_t>(rhs);
}
} // namespace mbgl

View File

@@ -549,15 +549,6 @@ Duration Map::getDefaultFadeDuration() const {
return data->getDefaultFadeDuration();
}
void Map::setDefaultTransitionDuration(const Duration& duration) {
data->setDefaultTransitionDuration(duration);
update(Update::DefaultTransition);
}
Duration Map::getDefaultTransitionDuration() const {
return data->getDefaultTransitionDuration();
}
void Map::setSourceTileCacheSize(size_t size) {
context->invoke(&MapContext::setSourceTileCacheSize, size);
}

View File

@@ -150,7 +150,7 @@ void MapContext::loadStyleJSON(const std::string& json, const std::string& base)
// created but before a style is loaded
data.loading = true;
updateAsync(Update::DefaultTransition | Update::Classes | Update::RecalculateStyle | Update::Annotations);
updateAsync(Update::Classes | Update::RecalculateStyle | Update::Annotations);
}
void MapContext::update() {

View File

@@ -25,12 +25,10 @@ public:
, pixelRatio(pixelRatio_)
, annotationManager(pixelRatio)
, animationTime(Duration::zero())
, defaultFadeDuration(mode_ == MapMode::Continuous ? Milliseconds(300) : Duration::zero())
, defaultTransitionDuration(Duration::zero()) {
, defaultFadeDuration(mode_ == MapMode::Continuous ? Milliseconds(300) : Duration::zero()) {
assert(pixelRatio > 0);
}
inline MapDebugOptions getDebug() const {
return debugOptions;
}
@@ -77,18 +75,6 @@ public:
defaultFadeDuration = duration;
}
inline Duration getDefaultTransitionDuration() const {
return defaultTransitionDuration;
}
inline void setDefaultTransitionDuration(const Duration& duration) {
if (mode == MapMode::Still) {
return;
}
defaultTransitionDuration = duration;
}
util::exclusive<AnnotationManager> getAnnotationManager() {
return util::exclusive<AnnotationManager>(
&annotationManager,
@@ -107,7 +93,6 @@ private:
std::atomic<MapDebugOptions> debugOptions { MapDebugOptions::NoDebug };
std::atomic<Duration> animationTime;
std::atomic<Duration> defaultFadeDuration;
std::atomic<Duration> defaultTransitionDuration;
// TODO: make private
public: