From 7f588409913beffaa00b033062a9d18b8b3a8341 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 1 Apr 2015 14:32:44 -0700 Subject: [PATCH] Remove unused --- src/mbgl/util/raster.cpp | 15 --------------- src/mbgl/util/raster.hpp | 9 --------- 2 files changed, 24 deletions(-) diff --git a/src/mbgl/util/raster.cpp b/src/mbgl/util/raster.cpp index 7300c291e..d0e305c33 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>(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 6e5a81991..f19ff7178 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 #include #include #include @@ -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 img; - - // fade in transition - util::ptr fade_transition = nullptr; }; }