tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] fix division by zero when defaultFadeDuration is 0

Browse Source
This commit is contained in:
Konstantin Käfer
2017-07-13 16:57:31 +02:00
parent 86682f2507
commit 13d6920661
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mbgl/renderer/cross_faded_property_evaluator.cpp
View File

@@ -27,7 +27,10 @@ Faded<T> CrossFadedPropertyEvaluator<T>::calculate(const T& min, const T& mid, c
const float z = parameters.z;
const float fraction = z - std::floor(z);
const std::chrono::duration<float> d = parameters.defaultFadeDuration;
const float t = std::min((parameters.now - parameters.zoomHistory.lastIntegerZoomTime) / d, 1.0f);
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 }