@arcgis/core 5.1.0-next.94 → 5.1.0-next.95

package/chunks/GlobalIllumination.glsl.js

@@ -1,28 +1,28 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.1/LICENSE.txt */
-import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{ReadDepthLastFrame as o}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadDepthLastFrame.glsl.js";import{addMainLightDirection as t}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{ScreenSpaceRayMarching as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ScreenSpaceRayMarching.glsl.js";import{CameraSpace as r}from"../views/3d/webgl-engine/core/shaderLibrary/util/CameraSpace.glsl.js";import{FloatPassUniform as l}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as i,If as n}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Matrix4BindUniform as s}from"../views/3d/webgl-engine/core/shaderModules/Matrix4BindUniform.js";import{Texture2DBindUniform as c}from"../views/3d/webgl-engine/core/shaderModules/Texture2DBindUniform.js";import{Texture2DPassUniform as m}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{ColorAttachment1 as u}from"../views/webgl/enums.js";import{NoParameters as d}from"../views/webgl/NoParameters.js";import{ShaderBuilder as h}from"../views/webgl/ShaderBuilder.js";const p=.01,f=.008,g=.002,v=.5,x=.02,b=.1,w=.008,y=.012,S=.008,C=40,M=.095,F=.008,D=60,W=2,j=.0039,I=.25,z=1/3,B=2/3,G=2,P=.05,T=.15,$=.75,R=.15,L=16;class O extends d{constructor(){super(...arguments),this.projScale=1,this.scaleGlobalIllumination=1,this.accumulatedFrames=0,this.frameCount=0,this.rayMarchMaxReach=R,this.rayMarchMaxSteps=L}}function E(d){const R=new h,L=R.fragment;return R.include(e),R.include(r),t(L),L.include(o),R.include(a,d),L.uniforms.add(new m("normalMap",e=>e.normalTexture),new m("depthMap",e=>e.depthTexture),new m("lastFrameColorTexture",(e,o)=>o.reprojection.lastFrameColor?.getTexture()),new m("lastFrameDepthTexture",(e,o)=>o.reprojection.lastFrameDepth?.attachment),new c("lastFrameGlobalIlluminationTexture",e=>e.globalIllumination?.getTexture()),new c("lastFrameGlobalIlluminationWeightTexture",e=>e.globalIllumination?.getTexture(u)),new s("reprojectionViewMatrix",e=>e.reprojection.viewMatrix),new s("view",e=>e.camera.viewMatrix),new l("accumulatedFramesGI",e=>e.accumulatedFrames),new l("frameCount",e=>e.frameCount),new l("scaleGlobalIllumination",e=>e.scaleGlobalIllumination),new m("blueNoiseTex",e=>e.noiseTexture)),L.uniforms.add(new l("rayMarchMaxReach",e=>e.rayMarchMaxReach),new l("rayMarchMaxSteps",e=>e.rayMarchMaxSteps)),d.hasEmission&&L.uniforms.add(new m("lastFrameEmissionTexture",(e,o)=>o.reprojection.lastFrameEmission?.attachment)),L.constants.add("timeSamplesSize","float",64),L.constants.add("blueNoiseGridSize","float",8),L.code.add(i`
+import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{ReadDepthLastFrame as o}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadDepthLastFrame.glsl.js";import{addMainLightDirection as t}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{ScreenSpaceRayMarching as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ScreenSpaceRayMarching.glsl.js";import{CameraSpace as r}from"../views/3d/webgl-engine/core/shaderLibrary/util/CameraSpace.glsl.js";import{FloatPassUniform as i}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as l,If as n}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Matrix4BindUniform as s}from"../views/3d/webgl-engine/core/shaderModules/Matrix4BindUniform.js";import{Texture2DBindUniform as c}from"../views/3d/webgl-engine/core/shaderModules/Texture2DBindUniform.js";import{Texture2DPassUniform as m}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{ColorAttachment1 as u}from"../views/webgl/enums.js";import{NoParameters as d}from"../views/webgl/NoParameters.js";import{ShaderBuilder as h}from"../views/webgl/ShaderBuilder.js";const p=.01,f=.008,g=.002,v=.5,x=.02,b=.1,w=.008,y=.012,S=.008,C=40,M=.095,F=.008,D=60,W=2,j=.0039,I=.25,z=1/3,B=2/3,G=2,P=.05,T=.15,$=.75,R=.15,L=16;class O extends d{constructor(){super(...arguments),this.projScale=1,this.scaleGlobalIllumination=1,this.accumulatedFrames=0,this.frameCount=0,this.rayMarchMaxReach=R,this.rayMarchMaxSteps=L,this.emissionWeight=1}}function E(d){const R=new h,L=R.fragment;return R.include(e),R.include(r),t(L),L.include(o),R.include(a,d),L.uniforms.add(new m("normalMap",e=>e.normalTexture),new m("depthMap",e=>e.depthTexture),new m("lastFrameColorTexture",(e,o)=>o.reprojection.lastFrameColor?.getTexture()),new m("lastFrameDepthTexture",(e,o)=>o.reprojection.lastFrameDepth?.attachment),new c("lastFrameGlobalIlluminationTexture",e=>e.globalIllumination?.getTexture()),new c("lastFrameGlobalIlluminationWeightTexture",e=>e.globalIllumination?.getTexture(u)),new s("reprojectionViewMatrix",e=>e.reprojection.viewMatrix),new s("view",e=>e.camera.viewMatrix),new i("accumulatedFramesGI",e=>e.accumulatedFrames),new i("frameCount",e=>e.frameCount),new i("scaleGlobalIllumination",e=>e.scaleGlobalIllumination),new m("blueNoiseTex",e=>e.noiseTexture)),L.uniforms.add(new i("rayMarchMaxReach",e=>e.rayMarchMaxReach),new i("rayMarchMaxSteps",e=>e.rayMarchMaxSteps),new i("emissionWeight",e=>e.emissionWeight)),d.hasEmission&&L.uniforms.add(new m("lastFrameEmissionTexture",(e,o)=>o.reprojection.lastFrameEmission?.attachment)),L.constants.add("timeSamplesSize","float",64),L.constants.add("blueNoiseGridSize","float",8),L.code.add(l`
     float computeIdleColorBlendWeight(float accumulatedFrames) {
       float idleColorBlendProgress = clamp(
-        accumulatedFrames / ${i.float(C)},
+        accumulatedFrames / ${l.float(C)},
         0.0,
         1.0
       );
       return mix(
-        ${i.float(y)},
-        ${i.float(S)},
+        ${l.float(y)},
+        ${l.float(S)},
         idleColorBlendProgress
       );
     }
 
     float computeIdleOcclusionBlendWeight(float accumulatedFrames) {
       float idleOcclusionBlendProgress = clamp(
-        accumulatedFrames / ${i.float(D)},
+        accumulatedFrames / ${l.float(D)},
         0.0,
         1.0
       );
       return mix(
-        ${i.float(M)},
-        ${i.float(F)},
-        pow(idleOcclusionBlendProgress, ${i.float(W)})
+        ${l.float(M)},
+        ${l.float(F)},
+        pow(idleOcclusionBlendProgress, ${l.float(W)})
       );
     }
 
@@ -69,28 +69,28 @@ import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/Scr
     }
 
     float computeChromaWeight(vec3 color) {
-      float gray = dot(color, vec3(${i.float(z)}));
+      float gray = dot(color, vec3(${l.float(z)}));
       vec3 deviationFromGray = color - gray;
       float chromaDistanceSquared = dot(deviationFromGray, deviationFromGray);
-      float normalizedChroma = chromaDistanceSquared / ${i.float(B)};
+      float normalizedChroma = chromaDistanceSquared / ${l.float(B)};
 
-      return clamp(normalizedChroma * ${i.float(G)}, 0.0, 1.0);
+      return clamp(normalizedChroma * ${l.float(G)}, 0.0, 1.0);
     }
 
     float computeColorBleedWeight(vec3 receiverColor, vec3 sourceColor) {
       float receiverChromaWeight = computeChromaWeight(receiverColor);
       float sourceChromaWeight = computeChromaWeight(sourceColor);
-      float receiverAverageIntensity = dot(receiverColor, vec3(${i.float(z)}));
+      float receiverAverageIntensity = dot(receiverColor, vec3(${l.float(z)}));
 
       // Favor bright, neutral receivers lit by more saturated hit surfaces
       float bleedFactor =
-        pow(receiverAverageIntensity, ${i.float(P)}) *
+        pow(receiverAverageIntensity, ${l.float(P)}) *
         (1.0 - receiverChromaWeight) *
-        pow(sourceChromaWeight, ${i.float(T)});
+        pow(sourceChromaWeight, ${l.float(T)});
 
-      return ${i.float($)} * clamp(bleedFactor, 0.0, 1.0);
+      return ${l.float($)} * clamp(bleedFactor, 0.0, 1.0);
     }
-  `),R.outputs.add("fragGlobalIllumination","vec4",0),R.outputs.add("fragWeight","float",1),L.main.add(i`
+  `),R.outputs.add("fragGlobalIllumination","vec4",0),R.outputs.add("fragWeight","float",1),L.main.add(l`
     float depth = depthFromTexture(depthMap, uv);
 
     // Early out if depth is out of range, such as in the sky
@@ -130,7 +130,7 @@ import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/Scr
     float idleColorBlendWeight = computeIdleColorBlendWeight(accumulatedFramesGI);
     float idleOcclusionBlendWeight = computeIdleOcclusionBlendWeight(accumulatedFramesGI);
     float reprojectionDepthMismatch = abs((lastFrameDepthViewPos + reprojectedViewPos.z) / max(lastFrameDepthViewPos, reprojectedViewPos.z));
-    bool hasReprojectionMismatch = reprojectionDepthMismatch > ${i.float(p)};
+    bool hasReprojectionMismatch = reprojectionDepthMismatch > ${l.float(p)};
     bool isScaledGlobalIllumination = scaleGlobalIllumination < 1.0;
     bool isLowQualityEdgePixel = isScaledGlobalIllumination && isEdgeDepth(currentPixelDepth, uv);
     bool resetColorHistory = false;
@@ -139,7 +139,7 @@ import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/Scr
     if (hasReprojectionMismatch) {
       if (isLowQualityEdgePixel) {
         steps = 1;
-        occlusionBlendWeight = ${i.float(f)};
+        occlusionBlendWeight = ${l.float(f)};
         resetColorHistory = true;
       } else {
         steps = 6;
@@ -148,15 +148,15 @@ import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/Scr
       }
     } else {
       steps = 1;
-      if (historyOcclusionBlendWeight > ${i.float(v)}) {
-        occlusionBlendWeight = ${i.float(b)};
-        colorBlendWeight = ${i.float(w)};
-      } else if (historyOcclusionBlendWeight > ${i.float(x)}) {
+      if (historyOcclusionBlendWeight > ${l.float(v)}) {
+        occlusionBlendWeight = ${l.float(b)};
+        colorBlendWeight = ${l.float(w)};
+      } else if (historyOcclusionBlendWeight > ${l.float(x)}) {
         occlusionBlendWeight = historyOcclusionBlendWeight - 0.05;
-        colorBlendWeight = ${i.float(w)};
+        colorBlendWeight = ${l.float(w)};
       } else {
-        occlusionBlendWeight = isScaledGlobalIllumination ? ${i.float(f)} : idleOcclusionBlendWeight;
-        colorBlendWeight = isScaledGlobalIllumination ? ${i.float(g)} : idleColorBlendWeight;
+        occlusionBlendWeight = isScaledGlobalIllumination ? ${l.float(f)} : idleOcclusionBlendWeight;
+        colorBlendWeight = isScaledGlobalIllumination ? ${l.float(g)} : idleColorBlendWeight;
       }
     }
 
@@ -184,7 +184,7 @@ import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/Scr
       );
 
       if (hit.z > 0.0) {
-        ${n(d.hasColor,i`
+        ${n(d.hasColor,l`
           // Emission and color bleed - Reproject the current receiver and sampled hit to estimate bounced color
           vec3 receiverColor = texture(lastFrameColorTexture, reprojectedCoordinate.xy).rgb;
 
@@ -193,7 +193,7 @@ import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/Scr
           vec3 sourceEmission = ${n(d.hasEmission,"texture(lastFrameEmissionTexture, hitReprojectedCoordinate).xyz","vec3(0.0)")};
 
           float colorBleedWeight = computeColorBleedWeight(receiverColor, sourceColor);
-          fragGlobalIllumination.rgb += (sourceColor * colorBleedWeight + sourceEmission) * stepSize;
+          fragGlobalIllumination.rgb += (sourceColor * colorBleedWeight + sourceEmission * emissionWeight) * stepSize;
           `)}
       } else {
         // Occlusion - heuristic modulating sky intensity based on angle to main light
@@ -207,17 +207,17 @@ import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/Scr
 
     // Rendering trick add noise to reduce accumulation artifacts
     float accumulationDither = occlusionBlendWeight < 1.0
-      ? randomDirectionSample.b * ${i.float(j)}
+      ? randomDirectionSample.b * ${l.float(j)}
       : 0.0;
 
-    ${n(d.hasColor,i`
+    ${n(d.hasColor,l`
       // Accumulate color
       vec3 lastFrameColor = lastFrameGlobalIllumination.rgb;
-      float colorDitherScale = isScaledGlobalIllumination ? ${i.float(I)} : 1.0;
+      float colorDitherScale = isScaledGlobalIllumination ? ${l.float(I)} : 1.0;
       fragGlobalIllumination.rgb = resetColorHistory
         ? vec3(0.0)
         : mix(lastFrameColor + accumulationDither * colorDitherScale, fragGlobalIllumination.rgb, colorBlendWeight);
-      `,i`
+      `,l`
       fragGlobalIllumination.rgb = vec3(0.0);
       `)}
 

package/chunks/OITBlend.glsl.js

@@ -1,19 +1,17 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.1/LICENSE.txt */
-import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{If as r,glsl as o}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DPassUniform as t}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{O as n}from"./OITDim.glsl.js";import{oitResolution as a}from"../views/3d/webgl-engine/shaders/oitResolution.glsl.js";import{ShaderBuilder as s}from"../views/webgl/ShaderBuilder.js";class i extends n{}function c(n){const i=new s;i.include(e);const{hasEmission:c,frontFaceMask:l,computeHudOcclusion:u,useFloatBlend:f}=n,{fragment:m,outputs:d}=i;m.include(a,n),m.uniforms.add(new t("colorTexture",e=>e.colorTexture),new t("alphaTexture",e=>e.alphaTexture),new t("frontFaceTexture",e=>e.frontFaceTexture));let g=0;return d.add("fragColor","vec4",g++),c&&d.add("fragEmission","vec4",g++),u&&d.add("fragOcclusion","vec4",g++),c&&m.uniforms.add(new t("emissionTexture",e=>e.emissionTexture),new t("emissionFrontFaceTexture",e=>e.emissionFrontFaceTexture)),m.main.add(o`
+import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{If as r,glsl as o}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DPassUniform as a}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{O as t}from"./OITDimOpaque.glsl.js";import{oitResolution as l}from"../views/3d/webgl-engine/shaders/oitResolution.glsl.js";import{ShaderBuilder as n}from"../views/webgl/ShaderBuilder.js";class c extends t{}function s(t){const c=new n;c.include(e);const{frontFaceMask:s,computeHudOcclusion:u,useFloatBlend:f}=t,{fragment:i,outputs:d}=c;i.include(l,t),i.uniforms.add(new a("colorTexture",e=>e.colorTexture),new a("alphaTexture",e=>e.alphaTexture),new a("frontFaceTexture",e=>e.frontFaceTexture));let g=0;return d.add("fragColor","vec4",g++),u&&d.add("fragOcclusion","vec4",g++),i.main.add(o`
     float srcAlpha = texture(alphaTexture, uv).r * floatBlendInputScale;
     ${r(u,"fragOcclusion = vec4(1.0, 0.0, 0.0, 1.0);")}
 
     if(srcAlpha == 0.0) {
       fragColor = vec4(0.0);
-      ${r(c,"fragEmission = vec4(0.0);")}
       return;
     }
     vec4 frontFace = texture(frontFaceTexture, uv);
 
-    ${r(l,o`
+    ${r(s,o`
         if (frontFace.a == 0.0) {
           fragColor = vec4(0.0);
-          ${r(c,"fragEmission = vec4(0.0);")}
           return;
         }
       `)}
@@ -23,7 +21,5 @@ import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/Scr
     vec3 backColor = srcColor.rgb * floatBlendInputScale / srcAlpha;
     fragColor = vec4(mix(backColor, frontFace.rgb, frontFace.a), 1.0 - srcColor.a);
 
-    ${r(c,"vec4 emission = texture(emissionTexture, uv);\n       emission.rgb *= floatBlendInputScale;\n       vec4 emissionFrontFace = texture(emissionFrontFaceTexture, uv);\n       emissionFrontFace.rgb *= floatBlendInputScale;\n\n       // Modulate transparent emitter by front faces. This case is important for surfaces which contain emitter and\n       // non-emitter at the same time. Non-emitter surface parts need to modulate emissions as well.\n       emission.rgb = emission.rgb * (1.0 - frontFace.a);\n\n       fragEmission = vec4(mix(emission.rgb / srcAlpha, emissionFrontFace.rgb, emissionFrontFace.a) * floatBlendOutputScale, 1.0 - srcColor.a);\n      ")}
-
     ${r(u,"fragOcclusion.r = pow(srcColor.a, 0.5);")}
-  `),i}const l=Object.freeze(Object.defineProperty({__proto__:null,OITBlendPassParameters:i,build:c},Symbol.toStringTag,{value:"Module"}));export{i as O,l as a,c as b};
+  `),c}const u=Object.freeze(Object.defineProperty({__proto__:null,OITBlendPassParameters:c,build:s},Symbol.toStringTag,{value:"Module"}));export{c as O,u as a,s as b};

package/chunks/OITBlendEmission.glsl.js

@@ -0,0 +1,22 @@
+/* COPYRIGHT Esri - https://js.arcgis.com/5.1/LICENSE.txt */
+import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{If as t,glsl as r}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DPassUniform as o}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{O as s}from"./OITDimOpaque.glsl.js";import{oitResolution as n}from"../views/3d/webgl-engine/shaders/oitResolution.glsl.js";import{ShaderBuilder as a}from"../views/webgl/ShaderBuilder.js";class i extends s{}function l(s){const i=new a;i.include(e);const{fragment:l,outputs:c}=i,{useFloatBlend:u}=s;return l.include(n,s),l.uniforms.add(new o("colorTexture",e=>e.colorTexture),new o("alphaTexture",e=>e.alphaTexture),new o("frontFaceTexture",e=>e.frontFaceTexture),new o("emissionTexture",e=>e.emissionTexture),new o("emissionFrontFaceTexture",e=>e.emissionFrontFaceTexture)),c.add("fragEmission","vec4",1),l.main.add(r`
+    float srcAlpha = texture(alphaTexture, uv).r * floatBlendInputScale;
+    if(srcAlpha == 0.0) {
+      fragEmission = vec4(0.0);
+      return;
+    }
+    vec4 frontFace = texture(frontFaceTexture, uv);
+    vec4 srcColor = texture(colorTexture, uv);
+    ${t(!u,"float frontWeight = srcAlpha * floatBlendOutputScale;\n       frontWeight = clamp((frontWeight - 0.9) * 10.0, 0.0, 1.0);\n\n       float toAlpha = (1.0 + frontFace.a) * 0.5;\n       frontFace.a = mix(frontFace.a, toAlpha, frontWeight);")}
+
+    vec4 emission = texture(emissionTexture, uv);
+    emission.rgb *= floatBlendInputScale;
+    vec4 emissionFrontFace = texture(emissionFrontFaceTexture, uv);
+    emissionFrontFace.rgb *= floatBlendInputScale;
+
+    // Modulate transparent emitter by front faces. This case is important for surfaces which contain emitter and
+    // non-emitter at the same time. Non-emitter surface parts need to modulate emissions as well.
+    emission.rgb = emission.rgb * (1.0 - frontFace.a);
+
+    fragEmission = vec4(mix(emission.rgb / srcAlpha, emissionFrontFace.rgb, emissionFrontFace.a) * floatBlendOutputScale, 1.0 - srcColor.a);
+  `),i}const c=Object.freeze(Object.defineProperty({__proto__:null,OITBlendEmissionPassParameters:i,build:l},Symbol.toStringTag,{value:"Module"}));export{c as O,i as a,l as b};

package/chunks/{OITDim.glsl.js → OITDimOpaque.glsl.js}

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.1/LICENSE.txt */
-import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{EmissionDimming as r}from"../views/3d/webgl-engine/core/shaderLibrary/util/EmissionDimming.glsl.js";import{glsl as s}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DPassUniform as o}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{oitResolution as i}from"../views/3d/webgl-engine/shaders/oitResolution.glsl.js";import{NoParameters as n}from"../views/webgl/NoParameters.js";import{ShaderBuilder as l}from"../views/webgl/ShaderBuilder.js";class t extends n{}function m(n){const t=new l;t.include(e),t.fragment.include(r),t.fragment.include(i,n);const{fragment:m,outputs:a}=t;return m.uniforms.add(new o("colorTexture",e=>e.colorTexture)),a.add("fragEmission","vec4",1),m.main.add(s`vec4 srcColor = texture(colorTexture, uv);
+import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{EmissionDimming as r}from"../views/3d/webgl-engine/core/shaderLibrary/util/EmissionDimming.glsl.js";import{glsl as s}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DPassUniform as o}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{oitResolution as i}from"../views/3d/webgl-engine/shaders/oitResolution.glsl.js";import{NoParameters as n}from"../views/webgl/NoParameters.js";import{ShaderBuilder as l}from"../views/webgl/ShaderBuilder.js";class t extends n{}function a(n){const t=new l;t.include(e),t.fragment.include(r),t.fragment.include(i,n);const{fragment:a,outputs:m}=t;return a.uniforms.add(new o("colorTexture",e=>e.colorTexture)),m.add("fragEmission","vec4",1),a.main.add(s`vec4 srcColor = texture(colorTexture, uv);
 srcColor.rgb *= floatBlendInputScale;
 vec3 dimming = emissionDimming(srcColor.rgb, 1.0 - srcColor.a);
-fragEmission = vec4(dimming, 0.0);`),t}const a=Object.freeze(Object.defineProperty({__proto__:null,OITDimPassParameters:t,build:m},Symbol.toStringTag,{value:"Module"}));export{t as O,a,m as b};
+fragEmission = vec4(dimming, 0.0);`),t}const m=Object.freeze(Object.defineProperty({__proto__:null,OITDimOpaquePassParameters:t,build:a},Symbol.toStringTag,{value:"Module"}));export{t as O,m as a,a as b};

package/chunks/RibbonLine.glsl.js

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.1/LICENSE.txt */
-import{SliceDraw as e}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{ObjectAndLayerIdColor as i}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/ObjectAndLayerIdColor.glsl.js";import{RibbonVertexPosition as t}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/RibbonVertexPosition.glsl.js";import{LineStipple as n,computePixelSize as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/LineStipple.glsl.js";import{MarkerSizing as o}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MarkerSizing.glsl.js";import{PiUtils as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PiUtils.glsl.js";import{positionOutsideClipSpace as s}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PositionOutsideClipSpace.js";import{ColorConversion as l}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{NoPerspectiveWrite as d,NoPerspectiveRead as c}from"../views/3d/webgl-engine/core/shaderLibrary/util/NoPerspective.glsl.js";import{addProjViewLocalOrigin as p,addPixelRatio as m}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float2BindUniform as f}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 h}from"../views/3d/webgl-engine/core/shaderModules/FloatBindUniform.js";import{FloatPassUniform as S}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as D,If as x}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Matrix4BindUniform as u}from"../views/3d/webgl-engine/core/shaderModules/Matrix4BindUniform.js";import{alphaCutoff as L}from"../views/3d/webgl-engine/shaders/alphaCutoff.glsl.js";import{AnimatedLine as w}from"../views/3d/webgl-engine/shaders/AnimatedLine.glsl.js";import{outputColorHighlightOLID as b}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{ShaderBuilder as y}from"../views/webgl/ShaderBuilder.js";const P=1;function C(P){const C=new y,{attributes:z,varyings:j,vertex:F,fragment:W}=C,{applyMarkerOffset:R,draped:A,output:V,capType:I,stippleEnabled:E,falloffEnabled:N,roundJoins:O,wireframe:T,innerColorEnabled:J,hasAnimation:_,hasScreenSizePerspective:M,worldSizedImagePattern:U}=P;F.inputs.add("position",()=>"position"),W.include(a),C.include(t,P),C.include(n,P),C.include(i,P),C.include(w,P);const $=R&&!A;$&&(F.uniforms.add(new S("markerScale",e=>e.markerScale)),C.include(o,{space:2,hasScreenSizePerspective:M})),p(F,P),F.uniforms.add(new u("inverseProjectionMatrix",e=>e.camera.inverseProjectionMatrix),new f("nearFar",e=>e.camera.nearFar),new S("miterLimit",e=>"miter"!==e.join?0:e.miterLimit),new v("viewport",e=>e.camera.fullViewport)),F.constants.add("LARGE_HALF_FLOAT","float",65500),F.constants.add("EPS","float",.001),F.constants.add("NUM_JOIN_SUBDIVISIONS","float",P.numJoinSubdivisions),z.add("position","vec3"),z.add("previousDelta","vec4"),z.add("nextDelta","vec4"),z.add("lineParameters","vec2"),z.add("u0","float"),j.add("vColor","vec4"),j.add("vpos","vec3",{invariant:!0}),j.add("vLineDistance","float"),j.add("vLineWidth","float"),E||(j.add("vIsInsideJoin","float"),j.add("vStretchFactor","float"),j.add("vJoinCenterLineSDF","float"));const B=E;B&&j.add("vLineSizeInv","float");const k=2===I,H=E&&k,G=N||H;G&&j.add("vLineDistanceNorm","float"),k&&(j.add("vSegmentSDF","float"),j.add("vReverseSegmentSDF","float")),F.code.add(D`vec3 perpendicular(vec3 v) {
+import{SliceDraw as e}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{ObjectAndLayerIdColor as i}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/ObjectAndLayerIdColor.glsl.js";import{RibbonVertexPosition as t}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/RibbonVertexPosition.glsl.js";import{LineStipple as n,computePixelSize as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/LineStipple.glsl.js";import{MarkerSizing as o}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MarkerSizing.glsl.js";import{PiUtils as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PiUtils.glsl.js";import{positionOutsideClipSpace as s}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PositionOutsideClipSpace.js";import{ColorConversion as l}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{NoPerspectiveWrite as d,NoPerspectiveRead as c}from"../views/3d/webgl-engine/core/shaderLibrary/util/NoPerspective.glsl.js";import{addProjViewLocalOrigin as p,addPixelRatio as m}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float2BindUniform as v}from"../views/3d/webgl-engine/core/shaderModules/Float2BindUniform.js";import{Float4BindUniform as f}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 h}from"../views/3d/webgl-engine/core/shaderModules/FloatBindUniform.js";import{FloatPassUniform as S}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as D,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 L}from"../views/3d/webgl-engine/shaders/alphaCutoff.glsl.js";import{AnimatedLine as w}from"../views/3d/webgl-engine/shaders/AnimatedLine.glsl.js";import{outputColorHighlightOLID as b}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{ShaderBuilder as y}from"../views/webgl/ShaderBuilder.js";const P=1;function C(P){const C=new y,{attributes:z,varyings:F,vertex:j,fragment:W}=C,{applyMarkerOffset:R,draped:I,output:V,capType:A,stippleEnabled:E,falloffEnabled:N,roundJoins:T,wireframe:O,innerColorEnabled:J,hasAnimation:_,hasScreenSizePerspective:M,worldSizedImagePattern:U}=P;j.inputs.add("position",()=>"position"),W.include(a),C.include(t,P),C.include(n,P),C.include(i,P),C.include(w,P);const H=R&&!I;H&&(j.uniforms.add(new S("markerScale",e=>e.markerScale)),C.include(o,{space:2,hasScreenSizePerspective:M})),p(j,P),j.uniforms.add(new x("inverseProjectionMatrix",e=>e.camera.inverseProjectionMatrix),new v("nearFar",e=>e.camera.nearFar),new S("miterLimit",e=>"miter"!==e.join?0:e.miterLimit),new f("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",P.numJoinSubdivisions),z.add("position","vec3"),z.add("previousDelta","vec4"),z.add("nextDelta","vec4"),z.add("lineParameters","vec2"),z.add("u0","float"),F.add("vColor","vec4"),F.add("vpos","vec3",{invariant:!0}),F.add("vLineDistance","float"),F.add("vLineWidth","float"),E||(F.add("vIsInsideJoin","int"),F.add("vStretchFactor","float"),F.add("vJoinCenterLineSDFs","vec2"),F.add("vSubdivisionFactor","float"));const $=E;$&&F.add("vLineSizeInv","float");const B=2===A,k=E&&B,G=N||k;G&&F.add("vLineDistanceNorm","float"),B&&(F.add("vSegmentSDF","float"),F.add("vReverseSegmentSDF","float")),j.code.add(D`vec3 perpendicular(vec3 v) {
 return vec3(v.y, -v.x, 0.0);
 }
 float interp(float ncp, vec4 a, vec4 b) {
@@ -10,12 +10,12 @@ float s = sin(a);
 float c = cos(a);
 mat2 m = mat2(c, -s, s, c);
 return vec3(m * v.xy, v.z);
-}`),F.code.add(D`vec4 projectAndScale(vec4 pos) {
+}`),j.code.add(D`vec4 projectAndScale(vec4 pos) {
 vec4 posNdc = proj * pos;
 posNdc.xy *= viewport.zw / posNdc.w;
 posNdc.z /= posNdc.w;
 return posNdc;
-}`),F.code.add(D`void clip(
+}`),j.code.add(D`void clip(
 inout vec4 pos,
 inout vec4 prev,
 inout vec4 next,
@@ -46,7 +46,7 @@ if (next.z > -nearFar[0]) {
 next = mix(next, pos, interp(vnp, next, pos));
 }
 }
-}`),m(F),F.constants.add("aaWidth","float",E?0:1).main.add(D`
+}`),m(j),j.constants.add("aaWidth","float",E?0:1).main.add(D`
     // unpack values from vertex type
     bool isStartVertex = abs(abs(lineParameters.y) - 3.0) == 1.0;
     vec3 prevPosition = position + previousDelta.xyz * previousDelta.w;
@@ -65,11 +65,11 @@ next = mix(next, pos, interp(vnp, next, pos));
       vec4 next = view * vec4(nextPosition, 1.0);
 
       bool isJoin = abs(lineParameters.y) < 3.0;
-  `),$&&F.main.add(D`vec4 other = isStartVertex ? next : prev;
+  `),H&&j.main.add(D`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;
-}`),C.include(d),F.main.add(D`
+}`),C.include(d),j.main.add(D`
       clip(pos, prev, next, isStartVertex);
 
       vec3 clippedPos = pos.xyz;
@@ -85,11 +85,11 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
       float leftLen = length(left);
       float rightLen = length(right);
 
-      float lineSize = getSize(${x(M,"clippedPos")});
-      ${x(E&&M,"float patternLineSize = getSize(clippedCenter);")}
-      ${x(E&&!M,"float patternLineSize = lineSize;")}
+      float lineSize = getSize(${u(M,"clippedPos")});
+      ${u(E&&M,"float patternLineSize = getSize(clippedCenter);")}
+      ${u(E&&!M,"float patternLineSize = lineSize;")}
 
-      ${x(U,D`
+      ${u(U,D`
           lineSize += aaWidth;
           float lineWidth = lineSize * pixelRatio * worldToScreenRatio;
           if (lineWidth < 1.0) {
@@ -107,22 +107,23 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
         `)}
 
       vLineWidth = noPerspectiveWrite(lineWidth, pos.w);
-      ${B?D`vLineSizeInv = noPerspectiveWrite(1.0 / lineSize, pos.w);`:""}
-  `);(E||k)&&F.main.add(D`
+      ${$?D`vLineSizeInv = noPerspectiveWrite(1.0 / lineSize, pos.w);`:""}
+  `);(E||B)&&j.main.add(D`
       float isEndVertex = float(!isStartVertex);
       vec3 segmentOrigin = mix(pos.xyz, prev.xyz, isEndVertex);
       vec3 segment = mix(right, left, isEndVertex);
-      ${k?D`vec3 segmentEnd = mix(next.xyz, pos.xyz, isEndVertex);`:""}
-    `),F.main.add(D`left = (leftLen > EPS) ? left/leftLen : vec3(0.0, 0.0, 0.0);
+      ${B?D`vec3 segmentEnd = mix(next.xyz, pos.xyz, isEndVertex);`:""}
+    `),j.main.add(D`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;`),E||F.main.add(D`vIsInsideJoin = 0.0;
+float innerDisplacementLen = lineWidth;`),E||j.main.add(D`vIsInsideJoin = 0;
 vStretchFactor = 1.0;
-vJoinCenterLineSDF = LARGE_HALF_FLOAT;`),F.main.add(D`float subdivisionFactor = 0.0;
+vSubdivisionFactor = 0.0;
+vJoinCenterLineSDFs = vec2(LARGE_HALF_FLOAT);`),j.main.add(D`float subdivisionFactor = 0.0;
 bool isOutside = false;
 if (isJoin) {
 isOutside = (left.x * right.y - left.y * right.x) * lineParameters.y > 0.0;
@@ -137,7 +138,10 @@ if (!isOutside) {
 displacementLen = innerDisplacementLen;
 }
 }
-subdivisionFactor = lineParameters.x;`),E||F.main.add(D`vIsInsideJoin = subdivisionFactor > 0.0 && subdivisionFactor < 1.0 ? 1.0: 0.0;
+subdivisionFactor = lineParameters.x;`),E||j.main.add(D`if(subdivisionFactor > 0.0) {
+vIsInsideJoin = 1;
+}
+vSubdivisionFactor = isOutside ? subdivisionFactor : 0.5;
 if (miterDisplacementLen > miterLimit * lineWidth) {
 vec2 leftScreenDir = left.xy;
 vec2 rightScreenDir = right.xy;
@@ -146,11 +150,13 @@ float rightScreenLen = length(rightScreenDir);
 if (leftScreenLen > EPS && rightScreenLen > EPS) {
 leftScreenDir /= leftScreenLen;
 rightScreenDir /= rightScreenLen;
-float roundJoinAngle = acos(clamp(dot(leftScreenDir, rightScreenDir), -1.0, 1.0));
-float triangleHeight = (innerDisplacementLen + lineWidth) * cos(roundJoinAngle / (2.0 + 2.0 * NUM_JOIN_SUBDIVISIONS));
+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);
 }
-}`),F.main.add(D`if (isOutside && (displacementLen > miterLimit * lineWidth)) {`),O?F.main.add(D`
+}`),j.main.add(D`if (isOutside && (displacementLen > miterLimit * lineWidth)) {`),T?j.main.add(D`
         vec3 startDir = leftLen < EPS ? right : left;
         startDir = perpendicular(startDir);
 
@@ -161,16 +167,12 @@ vStretchFactor = noPerspectiveWrite(max(triangleHeight / (2.0 * lineWidth), 1.0)
 
         float rotationAngle = acos(clamp(dot(startDir.xy, endDir.xy), -1.0, 1.0));
         joinDisplacementDir = rotateZ(startDir, -sign(lineParameters.y) * factor * rotationAngle);
-      `):F.main.add(D`if (leftLen < EPS) {
-joinDisplacementDir = right;
-}
-else if (rightLen < EPS) {
-joinDisplacementDir = left;
-}
-else {
-joinDisplacementDir = (isStartVertex || subdivisionFactor > 0.0) ? right : left;
-}
-joinDisplacementDir = perpendicular(joinDisplacementDir);`);const X=0!==I;return F.main.add(D`
+      `):j.main.add(D`
+        vec3 startDir = perpendicular(leftLen < EPS ? right : left);
+        vec3 endDir = perpendicular(rightLen < EPS ? left : right);
+
+        ${u(E,D`joinDisplacementDir = (isStartVertex || subdivisionFactor > 0.0) ? endDir : startDir;`,D`joinDisplacementDir = mix(startDir, endDir, subdivisionFactor);`)}
+  `);const X=0!==A;return j.main.add(D`
         displacementLen = lineWidth;
       }
     } else {
@@ -180,7 +182,7 @@ joinDisplacementDir = perpendicular(joinDisplacementDir);`);const X=0!==I;return
 
       ${X?D`capDisplacementDir = vec3((isStartVertex ? -right : left).xy, 0.0);`:""}
     }
-  `),F.main.add(D`
+  `),j.main.add(D`
     // Displacement (in pixels) caused by join/or cap
     vec2 dposXY = (joinDisplacementDir.xy * sign(lineParameters.y) + capDisplacementDir.xy) * displacementLen;
 
@@ -199,7 +201,7 @@ joinDisplacementDir = perpendicular(joinDisplacementDir);`);const X=0!==I;return
     ${G?D`vLineDistanceNorm = lineDistNorm;`:""}
 
     pos.xyz += dpos;
-  `),E||F.main.add(D`if (isJoin) {
+  `),E||j.main.add(D`if (isJoin) {
 vec2 joinCenterToVertex = dposXY;
 vec2 leftCenterlineDir = left.xy;
 vec2 rightCenterlineDir = right.xy;
@@ -207,25 +209,26 @@ float leftCenterlineLen = length(leftCenterlineDir);
 float rightCenterlineLen = length(rightCenterlineDir);
 leftCenterlineDir = leftCenterlineLen > EPS ? leftCenterlineDir / leftCenterlineLen : vec2(1.0, 0.0);
 rightCenterlineDir = rightCenterlineLen > EPS ? rightCenterlineDir / rightCenterlineLen : leftCenterlineDir;
-float leftCenterLineSDF = dot(vec2(leftCenterlineDir.y, -leftCenterlineDir.x), joinCenterToVertex);
-float rightCenterLineSDF = dot(vec2(rightCenterlineDir.y, -rightCenterlineDir.x), joinCenterToVertex);
-vJoinCenterLineSDF = noPerspectiveWrite(
-mix(leftCenterLineSDF, rightCenterLineSDF, step(0.5, subdivisionFactor)),
+vJoinCenterLineSDFs = noPerspectiveWrite(
+vec2(
+dot(vec2(rightCenterlineDir.y, -rightCenterlineDir.x), joinCenterToVertex),
+dot(vec2(leftCenterlineDir.y, -leftCenterlineDir.x), joinCenterToVertex)
+),
 pos.w
 );
-}`),k&&F.main.add(D`vec2 segmentDir = normalize(segment.xy);
+}`),B&&j.main.add(D`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);`),E&&(A?F.uniforms.add(new h("worldToScreenRatio",e=>1/e.screenToPCSRatio)):F.main.add(D`vec3 segmentCenter = mix((nextPosition + position) * 0.5, (position + prevPosition) * 0.5, isEndVertex);
-float worldToScreenRatio = computeWorldToScreenRatio(segmentCenter);`),F.main.add(D`float segmentLengthScreenDouble = length(segment.xy);
+vReverseSegmentSDF = noPerspectiveWrite((isJoin && !isStartVertex) ? LARGE_HALF_FLOAT : (dot(pos.xy - segmentEnd.xy, -segmentDir)), pos.w);`),E&&(I?j.uniforms.add(new h("worldToScreenRatio",e=>1/e.screenToPCSRatio)):j.main.add(D`vec3 segmentCenter = mix((nextPosition + position) * 0.5, (position + prevPosition) * 0.5, isEndVertex);
+float worldToScreenRatio = computeWorldToScreenRatio(segmentCenter);`),j.main.add(D`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;`),A?F.main.add(D`float segmentLengthPseudoScreen = segmentLengthScreen / pixelRatio * discreteWorldToScreenRatio / worldToScreenRatio;
-float startPseudoScreen = u0 * discreteWorldToScreenRatio - mix(0.0, segmentLengthPseudoScreen, isEndVertex);`):F.main.add(D`float startPseudoScreen = mix(u0, u0 - segmentLengthRender, isEndVertex) * discreteWorldToScreenRatio;
-float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRatio;`),F.uniforms.add(new S("stipplePatternPixelSize",e=>r(e))),F.main.add(D`
+vStipplePatternStretch = worldToScreenRatio / discreteWorldToScreenRatio;`),I?j.main.add(D`float segmentLengthPseudoScreen = segmentLengthScreen / pixelRatio * discreteWorldToScreenRatio / worldToScreenRatio;
+float startPseudoScreen = u0 * discreteWorldToScreenRatio - mix(0.0, segmentLengthPseudoScreen, isEndVertex);`):j.main.add(D`float startPseudoScreen = mix(u0, u0 - segmentLengthRender, isEndVertex) * discreteWorldToScreenRatio;
+float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRatio;`),j.uniforms.add(new S("stipplePatternPixelSize",e=>r(e))),j.main.add(D`
       float patternLength = patternLineSize * stipplePatternPixelSize;
 
-      ${x(U,D`
+      ${u(U,D`
           float uu = mix(u0, u0 - segmentLengthRender, isEndVertex);
           vStippleDistanceLimits = vec2(uu, uu + segmentLengthRender);
           vStipplePatternStretch = 1.0;
@@ -264,7 +267,7 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRat
                                  isStartVertex ?
                                   vec2(-1e34, vStippleDistanceLimits.y) :
                                   vec2(vStippleDistanceLimits.x, 1e34);
-    `)),F.main.add(D`
+    `)),j.main.add(D`
       // Convert back into NDC
       pos.xy = (pos.xy / viewport.zw) * pos.w;
       pos.z = pos.z * pos.w;
@@ -272,7 +275,7 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRat
       vColor = getColor();
       vColor.a = noPerspectiveWrite(vColor.a * coverage, pos.w);
 
-      ${T&&!A?"pos.z -= EPS * pos.w;":""}
+      ${O&&!I?"pos.z -= EPS * pos.w;":""}
 
       // transform final position to camera space for slicing
       vpos = (inverseProjectionMatrix * pos).xyz;
@@ -281,15 +284,15 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRat
     }`),C.fragment.include(e,P),C.include(b,P),W.include(l),W.main.add(D`discardBySlice(vpos);`),C.include(c),W.include(L),W.main.add(D`
     float lineWidth = noPerspectiveRead(vLineWidth);
     float lineDistance = noPerspectiveRead(vLineDistance);
-    ${x(G,D`float lineDistanceNorm = noPerspectiveRead(vLineDistanceNorm);`)}
-  `),T?W.main.add(D`vec4 finalColor = vec4(1.0, 0.0, 1.0, 1.0);`):(k&&W.main.add(D`float sdf = noPerspectiveRead(min(vSegmentSDF, vReverseSegmentSDF));
+    ${u(G,D`float lineDistanceNorm = noPerspectiveRead(vLineDistanceNorm);`)}
+  `),O?W.main.add(D`vec4 finalColor = vec4(1.0, 0.0, 1.0, 1.0);`):(B&&W.main.add(D`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;
-}`),H?W.main.add(D`vec2 stipplePosition = vec2(
+}`),k?W.main.add(D`vec2 stipplePosition = vec2(
 min(getStippleSDF() * 2.0 - 1.0, 0.0),
 lineDistanceNorm
 );
@@ -300,19 +303,20 @@ float stippleAlpha = step(alphaCutoff, stippleCoverage);`):W.main.add(D`float st
 color.a = noPerspectiveRead(color.a);`),J&&W.uniforms.add(new g("innerColor",e=>e.innerColor??e.color),new S("innerWidth",(e,i)=>e.innerWidth*i.camera.pixelRatio)).main.add(D`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);`),W.main.add(D`vec4 finalColor = blendStipple(color, stippleAlpha);`),N&&(W.uniforms.add(new S("falloff",e=>e.falloff)),W.main.add(D`finalColor.a *= pow(max(0.0, 1.0 - abs(lineDistanceNorm)), falloff);`)),E||W.main.add(D`float stretchFactor = vIsInsideJoin > 0.0 ? noPerspectiveRead(vStretchFactor) : 1.0;
+color = mix(color, vec4(innerColor.rgb, innerAlpha), innerAA);`),W.main.add(D`vec4 finalColor = blendStipple(color, stippleAlpha);`),N&&(W.uniforms.add(new S("falloff",e=>e.falloff)),W.main.add(D`finalColor.a *= pow(max(0.0, 1.0 - abs(lineDistanceNorm)), falloff);`)),E||W.main.add(D`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);
-float joinCenterLineDistance = abs(noPerspectiveRead(vJoinCenterLineSDF));
-float straightFeather = (joinCenterLineDistance - straightFeatherStartDistance) / (lineWidth - straightFeatherStartDistance);
-feather = vIsInsideJoin > 0.0 ? max(feather, straightFeather) : feather;
+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);`),_&&W.main.add(D`
         finalColor = animate(finalColor);
 
-        ${x(11!==V,D`
+        ${u(11!==V,D`
             if (finalColor.a <= alphaCutoff) {
               discard;
             }`)}