summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/cross_faded_property_evaluator.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/renderer/cross_faded_property_evaluator.cpp')
-rw-r--r--src/mbgl/renderer/cross_faded_property_evaluator.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/mbgl/renderer/cross_faded_property_evaluator.cpp b/src/mbgl/renderer/cross_faded_property_evaluator.cpp
index 9a7af8636c..7be9c2bcf5 100644
--- a/src/mbgl/renderer/cross_faded_property_evaluator.cpp
+++ b/src/mbgl/renderer/cross_faded_property_evaluator.cpp
@@ -25,16 +25,9 @@ Faded<T> CrossFadedPropertyEvaluator<T>::operator()(const style::PropertyExpress
template <typename T>
Faded<T> CrossFadedPropertyEvaluator<T>::calculate(const T& min, const T& mid, const T& max) const {
const float z = parameters.z;
- const float fraction = z - std::floor(z);
- const std::chrono::duration<float> d = parameters.defaultFadeDuration;
- const float t =
- d != std::chrono::duration<float>::zero()
- ? std::min((parameters.now - parameters.zoomHistory.lastIntegerZoomTime) / d, 1.0f)
- : 1.0f;
-
return z > parameters.zoomHistory.lastIntegerZoom
- ? Faded<T> { min, mid, 2.0f, 1.0f, fraction + (1.0f - fraction) * t }
- : Faded<T> { max, mid, 0.5f, 1.0f, 1 - (1 - t) * fraction };
+ ? Faded<T> { min, mid }
+ : Faded<T> { max, mid };
}
template class CrossFadedPropertyEvaluator<std::string>;