diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-04-01 14:32:44 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-04-02 15:30:12 -0700 |
commit | 7f588409913beffaa00b033062a9d18b8b3a8341 (patch) | |
tree | f0cd5d54c3a5244aed410ecb0f847a1f16380710 | |
parent | 7c05f941a8c001ad770a79fc2ae59093d0dcdcd2 (diff) | |
download | qtlocation-mapboxgl-7f588409913beffaa00b033062a9d18b8b3a8341.tar.gz |
Remove unused
-rw-r--r-- | src/mbgl/util/raster.cpp | 15 | ||||
-rw-r--r-- | src/mbgl/util/raster.hpp | 9 |
2 files changed, 0 insertions, 24 deletions
diff --git a/src/mbgl/util/raster.cpp b/src/mbgl/util/raster.cpp index 7300c291e5..d0e305c33a 100644 --- a/src/mbgl/util/raster.cpp +++ b/src/mbgl/util/raster.cpp @@ -89,18 +89,3 @@ void Raster::bind(const GLuint custom_texture) { } } - -void Raster::beginFadeInTransition() { - TimePoint start = Clock::now(); - fade_transition = std::make_shared<util::ease_transition<double>>(opacity, 1.0, opacity, start, std::chrono::milliseconds(250)); -} - -bool Raster::needsTransition() const { - return fade_transition != nullptr; -} - -void Raster::updateTransitions(TimePoint now) { - if (fade_transition->update(now) == util::transition::complete) { - fade_transition = nullptr; - } -} diff --git a/src/mbgl/util/raster.hpp b/src/mbgl/util/raster.hpp index 6e5a819916..f19ff7178a 100644 --- a/src/mbgl/util/raster.hpp +++ b/src/mbgl/util/raster.hpp @@ -1,7 +1,6 @@ #ifndef MBGL_UTIL_RASTER #define MBGL_UTIL_RASTER -#include <mbgl/util/transition.hpp> #include <mbgl/util/texture_pool.hpp> #include <mbgl/util/image.hpp> #include <mbgl/util/ptr.hpp> @@ -32,11 +31,6 @@ public: // loaded status bool isLoaded() const; - // transitions - void beginFadeInTransition(); - bool needsTransition() const; - void updateTransitions(TimePoint now); - public: // loaded image dimensions uint32_t width = 0, height = 0; @@ -64,9 +58,6 @@ private: // the raw pixels std::unique_ptr<util::Image> img; - - // fade in transition - util::ptr<util::transition> fade_transition = nullptr; }; } |