@arcgis/core 5.1.0-next.92 → 5.1.0-next.93

package/chunks/GlobalIllumination.glsl.js

@@ -1,8 +1,8 @@
 /* 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 t}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadDepthLastFrame.glsl.js";import{addMainLightDirection as o}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,M=40,C=.095,F=.008,D=60,W=2,j=.0039,z=.25,I=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.rayMarchMaxReach=R,this.rayMarchMaxSteps=L,this.accumulatedFrames=0,this.frameCount=0}}function E(d){const R=new h,L=R.fragment;return R.include(e),R.include(r),o(L),L.include(t),R.include(a,d),L.uniforms.add(new m("normalMap",e=>e.normalTexture),new m("depthMap",e=>e.depthTexture),new m("lastFrameColorTexture",(e,t)=>t.reprojection.lastFrameColor?.getTexture()),new m("lastFrameDepthTexture",(e,t)=>t.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 l("rayMarchMaxReach",e=>e.rayMarchMaxReach),new l("rayMarchMaxSteps",e=>e.rayMarchMaxSteps),new m("blueNoiseTex",e=>e.noiseTexture)),d.hasEmission&&L.uniforms.add(new m("lastFrameEmissionTexture",(e,t)=>t.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 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`
     float computeIdleColorBlendWeight(float accumulatedFrames) {
       float idleColorBlendProgress = clamp(
-        accumulatedFrames / ${i.float(M)},
+        accumulatedFrames / ${i.float(C)},
         0.0,
         1.0
       );
@@ -20,7 +20,7 @@ import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/Scr
         1.0
       );
       return mix(
-        ${i.float(C)},
+        ${i.float(M)},
         ${i.float(F)},
         pow(idleOcclusionBlendProgress, ${i.float(W)})
       );
@@ -69,7 +69,7 @@ import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/Scr
     }
 
     float computeChromaWeight(vec3 color) {
-      float gray = dot(color, vec3(${i.float(I)}));
+      float gray = dot(color, vec3(${i.float(z)}));
       vec3 deviationFromGray = color - gray;
       float chromaDistanceSquared = dot(deviationFromGray, deviationFromGray);
       float normalizedChroma = chromaDistanceSquared / ${i.float(B)};
@@ -80,7 +80,7 @@ import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/Scr
     float computeColorBleedWeight(vec3 receiverColor, vec3 sourceColor) {
       float receiverChromaWeight = computeChromaWeight(receiverColor);
       float sourceChromaWeight = computeChromaWeight(sourceColor);
-      float receiverAverageIntensity = dot(receiverColor, vec3(${i.float(I)}));
+      float receiverAverageIntensity = dot(receiverColor, vec3(${i.float(z)}));
 
       // Favor bright, neutral receivers lit by more saturated hit surfaces
       float bleedFactor =
@@ -184,15 +184,17 @@ import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/Scr
       );
 
       if (hit.z > 0.0) {
-        // Emission and color bleed - reproject the current receiver and sampled hit to estimate bounced color
-        vec3 receiverColor = texture(lastFrameColorTexture, reprojectedCoordinate.xy).rgb;
+        ${n(d.hasColor,i`
+          // Emission and color bleed - Reproject the current receiver and sampled hit to estimate bounced color
+          vec3 receiverColor = texture(lastFrameColorTexture, reprojectedCoordinate.xy).rgb;
 
-        vec2 hitReprojectedCoordinate = reprojectionCoordinate(hit);
-        vec3 sourceColor = texture(lastFrameColorTexture, hitReprojectedCoordinate).rgb;
-        vec3 sourceEmission = ${n(d.hasEmission,"texture(lastFrameEmissionTexture, hitReprojectedCoordinate).xyz","vec3(0.0)")};
+          vec2 hitReprojectedCoordinate = reprojectionCoordinate(hit);
+          vec3 sourceColor = texture(lastFrameColorTexture, hitReprojectedCoordinate).rgb;
+          vec3 sourceEmission = ${n(d.hasEmission,"texture(lastFrameEmissionTexture, hitReprojectedCoordinate).xyz","vec3(0.0)")};
 
-        float colorBleedWeight = computeColorBleedWeight(receiverColor, sourceColor);
-        fragGlobalIllumination.rgb += (sourceColor * colorBleedWeight + sourceEmission) * stepSize;
+          float colorBleedWeight = computeColorBleedWeight(receiverColor, sourceColor);
+          fragGlobalIllumination.rgb += (sourceColor * colorBleedWeight + sourceEmission) * stepSize;
+          `)}
       } else {
         // Occlusion - heuristic modulating sky intensity based on angle to main light
         vec4 viewMainLightDirection = view * vec4(mainLightDirection, 0.0);
@@ -208,12 +210,16 @@ import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/Scr
       ? randomDirectionSample.b * ${i.float(j)}
       : 0.0;
 
-    // Accumulate color
-    vec3 lastFrameColor = lastFrameGlobalIllumination.rgb;
-    float colorDitherScale = isScaledGlobalIllumination ? ${i.float(z)} : 1.0;
-    fragGlobalIllumination.rgb = resetColorHistory
-      ? vec3(0.0)
-      : mix(lastFrameColor + accumulationDither * colorDitherScale, fragGlobalIllumination.rgb, colorBlendWeight);
+    ${n(d.hasColor,i`
+      // Accumulate color
+      vec3 lastFrameColor = lastFrameGlobalIllumination.rgb;
+      float colorDitherScale = isScaledGlobalIllumination ? ${i.float(I)} : 1.0;
+      fragGlobalIllumination.rgb = resetColorHistory
+        ? vec3(0.0)
+        : mix(lastFrameColor + accumulationDither * colorDitherScale, fragGlobalIllumination.rgb, colorBlendWeight);
+      `,i`
+      fragGlobalIllumination.rgb = vec3(0.0);
+      `)}
 
     // Accumulate occlusion
     fragGlobalIllumination.a = mix(lastFrameGlobalIllumination.a + accumulationDither, fragGlobalIllumination.a, occlusionBlendWeight);

package/chunks/GlowBlur.glsl.js

@@ -1,24 +1,24 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.1/LICENSE.txt */
-import{normalize as e}from"../core/arrayUtils.js";import{gauss as r}from"../core/mathUtils.js";import{ScreenSpacePass as t}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{Gamma as o}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js";import{FloatPassUniform as i}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{If as l,glsl as s}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DPassUniform as a}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{NoParameters as n}from"../views/webgl/NoParameters.js";import{ShaderBuilder as c}from"../views/webgl/ShaderBuilder.js";class u extends n{constructor(){super(...arguments),this.blurRadius=0,this.level=0,this.inputScale=1}}function v({glowStage:n,useFloatBlend:u}){const v=new c,d=v.fragment;v.include(t),d.include(o);const f=0===n;d.uniforms.add(new a("colorTexture",e=>e.input),new i("blurRadius",({blurRadius:e})=>e),new i("level",({level:e})=>e),new i("inputScale",e=>u?1:e.inputScale));const m=7;let p="float locations1D["+m+"] = float["+m+"](";for(let e=0;e<m;e++){p+=`${0===e?"":","} ${(e/(m-1)*2-1).toFixed(15)}`}p+=");";const w=2,g=new Array(m).fill(0).map((e,t)=>r(t-Math.floor(m/2),w));e(g);const b=g.reduce((e,r,t)=>`${e}${0===t?"":","} ${r.toFixed(15)}`,"float locations1DWeights["+m+"] = float["+m+"](")+");";return d.code.add(s`
-    ${p}
-    ${b}
+import{normalize as e}from"../core/arrayUtils.js";import{gauss as r}from"../core/mathUtils.js";import{create as o}from"../core/libs/gl-matrix-2/factories/vec2f64.js";import{ScreenSpacePass as t}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{Gamma as i}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js";import{Float2PassUniform as s}from"../views/3d/webgl-engine/core/shaderModules/Float2PassUniform.js";import{FloatPassUniform as l}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{If as a,glsl as n}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DPassUniform as c}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{NoParameters as u}from"../views/webgl/NoParameters.js";import{ShaderBuilder as v}from"../views/webgl/ShaderBuilder.js";class d extends u{constructor(){super(...arguments),this.blurRadius=0,this.level=0,this.inputScale=1,this.size=o()}}function f({glowStage:o,useFloatBlend:u}){const d=new v,f=d.fragment;d.include(t),f.include(i);const m=0===o;f.uniforms.add(new c("colorTexture",e=>e.input),new l("blurRadius",({blurRadius:e})=>e),new l("level",({level:e})=>e),new l("inputScale",({inputScale:e})=>u?1:e),new s("size",({size:e})=>e));const p=7;let w="float locations1D["+p+"] = float["+p+"](";for(let e=0;e<p;e++){w+=`${0===e?"":","} ${(e/(p-1)*2-1).toFixed(15)}`}w+=");";const g=2,b=new Array(p).fill(0).map((e,o)=>r(o-Math.floor(p/2),g));e(b);const h=b.reduce((e,r,o)=>`${e}${0===o?"":","} ${r.toFixed(15)}`,"float locations1DWeights["+p+"] = float["+p+"](")+");";return f.code.add(n`
+    ${w}
+    ${h}
 
     vec3 blurUniformSamples() {
-      vec3 res = vec3(0.0);
-      int textureLevel = int(${f?"level":"0.0"});
-      vec2 size = vec2(textureSize(colorTexture, int(textureLevel)));
+      int textureLevel = int(${m?"level":"0.0"});
       vec2 aspectCorrection = vec2(1.0, size.x / size.y);
-      ${l(!f,"float viewportScale = 1.0 / pow(2.0, level);\n         vec2 uv = uv * viewportScale;\n        ")}
 
+      ${a(m,"float viewportScale = 1.0;","float viewportScale = 1.0 / pow(2.0, level);")}
+      vec2 uv = uv * viewportScale;
       vec2 pixelCenterShift = 0.5 / size;
 
-      for(int i=0;i < ${s.int(m)}; i++) {
-        float uv1D = locations1D[i] + ${f?"pixelCenterShift.x":"pixelCenterShift.y"};
-        vec2 uvOffset = ${f?"vec2(uv1D, 0.0)":"vec2(0.0, uv1D * viewportScale)"};
+      vec3 res = vec3(0.0);
+      for(int i = 0; i < ${n.int(p)}; ++i) {
+        float uv1D = locations1D[i] * viewportScale + ${m?"pixelCenterShift.x":"pixelCenterShift.y"};
+        vec2 uvOffset = ${m?"vec2(uv1D, 0.0)":"vec2(0.0, uv1D)"};
         vec2 uvDistorted = uv + uvOffset * blurRadius * aspectCorrection;
         vec3 sampleColor = texture(colorTexture, uvDistorted, -1.0).rgb * inputScale;
         res += sampleColor * locations1DWeights[i];
       }
       return res;
     }
-  `).main.add(s`fragColor = vec4(blurUniformSamples(), 0.0);`),v}const d=Object.freeze(Object.defineProperty({__proto__:null,GlowBlurPassParameters:u,build:v},Symbol.toStringTag,{value:"Module"}));export{u as G,d as a,v as b};
+  `).main.add(n`fragColor = vec4(blurUniformSamples(), 0.0);`),d}const m=Object.freeze(Object.defineProperty({__proto__:null,GlowBlurPassParameters:d,build:f},Symbol.toStringTag,{value:"Module"}));export{d as G,m as a,f 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 o}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 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 p}from"../views/3d/webgl-engine/core/shaderLibrary/util/NoPerspective.glsl.js";import{addProjViewLocalOrigin as c,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 u}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{Matrix4BindUniform as D}from"../views/3d/webgl-engine/core/shaderModules/Matrix4BindUniform.js";import{alphaCutoff as w}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{ShaderBuilder as y}from"../views/webgl/ShaderBuilder.js";const z=1;function P(P){const j=new y,{attributes:C,varyings:W,vertex:R,fragment:F}=j,{applyMarkerOffset:A,draped:V,output:T,capType:E,stippleEnabled:N,falloffEnabled:O,roundJoins:M,wireframe:$,innerColorEnabled:_,hasAnimation:k,hasScreenSizePerspective:I,worldSizedImagePattern:B}=P;R.inputs.add("position",()=>"position"),F.include(a),j.include(t,P),j.include(n,P),j.include(i,P),j.include(L,P);const H=A&&!V;H&&(R.uniforms.add(new u("markerScale",e=>e.markerScale)),j.include(r,{space:2,hasScreenSizePerspective:I})),c(R,P),R.uniforms.add(new D("inverseProjectionMatrix",e=>e.camera.inverseProjectionMatrix),new v("nearFar",e=>e.camera.nearFar),new u("miterLimit",e=>"miter"!==e.join?0:e.miterLimit),new f("viewport",e=>e.camera.fullViewport)),R.constants.add("LARGE_HALF_FLOAT","float",65500),C.add("position","vec3"),C.add("previousDelta","vec4"),C.add("nextDelta","vec4"),C.add("lineParameters","vec2"),C.add("u0","float"),W.add("vColor","vec4"),W.add("vpos","vec3",{invariant:!0}),W.add("vLineDistance","float"),W.add("vLineWidth","float");const J=N;J&&W.add("vLineSizeInv","float");const U=2===E,Z=N&&U,G=O||Z;G&&W.add("vLineDistanceNorm","float"),U&&(W.add("vSegmentSDF","float"),W.add("vReverseSegmentSDF","float")),R.code.add(x`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 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) {
 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);
-}`),R.code.add(x`vec4 projectAndScale(vec4 pos) {
+}`),F.code.add(D`vec4 projectAndScale(vec4 pos) {
 vec4 posNdc = proj * pos;
 posNdc.xy *= viewport.zw / posNdc.w;
 posNdc.z /= posNdc.w;
 return posNdc;
-}`),R.code.add(x`void clip(
+}`),F.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(R),R.constants.add("aaWidth","float",N?0:1).main.add(x`
+}`),m(F),F.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;
-  `),H&&R.main.add(x`vec4 other = isStartVertex ? next : prev;
+  `),$&&F.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;
-}`),j.include(d),R.main.add(x`
+}`),C.include(d),F.main.add(D`
       clip(pos, prev, next, isStartVertex);
 
       vec3 clippedPos = pos.xyz;
@@ -85,18 +85,18 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
       float leftLen = length(left);
       float rightLen = length(right);
 
-      float lineSize = getSize(${S(I,"clippedPos")});
-      ${S(N&&I,"float patternLineSize = getSize(clippedCenter);")}
-      ${S(N&&!I,"float patternLineSize = lineSize;")}
+      float lineSize = getSize(${x(M,"clippedPos")});
+      ${x(E&&M,"float patternLineSize = getSize(clippedCenter);")}
+      ${x(E&&!M,"float patternLineSize = lineSize;")}
 
-      ${S(B,x`
+      ${x(U,D`
           lineSize += aaWidth;
           float lineWidth = lineSize * pixelRatio * worldToScreenRatio;
           if (lineWidth < 1.0) {
             coverage = lineWidth;
             lineWidth = 1.0;
           }
-        `,x`
+        `,D`
           if (lineSize < 1.0) {
             coverage = lineSize; // convert sub-pixel coverage to alpha
             lineSize = 1.0;
@@ -107,51 +107,70 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
         `)}
 
       vLineWidth = noPerspectiveWrite(lineWidth, pos.w);
-      ${J?x`vLineSizeInv = noPerspectiveWrite(1.0 / lineSize, pos.w);`:""}
-  `);(N||U)&&R.main.add(x`
+      ${B?D`vLineSizeInv = noPerspectiveWrite(1.0 / lineSize, pos.w);`:""}
+  `);(E||k)&&F.main.add(D`
       float isEndVertex = float(!isStartVertex);
       vec3 segmentOrigin = mix(pos.xyz, prev.xyz, isEndVertex);
       vec3 segment = mix(right, left, isEndVertex);
-      ${U?x`vec3 segmentEnd = mix(next.xyz, pos.xyz, isEndVertex);`:""}
-    `),R.main.add(x`left = (leftLen > 0.001) ? left/leftLen : vec3(0.0, 0.0, 0.0);
-right = (rightLen > 0.001) ? right/rightLen : vec3(0.0, 0.0, 0.0);
+      ${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);
+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;
+vStretchFactor = 1.0;
+vJoinCenterLineSDF = LARGE_HALF_FLOAT;`),F.main.add(D`float subdivisionFactor = 0.0;
+bool isOutside = false;
 if (isJoin) {
-bool isOutside = (left.x * right.y - left.y * right.x) * lineParameters.y > 0.0;
+isOutside = (left.x * right.y - left.y * right.x) * lineParameters.y > 0.0;
 vec3 joinDirection = normalize(left + right);
 joinDisplacementDir = perpendicular(joinDirection);
-if (leftLen > 0.001 && rightLen > 0.001) {
+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 = min(displacementLen, min(leftLen, rightLen)/abs(nDotSeg));
+displacementLen = innerDisplacementLen;
 }
 }
-float subdivisionFactor = lineParameters.x;
-if (isOutside && (displacementLen > miterLimit * lineWidth)) {`),M?R.main.add(x`
-        vec3 startDir = leftLen < 0.001 ? right : left;
+subdivisionFactor = lineParameters.x;`),E||F.main.add(D`vIsInsideJoin = subdivisionFactor > 0.0 && subdivisionFactor < 1.0 ? 1.0: 0.0;
+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 roundJoinAngle = acos(clamp(dot(leftScreenDir, rightScreenDir), -1.0, 1.0));
+float triangleHeight = (innerDisplacementLen + lineWidth) * cos(roundJoinAngle / (2.0 + 2.0 * NUM_JOIN_SUBDIVISIONS));
+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`
+        vec3 startDir = leftLen < EPS ? right : left;
         startDir = perpendicular(startDir);
 
-        vec3 endDir = rightLen < 0.001 ? left : right;
+        vec3 endDir = rightLen < EPS ? left : right;
         endDir = perpendicular(endDir);
 
-        float factor = ${N?x`min(1.0, subdivisionFactor * ${x.float((z+2)/(z+1))})`:x`subdivisionFactor`};
+        float factor = ${E?D`min(1.0, subdivisionFactor * ((NUM_JOIN_SUBDIVISIONS + 1.0) / NUM_JOIN_SUBDIVISIONS))`:D`subdivisionFactor`};
 
         float rotationAngle = acos(clamp(dot(startDir.xy, endDir.xy), -1.0, 1.0));
         joinDisplacementDir = rotateZ(startDir, -sign(lineParameters.y) * factor * rotationAngle);
-      `):R.main.add(x`if (leftLen < 0.001) {
+      `):F.main.add(D`if (leftLen < EPS) {
 joinDisplacementDir = right;
 }
-else if (rightLen < 0.001) {
+else if (rightLen < EPS) {
 joinDisplacementDir = left;
 }
 else {
 joinDisplacementDir = (isStartVertex || subdivisionFactor > 0.0) ? right : left;
 }
-joinDisplacementDir = perpendicular(joinDisplacementDir);`);const X=0!==E;return R.main.add(x`
+joinDisplacementDir = perpendicular(joinDisplacementDir);`);const X=0!==I;return F.main.add(D`
         displacementLen = lineWidth;
       }
     } else {
@@ -159,9 +178,9 @@ joinDisplacementDir = perpendicular(joinDisplacementDir);`);const X=0!==E;return
       joinDisplacementDir = isStartVertex ? right : left;
       joinDisplacementDir = perpendicular(joinDisplacementDir);
 
-      ${X?x`capDisplacementDir = vec3((isStartVertex ? -right : left).xy, 0.0);`:""}
+      ${X?D`capDisplacementDir = vec3((isStartVertex ? -right : left).xy, 0.0);`:""}
     }
-  `),R.main.add(x`
+  `),F.main.add(D`
     // Displacement (in pixels) caused by join/or cap
     vec2 dposXY = (joinDisplacementDir.xy * sign(lineParameters.y) + capDisplacementDir.xy) * displacementLen;
 
@@ -173,25 +192,40 @@ joinDisplacementDir = perpendicular(joinDisplacementDir);`);const X=0!==E;return
      */
     float dposZ = dot(dposXY, segmentDirection.xy) / dot(segmentDirection.xy, segmentDirection.xy) * segmentDirection.z;
     vec3 dpos = vec3(dposXY, dposZ);
+
     float lineDistNorm = noPerspectiveWrite(sign(lineParameters.y), pos.w);
 
     vLineDistance = lineWidth * lineDistNorm;
-    ${G?x`vLineDistanceNorm = lineDistNorm;`:""}
+    ${G?D`vLineDistanceNorm = lineDistNorm;`:""}
 
     pos.xyz += dpos;
-  `),U&&R.main.add(x`vec2 segmentDir = normalize(segment.xy);
+  `),E||F.main.add(D`if (isJoin) {
+vec2 joinCenterToVertex = dposXY;
+vec2 leftCenterlineDir = left.xy;
+vec2 rightCenterlineDir = right.xy;
+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)),
+pos.w
+);
+}`),k&&F.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);`),N&&(V?R.uniforms.add(new h("worldToScreenRatio",e=>1/e.screenToPCSRatio)):R.main.add(x`vec3 segmentCenter = mix((nextPosition + position) * 0.5, (position + prevPosition) * 0.5, isEndVertex);
-float worldToScreenRatio = computeWorldToScreenRatio(segmentCenter);`),R.main.add(x`float segmentLengthScreenDouble = length(segment.xy);
+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);
 float segmentLengthScreen = segmentLengthScreenDouble * 0.5;
 float discreteWorldToScreenRatio = discretizeWorldToScreenRatio(worldToScreenRatio);
 float segmentLengthRender = length(mix(nextPosition - position, position - prevPosition, isEndVertex));
-vStipplePatternStretch = worldToScreenRatio / discreteWorldToScreenRatio;`),V?R.main.add(x`float segmentLengthPseudoScreen = segmentLengthScreen / pixelRatio * discreteWorldToScreenRatio / worldToScreenRatio;
-float startPseudoScreen = u0 * discreteWorldToScreenRatio - mix(0.0, segmentLengthPseudoScreen, isEndVertex);`):R.main.add(x`float startPseudoScreen = mix(u0, u0 - segmentLengthRender, isEndVertex) * discreteWorldToScreenRatio;
-float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRatio;`),R.uniforms.add(new u("stipplePatternPixelSize",e=>o(e))),R.main.add(x`
+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`
       float patternLength = patternLineSize * stipplePatternPixelSize;
 
-      ${S(B,x`
+      ${x(U,D`
           float uu = mix(u0, u0 - segmentLengthRender, isEndVertex);
           vStippleDistanceLimits = vec2(uu, uu + segmentLengthRender);
           vStipplePatternStretch = 1.0;
@@ -199,7 +233,7 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRat
           // The v-coordinate used in case of an image pattern.
           bool isLeft = sign(lineParameters.y) < 0.0;
           vStippleV = isLeft ? 0.0 : 1.0;
-        `,x`
+        `,D`
           // Compute the coordinates at both start and end of the line segment, because we need both to clamp to in the
           // fragment shader
           vStippleDistanceLimits = computeStippleDistanceLimits(startPseudoScreen, segmentLengthPseudoScreen, segmentLengthScreen, patternLength);
@@ -209,7 +243,7 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRat
 
       // Adjust the coordinate to the displaced position (the pattern is shortened/overextended on the in/outside of
       // joins)
-      if (segmentLengthScreenDouble >= 0.001) {
+      if (segmentLengthScreenDouble >= EPS) {
         // Project the actual vertex position onto the line segment. Note that the resulting factor is within [0..1]
         // at the original vertex positions, and slightly outside of that range at the displaced positions
         vec3 stippleDisplacement = pos.xyz - segmentOrigin;
@@ -230,7 +264,7 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRat
                                  isStartVertex ?
                                   vec2(-1e34, vStippleDistanceLimits.y) :
                                   vec2(vStippleDistanceLimits.x, 1e34);
-    `)),R.main.add(x`
+    `)),F.main.add(D`
       // Convert back into NDC
       pos.xy = (pos.xy / viewport.zw) * pos.w;
       pos.z = pos.z * pos.w;
@@ -238,42 +272,48 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRat
       vColor = getColor();
       vColor.a = noPerspectiveWrite(vColor.a * coverage, pos.w);
 
-      ${$&&!V?"pos.z -= 0.001 * pos.w;":""}
+      ${T&&!A?"pos.z -= EPS * pos.w;":""}
 
       // transform final position to camera space for slicing
       vpos = (inverseProjectionMatrix * pos).xyz;
       gl_Position = pos;
       forwardObjectAndLayerIdColor();
-    }`),j.fragment.include(e,P),j.include(b,P),F.include(l),F.main.add(x`discardBySlice(vpos);`),j.include(p),F.include(w),F.main.add(x`
+    }`),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);
-    ${S(G,x`float lineDistanceNorm = noPerspectiveRead(vLineDistanceNorm);`)}
-  `),$?F.main.add(x`vec4 finalColor = vec4(1.0, 0.0, 1.0, 1.0);`):(U&&F.main.add(x`float sdf = noPerspectiveRead(min(vSegmentSDF, vReverseSegmentSDF));
+    ${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));
 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;
-}`),Z?F.main.add(x`vec2 stipplePosition = vec2(
+}`),H?W.main.add(D`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);`):F.main.add(x`float stippleAlpha = getStippleAlpha(lineWidth);`),11!==T&&F.main.add(x`discardByStippleAlpha(stippleAlpha, alphaCutoff);`),j.include(p),F.uniforms.add(new g("intrinsicColor",e=>e.color)).main.add(x`vec4 color = intrinsicColor * vColor;
-color.a = noPerspectiveRead(color.a);`),_&&F.uniforms.add(new g("innerColor",e=>e.innerColor??e.color),new u("innerWidth",(e,i)=>e.innerWidth*i.camera.pixelRatio)).main.add(x`float distToInner = abs(lineDistance) - innerWidth;
+float stippleAlpha = step(alphaCutoff, stippleCoverage);`):W.main.add(D`float stippleAlpha = getStippleAlpha(lineWidth);`),11!==V&&W.main.add(D`discardByStippleAlpha(stippleAlpha, alphaCutoff);`),C.include(c),W.uniforms.add(new g("intrinsicColor",e=>e.color)).main.add(D`vec4 color = intrinsicColor * vColor;
+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);`),F.main.add(x`vec4 finalColor = blendStipple(color, stippleAlpha);`),O&&(F.uniforms.add(new u("falloff",e=>e.falloff)),F.main.add(x`finalColor.a *= pow(max(0.0, 1.0 - abs(lineDistanceNorm)), falloff);`)),N||F.main.add(x`float featherStartDistance = max(lineWidth - 2.0, 0.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 > 0.0 ? 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);
-finalColor.a *= 1.0 - clamp(feather, 0.0, 1.0);`),k&&F.main.add(x`
+float joinCenterLineDistance = abs(noPerspectiveRead(vJoinCenterLineSDF));
+float straightFeather = (joinCenterLineDistance - straightFeatherStartDistance) / (lineWidth - straightFeatherStartDistance);
+feather = vIsInsideJoin > 0.0 ? max(feather, straightFeather) : feather;
+finalColor.a *= 1.0 - clamp(feather, 0.0, 1.0);`),_&&W.main.add(D`
         finalColor = animate(finalColor);
 
-        ${S(11!==T,x`
+        ${x(11!==V,D`
             if (finalColor.a <= alphaCutoff) {
               discard;
             }`)}
-      `)),F.main.add(x`outputColorHighlightOLID(applySlice(finalColor, vpos), finalColor.rgb);`),j}const j=Object.freeze(Object.defineProperty({__proto__:null,build:P,ribbonlineNumRoundJoinSubdivisions:z},Symbol.toStringTag,{value:"Module"}));export{j as R,P as b,z as r};
+      `)),W.main.add(D`outputColorHighlightOLID(applySlice(finalColor, vpos), finalColor.rgb);`),C}const z=Object.freeze(Object.defineProperty({__proto__:null,build:C,ribbonlineNumRoundJoinSubdivisions:P},Symbol.toStringTag,{value:"Module"}));export{z as R,C as b,P as r};

package/chunks/ShadowCastVisualize.glsl.js

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.1/LICENSE.txt */
-import{create as e}from"../core/libs/gl-matrix-2/factories/vec2f64.js";import{clone as o,fromValues as r,create as a}from"../core/libs/gl-matrix-2/factories/vec4f64.js";import{ScreenSpacePass as l}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{BlendColorsPremultiplied as t,premultiplyAlpha as s}from"../views/3d/webgl-engine/core/shaderLibrary/util/BlendColorsPremultiplied.glsl.js";import{CameraSpace as n}from"../views/3d/webgl-engine/core/shaderLibrary/util/CameraSpace.glsl.js";import{Float2PassUniform as i}from"../views/3d/webgl-engine/core/shaderModules/Float2PassUniform.js";import{Float4PassUniform as d}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{Float4sPassUniform as m}from"../views/3d/webgl-engine/core/shaderModules/Float4sPassUniform.js";import{FloatPassUniform as h}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{FloatsPassUniform as p}from"../views/3d/webgl-engine/core/shaderModules/FloatsPassUniform.js";import{glsl as c,If as u}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{IntegerPassUniform as v}from"../views/3d/webgl-engine/core/shaderModules/IntegerPassUniform.js";import{Texture2DPassUniform as g}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{maxColorRampSize as w}from"../views/3d/webgl-engine/shaders/colorRampParameters.js";import{S as C}from"./ShadowCastAccumulate.glsl.js";import{NoParameters as f}from"../views/webgl/NoParameters.js";import{ShaderBuilder as b}from"../views/webgl/ShaderBuilder.js";class S extends f{constructor(r){super(),this._data=r,this.sampleScale=e(),this.opacityFromElevation=1,this.gradientColorRamp=y,this.thresholdColor=o(M),this.bandedGradientColorRamp=P,this.bandSize=.1,this.threshold=.5}get shadowCastMap(){return this._data.shadowCastTexture}}const R=.7,j=50/255,y=[[0,r(0,0,1,0)],[1,r(0,0,1,R)]],M=r(1,0,0,R),P=[[0,r(j,j,j,0)],[1,r(j,j,j,R)]];function $(e){const o=new b,r=o.fragment;o.include(n),o.include(l);const{visualization:a}=e;r.constants.add("inverseSampleValue","float",C),r.uniforms.add(new g("shadowCastMap",e=>e.shadowCastMap),new i("sampleScale",e=>e.sampleScale),new h("opacityFromElevation",e=>e.opacityFromElevation));const f=2===a,S=3===a,R=1===a;S&&r.include(t);const j=!f;switch(j&&r.code.add(c`vec4 evaluateColorRamp(float value) {
+import{create as e}from"../core/libs/gl-matrix-2/factories/vec2f64.js";import{clone as o,fromValues as r,create as a}from"../core/libs/gl-matrix-2/factories/vec4f64.js";import{ScreenSpacePass as t}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{BlendColorsPremultiplied as l,premultiplyAlpha as s}from"../views/3d/webgl-engine/core/shaderLibrary/util/BlendColorsPremultiplied.glsl.js";import{CameraSpace as n}from"../views/3d/webgl-engine/core/shaderLibrary/util/CameraSpace.glsl.js";import{Float2PassUniform as i}from"../views/3d/webgl-engine/core/shaderModules/Float2PassUniform.js";import{Float4PassUniform as d}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{Float4sPassUniform as m}from"../views/3d/webgl-engine/core/shaderModules/Float4sPassUniform.js";import{FloatPassUniform as h}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{FloatsPassUniform as p}from"../views/3d/webgl-engine/core/shaderModules/FloatsPassUniform.js";import{glsl as u,If as c}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{IntegerPassUniform as g}from"../views/3d/webgl-engine/core/shaderModules/IntegerPassUniform.js";import{Texture2DPassUniform as v}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{maxColorRampSize as C}from"../views/3d/webgl-engine/shaders/colorRampParameters.js";import{S as w}from"./ShadowCastAccumulate.glsl.js";import{NoParameters as f}from"../views/webgl/NoParameters.js";import{ShaderBuilder as b}from"../views/webgl/ShaderBuilder.js";class S extends f{constructor(r){super(),this._data=r,this.sampleScale=e(),this.opacityFromElevation=1,this.gradientColorRamp=y,this.thresholdColor=o($),this.bandedGradientColorRamp=M,this.bandSize=.1,this.threshold=.5}get shadowCastMap(){return this._data.shadowCastTexture}}const R=.7,j=50/255,y=[[0,r(0,0,1,0)],[1,r(0,0,1,R)]],$=r(1,0,0,R),M=[[0,r(j,j,j,0)],[1,r(j,j,j,R)]];function P(e){const o=new b,r=o.fragment;o.include(n),o.include(t);const{thresholdRendersSunlight:a,visualization:f}=e;r.constants.add("inverseSampleValue","float",w),r.uniforms.add(new v("shadowCastMap",e=>e.shadowCastMap),new i("sampleScale",e=>e.sampleScale),new h("opacityFromElevation",e=>e.opacityFromElevation));const S=2===f,R=3===f,j=1===f;R&&r.include(l);const y=!S;switch(y&&r.code.add(u`vec4 evaluateColorRamp(float value) {
 if (value <= vvColorValues[0]) {
 return vvColorColors[0];
 }
@@ -10,39 +10,42 @@ return mix(vvColorColors[i-1], vvColorColors[i], f);
 }
 }
 return vvColorColors[colorRampSize - 1];
-}`),a){case 0:r.uniforms.add(new m("vvColorColors",w,e=>e.gradientColorRamp.flatMap(([e,o])=>s(z,o))),new v("colorRampSize",e=>e.gradientColorRamp.length),new p("vvColorValues",w,e=>e.gradientColorRamp.map(([e,o])=>e)));break;case 1:r.uniforms.add(new m("vvColorColors",w,e=>e.bandedGradientColorRamp.flatMap(([e,o])=>s(z,o))),new v("colorRampSize",e=>e.bandedGradientColorRamp.length),new p("vvColorValues",w,e=>e.bandedGradientColorRamp.map(([e,o])=>e)),new h("bandSize",e=>e.bandSize));break;case 3:r.uniforms.add(new d("uColor",e=>s(z,e.thresholdColor)),new h("threshold",e=>e.threshold),new m("vvColorColors",w,e=>e.gradientColorRamp.flatMap(([e,o])=>s(z,o))),new v("colorRampSize",e=>e.gradientColorRamp.length),new p("vvColorValues",w,e=>e.gradientColorRamp.map(([e,o])=>e)));break;case 2:r.uniforms.add(new d("uColor",e=>s(z,e.thresholdColor)),new h("threshold",e=>e.threshold))}const{type:y,selector:M,thresholdStrengthSelector:P}=S?{type:"vec2",selector:"rg",thresholdStrengthSelector:"strength.x"}:{type:"float",selector:"r",thresholdStrengthSelector:"strength"};return r.main.add(c`
-    ${y} numSamples = texture(shadowCastMap, uv).${M} * inverseSampleValue;
+}`),f){case 0:r.uniforms.add(new m("vvColorColors",C,e=>e.gradientColorRamp.flatMap(([e,o])=>s(z,o))),new g("colorRampSize",e=>e.gradientColorRamp.length),new p("vvColorValues",C,e=>e.gradientColorRamp.map(([e,o])=>e)));break;case 1:r.uniforms.add(new m("vvColorColors",C,e=>e.bandedGradientColorRamp.flatMap(([e,o])=>s(z,o))),new g("colorRampSize",e=>e.bandedGradientColorRamp.length),new p("vvColorValues",C,e=>e.bandedGradientColorRamp.map(([e,o])=>e)),new h("bandSize",e=>e.bandSize));break;case 3:r.uniforms.add(new d("uColor",e=>s(z,e.thresholdColor)),new h("threshold",e=>e.threshold),new m("vvColorColors",C,e=>e.gradientColorRamp.flatMap(([e,o])=>s(z,o))),new g("colorRampSize",e=>e.gradientColorRamp.length),new p("vvColorValues",C,e=>e.gradientColorRamp.map(([e,o])=>e)));break;case 2:r.uniforms.add(new d("uColor",e=>s(z,e.thresholdColor)),new h("threshold",e=>e.threshold))}const{type:$,selector:M,thresholdStrengthSelector:P}=R?{type:"vec2",selector:"rg",thresholdStrengthSelector:"strength.x"}:{type:"float",selector:"r",thresholdStrengthSelector:"strength"},V=!(S||R)||!a;return r.main.add(u`
+    ${$} numSamples = texture(shadowCastMap, uv).${M} * inverseSampleValue;
 
     fragColor = vec4(0.0);
 
     // early out if we do not have any samples in one or more channels and 0 samples would be fully transparent
-    if (${u(j,c`vvColorColors[0].a == 0.0 && `,"")}dot(numSamples, ${y}(1)) < 1.0) {
+    ${c(V,u`
+    if (${c(y,u`vvColorColors[0].a == 0.0 && `,"")}dot(numSamples, ${$}(1)) < 1.0) {
       return;
     }
+    `)}
 
     // sampleScale is the number of total samples taken, so this brings strength to a 0-1 range.
     // note that sampleScale is always a vec2 even if we have only the primary channel.
-    ${y} strength = numSamples * sampleScale.${M};
+    ${$} strength = numSamples * sampleScale.${M};
 
     // in threshold mode, step the strength to 0 if we are at or below the threshold, 1 otherwise.
-    ${u(f||S,c`
-      ${P} = 1.0 - step(${P}, threshold);
+    ${c(S||R,u`
+      float thresholdStrength = ${a?u`1.0 - ${P}`:P};
+      ${P} = 1.0 - step(thresholdStrength, threshold);
     `)}
 
     // bail out if we are below the threshold
-    ${u(f,c`if (${P} == 0.0) { return; }`)}
+    ${c(S,u`if (${P} == 0.0) { return; }`)}
 
-    ${u(R,c`strength = ceil(strength / bandSize) * bandSize;`)}
+    ${c(j,u`strength = ceil(strength / bandSize) * bandSize;`)}
 
-    ${y} attenuation = opacityFromElevation * strength;
+    ${$} attenuation = opacityFromElevation * strength;
 
-    ${u(S,c`
+    ${c(R,u`
         vec4 thresholdColor = uColor * attenuation.r;
         vec4 gradientColor = evaluateColorRamp(attenuation.g);
-        fragColor = blendColorsPremultiplied(thresholdColor, gradientColor);
-      `,u(f,c`
+        fragColor = blendColorsPremultiplied(${c(a,u`gradientColor, thresholdColor`,u`thresholdColor, gradientColor`)});
+      `,c(S,u`
         fragColor = uColor * attenuation;
-      `,c`
+      `,u`
         fragColor = evaluateColorRamp(attenuation);
       `))}
-  `),o}const z=a(),V=Object.freeze(Object.defineProperty({__proto__:null,ShadowCastVisualizePassParameters:S,build:$},Symbol.toStringTag,{value:"Module"}));export{S,V as a,$ as b};
+  `),o}const z=a(),V=Object.freeze(Object.defineProperty({__proto__:null,ShadowCastVisualizePassParameters:S,build:P},Symbol.toStringTag,{value:"Module"}));export{S,V as a,P as b};

package/config.js

@@ -1,2 +1,2 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.1/LICENSE.txt */
-import"./core/has.js";import{deepMerge as e}from"./core/object.js";const s={apiKey:void 0,apiKeys:{scopes:[]},applicationName:"",applicationUrl:globalThis.location?.href,assetsPath:"",fontsUrl:"https://static.arcgis.com/fonts",geometryServiceUrl:"https://utility.arcgisonline.com/arcgis/rest/services/Geometry/GeometryServer",geoRSSServiceUrl:"https://utility.arcgis.com/sharing/rss",kmlServiceUrl:"https://utility.arcgis.com/sharing/kml",userPrivilegesApplied:!0,portalUrl:"https://www.arcgis.com",respectPrefersReducedMotion:!0,routeServiceUrl:"https://route-api.arcgis.com/arcgis/rest/services/World/Route/NAServer/Route_World",workers:{loaderConfig:{has:{},paths:{},map:{},packages:[]}},request:{crossOriginNoCorsDomains:null,httpsDomains:["arcgis.com","arcgisonline.com","esrikr.com","premiumservices.blackbridge.com","esripremium.accuweather.com","gbm.digitalglobe.com","firstlook.digitalglobe.com","msi.digitalglobe.com"],interceptors:[],internalInterceptors:[],maxUrlLength:2e3,priority:"high",proxyRules:[],proxyUrl:null,timeout:62e3,trustedServers:[],useIdentity:!0},log:{interceptors:[],level:null}};if(globalThis.esriConfig&&(e(s,globalThis.esriConfig,!0),delete s.has),!s.assetsPath){{const e="5.1.0-next.92";s.assetsPath=`https://cdn.jsdelivr.net/npm/@arcgis/core@${e}/assets`}s.defaultAssetsPath=s.assetsPath}export{s as default};
+import"./core/has.js";import{deepMerge as e}from"./core/object.js";const s={apiKey:void 0,apiKeys:{scopes:[]},applicationName:"",applicationUrl:globalThis.location?.href,assetsPath:"",fontsUrl:"https://static.arcgis.com/fonts",geometryServiceUrl:"https://utility.arcgisonline.com/arcgis/rest/services/Geometry/GeometryServer",geoRSSServiceUrl:"https://utility.arcgis.com/sharing/rss",kmlServiceUrl:"https://utility.arcgis.com/sharing/kml",userPrivilegesApplied:!0,portalUrl:"https://www.arcgis.com",respectPrefersReducedMotion:!0,routeServiceUrl:"https://route-api.arcgis.com/arcgis/rest/services/World/Route/NAServer/Route_World",workers:{loaderConfig:{has:{},paths:{},map:{},packages:[]}},request:{crossOriginNoCorsDomains:null,httpsDomains:["arcgis.com","arcgisonline.com","esrikr.com","premiumservices.blackbridge.com","esripremium.accuweather.com","gbm.digitalglobe.com","firstlook.digitalglobe.com","msi.digitalglobe.com"],interceptors:[],internalInterceptors:[],maxUrlLength:2e3,priority:"high",proxyRules:[],proxyUrl:null,timeout:62e3,trustedServers:[],useIdentity:!0},log:{interceptors:[],level:null}};if(globalThis.esriConfig&&(e(s,globalThis.esriConfig,!0),delete s.has),!s.assetsPath){{const e="5.1.0-next.93";s.assetsPath=`https://cdn.jsdelivr.net/npm/@arcgis/core@${e}/assets`}s.defaultAssetsPath=s.assetsPath}export{s as default};

package/kernel.js

@@ -1,2 +1,2 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.1/LICENSE.txt */
-import has from"./core/has.js";import{addQueryParameter as o}from"./core/urlUtils.js";export{buildDate,commitHash as revision}from"./support/revision.js";Symbol.dispose??=Symbol("Symbol.dispose"),Symbol.asyncDispose??=Symbol("Symbol.asyncDispose");const e="5.1";let s,r=e;function i(o){s=o}function t(e){const r=s?.findCredential(e);return r?.token?o(e,"token",r.token):e}r="5.1.0-next.92",has("host-webworker")||globalThis.$arcgis||Object.defineProperty(globalThis,"$arcgis",{configurable:!1,enumerable:!0,writable:!1,value:{}}),has("host-webworker");export{t as addTokenParameter,r as fullVersion,s as id,i as setId,e as version};
+import has from"./core/has.js";import{addQueryParameter as o}from"./core/urlUtils.js";export{buildDate,commitHash as revision}from"./support/revision.js";Symbol.dispose??=Symbol("Symbol.dispose"),Symbol.asyncDispose??=Symbol("Symbol.asyncDispose");const e="5.1";let s,r=e;function i(o){s=o}function t(e){const r=s?.findCredential(e);return r?.token?o(e,"token",r.token):e}r="5.1.0-next.93",has("host-webworker")||globalThis.$arcgis||Object.defineProperty(globalThis,"$arcgis",{configurable:!1,enumerable:!0,writable:!1,value:{}}),has("host-webworker");export{t as addTokenParameter,r as fullVersion,s as id,i as setId,e as version};