diff options
| author | Molly Lloyd <mollymerp@users.noreply.github.com> | 2018-06-19 13:46:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-19 13:46:12 -0700 |
| commit | 325ad2f711d038876c0180ac1022c265521e9578 (patch) | |
| tree | 0849d47931bb065587cab66842c2c8583383b3df /src | |
| parent | 4c7842045a231b40aa9f4c4765678f1cd5aa987d (diff) | |
| download | qtlocation-mapboxgl-325ad2f711d038876c0180ac1022c265521e9578.tar.gz | |
[core] port zero line-width fix from gl-js (#12175)
* port zero line-width fix from gl-js
* ignore transition test
* ignore feature-state tests
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/shaders/line.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/shaders/line_pattern.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/shaders/line_sdf.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/shaders/line.cpp b/src/mbgl/shaders/line.cpp index 68d2dcc468..a4df33d9b6 100644 --- a/src/mbgl/shaders/line.cpp +++ b/src/mbgl/shaders/line.cpp @@ -148,7 +148,7 @@ void main() { offset = -1.0 * offset; float inset = gapwidth + (gapwidth > 0.0 ? ANTIALIASING : 0.0); - float outset = gapwidth + halfwidth * (gapwidth > 0.0 ? 2.0 : 1.0) + ANTIALIASING; + float outset = gapwidth + halfwidth * (gapwidth > 0.0 ? 2.0 : 1.0) + (halfwidth == 0.0 ? 0.0 : ANTIALIASING); // Scale the extrusion vector down to a normal and then up by the line width // of this vertex. diff --git a/src/mbgl/shaders/line_pattern.cpp b/src/mbgl/shaders/line_pattern.cpp index be88255e3c..374fc0a995 100644 --- a/src/mbgl/shaders/line_pattern.cpp +++ b/src/mbgl/shaders/line_pattern.cpp @@ -133,7 +133,7 @@ void main() { offset = -1.0 * offset; float inset = gapwidth + (gapwidth > 0.0 ? ANTIALIASING : 0.0); - float outset = gapwidth + halfwidth * (gapwidth > 0.0 ? 2.0 : 1.0) + ANTIALIASING; + float outset = gapwidth + halfwidth * (gapwidth > 0.0 ? 2.0 : 1.0) + (halfwidth == 0.0 ? 0.0 : ANTIALIASING); // Scale the extrusion vector down to a normal and then up by the line width // of this vertex. diff --git a/src/mbgl/shaders/line_sdf.cpp b/src/mbgl/shaders/line_sdf.cpp index c5d50566e8..9b6bf47301 100644 --- a/src/mbgl/shaders/line_sdf.cpp +++ b/src/mbgl/shaders/line_sdf.cpp @@ -171,7 +171,7 @@ void main() { offset = -1.0 * offset; float inset = gapwidth + (gapwidth > 0.0 ? ANTIALIASING : 0.0); - float outset = gapwidth + halfwidth * (gapwidth > 0.0 ? 2.0 : 1.0) + ANTIALIASING; + float outset = gapwidth + halfwidth * (gapwidth > 0.0 ? 2.0 : 1.0) + (halfwidth == 0.0 ? 0.0 : ANTIALIASING); // Scale the extrusion vector down to a normal and then up by the line width // of this vertex. |