Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[core] fix opacity interpolation for composition expressions #15738

Merged
merged 3 commits into from
Oct 2, 2019
Merged

[core] fix opacity interpolation for composition expressions #15738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ab4061
[core] fix opacity interpolation for composition expressions
ansis Oct 1, 2019
0b0bd8b
fix formatting
ansis Oct 1, 2019
3a3662f
fix
ansis Oct 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions platform/node/test/ignores.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
"render-tests/circle-sort-key/literal": "https://github.com/mapbox/mapbox-gl-native/issues/15008",
"render-tests/fill-sort-key/literal": "https://github.com/mapbox/mapbox-gl-native/issues/15008",
"render-tests/line-sort-key/literal": "https://github.com/mapbox/mapbox-gl-native/issues/15008",
"render-tests/regressions/mapbox-gl-js#8817": "skip - https://github.com/mapbox/mapbox-gl-native/issues/15737",
"query-tests/fill-extrusion/base-in": "https://github.com/mapbox/mapbox-gl-native/issues/13139",
"query-tests/fill-extrusion/box-in": "https://github.com/mapbox/mapbox-gl-native/issues/13139",
"query-tests/fill-extrusion/side-in": "https://github.com/mapbox/mapbox-gl-native/issues/13139",
Expand Down
9 changes: 4 additions & 5 deletions src/mbgl/renderer/paint_property_binder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,11 +370,10 @@ class CompositeFunctionPaintPropertyBinder final : public PaintPropertyBinder<T,
}

std::tuple<float> interpolationFactor(float currentZoom) const override {
if (expression.useIntegerZoom) {
return std::tuple<float> { expression.interpolationFactor(zoomRange, std::floor(currentZoom)) };
} else {
return std::tuple<float> { expression.interpolationFactor(zoomRange, currentZoom) };
}
const float possiblyRoundedZoom = expression.useIntegerZoom ? std::floor(currentZoom) : currentZoom;

return std::tuple<float>{
::fmax(0.0, ::fmin(1.0, expression.interpolationFactor(zoomRange, possiblyRoundedZoom)))};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sad that std::clamp is C++17 :-/

}

std::tuple<T> uniformValue(const PossiblyEvaluatedPropertyValue<T>& currentValue) const override {
Expand Down