Merge c0a6b9d into be96de8

visgl · Feb 13, 2020 · 6800555 · 6800555
2 parents be96de8 + c0a6b9d
commit 6800555
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/examples/layer-browser/src/data-samples.js b/examples/layer-browser/src/data-samples.js
@@ -104,9 +104,11 @@ export const zigzag = [
       ])
   },
   {
+    // A-B-A
     path: [
       [positionOrigin[0] - 0.005, positionOrigin[1] + 0.005],
-      [positionOrigin[0] - 0.005, positionOrigin[1] - 0.005]
+      [positionOrigin[0] - 0.005, positionOrigin[1] - 0.005],
+      [positionOrigin[0] - 0.005, positionOrigin[1] + 0.005]
     ]
   }
 ];

diff --git a/modules/layers/src/path-layer/path-layer-vertex.glsl.js b/modules/layers/src/path-layer/path-layer-vertex.glsl.js
@@ -97,7 +97,7 @@ vec3 lineJoin(
   float cosHalfA = abs(dot(dirA, miterVec));
 
   // -1: right, 1: left
-  float turnDirection = flipIfTrue(dirA.x * dirB.y > dirA.y * dirB.x);
+  float turnDirection = flipIfTrue(dirA.x * dirB.y >= dirA.y * dirB.x);
 
   // relative position to the corner:
   // -1: inside (smaller side of the angle)

diff --git a/test/render/golden-images/path-lnglat.png b/test/render/golden-images/path-lnglat.png
diff --git a/test/render/golden-images/path-rounded.png b/test/render/golden-images/path-rounded.png