@arcgis/core 5.1.0-next.53 → 5.1.0-next.55

package/chunks/CutFillComposition.glsl.js

@@ -1,6 +1,9 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.1/LICENSE.txt */
-import{create as e}from"../core/libs/gl-matrix-2/factories/vec4f64.js";import{ScreenSpacePass as r}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{Float4PassUniform as o}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatPassUniform as s}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as l}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DPassUniform as t}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{NoParameters as i}from"../views/webgl/NoParameters.js";import{ShaderBuilder as a}from"../views/webgl/ShaderBuilder.js";class m extends i{constructor(){super(...arguments),this.borderColor=e()}}function c(){const e=new a;return e.include(r),e.outputs.add("fragColor","vec4",0),e.fragment.uniforms.add(new t("colorTexture",e=>e.color),new t("cutFillVolumes",e=>e.cutFillVolumes),new t("cutFillMask",e=>e.cutFillMask),new s("pixelRatio",(e,r)=>r.camera.pixelRatio),new o("borderColor",e=>e.borderColor)).main.add(l`vec4 color = texture(colorTexture, uv, 0.0);
-vec4 volumesColor = texture(cutFillVolumes, uv, 0.0);
+import{create as e}from"../core/libs/gl-matrix-2/factories/vec4f64.js";import{ScreenSpacePass as r}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{Float4PassUniform as t}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatPassUniform as l}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as o}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DPassUniform as s}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{NoParameters as i}from"../views/webgl/NoParameters.js";import{ShaderBuilder as c}from"../views/webgl/ShaderBuilder.js";class a extends i{constructor(){super(...arguments),this.borderColor=e()}}function u(){const e=new c;return e.include(r),e.outputs.add("fragColor","vec4",0),e.fragment.uniforms.add(new s("colorTexture",e=>e.color),new s("cutVolume",e=>e.cutVolume),new s("fillVolume",e=>e.fillVolume),new s("cutFillMask",e=>e.cutFillMask),new s("depthTexture",e=>e.sceneDepth),new s("cutFillReferenceDepthTexture",e=>e.referenceDepth),new l("pixelRatio",(e,r)=>r.camera.pixelRatio),new t("borderColor",e=>e.borderColor)).main.add(o`vec4 color = texture(colorTexture, uv, 0.0);
+vec4 cutVolume = texture(cutVolume, uv, 0.0);
+vec4 fillVolume = texture(fillVolume, uv, 0.0);
+float sceneDepth = texture(depthTexture, uv, 0.0).r;
+float referenceDepth = texture(cutFillReferenceDepthTexture, uv, 0.0).r;
 ivec2 iuv = ivec2(uv * vec2(textureSize(cutFillMask, 0)));
 vec2 m0 = texelFetch(cutFillMask, iuv, 0).rg;
 vec2 m1 = texelFetch(cutFillMask, iuv + ivec2(-1, 0), 0).rg;
@@ -13,5 +16,8 @@ step(1.5, abs(m0.r - m1.r) + abs(m0.g - m1.g))
 + step(1.5, abs(m0.r - m3.r) + abs(m0.g - m3.g))
 + step(1.5, abs(m0.r - m4.r) + abs(m0.g - m4.g))
 ) * 0.25 * pixelRatio;
-vec4 base = mix(color, volumesColor, max(m0.r, m0.g) * volumesColor.a);
-fragColor = mix(base, borderColor, d);`),e}const u=Object.freeze(Object.defineProperty({__proto__:null,CutFillCompositionPassParameters:m,build:c},Symbol.toStringTag,{value:"Module"}));export{m as C,u as a,c as b};
+float visibleAgainstScene = step(referenceDepth, sceneDepth);
+vec4 base = mix(color, cutVolume, m0.r * cutVolume.a * visibleAgainstScene);
+base = mix(base, fillVolume, m0.g * fillVolume.a);
+float borderFade = mix(0.5, 1.0, visibleAgainstScene);
+fragColor = mix(base, borderColor, d * borderFade);`),e}const m=Object.freeze(Object.defineProperty({__proto__:null,CutFillCompositionPassParameters:a,build:u},Symbol.toStringTag,{value:"Module"}));export{a as C,m as a,u as b};

package/chunks/OITBlend.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{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 s}from"./OITDim.glsl.js";import{oitResolution as a}from"../views/3d/webgl-engine/shaders/oitResolution.glsl.js";import{ShaderBuilder as n}from"../views/webgl/ShaderBuilder.js";class i extends s{}function c(s){const i=new n;i.include(e);const{hasEmission:c,frontFaceMask:l,computeHudOcclusion:u,useFloatBlend:m}=s,f=i.fragment;f.include(a,s),f.uniforms.add(new t("colorTexture",e=>e.colorTexture),new t("alphaTexture",e=>e.alphaTexture));let d=0;return i.outputs.add("fragColor","vec4",d++),c&&i.outputs.add("fragEmission","vec4",d++),u&&i.outputs.add("fragOcclusion","vec4",d++),f.uniforms.add(new t("frontFaceTexture",e=>e.frontFaceTexture)),c&&(f.uniforms.add(new t("emissionTexture",e=>e.emissionTexture)),f.uniforms.add(new t("emissionFrontFaceTexture",e=>e.emissionFrontFaceTexture))),f.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 t}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{O as s}from"./OITDim.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 c(s){const i=new a;i.include(e);const{hasEmission:c,frontFaceMask:l,computeHudOcclusion:u,useFloatBlend:m}=s,f=i.fragment;f.include(n,s),f.uniforms.add(new t("colorTexture",e=>e.colorTexture),new t("alphaTexture",e=>e.alphaTexture));let d=0;return i.outputs.add("fragColor","vec4",d++),c&&i.outputs.add("fragEmission","vec4",d++),u&&i.outputs.add("fragOcclusion","vec4",d++),f.uniforms.add(new t("frontFaceTexture",e=>e.frontFaceTexture)),c&&(f.uniforms.add(new t("emissionTexture",e=>e.emissionTexture)),f.uniforms.add(new t("emissionFrontFaceTexture",e=>e.emissionFrontFaceTexture))),f.main.add(o`
     float srcAlpha = texture(alphaTexture, uv).r * floatBlendInputScale;
     ${r(u,"fragOcclusion = vec4(1.0, 0.0, 0.0, 1.0);")}
 
@@ -22,7 +22,7 @@ import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/Scr
     ${r(!m,"float frontWeight = srcAlpha * floatBlendOutputScale;\n       frontFace.a = mix(frontFace.a, 1.0, clamp((frontWeight - 0.9) * 10.0, 0.0, 1.0));")}
     fragColor = vec4(mix(srcColor.rgb * floatBlendInputScale / srcAlpha, frontFace.rgb, frontFace.a), 1.0 - srcColor.a);
 
-    ${r(c,"vec4 emission = texture(emissionTexture, uv) * floatBlendInputScale;\n       vec4 emissionFrontFace = texture(emissionFrontFaceTexture, uv);\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(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};

package/chunks/RibbonLine.glsl.js

@@ -1,20 +1,21 @@
 /* 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{terrainDepthTest as l}from"../views/3d/webgl-engine/core/shaderLibrary/shading/TerrainDepthTest.glsl.js";import{ColorConversion as p}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 m,addPixelRatio as v}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 g}from"../views/3d/webgl-engine/core/shaderModules/Float4BindUniform.js";import{Float4PassUniform as h}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatBindUniform as u}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 L}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 b}from"../views/3d/webgl-engine/shaders/AnimatedLine.glsl.js";import{outputColorHighlightOLID as y}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{ShaderBuilder as P}from"../views/webgl/ShaderBuilder.js";const j=1;function z(z){const C=new P,{attributes:W,varyings:R,vertex:F,fragment:A}=C,{applyMarkerOffset:V,draped:T,output:E,capType:O,stippleEnabled:N,falloffEnabled:M,roundJoins:$,wireframe:_,innerColorEnabled:k,hasAnimation:I,hasScreenSizePerspective:B,worldSizedImagePattern:H}=z;A.include(a),C.include(t,z),C.include(n,z),C.include(i,z),C.include(l,z),C.include(b,z);const J=V&&!T;J&&(F.uniforms.add(new S("markerScale",e=>e.markerScale)),C.include(o,{space:2,hasScreenSizePerspective:B})),m(F,z),F.uniforms.add(new L("inverseProjectionMatrix",e=>e.camera.inverseProjectionMatrix),new f("nearFar",e=>e.camera.nearFar),new S("miterLimit",e=>"miter"!==e.join?0:e.miterLimit),new g("viewport",e=>e.camera.fullViewport)),F.constants.add("LARGE_HALF_FLOAT","float",65500),W.add("position","vec3"),W.add("previousDelta","vec4"),W.add("nextDelta","vec4"),W.add("lineParameters","vec2"),W.add("u0","float"),R.add("vColor","vec4"),R.add("vpos","vec3",{invariant:!0}),R.add("vLineDistance","float"),R.add("vLineWidth","float");const U=N;U&&R.add("vLineSizeInv","float");const G=2===O,q=N&&G,K=M||q;K&&R.add("vLineDistanceNorm","float"),G&&(R.add("vSegmentSDF","float"),R.add("vReverseSegmentSDF","float")),F.code.add(D`vec2 perpendicular(vec2 v) {
-return vec2(v.y, -v.x);
+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{terrainDepthTest as l}from"../views/3d/webgl-engine/core/shaderLibrary/shading/TerrainDepthTest.glsl.js";import{ColorConversion as d}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{NoPerspectiveWrite as p,NoPerspectiveRead as c}from"../views/3d/webgl-engine/core/shaderLibrary/util/NoPerspective.glsl.js";import{addProjViewLocalOrigin as m,addPixelRatio as v}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 g}from"../views/3d/webgl-engine/core/shaderModules/Float4BindUniform.js";import{Float4PassUniform as h}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatBindUniform as x}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 S,If as D}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Matrix4BindUniform as w}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 b}from"../views/3d/webgl-engine/shaders/AnimatedLine.glsl.js";import{outputColorHighlightOLID as y}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{ShaderBuilder as z}from"../views/webgl/ShaderBuilder.js";const P=1;function j(j){const C=new z,{attributes:W,varyings:R,vertex:F,fragment:A}=C,{applyMarkerOffset:V,draped:T,output:E,capType:N,stippleEnabled:O,falloffEnabled:M,roundJoins:$,wireframe:_,innerColorEnabled:k,hasAnimation:I,hasScreenSizePerspective:B,worldSizedImagePattern:H}=j;A.include(a),C.include(t,j),C.include(n,j),C.include(i,j),C.include(l,j),C.include(b,j);const J=V&&!T;J&&(F.uniforms.add(new u("markerScale",e=>e.markerScale)),C.include(r,{space:2,hasScreenSizePerspective:B})),m(F,j),F.uniforms.add(new w("inverseProjectionMatrix",e=>e.camera.inverseProjectionMatrix),new f("nearFar",e=>e.camera.nearFar),new u("miterLimit",e=>"miter"!==e.join?0:e.miterLimit),new g("viewport",e=>e.camera.fullViewport)),F.constants.add("LARGE_HALF_FLOAT","float",65500),W.add("position","vec3"),W.add("previousDelta","vec4"),W.add("nextDelta","vec4"),W.add("lineParameters","vec2"),W.add("u0","float"),R.add("vColor","vec4"),R.add("vpos","vec3",{invariant:!0}),R.add("vLineDistance","float"),R.add("vLineWidth","float");const U=O;U&&R.add("vLineSizeInv","float");const Z=2===N,G=O&&Z,X=M||G;X&&R.add("vLineDistanceNorm","float"),Z&&(R.add("vSegmentSDF","float"),R.add("vReverseSegmentSDF","float")),F.code.add(S`vec3 perpendicular(vec3 v) {
+return vec3(v.y, -v.x, 0.0);
 }
 float interp(float ncp, vec4 a, vec4 b) {
 return (-ncp - a.z) / (b.z - a.z);
 }
-vec2 rotate(vec2 v, float a) {
+vec3 rotateZ(vec3 v, float a) {
 float s = sin(a);
 float c = cos(a);
 mat2 m = mat2(c, -s, s, c);
-return m * v;
-}`),F.code.add(D`vec4 projectAndScale(vec4 pos) {
+return vec3(m * v.xy, v.z);
+}`),F.code.add(S`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(
+}`),F.code.add(S`void clip(
 inout vec4 pos,
 inout vec4 prev,
 inout vec4 next,
@@ -45,7 +46,7 @@ if (next.z > -nearFar[0]) {
 next = mix(next, pos, interp(vnp, next, pos));
 }
 }
-}`),v(F),F.constants.add("aaWidth","float",N?0:1).main.add(D`
+}`),v(F),F.constants.add("aaWidth","float",O?0:1).main.add(S`
     // unpack values from vertex type
     bool isStartVertex = abs(abs(lineParameters.y) - 3.0) == 1.0;
     vec3 prevPosition = position + previousDelta.xyz * previousDelta.w;
@@ -64,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;
-  `),J&&F.main.add(D`vec4 other = isStartVertex ? next : prev;
+  `),J&&F.main.add(S`vec4 other = isStartVertex ? next : prev;
 bool markersHidden = areWorldMarkersHidden(pos.xyz, other.xyz);
 if (!isJoin && !markersHidden) {
 pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
-}`),C.include(d),F.main.add(D`
+}`),C.include(p),F.main.add(S`
       clip(pos, prev, next, isStartVertex);
 
       vec3 clippedPos = pos.xyz;
@@ -80,24 +81,24 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
       next = projectAndScale(next);
       prev = projectAndScale(prev);
 
-      vec2 left = (pos.xy - prev.xy);
-      vec2 right = (next.xy - pos.xy);
+      vec3 left = (pos.xyz - prev.xyz);
+      vec3 right = (next.xyz - pos.xyz);
 
       float leftLen = length(left);
       float rightLen = length(right);
 
-      float lineSize = getSize(${x(B,"clippedPos")});
-      ${x(N&&B,"float patternLineSize = getSize(clippedCenter);")}
-      ${x(N&&!B,"float patternLineSize = lineSize;")}
+      float lineSize = getSize(${D(B,"clippedPos")});
+      ${D(O&&B,"float patternLineSize = getSize(clippedCenter);")}
+      ${D(O&&!B,"float patternLineSize = lineSize;")}
 
-      ${x(H,D`
+      ${D(H,S`
           lineSize += aaWidth;
           float lineWidth = lineSize * pixelRatio * worldToScreenRatio;
           if (lineWidth < 1.0) {
             coverage = lineWidth;
             lineWidth = 1.0;
           }
-        `,D`
+        `,S`
           if (lineSize < 1.0) {
             coverage = lineSize; // convert sub-pixel coverage to alpha
             lineSize = 1.0;
@@ -108,21 +109,22 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
         `)}
 
       vLineWidth = noPerspectiveWrite(lineWidth, pos.w);
-      ${U?D`vLineSizeInv = noPerspectiveWrite(1.0 / lineSize, pos.w);`:""}
-  `);(N||G)&&F.main.add(D`
+      ${U?S`vLineSizeInv = noPerspectiveWrite(1.0 / lineSize, pos.w);`:""}
+  `);(O||Z)&&F.main.add(S`
       float isEndVertex = float(!isStartVertex);
-      vec2 segmentOrigin = mix(pos.xy, prev.xy, isEndVertex);
-      vec2 segment = mix(right, left, isEndVertex);
-      ${G?D`vec2 segmentEnd = mix(next.xy, pos.xy, isEndVertex);`:""}
-    `),F.main.add(D`left = (leftLen > 0.001) ? left/leftLen : vec2(0.0, 0.0);
-right = (rightLen > 0.001) ? right/rightLen : vec2(0.0, 0.0);
-vec2 capDisplacementDir = vec2(0, 0);
-vec2 joinDisplacementDir = vec2(0, 0);
+      vec3 segmentOrigin = mix(pos.xyz, prev.xyz, isEndVertex);
+      vec3 segment = mix(right, left, isEndVertex);
+      ${Z?S`vec3 segmentEnd = mix(next.xyz, pos.xyz, isEndVertex);`:""}
+    `),F.main.add(S`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);
+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;
 if (isJoin) {
 bool isOutside = (left.x * right.y - left.y * right.x) * lineParameters.y > 0.0;
-joinDisplacementDir = normalize(left + right);
-joinDisplacementDir = perpendicular(joinDisplacementDir);
+vec3 joinDirection = normalize(left + right);
+joinDisplacementDir = perpendicular(joinDirection);
 if (leftLen > 0.001 && rightLen > 0.001) {
 float nDotSeg = dot(joinDisplacementDir, left);
 displacementLen /= length(nDotSeg * left - joinDisplacementDir);
@@ -131,18 +133,18 @@ displacementLen = min(displacementLen, min(leftLen, rightLen)/abs(nDotSeg));
 }
 }
 float subdivisionFactor = lineParameters.x;
-if (isOutside && (displacementLen > miterLimit * lineWidth)) {`),$?F.main.add(D`
-        vec2 startDir = leftLen < 0.001 ? right : left;
+if (isOutside && (displacementLen > miterLimit * lineWidth)) {`),$?F.main.add(S`
+        vec3 startDir = leftLen < 0.001 ? right : left;
         startDir = perpendicular(startDir);
 
-        vec2 endDir = rightLen < 0.001 ? left : right;
+        vec3 endDir = rightLen < 0.001 ? left : right;
         endDir = perpendicular(endDir);
 
-        float factor = ${N?D`min(1.0, subdivisionFactor * ${D.float((j+2)/(j+1))})`:D`subdivisionFactor`};
+        float factor = ${O?S`min(1.0, subdivisionFactor * ${S.float((P+2)/(P+1))})`:S`subdivisionFactor`};
 
-        float rotationAngle = acos(clamp(dot(startDir, endDir), -1.0, 1.0));
-        joinDisplacementDir = rotate(startDir, -sign(lineParameters.y) * factor * rotationAngle);
-      `):F.main.add(D`if (leftLen < 0.001) {
+        float rotationAngle = acos(clamp(dot(startDir.xy, endDir.xy), -1.0, 1.0));
+        joinDisplacementDir = rotateZ(startDir, -sign(lineParameters.y) * factor * rotationAngle);
+      `):F.main.add(S`if (leftLen < 0.001) {
 joinDisplacementDir = right;
 }
 else if (rightLen < 0.001) {
@@ -151,7 +153,7 @@ joinDisplacementDir = left;
 else {
 joinDisplacementDir = (isStartVertex || subdivisionFactor > 0.0) ? right : left;
 }
-joinDisplacementDir = perpendicular(joinDisplacementDir);`);const Q=0!==O;return F.main.add(D`
+joinDisplacementDir = perpendicular(joinDisplacementDir);`);const Y=0!==N;return F.main.add(S`
         displacementLen = lineWidth;
       }
     } else {
@@ -159,30 +161,39 @@ joinDisplacementDir = perpendicular(joinDisplacementDir);`);const Q=0!==O;return
       joinDisplacementDir = isStartVertex ? right : left;
       joinDisplacementDir = perpendicular(joinDisplacementDir);
 
-      ${Q?D`capDisplacementDir = isStartVertex ? -right : left;`:""}
+      ${Y?S`capDisplacementDir = vec3((isStartVertex ? -right : left).xy, 0.0);`:""}
     }
-  `),F.main.add(D`
+  `),F.main.add(S`
     // Displacement (in pixels) caused by join/or cap
-    vec2 dpos = joinDisplacementDir * sign(lineParameters.y) * displacementLen + capDisplacementDir * displacementLen;
+    vec2 dposXY = (joinDisplacementDir.xy * sign(lineParameters.y) + capDisplacementDir.xy) * displacementLen;
+
+    /**
+     * To prevent z-fighting between layers, we also adjust the z value.
+     * We want to ensure that the orientation of the final triangles is the same, regardless of the line width.
+     * To do so, the below formula projects the xy displacement onto the original segment direction
+     * to find the z-offset necessary so the triangle orientation is independent of the width.
+     */
+    float dposZ = dot(dposXY, segmentDirection.xy) / dot(segmentDirection.xy, segmentDirection.xy) * segmentDirection.z;
+    vec3 dpos = vec3(dposXY, dposZ);
     float lineDistNorm = noPerspectiveWrite(sign(lineParameters.y), pos.w);
 
     vLineDistance = lineWidth * lineDistNorm;
-    ${K?D`vLineDistanceNorm = lineDistNorm;`:""}
+    ${X?S`vLineDistanceNorm = lineDistNorm;`:""}
 
-    pos.xy += dpos;
-  `),G&&F.main.add(D`vec2 segmentDir = normalize(segment);
-vSegmentSDF = noPerspectiveWrite((isJoin && isStartVertex) ? LARGE_HALF_FLOAT : (dot(pos.xy - segmentOrigin, segmentDir)), pos.w);
-vReverseSegmentSDF = noPerspectiveWrite((isJoin && !isStartVertex) ? LARGE_HALF_FLOAT : (dot(pos.xy - segmentEnd, -segmentDir)), pos.w);`),N&&(T?F.uniforms.add(new u("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);
+    pos.xyz += dpos;
+  `),Z&&F.main.add(S`vec2 segmentDir = normalize(segment.xy);
+vSegmentSDF = noPerspectiveWrite((isJoin && isStartVertex) ? LARGE_HALF_FLOAT : (dot(pos.xy - segmentOrigin.xy, segmentDir)), pos.w);
+vReverseSegmentSDF = noPerspectiveWrite((isJoin && !isStartVertex) ? LARGE_HALF_FLOAT : (dot(pos.xy - segmentEnd.xy, -segmentDir)), pos.w);`),O&&(T?F.uniforms.add(new x("worldToScreenRatio",e=>1/e.screenToPCSRatio)):F.main.add(S`vec3 segmentCenter = mix((nextPosition + position) * 0.5, (position + prevPosition) * 0.5, isEndVertex);
+float worldToScreenRatio = computeWorldToScreenRatio(segmentCenter);`),F.main.add(S`float segmentLengthScreenDouble = length(segment.xy);
 float segmentLengthScreen = segmentLengthScreenDouble * 0.5;
 float discreteWorldToScreenRatio = discretizeWorldToScreenRatio(worldToScreenRatio);
 float segmentLengthRender = length(mix(nextPosition - position, position - prevPosition, isEndVertex));
-vStipplePatternStretch = worldToScreenRatio / discreteWorldToScreenRatio;`),T?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;`),T?F.main.add(S`float segmentLengthPseudoScreen = segmentLengthScreen / pixelRatio * discreteWorldToScreenRatio / worldToScreenRatio;
+float startPseudoScreen = u0 * discreteWorldToScreenRatio - mix(0.0, segmentLengthPseudoScreen, isEndVertex);`):F.main.add(S`float startPseudoScreen = mix(u0, u0 - segmentLengthRender, isEndVertex) * discreteWorldToScreenRatio;
+float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRatio;`),F.uniforms.add(new u("stipplePatternPixelSize",e=>o(e))),F.main.add(S`
       float patternLength = patternLineSize * stipplePatternPixelSize;
 
-      ${x(H,D`
+      ${D(H,S`
           float uu = mix(u0, u0 - segmentLengthRender, isEndVertex);
           vStippleDistanceLimits = vec2(uu, uu + segmentLengthRender);
           vStipplePatternStretch = 1.0;
@@ -190,7 +201,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;
-        `,D`
+        `,S`
           // 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);
@@ -203,8 +214,8 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRat
       if (segmentLengthScreenDouble >= 0.001) {
         // 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
-        vec2 stippleDisplacement = pos.xy - segmentOrigin;
-        float stippleDisplacementFactor = dot(segment, stippleDisplacement) / (segmentLengthScreenDouble * segmentLengthScreenDouble);
+        vec3 stippleDisplacement = pos.xyz - segmentOrigin;
+        float stippleDisplacementFactor = dot(segment.xy, stippleDisplacement.xy) / (segmentLengthScreenDouble * segmentLengthScreenDouble);
 
         // Apply this offset to the actual vertex coordinate (can be screen or pseudo-screen space)
         vStippleDistance += (stippleDisplacementFactor - isEndVertex) * (vStippleDistanceLimits.y - vStippleDistanceLimits.x);
@@ -221,9 +232,10 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRat
                                  isStartVertex ?
                                   vec2(-1e34, vStippleDistanceLimits.y) :
                                   vec2(vStippleDistanceLimits.x, 1e34);
-    `)),F.main.add(D`
+    `)),F.main.add(S`
       // Convert back into NDC
       pos.xy = (pos.xy / viewport.zw) * pos.w;
+      pos.z = pos.z * pos.w;
 
       vColor = getColor();
       vColor.a = noPerspectiveWrite(vColor.a * coverage, pos.w);
@@ -234,37 +246,37 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRat
       vpos = (inverseProjectionMatrix * pos).xyz;
       gl_Position = pos;
       forwardObjectAndLayerIdColor();
-    }`),C.fragment.include(e,z),C.include(y,z),A.include(p),A.main.add(D`discardBySlice(vpos);
-discardByTerrainDepth();`),C.include(c),A.include(w),A.main.add(D`
+    }`),C.fragment.include(e,j),C.include(y,j),A.include(d),A.main.add(S`discardBySlice(vpos);
+discardByTerrainDepth();`),C.include(c),A.include(L),A.main.add(S`
     float lineWidth = noPerspectiveRead(vLineWidth);
     float lineDistance = noPerspectiveRead(vLineDistance);
-    ${x(K,D`float lineDistanceNorm = noPerspectiveRead(vLineDistanceNorm);`)}
-  `),_?A.main.add(D`vec4 finalColor = vec4(1.0, 0.0, 1.0, 1.0);`):(G&&A.main.add(D`float sdf = noPerspectiveRead(min(vSegmentSDF, vReverseSegmentSDF));
+    ${D(X,S`float lineDistanceNorm = noPerspectiveRead(vLineDistanceNorm);`)}
+  `),_?A.main.add(S`vec4 finalColor = vec4(1.0, 0.0, 1.0, 1.0);`):(Z&&A.main.add(S`float sdf = noPerspectiveRead(min(vSegmentSDF, vReverseSegmentSDF));
 vec2 fragmentPosition = vec2(min(sdf, 0.0), lineDistance);
 float fragmentRadius = length(fragmentPosition);
 float fragmentCapSDF = (fragmentRadius - lineWidth) * 0.5;
 float capCoverage = clamp(0.5 - fragmentCapSDF, 0.0, 1.0);
 if (capCoverage < alphaCutoff) {
 discard;
-}`),q?A.main.add(D`vec2 stipplePosition = vec2(
+}`),G?A.main.add(S`vec2 stipplePosition = vec2(
 min(getStippleSDF() * 2.0 - 1.0, 0.0),
 lineDistanceNorm
 );
 float stippleRadius = length(stipplePosition * lineWidth);
 float stippleCapSDF = (stippleRadius - lineWidth) * 0.5;
 float stippleCoverage = clamp(0.5 - stippleCapSDF, 0.0, 1.0);
-float stippleAlpha = step(alphaCutoff, stippleCoverage);`):A.main.add(D`float stippleAlpha = getStippleAlpha(lineWidth);`),11!==E&&A.main.add(D`discardByStippleAlpha(stippleAlpha, alphaCutoff);`),C.include(c),A.uniforms.add(new h("intrinsicColor",e=>e.color)).main.add(D`vec4 color = intrinsicColor * vColor;
-color.a = noPerspectiveRead(color.a);`),k&&A.uniforms.add(new h("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 stippleAlpha = step(alphaCutoff, stippleCoverage);`):A.main.add(S`float stippleAlpha = getStippleAlpha(lineWidth);`),11!==E&&A.main.add(S`discardByStippleAlpha(stippleAlpha, alphaCutoff);`),C.include(c),A.uniforms.add(new h("intrinsicColor",e=>e.color)).main.add(S`vec4 color = intrinsicColor * vColor;
+color.a = noPerspectiveRead(color.a);`),k&&A.uniforms.add(new h("innerColor",e=>e.innerColor??e.color),new u("innerWidth",(e,i)=>e.innerWidth*i.camera.pixelRatio)).main.add(S`float distToInner = abs(lineDistance) - innerWidth;
 float innerAA = clamp(0.5 - distToInner, 0.0, 1.0);
 float innerAlpha = innerColor.a + color.a * (1.0 - innerColor.a);
-color = mix(color, vec4(innerColor.rgb, innerAlpha), innerAA);`),A.main.add(D`vec4 finalColor = blendStipple(color, stippleAlpha);`),M&&(A.uniforms.add(new S("falloff",e=>e.falloff)),A.main.add(D`finalColor.a *= pow(max(0.0, 1.0 - abs(lineDistanceNorm)), falloff);`)),N||A.main.add(D`float featherStartDistance = max(lineWidth - 2.0, 0.0);
+color = mix(color, vec4(innerColor.rgb, innerAlpha), innerAA);`),A.main.add(S`vec4 finalColor = blendStipple(color, stippleAlpha);`),M&&(A.uniforms.add(new u("falloff",e=>e.falloff)),A.main.add(S`finalColor.a *= pow(max(0.0, 1.0 - abs(lineDistanceNorm)), falloff);`)),O||A.main.add(S`float featherStartDistance = max(lineWidth - 2.0, 0.0);
 float value = abs(lineDistance);
 float feather = (value - featherStartDistance) / (lineWidth - featherStartDistance);
-finalColor.a *= 1.0 - clamp(feather, 0.0, 1.0);`),I&&A.main.add(D`
+finalColor.a *= 1.0 - clamp(feather, 0.0, 1.0);`),I&&A.main.add(S`
         finalColor = animate(finalColor);
 
-        ${x(11!==E,D`
+        ${D(11!==E,S`
             if (finalColor.a <= alphaCutoff) {
               discard;
             }`)}
-      `)),A.main.add(D`outputColorHighlightOLID(applySlice(finalColor, vpos), finalColor.rgb);`),C}const C=Object.freeze(Object.defineProperty({__proto__:null,build:z,ribbonlineNumRoundJoinSubdivisions:j},Symbol.toStringTag,{value:"Module"}));export{C as R,z as b,j as r};
+      `)),A.main.add(S`outputColorHighlightOLID(applySlice(finalColor, vpos), finalColor.rgb);`),C}const C=Object.freeze(Object.defineProperty({__proto__:null,build:j,ribbonlineNumRoundJoinSubdivisions:P},Symbol.toStringTag,{value:"Module"}));export{C as R,j as b,P as r};

package/chunks/ShadowHighlight.glsl.js

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.1/LICENSE.txt */
-import{normalize as e,transformMat4 as i}from"../core/libs/gl-matrix-2/math/vec3.js";import{create as o}from"../core/libs/gl-matrix-2/factories/vec3f64.js";import{NormalFromDepth as r}from"../views/3d/webgl-engine/core/shaderLibrary/NormalFromDepth.glsl.js";import{ScreenSpacePass as t}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{calculateUVZShadowFromDepthPass as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/calculateUVZShadowFromDepth.glsl.js";import{ShadowmapFiltering as l}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ShadowmapFiltering.glsl.js";import{Float3BindUniform as h}from"../views/3d/webgl-engine/core/shaderModules/Float3BindUniform.js";import{Float4PassUniform as d}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatPassUniform as g}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as n}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DBindUniform as s}from"../views/3d/webgl-engine/core/shaderModules/Texture2DBindUniform.js";import{Texture2DShadowBindUniform as c}from"../views/3d/webgl-engine/core/shaderModules/Texture2DShadowBindUniform.js";import{Texture2DUintPassUniform as u}from"../views/3d/webgl-engine/core/shaderModules/Texture2DUintPassUniform.js";import{ShaderBuilder as w}from"../views/webgl/ShaderBuilder.js";const m=.025;function p(){const o=new w;o.include(a),o.include(l),o.include(t),o.include(r);const p=o.fragment;return p.uniforms.add(new c("shadowMapExcludingHighlight",({shadowMap:e})=>e.getOutput(7)),new c("shadowMapHighlight",({shadowMap:e})=>e.getOutput(6)),new s("depthMap",e=>e.depth?.attachment),new u("highlightTexture",e=>e.highlightTexture),new d("uColor",e=>e.shadowColor),new g("opacity",e=>e.shadowOpacity),new g("occludedOpacity",e=>e.occludedShadowOpacity),new g("terminationFactor",e=>e.opacityElevation*e.dayNightTerminator),new h("lightingMainDirectionView",({lighting:o,camera:r})=>e(f,i(f,o.mainLight.direction,r.viewInverseTransposeMatrix)))),p.main.add(n`
+import{normalize as e,transformMat4 as i}from"../core/libs/gl-matrix-2/math/vec3.js";import{create as o}from"../core/libs/gl-matrix-2/factories/vec3f64.js";import{NormalFromDepth as r}from"../views/3d/webgl-engine/core/shaderLibrary/NormalFromDepth.glsl.js";import{ScreenSpacePass as t}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{calculateUVZShadowFromDepthPass as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/calculateUVZShadowFromDepth.glsl.js";import{ShadowmapFiltering as l}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ShadowmapFiltering.glsl.js";import{Float3BindUniform as h}from"../views/3d/webgl-engine/core/shaderModules/Float3BindUniform.js";import{Float4PassUniform as d}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatPassUniform as g}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as n}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DBindUniform as s}from"../views/3d/webgl-engine/core/shaderModules/Texture2DBindUniform.js";import{Texture2DShadowBindUniform as c}from"../views/3d/webgl-engine/core/shaderModules/Texture2DShadowBindUniform.js";import{Texture2DUintPassUniform as u}from"../views/3d/webgl-engine/core/shaderModules/Texture2DUintPassUniform.js";import{ShaderBuilder as w}from"../views/webgl/ShaderBuilder.js";const m=.025;function p(){const o=new w;o.include(a),o.include(l),o.include(t),o.include(r);const p=o.fragment;return p.uniforms.add(new c("shadowMapExcludingHighlight",({shadowMap:e})=>e.getOutput(7)),new c("shadowMapHighlight",({shadowMap:e})=>e.getOutput(6)),new s("depthMap",e=>e.mainDepth),new u("highlightTexture",e=>e.highlightTexture),new d("uColor",e=>e.shadowColor),new g("opacity",e=>e.shadowOpacity),new g("occludedOpacity",e=>e.occludedShadowOpacity),new g("terminationFactor",e=>e.opacityElevation*e.dayNightTerminator),new h("lightingMainDirectionView",({lighting:o,camera:r})=>e(f,i(f,o.mainLight.direction,r.viewInverseTransposeMatrix)))),p.main.add(n`
     ivec2 highlightTextureSize = textureSize(highlightTexture, 0);
     ivec2 highlightIUV = ivec2(uv * vec2(highlightTextureSize));
     uvec2 highlightInfo = texelFetch(highlightTexture, highlightIUV, 0).rg;

package/chunks/Viewshed.glsl.js

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.1/LICENSE.txt */
-import{invertOrIdentity as e}from"../core/libs/gl-matrix-2/math/mat4.js";import{IDENTITY as i,create as o}from"../core/libs/gl-matrix-2/factories/mat4f64.js";import{ScreenSpacePass as t}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{ReadDepth as s}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadDepth.glsl.js";import{PiUtils as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PiUtils.glsl.js";import{LocalFromScreenSpacePassParameters as r,localFromScreenSpace as n}from"../views/3d/webgl-engine/core/shaderLibrary/util/LocalFromScreenSpace.glsl.js";import{Float2PassUniform as d}from"../views/3d/webgl-engine/core/shaderModules/Float2PassUniform.js";import{Float3PassUniform as l}from"../views/3d/webgl-engine/core/shaderModules/Float3PassUniform.js";import{FloatPassUniform as h}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{FloatsPassUniform as v}from"../views/3d/webgl-engine/core/shaderModules/FloatsPassUniform.js";import{glsl as c}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{IntegerPassUniform as w}from"../views/3d/webgl-engine/core/shaderModules/IntegerPassUniform.js";import{Matrix4BindUniform as f}from"../views/3d/webgl-engine/core/shaderModules/Matrix4BindUniform.js";import{Matrix4sPassUniform as p}from"../views/3d/webgl-engine/core/shaderModules/Matrix4sPassUniform.js";import{Texture2DPassUniform as m}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{ShaderBuilder as g}from"../views/webgl/ShaderBuilder.js";class u extends r{constructor(){super(...arguments),this.shadowMap={depthTexture:null,nearFar:[1,100],numActiveFaces:1,atlasRegions:[[0,0,1,1]]},this.targetVector=[1,0,0],this.upVector=[0,0,1],this.fovs=[45,45],this.headingAndTilt=[0,0],this.observerOffset=[0,0,0],this.projectionMatrices=i.flat(),this.viewMatrices=i.flat(),this.volumeOffset=0}}function x(){const i=new g,o=i.fragment;return i.include(t),i.include(n),o.include(s),o.include(a),o.uniforms.add(new f("inverseProjectionMatrix",e=>e.camera.inverseProjectionMatrix),new f("inverseViewNormalMatrix",({camera:i})=>e(V,i.viewInverseTransposeMatrix)),new l("viewshedObserverOffset",e=>e.observerOffset),new l("viewshedTargetVector",e=>e.targetVector),new l("viewshedUpVector",e=>e.upVector),new d("viewshedFOVs",e=>e.fovs),new d("viewshedHeadingAndTilt",e=>e.headingAndTilt),new d("viewshedNearFar",e=>e.shadowMap.nearFar??[1,100]),new h("viewshedVolumeOffset",e=>e.volumeOffset),new m("viewshedShadowMap",e=>e.shadowMap.depthTexture),new p("viewshedProjectionMatrices",e=>e.projectionMatrices,6),new p("viewshedViewMatrices",e=>e.viewMatrices,6),new w("viewshedNumFaces",e=>e.shadowMap.numActiveFaces),new v("viewshedAtlasRegions",24,e=>e.shadowMap.atlasRegions.flat()),new m("depthTexture",e=>e.depth?.attachment),new m("normalMap",e=>e.normals)),o.constants.add("visibleColor","vec4",[0,1,0,.5]),o.constants.add("occludedColor","vec4",[1,0,0,.5]),o.code.add(c`vec2 getViewshedUv(vec4 worldPosition, int face) {
+import{invertOrIdentity as e}from"../core/libs/gl-matrix-2/math/mat4.js";import{IDENTITY as i,create as o}from"../core/libs/gl-matrix-2/factories/mat4f64.js";import{ScreenSpacePass as t}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{ReadDepth as s}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadDepth.glsl.js";import{PiUtils as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PiUtils.glsl.js";import{LocalFromScreenSpacePassParameters as r,localFromScreenSpace as n}from"../views/3d/webgl-engine/core/shaderLibrary/util/LocalFromScreenSpace.glsl.js";import{Float2PassUniform as d}from"../views/3d/webgl-engine/core/shaderModules/Float2PassUniform.js";import{Float3PassUniform as l}from"../views/3d/webgl-engine/core/shaderModules/Float3PassUniform.js";import{FloatPassUniform as h}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{FloatsPassUniform as v}from"../views/3d/webgl-engine/core/shaderModules/FloatsPassUniform.js";import{glsl as c}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{IntegerPassUniform as w}from"../views/3d/webgl-engine/core/shaderModules/IntegerPassUniform.js";import{Matrix4BindUniform as f}from"../views/3d/webgl-engine/core/shaderModules/Matrix4BindUniform.js";import{Matrix4sPassUniform as p}from"../views/3d/webgl-engine/core/shaderModules/Matrix4sPassUniform.js";import{Texture2DBindUniform as m}from"../views/3d/webgl-engine/core/shaderModules/Texture2DBindUniform.js";import{Texture2DPassUniform as g}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{ShaderBuilder as u}from"../views/webgl/ShaderBuilder.js";class x extends r{constructor(){super(...arguments),this.shadowMap={depthTexture:null,nearFar:[1,100],numActiveFaces:1,atlasRegions:[[0,0,1,1]]},this.targetVector=[1,0,0],this.upVector=[0,0,1],this.fovs=[45,45],this.headingAndTilt=[0,0],this.observerOffset=[0,0,0],this.projectionMatrices=i.flat(),this.viewMatrices=i.flat(),this.volumeOffset=0}}function V(){const i=new u,o=i.fragment;return i.include(t),i.include(n),o.include(s),o.include(a),o.uniforms.add(new f("inverseProjectionMatrix",e=>e.camera.inverseProjectionMatrix),new f("inverseViewNormalMatrix",({camera:i})=>e(b,i.viewInverseTransposeMatrix)),new l("viewshedObserverOffset",e=>e.observerOffset),new l("viewshedTargetVector",e=>e.targetVector),new l("viewshedUpVector",e=>e.upVector),new d("viewshedFOVs",e=>e.fovs),new d("viewshedHeadingAndTilt",e=>e.headingAndTilt),new d("viewshedNearFar",e=>e.shadowMap.nearFar??[1,100]),new h("viewshedVolumeOffset",e=>e.volumeOffset),new g("viewshedShadowMap",e=>e.shadowMap.depthTexture),new p("viewshedProjectionMatrices",e=>e.projectionMatrices,6),new p("viewshedViewMatrices",e=>e.viewMatrices,6),new w("viewshedNumFaces",e=>e.shadowMap.numActiveFaces),new v("viewshedAtlasRegions",24,e=>e.shadowMap.atlasRegions.flat()),new m("depthTexture",e=>e.mainDepth),new g("normalMap",e=>e.normals)),o.constants.add("visibleColor","vec4",[0,1,0,.5]),o.constants.add("occludedColor","vec4",[1,0,0,.5]),o.code.add(c`vec2 getViewshedUv(vec4 worldPosition, int face) {
 mat4 viewshedMatrix = viewshedProjectionMatrices[face];
 vec4 viewshedUv4 = viewshedMatrix * worldPosition;
 vec3 viewshedUv = viewshedUv4.xyz / viewshedUv4.w;
@@ -140,4 +140,4 @@ float cosAngle = normalCosAngle(linearDepth, localPosition.xyz);
 float threshold = -0.01;
 if (cosAngle > threshold) {
 fragColor = occludedColor;
-}`),i}const V=o(),b=Object.freeze(Object.defineProperty({__proto__:null,ViewshedPassParameters:u,build:x},Symbol.toStringTag,{value:"Module"}));export{u as V,b as a,x as b};
+}`),i}const b=o(),M=Object.freeze(Object.defineProperty({__proto__:null,ViewshedPassParameters:x,build:V},Symbol.toStringTag,{value:"Module"}));export{x as V,M as a,V as b};

package/chunks/Water.glsl.js

@@ -1,14 +1,14 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.1/LICENSE.txt */
-import{isColor as e}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutput.js";import{SliceDraw as r}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{Transform as o}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{ObjectAndLayerIdColor as i}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/ObjectAndLayerIdColor.glsl.js";import{OutputHighlight as a}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{EvaluateAmbientLighting as t}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientLighting.glsl.js";import{addMainLightDirection as n,addMainLightIntensity as s}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{NormalUtils as l}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{ReadShadowMapDraw as d}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{terrainDepthTest as g}from"../views/3d/webgl-engine/core/shaderLibrary/shading/TerrainDepthTest.glsl.js";import{WaterColor as c}from"../views/3d/webgl-engine/core/shaderLibrary/shading/WaterColor.glsl.js";import{WaterDistortion as m}from"../views/3d/webgl-engine/core/shaderLibrary/shading/WaterDistortion.glsl.js";import{ColorConversion as v}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{addProjViewLocalOrigin as p,addCameraPosition as w}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float4PassUniform as u}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatPassUniform as f}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as h}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{outputColorHighlightOLID as b}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{ShaderBuilder as y}from"../views/webgl/ShaderBuilder.js";import{alphaCutoff as j}from"../webscene/support/AlphaCutoff.js";function L(L){const C=new y,{vertex:P,fragment:x,varyings:S}=C,{output:O,draped:D,receiveShadows:M}=L;p(P,L),C.include(o),C.attributes.add("position","vec3"),C.attributes.add("uv0","vec2");const _=new u("waterColor",e=>e.color);if(S.add("vpos","vec3",{invariant:!0}),P.uniforms.add(_),e(O)){if(D)return P.main.add(h`
-      if (waterColor.a < ${h.float(j)}) {
+import e from"../core/Error.js";import{isColor as r}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutput.js";import{SliceDraw as o}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{Transform as i}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{ObjectAndLayerIdColor as a}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/ObjectAndLayerIdColor.glsl.js";import{OutputHighlight as t}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{EvaluateAmbientLighting as n}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientLighting.glsl.js";import{addMainLightDirection as s,addMainLightIntensity as l}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{NormalUtils as d}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{ReadShadowMapDraw as c}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{terrainDepthTest as g}from"../views/3d/webgl-engine/core/shaderLibrary/shading/TerrainDepthTest.glsl.js";import{WaterColor as m}from"../views/3d/webgl-engine/core/shaderLibrary/shading/WaterColor.glsl.js";import{WaterDistortion as v}from"../views/3d/webgl-engine/core/shaderLibrary/shading/WaterDistortion.glsl.js";import{ColorConversion as p}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{addProjViewLocalOrigin as u,addCameraPosition as w}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float4PassUniform as f}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatPassUniform as h}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as b}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{outputColorHighlightOLID as y}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{ShaderBuilder as j}from"../views/webgl/ShaderBuilder.js";import{alphaCutoff as L}from"../webscene/support/AlphaCutoff.js";function P(P){const C=new j,{vertex:x,fragment:S,varyings:_}=C,{output:D,draped:O,receiveShadows:M}=P;u(x,P),C.include(i),C.attributes.add("position","vec3"),C.attributes.add("uv0","vec2");const F=new f("waterColor",e=>e.color);if(_.add("vpos","vec3",{invariant:!0}),x.uniforms.add(F),r(D)){if(O)return x.main.add(b`
+      if (waterColor.a < ${b.float(L)}) {
         // Discard this vertex
         gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
         return;
       }
 
       vpos = position;
-      gl_Position = transformPosition(proj, view, vpos);`),x.uniforms.add(_),x.main.add(h`fragColor = waterColor;`),C;C.include(l,L),S.add("vuv","vec2"),S.add("vnormal","vec3"),S.add("vtbnMatrix","mat3"),P.main.add(h`
-      if (waterColor.a < ${h.float(j)}) {
+      gl_Position = transformPosition(proj, view, vpos);`),S.uniforms.add(F),S.main.add(b`fragColor = waterColor;`),C;C.include(d,P),_.add("vuv","vec2"),_.add("vnormal","vec3"),_.add("vtbnMatrix","mat3"),x.main.add(b`
+      if (waterColor.a < ${b.float(L)}) {
         // Discard this vertex
         gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
         return;
@@ -22,7 +22,7 @@ import{isColor as e}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutpu
       forwardViewPosDepth((view * vec4(vpos, 1.0)).xyz);
 
       gl_Position = transformPosition(proj, view, vpos);
-      forwardLinearDepthToReadShadowMap();`)}switch(C.include(d,L),C.include(g,L),O){case 0:case 1:case 2:x.include(t,{pbrMode:0}),C.include(m),C.include(c,L),x.include(r,L),C.include(b,L),x.include(v),w(x,L),n(x),s(x),x.uniforms.add(_,new f("timeElapsed",({timeElapsed:e})=>e),P.uniforms.get("view"),P.uniforms.get("localOrigin")).main.add(h`
+      forwardLinearDepthToReadShadowMap();`)}switch(C.include(c,P),C.include(g,P),D){case 0:case 1:case 2:S.include(n,{pbrMode:0}),C.include(v),C.include(m,P),S.include(o,P),C.include(y,P),S.include(p),w(S,P),s(S),l(S),S.uniforms.add(F,new h("timeElapsed",({timeElapsed:e})=>e),x.uniforms.get("view"),x.uniforms.get("localOrigin")).main.add(b`
         discardBySlice(vpos);
         discardByTerrainDepth();
         vec3 localUp = vnormal;
@@ -32,13 +32,13 @@ import{isColor as e}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutpu
         // we rotate the normal according to the tangent-bitangent-normal-Matrix
         vec3 n = normalize(vtbnMatrix * tangentNormalFoam.xyz);
         vec3 v = -normalize(vpos - cameraPosition);
-        float shadow = ${M?h`1.0 - readShadowMap(vpos, linearDepth)`:"1.0"};
+        float shadow = ${M?b`1.0 - readShadowMap(vpos, linearDepth)`:"1.0"};
         vec4 vPosView = view * vec4(vpos, 1.0);
         vec4 final = vec4(getWaterColor(n, v, mainLightDirection, waterColor.rgb, mainLightIntensity, localUp, shadow, tangentNormalFoam.w, vPosView.xyz, vpos + localOrigin), waterColor.w);
 
         fragColor = delinearizeGamma(final);
-        outputColorHighlightOLID(applySlice(fragColor, vpos), final.rgb);`);break;case 4:C.include(l,L),C.include(m,L),x.include(r,L),S.add("vuv","vec2"),P.main.add(h`
-        if (waterColor.a < ${h.float(j)}) {
+        outputColorHighlightOLID(applySlice(fragColor, vpos), final.rgb);`);break;case 4:C.include(d,P),C.include(v,P),S.include(o,P),_.add("vuv","vec2"),x.main.add(b`
+        if (waterColor.a < ${b.float(L)}) {
           // Discard this vertex
           gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
           return;
@@ -47,20 +47,28 @@ import{isColor as e}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutpu
         vuv = uv0;
         vpos = position;
 
-        gl_Position = transformPosition(proj, view, vpos);`),x.uniforms.add(new f("timeElapsed",({timeElapsed:e})=>e)).main.add(h`discardBySlice(vpos);
+        gl_Position = transformPosition(proj, view, vpos);`),S.uniforms.add(new h("timeElapsed",({timeElapsed:e})=>e)).main.add(b`discardBySlice(vpos);
 vec4 tangentNormalFoam = getSurfaceNormalAndFoam(vuv, timeElapsed);
 tangentNormalFoam.xyz = normalize(tangentNormalFoam.xyz);
-fragColor = vec4((tangentNormalFoam.xyz + vec3(1.0)) * 0.5, tangentNormalFoam.w);`);break;case 10:C.include(a,L),P.main.add(h`
-        if (waterColor.a < ${h.float(j)}) {
+fragColor = vec4((tangentNormalFoam.xyz + vec3(1.0)) * 0.5, tangentNormalFoam.w);`);break;case 3:x.main.add(b`
+        if (waterColor.a < ${b.float(L)}) {
           // Discard this vertex
           gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
           return;
         }
 
         vpos = position;
-        gl_Position = transformPosition(proj, view, vpos);`),x.include(r,L),x.main.add(h`discardBySlice(vpos);
-calculateOcclusionAndOutputHighlight();`);break;case 11:C.include(i,L),P.main.add(h`
-        if (waterColor.a < ${h.float(j)}) {
+        gl_Position = transformPosition(proj, view, vpos);`),S.include(o,P),S.main.add("discardBySlice(vpos);");break;case 10:C.include(t,P),x.main.add(b`
+        if (waterColor.a < ${b.float(L)}) {
+          // Discard this vertex
+          gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
+          return;
+        }
+
+        vpos = position;
+        gl_Position = transformPosition(proj, view, vpos);`),S.include(o,P),S.main.add(b`discardBySlice(vpos);
+calculateOcclusionAndOutputHighlight();`);break;case 11:C.include(a,P),x.main.add(b`
+        if (waterColor.a < ${b.float(L)}) {
           // Discard this vertex
           gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
           return;
@@ -68,5 +76,5 @@ calculateOcclusionAndOutputHighlight();`);break;case 11:C.include(i,L),P.main.ad
 
         vpos = position;
         gl_Position = transformPosition(proj, view, vpos);
-        forwardObjectAndLayerIdColor();`),x.include(r,L),x.main.add(h`discardBySlice(vpos);
-outputObjectAndLayerIdColor();`)}return C}const C=Object.freeze(Object.defineProperty({__proto__:null,build:L},Symbol.toStringTag,{value:"Module"}));export{C as W,L as b};
+        forwardObjectAndLayerIdColor();`),S.include(o,P),S.main.add(b`discardBySlice(vpos);
+outputObjectAndLayerIdColor();`);break;default:throw new e("shaderbuilder:missing-output",`Unimplemented shader output ${D} for WaterTechnique`)}return C}const C=Object.freeze(Object.defineProperty({__proto__:null,build:P},Symbol.toStringTag,{value:"Module"}));export{C as W,P as b};