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

Port line-dasharray fix from gl-js #16202

Merged
merged 4 commits into from
Feb 14, 2020
Merged

Port line-dasharray fix from gl-js #16202

merged 4 commits into from
Feb 14, 2020

Conversation

karimnaaji
Copy link
Contributor

@karimnaaji karimnaaji commented Feb 13, 2020

Port of bug-fix on line-dasharray from gl-js.

For background, refer:

Closes #16181

Launch Checklist

@karimnaaji karimnaaji added GL JS parity For feature parity with Mapbox GL JS needs changelog Indicates PR needs a changelog entry prior to merging. labels Feb 13, 2020
Copy link
Contributor

@alexshalamov alexshalamov left a comment

Choose a reason for hiding this comment

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

@karimnaaji could you 'unignore'

"render-tests/line-dasharray/zero-length-gap":"https://github.com/mapbox/mapbox-gl-js/pull/9246"

Patch for baselines bot could be downloaded from CI job https://406842-16286131-gh.circle-artifacts.com/0/tests/baselines/baselines.patch

Copy link
Contributor

@alexshalamov alexshalamov left a comment

Choose a reason for hiding this comment

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

few comments

src/mbgl/geometry/line_atlas.cpp Show resolved Hide resolved
src/mbgl/geometry/line_atlas.cpp Outdated Show resolved Hide resolved
src/mbgl/geometry/line_atlas.cpp Outdated Show resolved Hide resolved
src/mbgl/geometry/line_atlas.cpp Outdated Show resolved Hide resolved
@karimnaaji
Copy link
Contributor Author

karimnaaji commented Feb 13, 2020

Thanks for the info on the baselines @alexshalamov ! It's updated, ready for another review.

Copy link
Contributor

@alexshalamov alexshalamov left a comment

Choose a reason for hiding this comment

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

lgtm and thanks for backport!
Could you please add entry to changelog

@karimnaaji karimnaaji removed the needs changelog Indicates PR needs a changelog entry prior to merging. label Feb 13, 2020
* Fix artifact for zero-lenghted dash array
Fixes issue mapbox/mapbox-gl-js#9213 and add
render test for coverage around 0-length dash arrays

Update distance field generation for regular dashes as follows:
1. Compute the dash array ranges and stretch location along the distance field
2. Collapse any 0-length distance field range
3. Collapse neighbouring same-type parts into single part

* combine consecutive dashes and parts

mapbox/mapbox-gl-js#9246
#16181
@alexshalamov alexshalamov merged commit 189ed4a into master Feb 14, 2020
@alexshalamov alexshalamov deleted the line-dash-array-fix branch February 14, 2020 10:56
@alexshalamov
Copy link
Contributor

@karimnaaji rebased & meged.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
GL JS parity For feature parity with Mapbox GL JS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Port line-dasharray fix
3 participants