@arcgis/core 5.2.0-next.85 → 5.2.0-next.87

package/chunks/RibbonLine.glsl.js

@@ -1,7 +1,7 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import{SliceDraw as e}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{RibbonVertexPosition as t}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/RibbonVertexPosition.glsl.js";import{LineStipple as i,computePixelSize as n}from"../views/3d/webgl-engine/core/shaderLibrary/shading/LineStipple.glsl.js";import{MarkerSizing as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MarkerSizing.glsl.js";import{PiUtils as o}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PiUtils.glsl.js";import{positionOutsideClipSpace as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PositionOutsideClipSpace.js";import{ColorConversion as s}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{NoPerspectiveWrite as l,NoPerspectiveRead as d}from"../views/3d/webgl-engine/core/shaderLibrary/util/NoPerspective.glsl.js";import{addProjViewLocalOrigin as c,addPixelRatio as p}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float2BindUniform as m}from"../views/3d/webgl-engine/core/shaderModules/Float2BindUniform.js";import{Float4BindUniform as v}from"../views/3d/webgl-engine/core/shaderModules/Float4BindUniform.js";import{Float4PassUniform as g}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatBindUniform as f}from"../views/3d/webgl-engine/core/shaderModules/FloatBindUniform.js";import{FloatPassUniform as h}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as S,If as u}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Matrix4BindUniform as D}from"../views/3d/webgl-engine/core/shaderModules/Matrix4BindUniform.js";import{alphaCutoff as x}from"../views/3d/webgl-engine/shaders/alphaCutoff.glsl.js";import{AnimatedLine as L}from"../views/3d/webgl-engine/shaders/AnimatedLine.glsl.js";import{outputColorHighlightOLID as b}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{getTextureBackedBufferModule as w}from"../views/3d/webgl-engine/shaders/RibbonLineTextureBuffer.glsl.js";import{ShaderBuilder as y}from"../views/webgl/ShaderBuilder.js";const C=1;function P(C){const P=new y,{attributes:z,varyings:F,vertex:j,fragment:A}=P,{applyMarkerOffset:W,draped:I,output:R,capType:V,stippleEnabled:T,falloffEnabled:O,roundJoins:E,wireframe:N,innerColorEnabled:J,hasAnimation:_,hasScreenSizePerspective:M,worldSizedImagePattern:$}=C,U=w(C).createBuilder(P,C);j.inputs.add("position",()=>U.getTextureAttribute("position")),C.hasVVSize?j.inputs.add("sizeFeatureAttribute",()=>U.getTextureAttribute("sizeFeatureAttribute")):j.inputs.add("size",()=>U.getTextureAttribute("size")),C.hasVVOpacity&&j.inputs.add("opacityFeatureAttribute",()=>U.getTextureAttribute("opacityFeatureAttribute")),C.hasVVColor?j.inputs.add("colorFeatureAttribute",()=>U.getTextureAttribute("colorFeatureAttribute")):j.inputs.add("color",()=>U.getTextureAttribute("color")),A.include(o),P.include(t,C),P.include(i,C);const B={animation:C.animation,hasAnimation:C.hasAnimation,timeStampsExpr:U.getTextureAttribute("timeStamps")};P.include(L,B),11===R?(P.varyings.add("objectAndLayerIdColorVarying","vec4"),j.code.add(S`
+import{SliceDraw as e}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{RibbonVertexPosition as t}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/RibbonVertexPosition.glsl.js";import{LineStipple as i,computePixelSize as n}from"../views/3d/webgl-engine/core/shaderLibrary/shading/LineStipple.glsl.js";import{MarkerSizing as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MarkerSizing.glsl.js";import{PiUtils as o}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PiUtils.glsl.js";import{positionOutsideClipSpace as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PositionOutsideClipSpace.js";import{ColorConversion as s}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{NoPerspectiveWrite as l,NoPerspectiveRead as d}from"../views/3d/webgl-engine/core/shaderLibrary/util/NoPerspective.glsl.js";import{addProjViewLocalOrigin as c,addPixelRatio as p}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float2BindUniform as m}from"../views/3d/webgl-engine/core/shaderModules/Float2BindUniform.js";import{Float4BindUniform as v}from"../views/3d/webgl-engine/core/shaderModules/Float4BindUniform.js";import{Float4PassUniform as f}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatBindUniform as h}from"../views/3d/webgl-engine/core/shaderModules/FloatBindUniform.js";import{FloatPassUniform as g}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as S,If as u}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Matrix4BindUniform as x}from"../views/3d/webgl-engine/core/shaderModules/Matrix4BindUniform.js";import{alphaCutoff as D}from"../views/3d/webgl-engine/shaders/alphaCutoff.glsl.js";import{AnimatedLine as L}from"../views/3d/webgl-engine/shaders/AnimatedLine.glsl.js";import{outputColorHighlightOLID as b}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{getTextureBackedBufferModule as w}from"../views/3d/webgl-engine/shaders/RibbonLineTextureBuffer.glsl.js";import{ShaderBuilder as y}from"../views/webgl/ShaderBuilder.js";const C=1;function P(C){const P=new y,{attributes:F,varyings:j,vertex:z,fragment:A}=P,{applyMarkerOffset:W,draped:T,output:I,capType:R,stippleEnabled:V,falloffEnabled:N,wireframe:E,innerColorEnabled:O,hasAnimation:J,hasScreenSizePerspective:_,worldSizedImagePattern:$}=C,M=2===R,H=V&&M,U=N||H,B=V||M,k=w(C).createBuilder(P,C);z.inputs.add("position",()=>k.getTextureAttribute("position")),C.hasVVSize?z.inputs.add("sizeFeatureAttribute",()=>k.getTextureAttribute("sizeFeatureAttribute")):z.inputs.add("size",()=>k.getTextureAttribute("size")),C.hasVVOpacity&&z.inputs.add("opacityFeatureAttribute",()=>k.getTextureAttribute("opacityFeatureAttribute")),C.hasVVColor?z.inputs.add("colorFeatureAttribute",()=>k.getTextureAttribute("colorFeatureAttribute")):z.inputs.add("color",()=>k.getTextureAttribute("color")),A.include(o),P.include(t,C),P.include(i,C);const G={animation:C.animation,hasAnimation:C.hasAnimation,timeStampsExpr:k.getTextureAttribute("timeStamps")};P.include(L,G),11===I?(P.varyings.add("objectAndLayerIdColorVarying","vec4"),z.code.add(S`
       vec4 getOlidColor() {
-        return ${U.getTextureAttribute("olidColor")};
+        return ${k.getTextureAttribute("olidColor")};
       }
 
       void forwardObjectAndLayerIdColor() {
@@ -9,40 +9,40 @@ import{SliceDraw as e}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.gls
       }
     `),A.code.add(S`void outputObjectAndLayerIdColor() {
 fragColor = objectAndLayerIdColorVarying;
-}`)):(j.code.add(S`void forwardObjectAndLayerIdColor() {}`),A.code.add(S`void outputObjectAndLayerIdColor() {}`));const H=W&&!I;H&&(j.uniforms.add(new h("markerScale",e=>e.markerScale)),P.include(r,{space:2,hasScreenSizePerspective:M})),c(j,C),j.uniforms.add(new D("inverseProjectionMatrix",e=>e.camera.inverseProjectionMatrix),new m("nearFar",e=>e.camera.nearFar),new h("miterLimit",e=>"miter"!==e.join?0:e.miterLimit),new v("viewport",e=>e.camera.fullViewport)),j.constants.add("LARGE_HALF_FLOAT","float",65500),j.constants.add("EPS","float",.001),j.constants.add("NUM_JOIN_SUBDIVISIONS","float",C.numJoinSubdivisions),z.add("textureElementIndex","uint"),z.add("lineParameters","vec2"),F.add("vColor","vec4"),F.add("vpos","vec3",{invariant:!0}),F.add("vLineDistance","float"),F.add("vLineWidth","float"),T||(F.add("vIsInsideJoin","int"),F.add("vStretchFactor","float"),F.add("vJoinCenterLineSDFs","vec2"),F.add("vSubdivisionFactor","float"));const k=T;k&&F.add("vLineSizeInv","float");const G=2===V,X=T&&G,Y=O||X;Y&&F.add("vLineDistanceNorm","float"),G&&(F.add("vSegmentSDF","float"),F.add("vReverseSegmentSDF","float")),j.code.add(S`vec3 perpendicular(vec3 v) {
+}`)):(z.code.add(S`void forwardObjectAndLayerIdColor() {}`),A.code.add(S`void outputObjectAndLayerIdColor() {}`));const X=W&&!T;return X&&(z.uniforms.add(new g("markerScale",e=>e.markerScale)),P.include(r,{space:2,hasScreenSizePerspective:_})),c(z,C),z.uniforms.add(new x("inverseProjectionMatrix",e=>e.camera.inverseProjectionMatrix),new m("nearFar",e=>e.camera.nearFar),new g("miterLimit",e=>"miter"!==e.join?0:e.miterLimit),new v("viewport",e=>e.camera.fullViewport)),z.constants.add("LARGE_HALF_FLOAT","float",65500),z.constants.add("EPS","float",.001),z.constants.add("NUM_JOIN_SUBDIVISIONS","float",C.numJoinSubdivisions),F.add("textureElementIndex","uint"),F.add("lineParameters","vec2"),j.add("vColor","vec4"),j.add("vpos","vec3",{invariant:!0}),j.add("vLineDistance","float"),j.add("vLineWidth","float"),V||(j.add("vIsInsideJoin","int"),j.add("vStretchFactor","float"),j.add("vJoinCenterLineSDFs","vec2"),j.add("vSubdivisionFactor","float")),V&&j.add("vLineSizeInv","float"),U&&j.add("vLineDistanceNorm","float"),M&&(j.add("vSegmentSDF","float"),j.add("vReverseSegmentSDF","float")),z.code.add(S`vec3 perpendicular(vec3 v) {
 return vec3(v.y, -v.x, 0.0);
 }
-float interp(float ncp, vec4 a, vec4 b) {
-return (-ncp - a.z) / (b.z - a.z);
+float nearPlaneInterpolationFactor(float nearPlaneDistance, vec4 start, vec4 end) {
+return (-nearPlaneDistance - start.z) / (end.z - start.z);
 }
 vec3 rotateZ(vec3 v, float a) {
 float s = sin(a);
 float c = cos(a);
 mat2 m = mat2(c, -s, s, c);
 return vec3(m * v.xy, v.z);
-}`),j.code.add(S`vec4 projectAndScale(vec4 pos) {
+}`),z.code.add(S`vec4 projectAndScale(vec4 pos) {
 vec4 posNdc = proj * pos;
 posNdc.xy *= viewport.zw / posNdc.w;
 posNdc.z /= posNdc.w;
 return posNdc;
-}`),j.code.add(S`void clip(
+}`),z.code.add(S`void clip(
 inout vec4 pos,
 inout vec4 prev,
 inout vec4 next,
 bool isStartVertex
 ) {
-float vnp = nearFar[0] * 0.99;
+float adjustedNearPlaneDistance = nearFar[0] * 0.99;
 if (pos.z > -nearFar[0]) {
 if (!isStartVertex) {
 if (prev.z < -nearFar[0]) {
-pos = mix(prev, pos, interp(vnp, prev, pos));
+pos = mix(prev, pos, nearPlaneInterpolationFactor(adjustedNearPlaneDistance, prev, pos));
 next = pos;
 } else {
 pos = vec4(0.0, 0.0, 0.0, 1.0);
 }
 } else {
 if (next.z < -nearFar[0]) {
-pos = mix(pos, next, interp(vnp, pos, next));
+pos = mix(pos, next, nearPlaneInterpolationFactor(adjustedNearPlaneDistance, pos, next));
 prev = pos;
 } else {
 pos = vec4(0.0, 0.0, 0.0, 1.0);
@@ -50,20 +50,22 @@ pos = vec4(0.0, 0.0, 0.0, 1.0);
 }
 } else {
 if (prev.z > -nearFar[0]) {
-prev = mix(pos, prev, interp(vnp, pos, prev));
+prev = mix(pos, prev, nearPlaneInterpolationFactor(adjustedNearPlaneDistance, pos, prev));
 }
 if (next.z > -nearFar[0]) {
-next = mix(next, pos, interp(vnp, next, pos));
+next = mix(next, pos, nearPlaneInterpolationFactor(adjustedNearPlaneDistance, next, pos));
 }
 }
-}`),p(j),j.constants.add("aaWidth","float",T?0:1),j.main.add(S`
-    vec3 position = ${U.getTextureAttribute("position")};
-    float u0 = ${U.getTextureAttribute("u0")};
+}`),p(z),z.constants.add("aaWidth","float",V?0:1),z.main.add(S`
+    vec3 position = ${k.getTextureAttribute("position")};
+    float u0 = ${k.getTextureAttribute("u0")};
 
     // unpack values from vertex type
-    bool isStartVertex = abs(abs(lineParameters.y) - 3.0) == 1.0;
-    vec3 prevPosition = ${U.getTextureAttribute("position",-1)};
-    vec3 nextPosition = ${U.getTextureAttribute("position",1)};
+    float vertexType = abs(lineParameters.y);
+    float lineSide = sign(lineParameters.y);
+    bool isStartVertex = vertexType == 2.0 || vertexType == 4.0;
+    vec3 prevPosition = ${k.getTextureAttribute("position",-1)};
+    vec3 nextPosition = ${k.getTextureAttribute("position",1)};
 
     float coverage = 1.0;
 
@@ -77,12 +79,122 @@ next = mix(next, pos, interp(vnp, next, pos));
       vec4 prev = view * vec4(prevPosition, 1.0);
       vec4 next = view * vec4(nextPosition, 1.0);
 
-      bool isJoin = abs(lineParameters.y) < 3.0;
-  `),H&&j.main.add(S`vec4 other = isStartVertex ? next : prev;
+      bool isJoin = vertexType < 3.0;
+  `),X&&z.main.add(S`vec4 other = isStartVertex ? next : prev;
 bool markersHidden = areWorldMarkersHidden(pos.xyz, other.xyz);
 if (!isJoin && !markersHidden) {
 pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
-}`),P.include(l),j.main.add(S`
+}`),P.include(l),z.code.add(S`
+    vec2 computeJoinAndCapDisplacement(
+      bool isJoin,
+      bool isStartVertex,
+      inout vec3 left,
+      inout vec3 right,
+      float lineSide,
+      float lineWidth,
+      float subdivisionFactor,
+      float perspectiveDivisor
+    ) {
+      float leftLen = length(left);
+      float rightLen = length(right);
+      left = leftLen > EPS ? left / leftLen : vec3(0.0);
+      right = rightLen > EPS ? right / rightLen : vec3(0.0);
+
+      vec3 capDisplacementDir = vec3(0.0);
+      vec3 joinDisplacementDir = vec3(0.0);
+      float displacementLen = lineWidth;
+      float miterDisplacementLen = lineWidth;
+      float innerDisplacementLen = lineWidth;
+      bool isOutside = false;
+
+      if (isJoin) {
+        // Determine if the vertex is on the outside or inside of the join.
+        isOutside = (left.x * right.y - left.y * right.x) * lineSide > 0.0;
+
+        // Compute the miter join position first.
+        vec3 joinDirection = normalize(left + right);
+        joinDisplacementDir = perpendicular(joinDirection);
+
+        // Compute the miter stretch.
+        if (leftLen > EPS && rightLen > EPS) {
+          float nDotSeg = dot(joinDisplacementDir, left);
+          displacementLen /= length(nDotSeg * left - joinDisplacementDir);
+          miterDisplacementLen = displacementLen;
+
+          innerDisplacementLen = min(displacementLen, min(leftLen, rightLen) / abs(nDotSeg));
+
+          // Limit displacement of inner vertices.
+          if (!isOutside) {
+            displacementLen = innerDisplacementLen;
+          }
+        }
+
+        ${u(!V,S`
+            // Compute stretch compensation for feathering.
+            if (subdivisionFactor > 0.0) {
+              vIsInsideJoin = 1;
+            }
+            vSubdivisionFactor = isOutside ? subdivisionFactor : 0.5;
+
+            if (miterDisplacementLen > miterLimit * lineWidth) {
+              vec2 leftScreenDir = left.xy;
+              vec2 rightScreenDir = right.xy;
+              float leftScreenLen = length(leftScreenDir);
+              float rightScreenLen = length(rightScreenDir);
+
+              if (leftScreenLen > EPS && rightScreenLen > EPS) {
+                leftScreenDir /= leftScreenLen;
+                rightScreenDir /= rightScreenLen;
+
+                /**
+                 * Feathering AA needs special considerations on join triangles because these can get stretched a lot at acute angles.
+                 * We use the triangle height to determine by how much they get stretched.
+                 */
+                float theta = acos(clamp(dot(leftScreenDir, rightScreenDir), -1.0, 1.0));
+                /**
+                 * The argument of cos here is half the angle of a join triangle.
+                 * We start with one triangle, and every subdivision adds another triangle.
+                 */
+                float subdividedTriangleHeight = (innerDisplacementLen + lineWidth) * cos(theta / (2.0 + 2.0 * NUM_JOIN_SUBDIVISIONS));
+                float bevelTriangleHeight = innerDisplacementLen + lineWidth * cos(theta * 0.5);
+                float triangleHeight = NUM_JOIN_SUBDIVISIONS > 0.0 ? subdividedTriangleHeight : bevelTriangleHeight;
+                vStretchFactor = noPerspectiveWrite(max(triangleHeight / (2.0 * lineWidth), 1.0), perspectiveDivisor);
+              }
+            }
+          `)}
+
+        if (isOutside && displacementLen > miterLimit * lineWidth) {
+          ${u(C.roundJoins,S`
+              vec3 startDir = perpendicular(leftLen < EPS ? right : left);
+              vec3 endDir = perpendicular(rightLen < EPS ? left : right);
+              float factor = ${V?S`min(1.0, subdivisionFactor * ((NUM_JOIN_SUBDIVISIONS + 1.0) / NUM_JOIN_SUBDIVISIONS))`:S`subdivisionFactor`};
+
+              float rotationAngle = acos(clamp(dot(startDir.xy, endDir.xy), -1.0, 1.0));
+              joinDisplacementDir = rotateZ(startDir, -lineSide * factor * rotationAngle);
+            `,S`
+              /**
+               * Convert to bevel join if miterLimit is exceeded.
+               * Here vertices with a subdivisionFactor > 0 are either START vertices or
+               * an additional END vertex to fix line pattern interpolation.
+               * The additional vertex is considered to be the END of the previous segment.
+               * However, it is pushed to the position of the START of the next segment,
+               * so that the entire bevel join will be part of the first segment, pattern-wise.
+               */
+              vec3 startDir = perpendicular(leftLen < EPS ? right : left);
+              vec3 endDir = perpendicular(rightLen < EPS ? left : right);
+
+              ${u(V,S`joinDisplacementDir = (isStartVertex || subdivisionFactor > 0.0) ? endDir : startDir;`,S`joinDisplacementDir = mix(startDir, endDir, subdivisionFactor);`)}
+            `)}
+          displacementLen = lineWidth;
+        }
+      } else {
+        joinDisplacementDir = perpendicular(isStartVertex ? right : left);
+        ${0!==R?S`capDisplacementDir = vec3((isStartVertex ? -right : left).xy, 0.0);`:""}
+      }
+
+      return (joinDisplacementDir.xy * lineSide + capDisplacementDir.xy) * displacementLen;
+    }
+  `),z.main.add(S`
       clip(pos, prev, next, isStartVertex);
 
       vec3 clippedPos = pos.xyz;
@@ -95,12 +207,9 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
       vec3 left = (pos.xyz - prev.xyz);
       vec3 right = (next.xyz - pos.xyz);
 
-      float leftLen = length(left);
-      float rightLen = length(right);
-
-      float lineSize = getSize(${u(M,"clippedPos")});
-      ${u(T&&M,"float patternLineSize = getSize(clippedCenter);")}
-      ${u(T&&!M,"float patternLineSize = lineSize;")}
+      float lineSize = getSize(${u(_,"clippedPos")});
+      ${u(V&&_,"float patternLineSize = getSize(clippedCenter);")}
+      ${u(V&&!_,"float patternLineSize = lineSize;")}
 
       ${u($,S`
           lineSize += aaWidth;
@@ -120,84 +229,31 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
         `)}
 
       vLineWidth = noPerspectiveWrite(lineWidth, pos.w);
-      ${k?S`vLineSizeInv = noPerspectiveWrite(1.0 / lineSize, pos.w);`:""}
-  `);(T||G)&&j.main.add(S`
+      ${V?S`vLineSizeInv = noPerspectiveWrite(1.0 / lineSize, pos.w);`:""}
+  `),B&&z.main.add(S`
       float isEndVertex = float(!isStartVertex);
       vec3 segmentOrigin = mix(pos.xyz, prev.xyz, isEndVertex);
       vec3 segment = mix(right, left, isEndVertex);
-      ${G?S`vec3 segmentEnd = mix(next.xyz, pos.xyz, isEndVertex);`:""}
-    `),j.main.add(S`left = (leftLen > EPS) ? left/leftLen : vec3(0.0, 0.0, 0.0);
-right = (rightLen > EPS) ? right/rightLen : vec3(0.0, 0.0, 0.0);
-vec3 segmentDirection = isStartVertex ? right : left;
-vec3 capDisplacementDir = vec3(0.0, 0.0, 0.0);
-vec3 joinDisplacementDir = vec3(0.0, 0.0, 0.0);
-float displacementLen = lineWidth;
-float miterDisplacementLen = lineWidth;
-float innerDisplacementLen = lineWidth;`),T||j.main.add(S`vIsInsideJoin = 0;
-vStretchFactor = 1.0;
-vSubdivisionFactor = 0.0;
-vJoinCenterLineSDFs = vec2(LARGE_HALF_FLOAT);`),j.main.add(S`float subdivisionFactor = 0.0;
-bool isOutside = false;
-if (isJoin) {
-isOutside = (left.x * right.y - left.y * right.x) * lineParameters.y > 0.0;
-vec3 joinDirection = normalize(left + right);
-joinDisplacementDir = perpendicular(joinDirection);
-if (leftLen > EPS && rightLen > EPS) {
-float nDotSeg = dot(joinDisplacementDir, left);
-displacementLen /= length(nDotSeg * left - joinDisplacementDir);
-miterDisplacementLen = displacementLen;
-innerDisplacementLen = min(displacementLen, min(leftLen, rightLen)/abs(nDotSeg));
-if (!isOutside) {
-displacementLen = innerDisplacementLen;
-}
-}
-subdivisionFactor = lineParameters.x;`),T||j.main.add(S`if(subdivisionFactor > 0.0) {
-vIsInsideJoin = 1;
-}
-vSubdivisionFactor = isOutside ? subdivisionFactor : 0.5;
-if (miterDisplacementLen > miterLimit * lineWidth) {
-vec2 leftScreenDir = left.xy;
-vec2 rightScreenDir = right.xy;
-float leftScreenLen = length(leftScreenDir);
-float rightScreenLen = length(rightScreenDir);
-if (leftScreenLen > EPS && rightScreenLen > EPS) {
-leftScreenDir /= leftScreenLen;
-rightScreenDir /= rightScreenLen;
-float theta = acos(clamp(dot(leftScreenDir, rightScreenDir), -1.0, 1.0));
-float subdividedTriangleHeight = (innerDisplacementLen + lineWidth) * cos(theta / (2.0 + 2.0 * NUM_JOIN_SUBDIVISIONS));
-float bevelTriangleHeight = innerDisplacementLen + lineWidth * cos(theta * 0.5);
-float triangleHeight = NUM_JOIN_SUBDIVISIONS > 0.0 ? subdividedTriangleHeight : bevelTriangleHeight;
-vStretchFactor = noPerspectiveWrite(max(triangleHeight / (2.0 * lineWidth), 1.0), pos.w);
-}
-}`),j.main.add(S`if (isOutside && (displacementLen > miterLimit * lineWidth)) {`),E?j.main.add(S`
-        vec3 startDir = leftLen < EPS ? right : left;
-        startDir = perpendicular(startDir);
-
-        vec3 endDir = rightLen < EPS ? left : right;
-        endDir = perpendicular(endDir);
-
-        float factor = ${T?S`min(1.0, subdivisionFactor * ((NUM_JOIN_SUBDIVISIONS + 1.0) / NUM_JOIN_SUBDIVISIONS))`:S`subdivisionFactor`};
-
-        float rotationAngle = acos(clamp(dot(startDir.xy, endDir.xy), -1.0, 1.0));
-        joinDisplacementDir = rotateZ(startDir, -sign(lineParameters.y) * factor * rotationAngle);
-      `):j.main.add(S`
-        vec3 startDir = perpendicular(leftLen < EPS ? right : left);
-        vec3 endDir = perpendicular(rightLen < EPS ? left : right);
-
-        ${u(T,S`joinDisplacementDir = (isStartVertex || subdivisionFactor > 0.0) ? endDir : startDir;`,S`joinDisplacementDir = mix(startDir, endDir, subdivisionFactor);`)}
-  `);const Z=0!==V;return j.main.add(S`
-        displacementLen = lineWidth;
-      }
-    } else {
-      // CAP handling ---------------------------------------------------
-      joinDisplacementDir = isStartVertex ? right : left;
-      joinDisplacementDir = perpendicular(joinDisplacementDir);
-
-      ${Z?S`capDisplacementDir = vec3((isStartVertex ? -right : left).xy, 0.0);`:""}
-    }
-  `),j.main.add(S`
-    // Displacement (in pixels) caused by join/or cap
-    vec2 dposXY = (joinDisplacementDir.xy * sign(lineParameters.y) + capDisplacementDir.xy) * displacementLen;
+      ${M?S`vec3 segmentEnd = mix(next.xyz, pos.xyz, isEndVertex);`:""}
+    `),z.main.add(S`
+    ${u(!V,S`
+        vIsInsideJoin = 0;
+        vStretchFactor = 1.0;
+        vSubdivisionFactor = 0.0;
+        vJoinCenterLineSDFs = vec2(LARGE_HALF_FLOAT);
+      `)}
+
+    vec2 displacementXY = computeJoinAndCapDisplacement(
+      isJoin,
+      isStartVertex,
+      left,
+      right,
+      lineSide,
+      lineWidth,
+      lineParameters.x,
+      pos.w
+    );
+    vec3 segmentDirection = isStartVertex ? right : left;
 
     /**
      * To prevent z-fighting between layers, we also adjust the z value.
@@ -205,17 +261,17 @@ vStretchFactor = noPerspectiveWrite(max(triangleHeight / (2.0 * lineWidth), 1.0)
      * To do so, the below formula projects the xy displacement onto the original segment direction
      * to find the z-offset necessary so the triangle orientation is independent of the width.
      */
-    float dposZ = dot(dposXY, segmentDirection.xy) / dot(segmentDirection.xy, segmentDirection.xy) * segmentDirection.z;
-    vec3 dpos = vec3(dposXY, dposZ);
+    float displacementZ = dot(displacementXY, segmentDirection.xy) / dot(segmentDirection.xy, segmentDirection.xy) * segmentDirection.z;
+    vec3 displacement = vec3(displacementXY, displacementZ);
 
-    float lineDistNorm = noPerspectiveWrite(sign(lineParameters.y), pos.w);
+    float lineDistNorm = noPerspectiveWrite(lineSide, pos.w);
 
     vLineDistance = lineWidth * lineDistNorm;
-    ${Y?S`vLineDistanceNorm = lineDistNorm;`:""}
+    ${U?S`vLineDistanceNorm = lineDistNorm;`:""}
 
-    pos.xyz += dpos;
-  `),T||j.main.add(S`if (isJoin) {
-vec2 joinCenterToVertex = dposXY;
+    pos.xyz += displacement;
+  `),V||z.main.add(S`if (isJoin) {
+vec2 joinCenterToVertex = displacementXY;
 vec2 leftCenterlineDir = left.xy;
 vec2 rightCenterlineDir = right.xy;
 float leftCenterlineLen = length(leftCenterlineDir);
@@ -229,25 +285,28 @@ dot(vec2(leftCenterlineDir.y, -leftCenterlineDir.x), joinCenterToVertex)
 ),
 pos.w
 );
-}`),G&&j.main.add(S`vec2 segmentDir = normalize(segment.xy);
+}`),M&&z.main.add(S`vec2 segmentDir = normalize(segment.xy);
 vSegmentSDF = noPerspectiveWrite((isJoin && isStartVertex) ? LARGE_HALF_FLOAT : (dot(pos.xy - segmentOrigin.xy, segmentDir)), pos.w);
-vReverseSegmentSDF = noPerspectiveWrite((isJoin && !isStartVertex) ? LARGE_HALF_FLOAT : (dot(pos.xy - segmentEnd.xy, -segmentDir)), pos.w);`),T&&(I?j.uniforms.add(new f("worldToScreenRatio",e=>1/e.screenToPCSRatio)):j.main.add(S`vec3 segmentCenter = mix((nextPosition + position) * 0.5, (position + prevPosition) * 0.5, isEndVertex);
-float worldToScreenRatio = computeWorldToScreenRatio(segmentCenter);`),j.main.add(S`float segmentLengthScreenDouble = length(segment.xy);
-float segmentLengthScreen = segmentLengthScreenDouble * 0.5;
-float discreteWorldToScreenRatio = discretizeWorldToScreenRatio(worldToScreenRatio);
-float segmentLengthRender = length(mix(nextPosition - position, position - prevPosition, isEndVertex));
-vStipplePatternStretch = worldToScreenRatio / discreteWorldToScreenRatio;`),I?j.main.add(S`float segmentLengthPseudoScreen = segmentLengthScreen / pixelRatio * discreteWorldToScreenRatio / worldToScreenRatio;
-float startPseudoScreen = u0 * discreteWorldToScreenRatio - mix(0.0, segmentLengthPseudoScreen, isEndVertex);`):j.main.add(S`float startPseudoScreen = mix(u0, u0 - segmentLengthRender, isEndVertex) * discreteWorldToScreenRatio;
-float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRatio;`),j.uniforms.add(new h("stipplePatternPixelSize",e=>n(e))),j.main.add(S`
+vReverseSegmentSDF = noPerspectiveWrite((isJoin && !isStartVertex) ? LARGE_HALF_FLOAT : (dot(pos.xy - segmentEnd.xy, -segmentDir)), pos.w);`),V&&(T?z.uniforms.add(new h("worldToScreenRatio",e=>1/e.screenToPCSRatio)):z.main.add(S`vec3 segmentCenter = mix((nextPosition + position) * 0.5, (position + prevPosition) * 0.5, isEndVertex);
+float worldToScreenRatio = computeWorldToScreenRatio(segmentCenter);`),z.main.add(S`
+      float segmentLengthScreenDouble = length(segment.xy);
+      float segmentLengthScreen = segmentLengthScreenDouble * 0.5;
+      float discreteWorldToScreenRatio = discretizeWorldToScreenRatio(worldToScreenRatio);
+      float segmentLengthRender = length(mix(nextPosition - position, position - prevPosition, isEndVertex));
+      ${u(!T||$,S`float segmentStartRender = mix(u0, u0 - segmentLengthRender, isEndVertex);`)}
+
+      vStipplePatternStretch = worldToScreenRatio / discreteWorldToScreenRatio;
+    `),T?z.main.add(S`float segmentLengthPseudoScreen = segmentLengthScreen / pixelRatio * discreteWorldToScreenRatio / worldToScreenRatio;
+float startPseudoScreen = u0 * discreteWorldToScreenRatio - mix(0.0, segmentLengthPseudoScreen, isEndVertex);`):z.main.add(S`float startPseudoScreen = segmentStartRender * discreteWorldToScreenRatio;
+float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRatio;`),z.uniforms.add(new g("stipplePatternPixelSize",e=>n(e))),z.main.add(S`
       float patternLength = patternLineSize * stipplePatternPixelSize;
 
       ${u($,S`
-          float uu = mix(u0, u0 - segmentLengthRender, isEndVertex);
-          vStippleDistanceLimits = vec2(uu, uu + segmentLengthRender);
+          vStippleDistanceLimits = vec2(segmentStartRender, segmentStartRender + segmentLengthRender);
           vStipplePatternStretch = 1.0;
 
           // The v-coordinate used in case of an image pattern.
-          bool isLeft = sign(lineParameters.y) < 0.0;
+          bool isLeft = lineSide < 0.0;
           vStippleV = isLeft ? 0.0 : 1.0;
         `,S`
           // Compute the coordinates at both start and end of the line segment, because we need both to clamp to in the
@@ -269,7 +328,7 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRat
         vStippleDistance += (stippleDisplacementFactor - isEndVertex) * (vStippleDistanceLimits.y - vStippleDistanceLimits.x);
       }
 
-      // Cancel out perspective correct interpolation because we want this length the really represent the screen
+      // Cancel out perspective correct interpolation because we want this length to really represent the screen
       // distance
       vStippleDistanceLimits = noPerspectiveWrite(vStippleDistanceLimits, pos.w);
       vStippleDistance = noPerspectiveWrite(vStippleDistance, pos.w);
@@ -280,7 +339,7 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRat
                                  isStartVertex ?
                                   vec2(-1e34, vStippleDistanceLimits.y) :
                                   vec2(vStippleDistanceLimits.x, 1e34);
-    `)),j.main.add(S`
+    `)),z.main.add(S`
       // Convert back into NDC
       pos.xy = (pos.xy / viewport.zw) * pos.w;
       pos.z = pos.z * pos.w;
@@ -288,42 +347,44 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRat
       vColor = getColor();
       vColor.a = noPerspectiveWrite(vColor.a * coverage, pos.w);
 
-      ${N&&!I?"pos.z -= EPS * pos.w;":""}
+      ${E&&!T?"pos.z -= EPS * pos.w;":""}
 
       // transform final position to camera space for slicing
       vpos = (inverseProjectionMatrix * pos).xyz;
       gl_Position = pos;
       forwardObjectAndLayerIdColor();
-    }`),P.fragment.include(e,C),P.include(b,C),A.include(s),A.main.add(S`discardBySlice(vpos);`),P.include(d),A.include(x),A.main.add(S`
+    }`),P.fragment.include(e,C),P.include(b,C),A.include(s),A.main.add(S`discardBySlice(vpos);`),P.include(d),A.include(D),V||A.code.add(S`float lineFeatheringFactor(float lineWidth, float lineDistance) {
+float stretchFactor = vIsInsideJoin == 1 ? noPerspectiveRead(vStretchFactor) : 1.0;
+float featherWidth = 2.0;
+float featherStartDistance = max(lineWidth - featherWidth / stretchFactor, 0.0);
+float straightFeatherStartDistance = max(lineWidth - featherWidth, 0.0);
+float value = abs(lineDistance);
+float feather = (value - featherStartDistance) / (lineWidth - featherStartDistance);
+vec2 joinCenterSDFs = noPerspectiveRead(vJoinCenterLineSDFs);
+float joinCenterDistance = abs(vSubdivisionFactor > 0.5 ? joinCenterSDFs.x : joinCenterSDFs.y);
+float straightFeather = (joinCenterDistance - straightFeatherStartDistance) / (lineWidth - straightFeatherStartDistance);
+feather = vIsInsideJoin == 1 ? max(feather, straightFeather) : feather;
+return 1.0 - clamp(feather, 0.0, 1.0);
+}`),A.main.add(S`
     float lineWidth = noPerspectiveRead(vLineWidth);
     float lineDistance = noPerspectiveRead(vLineDistance);
-    ${u(Y,S`float lineDistanceNorm = noPerspectiveRead(vLineDistanceNorm);`)}
-  `),N?A.main.add(S`vec4 finalColor = vec4(1.0, 0.0, 1.0, 1.0);`):(G&&A.main.add(S`float sdf = noPerspectiveRead(min(vSegmentSDF, vReverseSegmentSDF));
+    ${u(U,S`float lineDistanceNorm = noPerspectiveRead(vLineDistanceNorm);`)}
+  `),E?A.main.add(S`vec4 finalColor = vec4(1.0, 0.0, 1.0, 1.0);`):(M&&A.main.add(S`float sdf = noPerspectiveRead(min(vSegmentSDF, vReverseSegmentSDF));
 vec2 fragmentPosition = vec2(min(sdf, 0.0), lineDistance);
 float fragmentRadius = length(fragmentPosition);
 float fragmentCapSDF = (fragmentRadius - lineWidth) * 0.5;
 float capCoverage = clamp(0.5 - fragmentCapSDF, 0.0, 1.0);
 if (capCoverage < alphaCutoff) {
 discard;
-}`),X?A.main.add(S`vec2 stipplePosition = vec2(
+}`),H?A.main.add(S`vec2 stipplePosition = vec2(
 min(getStippleSDF() * 2.0 - 1.0, 0.0),
 lineDistanceNorm
 );
 float stippleRadius = length(stipplePosition * lineWidth);
 float stippleCapSDF = (stippleRadius - lineWidth) * 0.5;
 float stippleCoverage = clamp(0.5 - stippleCapSDF, 0.0, 1.0);
-float stippleAlpha = step(alphaCutoff, stippleCoverage);`):A.main.add(S`float stippleAlpha = getStippleAlpha(lineWidth);`),11!==R&&A.main.add(S`discardByStippleAlpha(stippleAlpha, alphaCutoff);`),P.include(d),A.uniforms.add(new g("intrinsicColor",e=>e.color)).main.add(S`vec4 color = intrinsicColor * vColor;
-color.a = noPerspectiveRead(color.a);`),J&&A.uniforms.add(new g("innerColor",e=>e.innerColor??e.color),new h("innerWidth",(e,t)=>e.innerWidth*t.camera.pixelRatio)).main.add(S`float distToInner = abs(lineDistance) - innerWidth;
+float stippleAlpha = step(alphaCutoff, stippleCoverage);`):A.main.add(S`float stippleAlpha = getStippleAlpha(lineWidth);`),11!==I&&A.main.add(S`discardByStippleAlpha(stippleAlpha, alphaCutoff);`),A.uniforms.add(new f("intrinsicColor",e=>e.color)).main.add(S`vec4 color = intrinsicColor * vColor;
+color.a = noPerspectiveRead(color.a);`),O&&A.uniforms.add(new f("innerColor",e=>e.innerColor??e.color),new g("innerWidth",(e,t)=>e.innerWidth*t.camera.pixelRatio)).main.add(S`float distToInner = abs(lineDistance) - innerWidth;
 float innerAA = clamp(0.5 - distToInner, 0.0, 1.0);
 float innerAlpha = innerColor.a + color.a * (1.0 - innerColor.a);
-color = mix(color, vec4(innerColor.rgb, innerAlpha), innerAA);`),A.main.add(S`vec4 finalColor = blendStipple(color, stippleAlpha);`),O&&(A.uniforms.add(new h("falloff",e=>e.falloff)),A.main.add(S`finalColor.a *= pow(max(0.0, 1.0 - abs(lineDistanceNorm)), falloff);`)),T||A.main.add(S`float stretchFactor = vIsInsideJoin == 1 ? noPerspectiveRead(vStretchFactor) : 1.0;
-float featherWidth = 2.0;
-float featherStartDistance = max(lineWidth - featherWidth / stretchFactor, 0.0);
-float straightFeatherStartDistance = max(lineWidth - featherWidth, 0.0);
-float value = abs(lineDistance);
-float feather = (value - featherStartDistance) / (lineWidth - featherStartDistance);
-vec2 joinCenterSDFs = noPerspectiveRead(vJoinCenterLineSDFs);
-float joinCenterDistance = abs(vSubdivisionFactor > 0.5 ? joinCenterSDFs.x : joinCenterSDFs.y);
-float straightFeather = (joinCenterDistance - straightFeatherStartDistance) / (lineWidth - straightFeatherStartDistance);
-feather = vIsInsideJoin == 1 ? max(feather, straightFeather) : feather;
-finalColor.a *= 1.0 - clamp(feather, 0.0, 1.0);`),_&&A.main.add("finalColor = animate(finalColor);")),A.main.add(S`outputColorHighlightOLID(applySlice(finalColor, vpos), finalColor.rgb);`),P}const z=Object.freeze(Object.defineProperty({__proto__:null,build:P,ribbonlineNumRoundJoinSubdivisions:C},Symbol.toStringTag,{value:"Module"}));export{z as R,P as b,C as r};
+color = mix(color, vec4(innerColor.rgb, innerAlpha), innerAA);`),A.main.add(S`vec4 finalColor = blendStipple(color, stippleAlpha);`),N&&(A.uniforms.add(new g("falloff",e=>e.falloff)),A.main.add(S`finalColor.a *= pow(max(0.0, 1.0 - abs(lineDistanceNorm)), falloff);`)),V||A.main.add(S`finalColor.a *= lineFeatheringFactor(lineWidth, lineDistance);`),J&&A.main.add("finalColor = animate(finalColor);")),A.main.add(S`outputColorHighlightOLID(applySlice(finalColor, vpos), finalColor.rgb);`),P}const F=Object.freeze(Object.defineProperty({__proto__:null,build:P,numRoundJoinSubdivisions:C},Symbol.toStringTag,{value:"Module"}));export{F as R,P as b,C as n};