@arcgis/core 5.2.0-next.160 → 5.2.0-next.162

package/chunks/DefaultMaterial.glsl.js

@@ -43,7 +43,7 @@ import{Offset as e}from"../views/3d/webgl-engine/core/shaderLibrary/Offset.glsl.
       ${M(X,`vColor.rgb *`)} matColor,
       texColor.rgb,
       vExternalColor.rgb,
-      colorMixMode
+      int(colorMixMode)
     );
     float opacity_ = getDefaultMaterialOpacity(texColor.a);
 

package/chunks/RealisticTree.glsl.js

@@ -34,7 +34,7 @@ import{Offset as e}from"../views/3d/webgl-engine/core/shaderLibrary/Offset.glsl.
       ${O(P.hasVertexColors,`vColor.rgb * `)} matColor,
       texColor.rgb,
       vExternalColor.rgb,
-      colorMixMode
+      int(colorMixMode)
     );
     float opacity_ = getDefaultMaterialOpacity(texColor.a);
 

package/chunks/RibbonLine.glsl.js

@@ -1,5 +1,5 @@
 /* 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{evaluateSceneLightingFragment as n}from"../views/3d/webgl-engine/core/shaderLibrary/shading/evaluateSceneLightingFragment.glsl.js";import{LineStipple as r,computePixelSize as i}from"../views/3d/webgl-engine/core/shaderLibrary/shading/LineStipple.glsl.js";import{MarkerSizing as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MarkerSizing.glsl.js";import{NormalUtils as o}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{PiUtils as s}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PiUtils.glsl.js";import{positionOutsideClipSpace as c}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PositionOutsideClipSpace.js";import{metersPerRenderUnit as l,screenPixelSizePerDistance as u,inverseProjectionMatrix as d,nearFar as f,viewport as p}from"../views/3d/webgl-engine/core/shaderLibrary/util/cameraUniforms.js";import{ColorConversion as m}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{NoPerspectiveWrite as h,NoPerspectiveRead as g}from"../views/3d/webgl-engine/core/shaderLibrary/util/NoPerspective.glsl.js";import{addProjViewLocalOrigin as _,addPixelRatio as v}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float4PassUniform as y}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatBindUniform as b}from"../views/3d/webgl-engine/core/shaderModules/FloatBindUniform.js";import{FloatPassUniform as x}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as S,If as C}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{alphaCutoff as w}from"../views/3d/webgl-engine/shaders/alphaCutoff.glsl.js";import{animatedAlpha as T}from"../views/3d/webgl-engine/shaders/animatedAlpha.glsl.js";import{outputColorHighlightOLID as E}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{getTextureBackedBufferModule as ee}from"../views/3d/webgl-engine/shaders/RibbonLineTextureBuffer.glsl.js";import{ShaderBuilder as D}from"../views/webgl/ShaderBuilder.js";const O=1;function k(O){let k=new D,{attributes:A,varyings:j,vertex:M,fragment:N}=k,{applyMarkerOffset:P,draped:F,shadingEnabled:I,output:L,capType:R,stippleEnabled:z,falloffEnabled:B,wireframe:V,innerColorEnabled:H,hasAnimation:U,hasScreenSizePerspective:W,worldSized:G,imagePattern:K}=O,q=R===2,J=z&&q,Y=B||J,X=z||q,Z=O.usePerspectiveCorrectStipple,Q=ee(O).createBuilder(k,O);M.inputs.add(`position`,()=>Q.getTextureAttribute(`position`)),O.hasVVSize?M.inputs.add(`sizeFeatureAttribute`,()=>Q.getTextureAttribute(`sizeFeatureAttribute`)):M.inputs.add(`size`,()=>Q.getTextureAttribute(`size`)),O.hasVVOpacity&&M.inputs.add(`opacityFeatureAttribute`,()=>Q.getTextureAttribute(`opacityFeatureAttribute`)),O.hasVVColor?M.inputs.add(`colorFeatureAttribute`,()=>Q.getTextureAttribute(`colorFeatureAttribute`)):M.inputs.add(`color`,()=>Q.getTextureAttribute(`color`)),N.include(s),k.include(t,O),k.include(r,O),L===11?(k.varyings.add(`objectAndLayerIdColorVarying`,`vec4`),M.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{evaluateSceneLightingFragment as n}from"../views/3d/webgl-engine/core/shaderLibrary/shading/evaluateSceneLightingFragment.glsl.js";import{LineStipple as r,computePixelSize as i}from"../views/3d/webgl-engine/core/shaderLibrary/shading/LineStipple.glsl.js";import{MarkerSizing as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MarkerSizing.glsl.js";import{NormalUtils as o}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{PiUtils as s}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PiUtils.glsl.js";import{positionOutsideClipSpace as c}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PositionOutsideClipSpace.js";import{metersPerRenderUnit as l,screenPixelSizePerDistance as u,inverseProjectionMatrix as d,nearFar as f,viewport as p}from"../views/3d/webgl-engine/core/shaderLibrary/util/cameraUniforms.js";import{ColorConversion as ee}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{NoPerspectiveWrite as m,NoPerspectiveRead as h}from"../views/3d/webgl-engine/core/shaderLibrary/util/NoPerspective.glsl.js";import{addProjViewLocalOrigin as g,addPixelRatio as _}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float4PassUniform as v}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatBindUniform as y}from"../views/3d/webgl-engine/core/shaderModules/FloatBindUniform.js";import{FloatPassUniform as b}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as x,If as S}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{alphaCutoff as C}from"../views/3d/webgl-engine/shaders/alphaCutoff.glsl.js";import{animatedAlpha as w}from"../views/3d/webgl-engine/shaders/animatedAlpha.glsl.js";import{outputColorHighlightOLID as T}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{getTextureBackedBufferModule as E}from"../views/3d/webgl-engine/shaders/RibbonLineTextureBuffer.glsl.js";import{ShaderBuilder as te}from"../views/webgl/ShaderBuilder.js";const D=1;function O(D){let O=new te,{attributes:k,varyings:A,vertex:j,fragment:M}=O,{applyMarkerOffset:N,draped:P,shadingEnabled:F,output:I,capType:L,stippleEnabled:R,falloffEnabled:z,wireframe:B,innerColorEnabled:V,hasAnimation:H,hasScreenSizePerspective:U,worldSized:W,imagePattern:G,useFlatJoinVarying:K}=D,q=L===2,J=R&&q,Y=z||J,X=R||q,Z=D.usePerspectiveCorrectStipple,Q=E(D).createBuilder(O,D);j.inputs.add(`position`,()=>Q.getTextureAttribute(`position`)),D.hasVVSize?j.inputs.add(`sizeFeatureAttribute`,()=>Q.getTextureAttribute(`sizeFeatureAttribute`)):j.inputs.add(`size`,()=>Q.getTextureAttribute(`size`)),D.hasVVOpacity&&j.inputs.add(`opacityFeatureAttribute`,()=>Q.getTextureAttribute(`opacityFeatureAttribute`)),D.hasVVColor?j.inputs.add(`colorFeatureAttribute`,()=>Q.getTextureAttribute(`colorFeatureAttribute`)):j.inputs.add(`color`,()=>Q.getTextureAttribute(`color`)),M.include(s),O.include(t,D),O.include(r,D),I===11?(O.varyings.add(`objectAndLayerIdColorVarying`,`vec4`),j.code.add(x`
       vec4 getOlidColor() {
         return ${Q.getTextureAttribute(`olidColor`)};
       }
@@ -7,9 +7,9 @@ import{sliceDraw as e}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.gls
       void forwardObjectAndLayerIdColor() {
         objectAndLayerIdColorVarying = getOlidColor();
       }
-    `),N.code.add(S`void outputObjectAndLayerIdColor() {
+    `),M.code.add(x`void outputObjectAndLayerIdColor() {
 fragColor = objectAndLayerIdColorVarying;
-}`)):(M.code.add(S`void forwardObjectAndLayerIdColor() {}`),N.code.add(S`void outputObjectAndLayerIdColor() {}`));let $=P&&!F;if($&&k.include(a,O),_(M,O),F&&(G||z)){let e=G?`groundMetersToScreenRatio`:`planarDistanceToScreenRatio`;M.uniforms.add(new b(e,e=>1/(e.screenToPlanarDistanceRatio*(G?e.planarDistanceToGroundRatio:1))))}return G&&!F&&M.uniforms.add(l,u),M.uniforms.add(d,f,p,new x(`miterLimit`,e=>e.join===`miter`?e.miterLimit:0)),M.constants.add(`LARGE_HALF_FLOAT`,`float`,65500),M.constants.add(`EPS`,`float`,.001),M.constants.add(`NUM_JOIN_SUBDIVISIONS`,`float`,O.numJoinSubdivisions),A.add(`textureElementIndex`,`uint`),A.add(`lineParameters`,`vec2`),j.add(`vColor`,`vec4`),j.add(`vpos`,`vec3`,{invariant:!0}),j.add(`vLineDistance`,`float`),j.add(`vLineWidth`,`float`),z||(j.add(`vIsInsideJoin`,`int`),j.add(`vStretchFactor`,`float`),j.add(`vJoinCenterLineSDFs`,`vec2`),j.add(`vSubdivisionFactor`,`float`)),z&&j.add(`vLineSizeInv`,`float`),Y&&j.add(`vLineDistanceNorm`,`float`),q&&(j.add(`vSegmentSDF`,`float`),j.add(`vReverseSegmentSDF`,`float`)),M.code.add(S`vec3 perpendicular(vec3 v) {
+}`)):(j.code.add(x`void forwardObjectAndLayerIdColor() {}`),M.code.add(x`void outputObjectAndLayerIdColor() {}`));let $=N&&!P;if($&&O.include(a,D),g(j,D),P&&(W||R)){let e=W?`groundMetersToScreenRatio`:`planarDistanceToScreenRatio`;j.uniforms.add(new y(e,e=>1/(e.screenToPlanarDistanceRatio*(W?e.planarDistanceToGroundRatio:1))))}return W&&!P&&j.uniforms.add(l,u),j.uniforms.add(d,f,p,new b(`miterLimit`,e=>e.join===`miter`?e.miterLimit:0)),j.constants.add(`LARGE_HALF_FLOAT`,`float`,65500),j.constants.add(`EPS`,`float`,.001),j.constants.add(`NUM_JOIN_SUBDIVISIONS`,`float`,D.numJoinSubdivisions),k.add(`textureElementIndex`,`uint`),k.add(`lineParameters`,`vec2`),A.add(`vColor`,`vec4`),A.add(`vpos`,`vec3`,{invariant:!0}),A.add(`vLineDistance`,`float`),A.add(`vLineWidth`,`float`),K?A.add(`vIsInsideJoin`,`int`,{flat:!0}):A.add(`vIsInsideJoin`,`float`),A.add(`vStretchFactor`,`float`),A.add(`vJoinCenterLineSDFs`,`vec2`),A.add(`vSubdivisionFactor`,`float`),R&&A.add(`vLineSizeInv`,`float`),Y&&A.add(`vLineDistanceNorm`,`float`),q&&(A.add(`vSegmentSDF`,`float`),A.add(`vReverseSegmentSDF`,`float`)),j.code.add(x`vec3 perpendicular(vec3 v) {
 return vec3(v.y, -v.x, 0.0);
 }
 float nearPlaneInterpolationFactor(float nearPlaneDistance, vec4 start, vec4 end) {
@@ -20,17 +20,17 @@ float s = sin(a);
 float c = cos(a);
 mat2 m = mat2(c, -s, s, c);
 return vec3(m * v.xy, v.z);
-}`),M.code.add(S`vec4 projectAndScale(vec4 pos) {
+}`),j.code.add(x`vec4 projectAndScale(vec4 pos) {
 vec4 posNdc = proj * pos;
 posNdc.xy *= viewport.zw / posNdc.w;
 posNdc.z /= posNdc.w;
 return posNdc;
-}`),M.code.add(S`
+}`),j.code.add(x`
     void clip(
       inout vec4 pos,
       inout vec4 prev,
       inout vec4 next,
-      ${C(Z,S`inout float u0, inout float prevU0, inout float nextU0,`)}
+      ${S(Z,x`inout float u0, inout float prevU0, inout float nextU0,`)}
       bool isStartVertex
     ) {
       float adjustedNearPlaneDistance = nearFar[0] * 0.99;
@@ -41,7 +41,7 @@ return posNdc;
           if (prev.z < -nearFar[0]) {
             // Previous position in front of near plane
             float clipFactor = nearPlaneInterpolationFactor(adjustedNearPlaneDistance, prev, pos);
-            ${C(Z,S`u0 = mix(prevU0, u0, clipFactor); nextU0 = u0;`)}
+            ${S(Z,x`u0 = mix(prevU0, u0, clipFactor); nextU0 = u0;`)}
             pos = mix(prev, pos, clipFactor);
             next = pos;
           } else {
@@ -51,7 +51,7 @@ return posNdc;
           if (next.z < -nearFar[0]) {
             // Next position in front of near plane
             float clipFactor = nearPlaneInterpolationFactor(adjustedNearPlaneDistance, pos, next);
-            ${C(Z,S`u0 = mix(u0, nextU0, clipFactor); prevU0 = u0;`)}
+            ${S(Z,x`u0 = mix(u0, nextU0, clipFactor); prevU0 = u0;`)}
             pos = mix(pos, next, clipFactor);
             prev = pos;
           } else {
@@ -63,25 +63,25 @@ return posNdc;
         if (prev.z > -nearFar[0]) {
           // Previous position behind near plane
           float clipFactor = nearPlaneInterpolationFactor(adjustedNearPlaneDistance, pos, prev);
-          ${C(Z,S`prevU0 = mix(u0, prevU0, clipFactor);`)}
+          ${S(Z,x`prevU0 = mix(u0, prevU0, clipFactor);`)}
           prev = mix(pos, prev, clipFactor);
         }
 
         if (next.z > -nearFar[0]) {
           // Next position behind near plane
           float clipFactor = nearPlaneInterpolationFactor(adjustedNearPlaneDistance, next, pos);
-          ${C(Z,S`nextU0 = mix(nextU0, u0, clipFactor);`)}
+          ${S(Z,x`nextU0 = mix(nextU0, u0, clipFactor);`)}
           next = mix(next, pos, clipFactor);
         }
       }
     }
-  `),v(M),M.constants.add(`aaWidth`,`float`,+!z),M.main.add(S`
+  `),_(j),j.constants.add(`aaWidth`,`float`,1),M.constants.add(`aaWidth`,`float`,1),j.main.add(x`
     vec3 position = ${Q.getTextureAttribute(`position`)};
     float u0 = ${Q.getTextureAttribute(`u0`)};
-    ${C(G,S`
+    ${S(W,x`
         float prevU0 = ${Q.getTextureAttribute(`u0`,-1)};
         float nextU0 = ${Q.getTextureAttribute(`u0`,1)};
-        ${C(!F,S`
+        ${S(!P,x`
             u0 *= metersPerRenderUnit;
             prevU0 *= metersPerRenderUnit;
             nextU0 *= metersPerRenderUnit;
@@ -90,13 +90,15 @@ return posNdc;
 
     // unpack values from vertex type
     float vertexType = abs(lineParameters.y);
+    ${S(!K,x`
+      bool isInsideJoin = vertexType > 8.0;
+      vertexType -= isInsideJoin ? 8.0 : 0.0;
+    `)}
     float lineSide = sign(lineParameters.y);
     bool isStartVertex = vertexType == 2.0 || vertexType == 4.0;
     vec3 prevPosition = ${Q.getTextureAttribute(`position`,-1)};
     vec3 nextPosition = ${Q.getTextureAttribute(`position`,1)};
 
-    float coverage = 1.0;
-
     // Check for special value of lineParameters.y which is used by the Renderer when graphics are removed before the
     // VBO is recompacted. If this is the case, then we just project outside of clip space.
     if (lineParameters.y == 0.0) {
@@ -108,11 +110,11 @@ return posNdc;
       vec4 next = view * vec4(nextPosition, 1.0);
 
       bool isJoin = vertexType < 3.0;
-  `),$&&M.main.add(S`vec4 other = isStartVertex ? next : prev;
+  `),$&&j.main.add(x`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;
-}`),k.include(h),M.code.add(S`
+}`),O.include(m),j.code.add(x`
     vec2 computeJoinAndCapDisplacement(
       bool isJoin,
       bool isStartVertex,
@@ -157,49 +159,49 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
           }
         }
 
-        ${C(!z,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);
-              }
-            }
-          `)}
+        // Compute stretch compensation for feathering.
+        ${S(K,x`
+          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) {
-          ${C(O.roundJoins,S`
+          ${S(D.roundJoins,x`
               vec3 startDir = perpendicular(leftLen < EPS ? right : left);
               vec3 endDir = perpendicular(rightLen < EPS ? left : right);
-              float factor = ${z?S`min(1.0, subdivisionFactor * ((NUM_JOIN_SUBDIVISIONS + 1.0) / NUM_JOIN_SUBDIVISIONS))`:S`subdivisionFactor`};
+              float factor = ${R?x`min(1.0, subdivisionFactor * ((NUM_JOIN_SUBDIVISIONS + 1.0) / NUM_JOIN_SUBDIVISIONS))`:x`subdivisionFactor`};
 
               float rotationAngle = acos(clamp(dot(startDir.xy, endDir.xy), -1.0, 1.0));
               joinDisplacementDir = rotateZ(startDir, -lineSide * factor * rotationAngle);
-            `,S`
+            `,x`
               /**
                * Convert to bevel join if miterLimit is exceeded.
                * Here vertices with a subdivisionFactor > 0 are either START vertices or
@@ -211,19 +213,19 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
               vec3 startDir = perpendicular(leftLen < EPS ? right : left);
               vec3 endDir = perpendicular(rightLen < EPS ? left : right);
 
-              ${C(z,S`joinDisplacementDir = (isStartVertex || subdivisionFactor > 0.0) ? endDir : startDir;`,S`joinDisplacementDir = mix(startDir, endDir, subdivisionFactor);`)}
+              ${S(R,x`joinDisplacementDir = (isStartVertex || subdivisionFactor > 0.0) ? endDir : startDir;`,x`joinDisplacementDir = mix(startDir, endDir, subdivisionFactor);`)}
             `)}
           displacementLen = lineWidth;
         }
       } else {
         joinDisplacementDir = perpendicular(isStartVertex ? right : left);
-        ${R===0?``:S`capDisplacementDir = vec3((isStartVertex ? -right : left).xy, 0.0);`}
+        ${L===0?``:x`capDisplacementDir = vec3((isStartVertex ? -right : left).xy, 0.0);`}
       }
 
       return (joinDisplacementDir.xy * lineSide + capDisplacementDir.xy) * displacementLen;
     }
-  `),M.main.add(S`
-      clip(pos, prev, next, ${C(Z,S`u0, prevU0, nextU0,`)} isStartVertex);
+  `),j.main.add(x`
+      clip(pos, prev, next, ${S(Z,x`u0, prevU0, nextU0,`)} isStartVertex);
 
       vec3 clippedPos = pos.xyz;
       vec3 clippedCenter = mix(pos.xyz, isStartVertex ? next.xyz : prev.xyz, 0.5);
@@ -235,46 +237,32 @@ 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 lineSize = getSize(${C(W,`clippedPos`)});
-      ${C(z&&W,`float patternLineSize = getSize(clippedCenter);`)}
-      ${C(z&&!W,`float patternLineSize = lineSize;`)}
+      float lineSize = getSize(${S(U,`clippedPos`)});
+      ${S(R&&U,`float patternLineSize = getSize(clippedCenter);`)}
+      ${S(R&&!U,`float patternLineSize = lineSize;`)}
 
-      ${C(G,S`
-          ${C(F,S`float lineSizeScreen = lineSize * groundMetersToScreenRatio;`,S`
+      ${S(W,x`
+          ${S(P,x`float lineSizeScreen = lineSize * groundMetersToScreenRatio;`,x`
               float metersPerScreenPixel = max(-clippedPos.z, nearFar[0]) * metersPerRenderUnit * screenPixelSizePerDistance;
               float lineSizeScreen = lineSize / metersPerScreenPixel;
             `)}
-          if (lineSizeScreen < 1.0) {
-            coverage = lineSizeScreen;
-            lineSizeScreen = 1.0;
-          }
-
-          lineSizeScreen += aaWidth;
-          float lineWidth = lineSizeScreen * pixelRatio;
-        `,S`
-          if (lineSize < 1.0) {
-            coverage = lineSize; // convert sub-pixel coverage to alpha
-            lineSize = 1.0;
-          }
-
-          lineSize += aaWidth;
-          float lineWidth = lineSize * pixelRatio;
+          float lineWidth = lineSizeScreen * pixelRatio + aaWidth;
+        `,x`
+          float lineWidth = lineSize * pixelRatio + aaWidth;
         `)}
 
       vLineWidth = noPerspectiveWrite(lineWidth, pos.w);
-      ${z?S`vLineSizeInv = noPerspectiveWrite(1.0 / lineSize, pos.w);`:``}
-  `),X&&M.main.add(S`
+      ${R?x`vLineSizeInv = noPerspectiveWrite(1.0 / ${W?`lineSize`:`max(lineSize, 1.0)`}, pos.w);`:``}
+  `),X&&j.main.add(x`
       float isEndVertex = float(!isStartVertex);
       vec3 segmentOrigin = mix(pos.xyz, prev.xyz, isEndVertex);
       vec3 segment = mix(right, left, isEndVertex);
-      ${q?S`vec3 segmentEnd = mix(next.xyz, pos.xyz, isEndVertex);`:``}
-    `),M.main.add(S`
-    ${C(!z,S`
-        vIsInsideJoin = 0;
-        vStretchFactor = 1.0;
-        vSubdivisionFactor = 0.0;
-        vJoinCenterLineSDFs = vec2(LARGE_HALF_FLOAT);
-      `)}
+      ${q?x`vec3 segmentEnd = mix(next.xyz, pos.xyz, isEndVertex);`:``}
+    `),j.main.add(x`
+    vIsInsideJoin = ${K?x`0`:x`float(isInsideJoin)`};
+    vStretchFactor = 1.0;
+    vSubdivisionFactor = 0.0;
+    vJoinCenterLineSDFs = vec2(LARGE_HALF_FLOAT);
 
     vec2 displacementXY = computeJoinAndCapDisplacement(
       isJoin,
@@ -300,10 +288,10 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
     float lineDistNorm = noPerspectiveWrite(lineSide, pos.w);
 
     vLineDistance = lineWidth * lineDistNorm;
-    ${Y?S`vLineDistanceNorm = lineDistNorm;`:``}
+    ${Y?x`vLineDistanceNorm = lineDistNorm;`:``}
 
     pos.xyz += displacement;
-  `),z||M.main.add(S`if (isJoin) {
+  `),j.main.add(x`if (isJoin) {
 vec2 joinCenterToVertex = displacementXY;
 vec2 leftCenterlineDir = left.xy;
 vec2 rightCenterlineDir = right.xy;
@@ -318,36 +306,36 @@ dot(vec2(leftCenterlineDir.y, -leftCenterlineDir.x), joinCenterToVertex)
 ),
 pos.w
 );
-}`),q&&M.main.add(S`vec2 segmentDir = normalize(segment.xy);
+}`),q&&j.main.add(x`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);`),z&&(F?M.main.add(S`float stippleDistanceToScreenRatio = ${G?`groundMetersToScreenRatio`:`planarDistanceToScreenRatio`};`):M.main.add(S`vec3 segmentCenter = mix((nextPosition + position) * 0.5, (position + prevPosition) * 0.5, isEndVertex);
-float stippleDistanceToScreenRatio = computeWorldToScreenRatio(segmentCenter);`),M.main.add(S`
+vReverseSegmentSDF = noPerspectiveWrite((isJoin && !isStartVertex) ? LARGE_HALF_FLOAT : (dot(pos.xy - segmentEnd.xy, -segmentDir)), pos.w);`),R&&(P?j.main.add(x`float stippleDistanceToScreenRatio = ${W?`groundMetersToScreenRatio`:`planarDistanceToScreenRatio`};`):j.main.add(x`vec3 segmentCenter = mix((nextPosition + position) * 0.5, (position + prevPosition) * 0.5, isEndVertex);
+float stippleDistanceToScreenRatio = computeWorldToScreenRatio(segmentCenter);`),j.main.add(x`
       float segmentLengthScreenDouble = length(segment.xy);
       float segmentLengthScreen = segmentLengthScreenDouble * 0.5;
       float discreteStippleDistanceToScreenRatio = discretizeStippleDistanceToScreenRatio(stippleDistanceToScreenRatio);
-      float segmentLengthRender = ${C(G,S`abs(mix(nextU0 - u0, u0 - prevU0, isEndVertex))`,S`length(mix(nextPosition - position, position - prevPosition, isEndVertex))`)};
+      float segmentLengthRender = ${S(W,x`abs(mix(nextU0 - u0, u0 - prevU0, isEndVertex))`,x`length(mix(nextPosition - position, position - prevPosition, isEndVertex))`)};
 
-      ${C(!F||G,S`
-          float segmentStartRender = ${C(G,S`mix(u0, prevU0, isEndVertex)`,S`mix(u0, u0 - segmentLengthRender, isEndVertex)`)};
+      ${S(!P||W,x`
+          float segmentStartRender = ${S(W,x`mix(u0, prevU0, isEndVertex)`,x`mix(u0, u0 - segmentLengthRender, isEndVertex)`)};
         `)}
 
       vStipplePatternStretch = stippleDistanceToScreenRatio / discreteStippleDistanceToScreenRatio;
-    `),F?M.main.add(S`float segmentLengthPseudoScreen = segmentLengthScreen / pixelRatio * discreteStippleDistanceToScreenRatio / stippleDistanceToScreenRatio;
-float startPseudoScreen = u0 * discreteStippleDistanceToScreenRatio - mix(0.0, segmentLengthPseudoScreen, isEndVertex);`):M.main.add(S`float startPseudoScreen = segmentStartRender * discreteStippleDistanceToScreenRatio;
-float segmentLengthPseudoScreen = segmentLengthRender * discreteStippleDistanceToScreenRatio;`),M.uniforms.add(new x(`stipplePatternPixelSize`,e=>i(e))),M.main.add(S`
+    `),P?j.main.add(x`float segmentLengthPseudoScreen = segmentLengthScreen / pixelRatio * discreteStippleDistanceToScreenRatio / stippleDistanceToScreenRatio;
+float startPseudoScreen = u0 * discreteStippleDistanceToScreenRatio - mix(0.0, segmentLengthPseudoScreen, isEndVertex);`):j.main.add(x`float startPseudoScreen = segmentStartRender * discreteStippleDistanceToScreenRatio;
+float segmentLengthPseudoScreen = segmentLengthRender * discreteStippleDistanceToScreenRatio;`),j.uniforms.add(new b(`stipplePatternPixelSize`,e=>i(e))),j.main.add(x`
       float patternLength = patternLineSize * stipplePatternPixelSize;
       vec2 stippleDistanceLimits;
 
-      ${C(G,S`
+      ${S(W,x`
           stippleDistanceLimits = vec2(segmentStartRender, segmentStartRender + segmentLengthRender);
           vStipplePatternStretch = 1.0;
 
-          ${C(K,S`
+          ${S(G,x`
               // The v-coordinate used in case of an image pattern.
               bool isLeft = lineSide < 0.0;
               vStippleV = isLeft ? 0.0 : 1.0;
             `)}
-        `,S`
+        `,x`
           // Compute the coordinates at both start and end of the line segment, because we need both to clamp to in the
           // fragment shader
           stippleDistanceLimits = computeStippleDistanceLimits(startPseudoScreen, segmentLengthPseudoScreen, segmentLengthScreen, patternLength);
@@ -367,7 +355,7 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteStippleDistanceT
         vStippleDistance += (stippleDisplacementFactor - isEndVertex) * (stippleDistanceLimits.y - stippleDistanceLimits.x);
       }
 
-      ${C(Z,S`
+      ${S(Z,x`
           float segmentStartInverseW = 1.0 / mix(pos.w, prev.w, isEndVertex);
           float segmentEndInverseW = 1.0 / mix(next.w, pos.w, isEndVertex);
           vStipplePerspective = noPerspectiveWrite(
@@ -383,55 +371,59 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteStippleDistanceT
       // Disable stipple distance limits on caps
       vStippleLimitsAndCaps.zw = isJoin ? vec2(0.0) :
                isStartVertex ? vec2(1.0, 0.0) : vec2(0.0, 1.0);
-    `)),M.main.add(S`
+    `)),j.main.add(x`
       // Convert back into NDC
       pos.xy = (pos.xy / viewport.zw) * pos.w;
       pos.z = pos.z * pos.w;
 
       vColor = getColor();
-      vColor.a = noPerspectiveWrite(vColor.a * coverage, pos.w);
+      vColor.a = noPerspectiveWrite(vColor.a, pos.w);
 
-      ${V&&!F?`pos.z -= EPS * pos.w;`:``}
+      ${B&&!P?`pos.z -= EPS * pos.w;`:``}
 
       // transform final position to camera space for slicing
       vpos = (inverseProjectionMatrix * pos).xyz;
       gl_Position = pos;
       forwardObjectAndLayerIdColor();
-    }`),k.include(E,O),k.include(g),N.include(m),N.include(w),N.include(e,O),N.main.add(`discardBySlice(vpos);`),z||N.code.add(S`float lineFeatheringFactor(float lineWidth, float lineDistance) {
-float stretchFactor = vIsInsideJoin == 1 ? noPerspectiveRead(vStretchFactor) : 1.0;
+    }`),O.include(T,D),O.include(h),M.include(ee),M.include(C),M.include(e,D),M.main.add(`discardBySlice(vpos);`),M.code.add(x`float lineFeatheringFactor(float lineWidth, float lineDistance) {
+float stretchFactor = float(vIsInsideJoin) > 0.5 ? noPerspectiveRead(vStretchFactor) : 1.0;
 float featherWidth = 2.0;
-float featherStartDistance = max(lineWidth - featherWidth / stretchFactor, 0.0);
-float straightFeatherStartDistance = max(lineWidth - featherWidth, 0.0);
+float featherStartDistance = lineWidth - featherWidth / stretchFactor;
+float straightFeatherStartDistance = lineWidth - featherWidth;
 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);
-}`),N.main.add(S`
+feather = float(vIsInsideJoin) > 0.5 ? max(feather, straightFeather) : feather;
+float coverage = min(lineWidth - aaWidth, 1.0);
+return clamp(1.0 - feather, 0.0, coverage);
+}`),M.main.add(x`
     float lineWidth = noPerspectiveRead(vLineWidth);
     float lineDistance = noPerspectiveRead(vLineDistance);
-    ${C(Y,S`float lineDistanceNorm = noPerspectiveRead(vLineDistanceNorm);`)}
-  `),V?N.main.add(S`vec4 albedo = vec4(1.0, 0.0, 1.0, 1.0);
-vec4 finalColor = albedo;`):(q&&N.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;
-}`),J?N.main.add(S`
-      vec2 stipplePosition = vec2(
-        min(getStippleCapDistance(), 0.0),
-        ${Z?S`lineDistance / lineWidth`:S`lineDistanceNorm`}
-      );
-      float stippleRadius = length(stipplePosition * lineWidth);
-      float stippleCapSDF = (stippleRadius - lineWidth) * 0.5; // Divide by 2 to transform from double pixel scale
-      float stippleCoverage = clamp(0.5 - stippleCapSDF, 0.0, 1.0);
-      float stippleAlpha = step(alphaCutoff, stippleCoverage);
-      `):N.main.add(S`float stippleAlpha = getStippleAlpha(lineWidth);`),L!==11&&N.main.add(S`discardByStippleAlpha(stippleAlpha, alphaCutoff);`),N.uniforms.add(new y(`intrinsicColor`,e=>e.color)).main.add(S`vec4 color = intrinsicColor * vColor;
-color.a = noPerspectiveRead(color.a);`),H&&N.uniforms.add(new y(`innerColor`,e=>e.innerColor??e.color),new x(`innerWidth`,(e,t)=>e.innerWidth*t.camera.pixelRatio)).main.add(S`float distToInner = abs(lineDistance) - innerWidth;
+    ${S(Y,x`float lineDistanceNorm = noPerspectiveRead(vLineDistanceNorm);`)}
+  `),J&&M.main.add(x`float nominalLineWidth = lineWidth - aaWidth;`),B?M.main.add(x`vec4 albedo = vec4(1.0, 0.0, 1.0, 1.0);
+vec4 finalColor = albedo;`):(q&&M.main.add(x`
+        float sdf = noPerspectiveRead(min(vSegmentSDF, vReverseSegmentSDF));
+        vec2 fragmentPosition = vec2(min(sdf, 0.0), lineDistance);
+
+        float fragmentRadius = length(fragmentPosition);
+        float fragmentCapSDF = (fragmentRadius - ${J?`nominalLineWidth`:`lineWidth`}) * 0.5; // Divide by 2 to transform from double pixel scale
+        float capCoverage = clamp(0.5 - fragmentCapSDF, 0.0, 1.0);
+
+        if (capCoverage < alphaCutoff) {
+          discard;
+        }
+      `),J?M.main.add(x`vec2 stipplePosition = vec2(
+min(getStippleCapDistance(), 0.0) * nominalLineWidth,
+lineDistance
+);
+float stippleRadius = length(stipplePosition);
+float stippleCapSDF = (stippleRadius - nominalLineWidth) * 0.5;
+float stippleCoverage = clamp(0.5 - stippleCapSDF, 0.0, 1.0);
+float lineCoverage = min(lineFeatheringFactor(lineWidth, lineDistance), capCoverage);
+float stippleAlpha = lineCoverage > 0.0 ? min(stippleCoverage, lineCoverage) / lineCoverage : 0.0;`):M.main.add(x`float stippleAlpha = getStippleAlpha(lineWidth);`),I!==11&&M.main.add(x`discardByStippleAlpha(stippleAlpha, alphaCutoff);`),M.uniforms.add(new v(`intrinsicColor`,e=>e.color)).main.add(x`vec4 color = intrinsicColor * vColor;
+color.a = noPerspectiveRead(color.a);`),V&&M.uniforms.add(new v(`innerColor`,e=>e.innerColor??e.color),new b(`innerWidth`,(e,t)=>e.innerWidth*t.camera.pixelRatio)).main.add(x`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);`),N.main.add(`vec4 albedo = blendStipple(color, stippleAlpha);`),B&&(N.uniforms.add(new x(`falloff`,e=>e.falloff)),N.main.add(S`albedo.a *= pow(max(0.0, 1.0 - abs(lineDistanceNorm)), falloff);`)),z||N.main.add(S`albedo.a *= lineFeatheringFactor(lineWidth, lineDistance);`),U&&(M.main.add(`vec4 animatedAlphaTimeStamps = ${Q.getTextureAttribute(`timeStamps`)};`),k.include(T,O),N.main.add(`albedo.a *= animatedAlpha();`)),I?(j.add(`vnormal`,`vec3`),M.include(o,O),M.main.add(`vnormal = getLocalUp(vpos, localOrigin);`),k.include(n,O),N.main.add(`vec4 finalColor = evaluateSceneLightingFragment(vpos, vnormal, albedo);`)):N.main.add(`vec4 finalColor = albedo;`)),N.main.add(S`outputColorHighlightOLID(applySlice(finalColor, vpos), albedo.rgb);`),k}const A=Object.freeze(Object.defineProperty({__proto__:null,build:k,numRoundJoinSubdivisions:1},Symbol.toStringTag,{value:`Module`}));export{A as R,k as b,O as n};
+color = mix(color, vec4(innerColor.rgb, innerAlpha), innerAA);`),M.main.add(`vec4 albedo = blendStipple(color, stippleAlpha);`),z&&(M.uniforms.add(new b(`falloff`,e=>e.falloff)),M.main.add(x`albedo.a *= pow(max(0.0, 1.0 - abs(lineDistanceNorm)), falloff);`)),M.main.add(x`albedo.a *= ${J?`lineCoverage`:`lineFeatheringFactor(lineWidth, lineDistance)`};`),H&&(j.main.add(`vec4 animatedAlphaTimeStamps = ${Q.getTextureAttribute(`timeStamps`)};`),O.include(w,D),M.main.add(`albedo.a *= animatedAlpha();`)),F?(A.add(`vnormal`,`vec3`),j.include(o,D),j.main.add(`vnormal = getLocalUp(vpos, localOrigin);`),O.include(n,D),M.main.add(`vec4 finalColor = evaluateSceneLightingFragment(vpos, vnormal, albedo);`)):M.main.add(`vec4 finalColor = albedo;`)),M.main.add(x`outputColorHighlightOLID(applySlice(finalColor, vpos), albedo.rgb);`),O}const k=Object.freeze(Object.defineProperty({__proto__:null,build:O,numRoundJoinSubdivisions:1},Symbol.toStringTag,{value:`Module`}));export{k as R,O as b,D as n};