diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2014-07-16 18:53:56 -0700 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2014-07-16 18:53:56 -0700 |
commit | 4ea281c750c5afcc68f2832bb42d98a1cbce6735 (patch) | |
tree | 60bc7d3ccba2c54859e2e023997cc027cc67aea7 /src/util/transition.cpp | |
parent | c1a64dc5fa73b54cc5de77629781dfc74302a1e7 (diff) | |
download | qtlocation-mapboxgl-4ea281c750c5afcc68f2832bb42d98a1cbce6735.tar.gz |
rename llmr => mbgl
Diffstat (limited to 'src/util/transition.cpp')
-rw-r--r-- | src/util/transition.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/util/transition.cpp b/src/util/transition.cpp index 10f94c78b2..c91c8019b7 100644 --- a/src/util/transition.cpp +++ b/src/util/transition.cpp @@ -1,8 +1,8 @@ -#include <llmr/util/transition.hpp> -#include <llmr/util/unitbezier.hpp> -#include <llmr/platform/platform.hpp> +#include <mbgl/util/transition.hpp> +#include <mbgl/util/unitbezier.hpp> +#include <mbgl/platform/platform.hpp> -namespace llmr { namespace util { +namespace mbgl { namespace util { UnitBezier ease(0, 0, 0.25, 1); @@ -16,7 +16,7 @@ float transition::interpolateFloat(float from, float to, double t) const { return from + (to - from) * (float)t; } -llmr::Color transition::interpolateColor(llmr::Color from, llmr::Color to, double t) const { +mbgl::Color transition::interpolateColor(mbgl::Color from, mbgl::Color to, double t) const { return {{ interpolateFloat(from[0], to[0], t), interpolateFloat(from[1], to[1], t), interpolateFloat(from[2], to[2], t), @@ -40,7 +40,7 @@ transition::state ease_transition<double>::update(timestamp now) const { } template <> -transition::state ease_transition<llmr::Color>::update(timestamp now) const { +transition::state ease_transition<mbgl::Color>::update(timestamp now) const { float t = progress(now); if (t >= 1) { value = to; |