support icon-text-fit with vertical text #8835
Merged
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
So that we don't have to rewrite the buffers on every frame.
arindam1993
suggested changes
Oct 14, 2019
| const placedOrientation = this.placedOrientations[symbolInstance.crossTileID]; | ||
| const verticalHidden = (placedOrientation === WritingMode.horizontal || placedOrientation === WritingMode.horizontalOnly) ? 1 : 0; | ||
| const horizontalHidden = placedOrientation === WritingMode.vertical ? 1 : 0; | ||
|
|
There was a problem hiding this comment.
Do we need an assertion here that both verticalHidden and horizontalHidden are not 0.
horizontallHidden can also be !verticalHidden, right? since we have 3 writing modes
There was a problem hiding this comment.
That made sense to me but I tried this and it turns out they can both be 0. Switching between vertical and horizontal glyphs happens in updateLineLabels(...) in symbol/projection.js and both versions need to be not hidden for that to work. It relies on a placedOrientation not being set for line labels. This is pretty tricky and it would be great to try to clean this up but it's out of the scope of this pr
There was a problem hiding this comment.
Ah ok!, could you leave a comment about this?
arindam1993
suggested changes
Oct 15, 2019
arindam1993
approved these changes
Oct 15, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 ports support for
icon-text-fitcombined with vertical text. This works with both variable and non-variable placement. fix #8806A second vertical icon is added to the buffers along with a second vertical icon collision box. Then at placement time it selects the correct icon depending on which version of text it ended up placing.
Vertical text used to be toggled by updating the vertex buffers every frame. I switched this so that it just uses the opacity that only gets updated whenever placement is done. This is simpler and faster.
This enables
render-tests/text-writing-mode/point_label/cjk-variable-anchors-vertical-horizontal-mode-icon-text-fitrender-tests/text-writing-mode/point_label/mixed-multiline-vertical-horizontal-mode-icon-text-fitLaunch Checklist