@arcgis/core 6.0.0-next.1 → 6.0.0-next.11

package/chunks/RibbonLine.glsl.js

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

package/chunks/ShadowCastAccumulate.glsl.js

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{calculateUVZShadowFromDepth as t}from"../views/3d/webgl-engine/core/shaderLibrary/shading/calculateUVZShadowFromDepth.glsl.js";import{readShadowMaps as n}from"../views/3d/webgl-engine/core/shaderLibrary/shading/readShadow.glsl.js";import{glsl as r}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DBindUniform as i}from"../views/3d/webgl-engine/core/shaderModules/Texture2DBindUniform.js";import{ShaderBuilder as a}from"../views/webgl/ShaderBuilder.js";const o=255;function s(o){let s=new a,{fragment:c}=s;s.include(e),s.include(t),c.include(n,!1),c.constants.add(`sampleValue`,`float`,.00392156862745098);let l=o.index===1?`vec2`:`float`;return s.outputs.add(`sampleCount`,l),c.uniforms.add(new i(`depthMap`,e=>e.depth?.attachment)).main.add(r`
+import{depthMap as e}from"../views/3d/webgl-engine/core/shaderLibrary/bindUniforms.js";import{ScreenSpacePass as t}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{calculateUVZShadowFromDepth as n}from"../views/3d/webgl-engine/core/shaderLibrary/shading/calculateUVZShadowFromDepth.glsl.js";import{readShadowMaps as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/readShadow.glsl.js";import{glsl as i}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{ShaderBuilder as a}from"../views/webgl/ShaderBuilder.js";const o=255;function s(o){let s=new a,{fragment:c}=s;s.include(t),s.include(n),c.include(r,!1),c.constants.add(`sampleValue`,`float`,.00392156862745098);let l=o.index===1?`vec2`:`float`;return s.outputs.add(`sampleCount`,l),c.uniforms.add(e).main.add(i`
     sampleCount = ${l}(0.0);
 
     vec3 uvzShadow = calculateUVZShadowFromDepth(uv, textureSize(shadowMap,0), depthMap);

package/chunks/ShadowHighlight.glsl.js

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{normalize as e,transformMat4 as t}from"../core/libs/gl-matrix-2/math/vec3.js";import{create as n}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 i}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{calculateUVZShadowFromDepth as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/calculateUVZShadowFromDepth.glsl.js";import{blendEmission as o}from"../views/3d/webgl-engine/core/shaderLibrary/util/blendEmission.glsl.js";import{Float3BindUniform as s}from"../views/3d/webgl-engine/core/shaderModules/Float3BindUniform.js";import{Float4PassUniform as c}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 u}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DBindUniform as d}from"../views/3d/webgl-engine/core/shaderModules/Texture2DBindUniform.js";import{Texture2DShadowBindUniform as f}from"../views/3d/webgl-engine/core/shaderModules/Texture2DShadowBindUniform.js";import{Texture2DUintPassUniform as p}from"../views/3d/webgl-engine/core/shaderModules/Texture2DUintPassUniform.js";import{ShaderBuilder as m}from"../views/webgl/ShaderBuilder.js";function h(n){let h=new m;h.include(a),h.include(i),h.include(r);let{fragment:_,outputs:v}=h;return v.add(`fragColor`,`vec4`,0),_.uniforms.add(new f(`shadowMapExcludingHighlight`,({shadowMap:e})=>e.getOutput(7)),new d(`shadowHighlight`,({shadowHighlight:e})=>e?.getTexture()),new d(`depthMap`,e=>e.mainDepth),new p(`highlightTexture`,e=>e.highlightTexture),new c(`uColor`,e=>e.shadowColor),new l(`opacity`,e=>e.shadowOpacity),new l(`occludedOpacity`,e=>e.occludedShadowOpacity),new l(`terminationFactor`,e=>e.opacityElevation*e.dayNightTerminator),new s(`lightingMainDirectionView`,({lighting:n,camera:r})=>e(g,t(g,n.mainLight.direction,r.viewInverseTransposeMatrix)))),_.main.add(u`
+import{normalize as e,transformMat4 as t}from"../core/libs/gl-matrix-2/math/vec3.js";import{create as n}from"../core/libs/gl-matrix-2/factories/vec3f64.js";import{shadowHighlight as r,mainDepth as i}from"../views/3d/webgl-engine/core/shaderLibrary/bindUniforms.js";import{NormalFromDepth as a}from"../views/3d/webgl-engine/core/shaderLibrary/NormalFromDepth.glsl.js";import{ScreenSpacePass as o}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{calculateUVZShadowFromDepth as s}from"../views/3d/webgl-engine/core/shaderLibrary/shading/calculateUVZShadowFromDepth.glsl.js";import{blendEmission as c}from"../views/3d/webgl-engine/core/shaderLibrary/util/blendEmission.glsl.js";import{Float3BindUniform as l}from"../views/3d/webgl-engine/core/shaderModules/Float3BindUniform.js";import{Float4PassUniform as u}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatPassUniform as d}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as f}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DShadowBindUniform as p}from"../views/3d/webgl-engine/core/shaderModules/Texture2DShadowBindUniform.js";import{Texture2DUintPassUniform as m}from"../views/3d/webgl-engine/core/shaderModules/Texture2DUintPassUniform.js";import{ShaderBuilder as h}from"../views/webgl/ShaderBuilder.js";function g(n){let g=new h;g.include(s),g.include(o),g.include(a);let{fragment:v,outputs:y}=g;return y.add(`fragColor`,`vec4`,0),v.uniforms.add(new p(`shadowMapExcludingHighlight`,({shadowMap:e})=>e.getOutput(7)),r,i,new m(`highlightTexture`,e=>e.highlightTexture),new u(`uColor`,e=>e.shadowColor),new d(`opacity`,e=>e.shadowOpacity),new d(`occludedOpacity`,e=>e.occludedShadowOpacity),new d(`terminationFactor`,e=>e.opacityElevation*e.dayNightTerminator),new l(`lightingMainDirectionView`,({lighting:n,camera:r})=>e(_,t(_,n.mainLight.direction,r.viewInverseTransposeMatrix)))),v.main.add(f`
     ivec2 highlightTextureSize = textureSize(highlightTexture, 0);
     ivec2 highlightIUV = ivec2(uv * vec2(highlightTextureSize));
     uvec2 highlightInfo = texelFetch(highlightTexture, highlightIUV, 0).rg;
@@ -25,7 +25,7 @@ import{normalize as e,transformMat4 as t}from"../core/libs/gl-matrix-2/math/vec3
     vec3 uvzShadow = calculateUVZShadowAndPixelPosFromDepth(
       uv,
       textureSize(shadowMapExcludingHighlight, 0),
-      depthMap,
+      mainDepth,
       currentPixelPos
     );
     if (uvzShadow.z < 0.0) {
@@ -34,10 +34,10 @@ import{normalize as e,transformMat4 as t}from"../core/libs/gl-matrix-2/math/vec3
 
     float shadowExcludingHighlightFactor = texture(shadowMapExcludingHighlight, uvzShadow);
 
-    vec3 normal = normalFromDepth(depthMap, currentPixelPos.xyz, gl_FragCoord.xy, uv);
-    bool shaded = dot(normal, lightingMainDirectionView) < ${u.float(.025)};
+    vec3 normal = normalFromDepth(mainDepth, currentPixelPos.xyz, gl_FragCoord.xy, uv);
+    bool shaded = dot(normal, lightingMainDirectionView) < ${f.float(.025)};
 
     float occludedFactor = max(shadowExcludingHighlightFactor, shaded ? 1.0 : 0.0);
     float fragOpacity = mix(opacity, occludedOpacity, occludedFactor);
     fragColor = vec4(uColor.rgb, uColor.a * fragOpacity * terminationFactor);
-  `),h.include(o,n),h}const g=n(),_=Object.freeze(Object.defineProperty({__proto__:null,build:h},Symbol.toStringTag,{value:`Module`}));export{_ as S,h as b};
+  `),g.include(c,n),g}const _=n(),v=Object.freeze(Object.defineProperty({__proto__:null,build:g},Symbol.toStringTag,{value:`Module`}));export{v as S,g as b};

package/chunks/ShadowHighlightBuffer.glsl.js

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{calculateUVZShadowFromDepth as t}from"../views/3d/webgl-engine/core/shaderLibrary/shading/calculateUVZShadowFromDepth.glsl.js";import{glsl as n}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DBindUniform as r}from"../views/3d/webgl-engine/core/shaderModules/Texture2DBindUniform.js";import{Texture2DShadowBindUniform as i}from"../views/3d/webgl-engine/core/shaderModules/Texture2DShadowBindUniform.js";import{ShaderBuilder as a}from"../views/webgl/ShaderBuilder.js";function o(){let o=new a;return o.include(e),o.include(t),o.outputs.add(`fragShadow`,`float`),o.fragment.uniforms.add(new i(`shadowMapHighlight`,({shadowMap:e})=>e.getOutput(6)),new r(`depthMap`,({depth:e})=>e?.attachment)).main.add(n`fragShadow = 0.0;
+import{depthMap as e}from"../views/3d/webgl-engine/core/shaderLibrary/bindUniforms.js";import{ScreenSpacePass as t}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{calculateUVZShadowFromDepth as n}from"../views/3d/webgl-engine/core/shaderLibrary/shading/calculateUVZShadowFromDepth.glsl.js";import{glsl as r}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DShadowBindUniform as i}from"../views/3d/webgl-engine/core/shaderModules/Texture2DShadowBindUniform.js";import{ShaderBuilder as a}from"../views/webgl/ShaderBuilder.js";function o(){let o=new a;return o.include(t),o.include(n),o.outputs.add(`fragShadow`,`float`),o.fragment.uniforms.add(new i(`shadowMapHighlight`,({shadowMap:e})=>e.getOutput(6)),e).main.add(r`fragShadow = 0.0;
 vec3 uvzShadow = calculateUVZShadowFromDepth(uv, textureSize(shadowMapHighlight, 0), depthMap);
 if (uvzShadow.z >= 0.0) {
 fragShadow = texture(shadowMapHighlight, uvzShadow);

package/chunks/SimpleAtmosphere.glsl.js

@@ -1,18 +1,18 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{create as e}from"../core/libs/gl-matrix-2/factories/vec2f64.js";import{create as t}from"../core/libs/gl-matrix-2/factories/vec3f64.js";import{Transform as n}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{mainLightDirection as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{projMatrix as i,viewMatrix as a}from"../views/3d/webgl-engine/core/shaderLibrary/util/cameraUniforms.js";import{Float2PassUniform as o}from"../views/3d/webgl-engine/core/shaderModules/Float2PassUniform.js";import{Float3BindUniform as s}from"../views/3d/webgl-engine/core/shaderModules/Float3BindUniform.js";import{Float3PassUniform as c}from"../views/3d/webgl-engine/core/shaderModules/Float3PassUniform.js";import{FloatPassUniform as l}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as u}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DPassUniform as d}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{NoParameters as f}from"../views/webgl/NoParameters.js";import{ShaderBuilder as p}from"../views/webgl/ShaderBuilder.js";class m extends f{constructor(){super(...arguments),this.texV=e(),this.altitudeFade=0,this.innerScale=0,this.undergroundFadeAlpha=0,this.silhouette=new h}}class h{constructor(){this.center=t(),this.v1=t(),this.v2=t()}}function g(e){let t=new p,{vertex:f,fragment:m}=t;if(f.uniforms.add(r),e.geometry===2)t.attributes.add(`position`,`vec2`),t.varyings.add(`color`,`vec4`),f.uniforms.add(new s(`cameraPosition`,e=>e.camera.eye),new l(`undergroundFadeAlpha`,e=>e.undergroundFadeAlpha)),f.main.add(u`float ndotl = dot(normalize(cameraPosition), mainLightDirection);
+import{create as e}from"../core/libs/gl-matrix-2/factories/vec2f64.js";import{create as t}from"../core/libs/gl-matrix-2/factories/vec3f64.js";import{Transform as n}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{mainLightDirection as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/lightingUniforms.js";import{cameraPosition as i,projMatrix as a,viewMatrix as o}from"../views/3d/webgl-engine/core/shaderLibrary/util/cameraUniforms.js";import{Float2PassUniform as s}from"../views/3d/webgl-engine/core/shaderModules/Float2PassUniform.js";import{Float3PassUniform as c}from"../views/3d/webgl-engine/core/shaderModules/Float3PassUniform.js";import{FloatPassUniform as l}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as u}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DPassUniform as d}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{NoParameters as f}from"../views/webgl/NoParameters.js";import{ShaderBuilder as p}from"../views/webgl/ShaderBuilder.js";class m extends f{constructor(){super(...arguments),this.texV=e(),this.altitudeFade=0,this.innerScale=0,this.undergroundFadeAlpha=0,this.silhouette=new h}}class h{constructor(){this.center=t(),this.v1=t(),this.v2=t()}}function g(e){let t=new p,{vertex:f,fragment:m}=t;if(f.uniforms.add(r),e.geometry===2)t.attributes.add(`position`,`vec2`),t.varyings.add(`color`,`vec4`),f.uniforms.add(i,new l(`undergroundFadeAlpha`,e=>e.undergroundFadeAlpha)),f.main.add(u`float ndotl = dot(normalize(cameraPosition), mainLightDirection);
 float lighting = max(0.0, smoothstep(-1.0, 0.8, 2.0 * ndotl));
 color = vec4(vec3(lighting), undergroundFadeAlpha);
-gl_Position = vec4(position.xy, 1.0, 1.0);`),m.main.add(u`fragColor = color;`);else{t.include(n),t.attributes.add(`position`,`vec3`),t.varyings.add(`vtc`,`vec2`),t.varyings.add(`falloff`,`float`);let r=e.geometry===1;f.uniforms.add(i,a),r||(t.varyings.add(`innerFactor`,`float`),f.uniforms.add(new c(`silCircleCenter`,e=>e.silhouette.center),new c(`silCircleV1`,e=>e.silhouette.v1),new c(`silCircleV2`,e=>e.silhouette.v2),new o(`texV`,e=>e.texV),new l(`innerScale`,e=>e.innerScale)));let s=1/128;f.main.add(u`
+gl_Position = vec4(position.xy, 1.0, 1.0);`),m.main.add(u`fragColor = color;`);else{t.include(n),t.attributes.add(`position`,`vec3`),t.varyings.add(`vtc`,`vec2`),t.varyings.add(`falloff`,`float`);let r=e.geometry===1;f.uniforms.add(a,o),r||(t.varyings.add(`innerFactor`,`float`),f.uniforms.add(new c(`silCircleCenter`,e=>e.silhouette.center),new c(`silCircleV1`,e=>e.silhouette.v1),new c(`silCircleV2`,e=>e.silhouette.v2),new s(`texV`,e=>e.texV),new l(`innerScale`,e=>e.innerScale)));let i=1/128;f.main.add(u`
       ${r?u`
       vec3 pos = position;
       float ndotl = mainLightDirection.z;
       vtc = vec2(0.0, position.z + 0.05);`:u`
       innerFactor = clamp(-position.z, 0.0, 1.0);
       float scale = position.y * (1.0 + innerFactor * innerScale);
-      float phi = position.x * ${u.float(6.2831853*s)} + 1.0;
+      float phi = position.x * ${u.float(6.2831853*i)} + 1.0;
       vec3 pos =  (silCircleCenter + sin(phi) * silCircleV1 + cos(phi) * silCircleV2) * scale;
       float ndotl = dot(normalize(position.y > 0.0 ? pos: silCircleCenter), mainLightDirection);
-      vtc.x = position.x  * ${u.float(s)};
+      vtc.x = position.x  * ${u.float(i)};
       vtc.y = texV.x * (1.0 - position.z) + texV.y * position.z;
       `}
       falloff = max(0.0, smoothstep(-1.0, 0.8, 2.0 * ndotl));