This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
Update shaders: get 'icon-pitch-alignment' and fix for issue #9456 #9479
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mollymerp
approved these changes
Jul 12, 2017
src/mbgl/layout/symbol_layout.cpp
Outdated
| if (layout.get<TextPitchAlignment>() == AlignmentType::Auto) { | ||
| layout.get<TextPitchAlignment>() = layout.get<TextRotationAlignment>(); | ||
| } | ||
| // If unspecified `text-pitch-alignment` inherits `text-rotation-alignment` |
There was a problem hiding this comment.
I think we can remove this comment ✂️
src/mbgl/shaders/preludes.cpp
Outdated
| @@ -24,25 +24,6 @@ precision highp float; | |||
|
|
|||
| #endif | |||
|
|
|||
| float evaluate_zoom_function_1(const vec4 values, const float t) { | |||
There was a problem hiding this comment.
is this deletion meant to be included with this PR?
ChrisLoer
force-pushed
the
cloer_9345_9456
branch
from
0ec9633 to
25fdf3b
Compare
ChrisLoer
force-pushed
the
cloer_9345_9456
branch
from
25fdf3b to
4a53986
Compare
This was referenced Jul 12, 2017
This was referenced Aug 31, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR depends on mapbox/mapbox-gl-js#4974 and #9478 for tests. Once those go in, this will be ready -- no code changes should be necessary.
Implements 'icon-pitch-alignment' (issue #9345)
Fixes issue #9456 (map-aligned point label regression)
/cc @ansis @mollymerp