From 5792091e9db92aefb3ff969d9059923fa03bb90e Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Fri, 10 Jun 2016 21:57:12 +0300 Subject: [core] Added mbgl::util::DEFAULT_TRANSITION_EASE --- include/mbgl/util/constants.hpp | 3 +++ src/mbgl/map/transform.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/mbgl/util/constants.hpp b/include/mbgl/util/constants.hpp index 543d5b3cab..607c388e95 100644 --- a/include/mbgl/util/constants.hpp +++ b/include/mbgl/util/constants.hpp @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include @@ -40,6 +41,8 @@ constexpr uint64_t DEFAULT_MAX_CACHE_SIZE = 50 * 1024 * 1024; constexpr Duration DEFAULT_FADE_DURATION = Milliseconds(300); constexpr Seconds CLOCK_SKEW_RETRY_TIMEOUT { 30 }; +constexpr UnitBezier DEFAULT_TRANSITION_EASE = { 0, 0, 0.25, 1 }; + } // namespace util namespace debug { diff --git a/src/mbgl/map/transform.cpp b/src/mbgl/map/transform.cpp index bf95dd0714..9137f859d3 100644 --- a/src/mbgl/map/transform.cpp +++ b/src/mbgl/map/transform.cpp @@ -584,7 +584,7 @@ void Transform::startTransition(const CameraOptions& camera, if (t >= 1.0) { result = frame(1.0); } else { - util::UnitBezier ease = animation.easing ? *animation.easing : util::UnitBezier(0, 0, 0.25, 1); + util::UnitBezier ease = animation.easing ? *animation.easing : util::DEFAULT_TRANSITION_EASE; result = frame(ease.solve(t, 0.001)); } -- cgit v1.2.1