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

[core] More complete fix for composite function interpolation edge case

Browse Source 
b5b4549 / #8613 handled the edge case for layout properties, but not paint properties. Move the check for a degenerate range to interpolationFactor in order to handle both correctly.
This commit is contained in:
John Firebaugh
2017-04-20 15:28:28 -07:00
parent c6be40b71b
commit 3c23faf65a
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/mbgl/style/function/composite_function.hpp
View File

@@ -100,9 +100,6 @@ public:
T evaluate(float zoom, const GeometryTileFeature& feature, T finalDefaultValue) const {
std::tuple<Range<float>, Range<InnerStops>> ranges = coveringRanges(zoom);
Range<T> resultRange = evaluate(std::get<1>(ranges), feature, finalDefaultValue);
// If the covering stop range is constant, just return the output value directly.
if (resultRange.min == resultRange.max) return resultRange.min;
// Otherwise, interpolate between the two stops.
return util::interpolate(
resultRange.min,
resultRange.max,

2
mapbox-gl-js

Submodule mapbox-gl-js updated: fbea856524...dff6bf91ec

4
src/mbgl/util/interpolate.cpp
View File

@@ -8,7 +8,9 @@ namespace util {
float interpolationFactor(float base, Range<float> range, float z) {
const float zoomDiff = range.max - range.min;
const float zoomProgress = z - range.min;
if (base == 1.0f) {
if (zoomDiff == 0) {
return 0;
} else if (base == 1.0f) {
return zoomProgress / zoomDiff;
} else {
return (std::pow(base, zoomProgress) - 1) / (std::pow(base, zoomDiff) - 1);