@arcgis/core 4.23.0-next.20220123 → 4.23.0-next.20220128

package/chunks/ColorMaterial.glsl.js

@@ -2,27 +2,27 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/esri/copyright.txt for details.
 */
-import{ShaderOutput as e}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutputOptions.js";import{Slice as r}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{VertexColor as o}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexColor.glsl.js";import{OutputDepth as t}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.glsl.js";import{OutputHighlight as a}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{ReadLinearDepth as l}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{multipassTerrainTest as s}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{symbolAlphaCutoff as d}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{ColorConversion as n}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{glsl as p}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as g}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as u}from"../views/3d/webgl-engine/lib/basicInterfaces.js";function c(c){const m=new g,h=c.output===e.Depth;return m.include(i,{linearDepth:h}),m.include(o,c),m.vertex.uniforms.add("proj","mat4").add("view","mat4"),m.attributes.add(u.POSITION,"vec3"),m.varyings.add("vpos","vec3"),c.multipassTerrainEnabled&&m.varyings.add("depth","float"),h&&(m.include(t,c),m.vertex.uniforms.add("cameraNearFar","vec2"),m.varyings.add("linearDepth","float")),m.vertex.code.add(p`
+import{ShaderOutput as e}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutputOptions.js";import{Slice as r}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{VertexColor as o}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexColor.glsl.js";import{OutputDepth as t}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.glsl.js";import{OutputHighlight as l}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{ReadLinearDepth as a}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{multipassTerrainTest as s}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{symbolAlphaCutoff as n}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{ColorConversion as d}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{glsl as p}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as g}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as u}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function m(m){const h=new g,v=m.output===e.Depth;return h.include(i,{linearDepth:v}),h.include(o,m),h.vertex.uniforms.add("proj","mat4").add("view","mat4"),h.attributes.add(u.POSITION,"vec3"),h.varyings.add("vpos","vec3"),m.multipassTerrainEnabled&&h.varyings.add("depth","float"),v&&(h.include(t,m),h.vertex.uniforms.add("nearFar","vec2"),h.varyings.add("linearDepth","float")),h.vertex.code.add(p`
     void main(void) {
       vpos = position;
       forwardNormalizedVertexColor();
-      ${c.multipassTerrainEnabled?"depth = (view * vec4(vpos, 1.0)).z;":""}
-      gl_Position = ${h?p`transformPositionWithDepth(proj, view, vpos, cameraNearFar, linearDepth);`:p`transformPosition(proj, view, vpos);`}
+      ${m.multipassTerrainEnabled?"depth = (view * vec4(vpos, 1.0)).z;":""}
+      gl_Position = ${v?p`transformPositionWithDepth(proj, view, vpos, nearFar, linearDepth);`:p`transformPosition(proj, view, vpos);`}
     }
-  `),m.include(r,c),m.fragment.include(n),c.multipassTerrainEnabled&&(m.fragment.include(l),m.include(s,c)),m.fragment.uniforms.add("eColor","vec4"),c.output===e.Highlight&&m.include(a),m.fragment.code.add(p`
+  `),h.include(r,m),h.fragment.include(d),m.multipassTerrainEnabled&&(h.fragment.include(a),h.include(s,m)),h.fragment.uniforms.add("eColor","vec4"),m.output===e.Highlight&&h.include(l),h.fragment.code.add(p`
   void main() {
     discardBySlice(vpos);
-    ${c.multipassTerrainEnabled?"terrainDepthTest(gl_FragCoord, depth);":""}
-    vec4 color = ${c.attributeColor?"vColor * eColor;":"eColor;"}
+    ${m.multipassTerrainEnabled?"terrainDepthTest(gl_FragCoord, depth);":""}
+    vec4 fColor = ${m.attributeColor?"vColor * eColor;":"eColor;"}
 
-    if (color.a < ${p.float(d)}) {
+    if (fColor.a < ${p.float(n)}) {
       discard;
     }
 
-    ${c.output===e.Alpha?p`gl_FragColor = vec4(color.a);`:""}
+    ${m.output===e.Alpha?p`gl_FragColor = vec4(fColor.a);`:""}
 
-    ${c.output===e.Color?p`gl_FragColor = highlightSlice(color, vpos); ${c.OITEnabled?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}`:""}
-    ${c.output===e.Highlight?p`outputHighlight();`:""};
-    ${c.output===e.Depth?p`outputDepth(linearDepth);`:""};
+    ${m.output===e.Color?p`gl_FragColor = highlightSlice(fColor, vpos); ${m.oitEnabled?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}`:""}
+    ${m.output===e.Highlight?p`outputHighlight();`:""};
+    ${m.output===e.Depth?p`outputDepth(linearDepth);`:""};
   }
-  `),m}const m=Object.freeze({__proto__:null,build:c});export{m as C,c as b};
+  `),h}const h=Object.freeze({__proto__:null,build:m});export{h as C,m as b};

package/chunks/ComponentShader.glsl.js

@@ -2,12 +2,12 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/esri/copyright.txt for details.
 */
-import{earth as e,mars as r,moon as o}from"../geometry/support/Ellipsoid.js";import{ViewingMode as a}from"../views/ViewingMode.js";import{ComponentData as l,ComponentDataType as i}from"../views/3d/webgl-engine/collections/Component/Material/shader/ComponentData.glsl.js";import{VertexDiscardByOpacity as t}from"../views/3d/webgl-engine/collections/Component/Material/shader/VertexDiscardByOpacity.glsl.js";import{ForwardLinearDepth as d}from"../views/3d/webgl-engine/core/shaderLibrary/ForwardLinearDepth.glsl.js";import{ShaderOutput as n}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutputOptions.js";import{Slice as s}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{NormalAttribute as c}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/NormalAttribute.glsl.js";import{TextureCoordinateAttribute as g}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/TextureCoordinateAttribute.glsl.js";import{VertexColor as m}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexColor.glsl.js";import{VertexNormal as v}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexNormal.glsl.js";import{VertexPosition as u}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexPosition.glsl.js";import{OutputDepth as p}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.glsl.js";import{OutputHighlight as h}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{ReadLinearDepth as C}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{ComputeMaterialColor as w}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeMaterialColor.glsl.js";import{ComputeNormalTexture as b}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeNormalTexture.glsl.js";import{ComputeShadingNormal as y}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeShadingNormal.glsl.js";import{EvaluateSceneLighting as f}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{multipassTerrainTest as x}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{PBRMode as M,PhysicallyBasedRenderingParameters as O}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{ReadBaseColorTexture as L}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadBaseColorTexture.glsl.js";import{ReadShadowMap as S}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{Overlay as T}from"../views/3d/webgl-engine/core/shaderLibrary/terrain/Overlay.glsl.js";import{DiscardOrAdjustAlpha as N,symbolAlphaCutoff as j}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{EllipsoidMode as A}from"../views/3d/webgl-engine/core/shaderLibrary/util/EllipsoidMode.js";import{glsl as E}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as P}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as R}from"../views/3d/webgl-engine/lib/basicInterfaces.js";const D=new Map([[R.POSITION,0],[R.NORMAL,1],[R.NORMALCOMPRESSED,1],[R.COLOR,2],[R.UV0,3],[R.UVREGION,4],[R.COMPONENTINDEX,5]]);function W(R){const D=new P;D.include(u,R),D.include(v,R),D.include(m,R),D.include(g,R),D.include(d,R),D.include(l,R),D.include(N,R),D.include(s,R),D.include(L,R),D.include(t,R),D.fragment.uniforms.add("view","mat4"),R.pbrMode!==M.Normal&&R.pbrMode!==M.Schematic||(D.include(O,R),R.hasNormalTexture&&D.include(b,R)),R.output===n.Shadow&&R.componentData===i.Varying?D.vertex.code.add(E`#define discardShadows(castShadows) { if(!castShadows) { gl_Position = vec4(1e38, 1e38, 1e38, 1.0); return; } }`):D.vertex.code.add(E`#define discardShadows(castShadows) {}`);const W=R.overlayEnabled&&R.output===n.Color&&R.pbrMode===M.WaterOnIntegratedMesh;return R.overlayEnabled&&(D.include(T,R),R.viewingMode===a.Global?D.vertex.code.add(E`
+import{earth as e,mars as r,moon as o}from"../geometry/support/Ellipsoid.js";import{ViewingMode as a}from"../views/ViewingMode.js";import{ComponentData as i,ComponentDataType as l}from"../views/3d/webgl-engine/collections/Component/Material/shader/ComponentData.glsl.js";import{VertexDiscardByOpacity as t}from"../views/3d/webgl-engine/collections/Component/Material/shader/VertexDiscardByOpacity.glsl.js";import{ForwardLinearDepth as d}from"../views/3d/webgl-engine/core/shaderLibrary/ForwardLinearDepth.glsl.js";import{ShaderOutput as n}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutputOptions.js";import{Slice as s}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{NormalAttributeType as c}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/NormalAttribute.glsl.js";import{TextureCoordinateAttribute as g}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/TextureCoordinateAttribute.glsl.js";import{VertexColor as m}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexColor.glsl.js";import{VertexNormal as v}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexNormal.glsl.js";import{VertexPosition as u}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexPosition.glsl.js";import{OutputDepth as p}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.glsl.js";import{OutputHighlight as h}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{ReadLinearDepth as C}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{ComputeMaterialColor as w}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeMaterialColor.glsl.js";import{ComputeNormalTexture as b}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeNormalTexture.glsl.js";import{ComputeShadingNormal as y}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeShadingNormal.glsl.js";import{EvaluateSceneLighting as f}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{multipassTerrainTest as x}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{PBRMode as M,PhysicallyBasedRenderingParameters as O}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{ReadBaseColorTexture as L}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadBaseColorTexture.glsl.js";import{ReadShadowMap as S}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{Overlay as N}from"../views/3d/webgl-engine/core/shaderLibrary/terrain/Overlay.glsl.js";import{DiscardOrAdjustAlpha as T,symbolAlphaCutoff as j}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{EllipsoidMode as A}from"../views/3d/webgl-engine/core/shaderLibrary/util/EllipsoidMode.js";import{glsl as E}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as P}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as R}from"../views/3d/webgl-engine/lib/VertexAttribute.js";const W=new Map([[R.POSITION,0],[R.NORMAL,1],[R.NORMALCOMPRESSED,1],[R.COLOR,2],[R.UV0,3],[R.UVREGION,4],[R.COMPONENTINDEX,5]]);function D(R){const W=new P;W.include(u,R),W.include(v,R),W.include(m,R),W.include(g,R),W.include(d,R),W.include(i,R),W.include(T,R),W.include(s,R),W.include(L,R),W.include(t,R),W.fragment.uniforms.add("view","mat4"),R.pbrMode!==M.Normal&&R.pbrMode!==M.Schematic||(W.include(O,R),R.hasNormalTexture&&W.include(b,R)),R.output===n.Shadow&&R.componentData===l.Varying?W.vertex.code.add(E`#define discardShadows(castShadows) { if(!castShadows) { gl_Position = vec4(1e38, 1e38, 1e38, 1.0); return; } }`):W.vertex.code.add(E`#define discardShadows(castShadows) {}`);const D=R.overlayEnabled&&R.output===n.Color&&R.pbrMode===M.WaterOnIntegratedMesh;return R.overlayEnabled&&(W.include(f,R),W.include(N,R),R.viewingMode===a.Global?W.vertex.code.add(E`
       const float invEllipsoidRadius = ${E.float(1/(R.ellipsoidMode===A.Earth?e.radius:R.ellipsoidMode===A.Mars?r.radius:o.radius))};
       vec2 projectOverlay(vec3 pos) {
         return pos.xy / (1.0 + invEllipsoidRadius * pos.z);
       }
-      `):D.vertex.code.add(E`vec2 projectOverlay(vec3 pos) { return pos.xy; }`)),W&&(D.varyings.add("tbnTangent","vec3"),D.varyings.add("tbnBiTangent","vec3"),D.varyings.add("groundNormal","vec3"),D.varyings.add("positionView","vec3")),D.vertex.code.add(E`
+      `):W.vertex.code.add(E`vec2 projectOverlay(vec3 pos) { return pos.xy; }`)),D&&(W.varyings.add("tbnTangent","vec3"),W.varyings.add("tbnBiTangent","vec3"),W.varyings.add("groundNormal","vec3"),W.varyings.add("positionView","vec3")),W.vertex.code.add(E`
     void main() {
       bool castShadows;
       vec4 externalColor = forwardExternalColor(castShadows);
@@ -22,7 +22,7 @@ import{earth as e,mars as r,moon as o}from"../geometry/support/Ellipsoid.js";imp
       }
       forwardPosition();
       forwardNormal();
-      ${W?E`
+      ${D?E`
         positionView = position_view();
         ${R.viewingMode===a.Global?E`
         groundNormal = normalize(positionWorld());
@@ -38,7 +38,7 @@ import{earth as e,mars as r,moon as o}from"../geometry/support/Ellipsoid.js";imp
       forwardVertexColor();
       forwardLinearDepth(); // depends on forwardPosition()
     }
-  `),R.output===n.Alpha&&(D.fragment.include(C),R.multipassTerrainEnabled&&D.include(x,R),D.include(w,R),D.fragment.code.add(E`
+  `),R.output===n.Alpha&&(W.fragment.include(C),R.multipassTerrainEnabled&&W.include(x,R),W.include(w,R),W.fragment.code.add(E`
       void main() {
         discardBySlice(vPositionWorldCameraRelative);
         ${R.multipassTerrainEnabled?E`terrainDepthTest(gl_FragCoord, vPosition_view.z);`:""}
@@ -62,9 +62,9 @@ import{earth as e,mars as r,moon as o}from"../geometry/support/Ellipsoid.js";imp
 
         gl_FragColor = vec4(materialColor.a);
       }
-    `)),R.output===n.Color&&(D.fragment.include(C),R.multipassTerrainEnabled&&D.include(x,R),D.include(w,R),D.include(y,R),D.include(f,R),W&&D.fragment.uniforms.add("ovNormalTex","sampler2D"),R.receiveShadows?(D.include(S,R),D.fragment.code.add(E`float evaluateShadow() {
+    `)),R.output===n.Color&&(W.fragment.include(C),R.multipassTerrainEnabled&&W.include(x,R),W.include(w,R),W.include(y,R),W.include(f,R),D&&W.fragment.uniforms.add("ovNormalTex","sampler2D"),R.receiveShadows?(W.include(S,R),W.fragment.code.add(E`float evaluateShadow() {
 return readShadowMap(vPositionWorldCameraRelative, linearDepth);
-}`)):D.fragment.code.add(E`float evaluateShadow() { return 0.0; }`),D.fragment.code.add(E`
+}`)):W.fragment.code.add(E`float evaluateShadow() { return 0.0; }`),W.fragment.code.add(E`
       void main() {
         discardBySlice(vPositionWorldCameraRelative);
         ${R.multipassTerrainEnabled?E`terrainDepthTest(gl_FragCoord, vPosition_view.z);`:""}
@@ -85,7 +85,7 @@ return readShadowMap(vPositionWorldCameraRelative, linearDepth);
         vec4 overlayColorOpaque = getOverlayColor(ovColorTex, vtcOverlay);
         vec4 overlayColor = overlayOpacity * overlayColorOpaque;
         materialColor = materialColor * (1.0 - overlayColor.a) + overlayColor;`:""}
-    `),R.pbrMode===M.Normal||R.pbrMode===M.Schematic?(D.fragment.code.add(E`
+    `),R.pbrMode===M.Normal||R.pbrMode===M.Schematic?(W.fragment.code.add(E`
         ${R.pbrMode===M.Normal?E`
         applyPBRFactors();
         if (int(externalColorMixMode) == 3) {
@@ -93,38 +93,38 @@ return readShadowMap(vPositionWorldCameraRelative, linearDepth);
         }`:""}
         vec3 normalVertex = shadingNormalWorld();
         float additionalIrradiance = 0.02 * lightingMainIntensity[2];
-      `),R.hasNormalTexture?D.fragment.code.add(E`mat3 tangentSpace = computeTangentSpace(normalVertex, vPositionWorldCameraRelative, vuv0);
-vec3 shadingNormal = computeTextureNormal(tangentSpace, vuv0);`):D.fragment.code.add(E`vec3 shadingNormal = normalVertex;`),D.fragment.code.add(E`${R.viewingMode===a.Global?E`vec3 normalGround = normalize(positionWorld());`:E`vec3 normalGround = vec3(0.0, 0.0, 1.0);`}
-      `),D.fragment.code.add(E`vec3 viewDir = normalize(vPositionWorldCameraRelative);
+      `),R.hasNormalTexture?W.fragment.code.add(E`mat3 tangentSpace = computeTangentSpace(normalVertex, vPositionWorldCameraRelative, vuv0);
+vec3 shadingNormal = computeTextureNormal(tangentSpace, vuv0);`):W.fragment.code.add(E`vec3 shadingNormal = normalVertex;`),W.fragment.code.add(E`${R.viewingMode===a.Global?E`vec3 normalGround = normalize(positionWorld());`:E`vec3 normalGround = vec3(0.0, 0.0, 1.0);`}
+      `),W.fragment.code.add(E`vec3 viewDir = normalize(vPositionWorldCameraRelative);
 float ssao = 1.0 - occlusion * (1.0 - evaluateAmbientOcclusion());
 vec3 additionalLight = evaluateAdditionalLighting(ssao, positionWorld());
-vec4 shadedColor = vec4(evaluateSceneLightingPBR(shadingNormal, materialColor.rgb, evaluateShadow(), ssao, additionalLight, viewDir, normalGround, mrr, emission, additionalIrradiance), materialColor.a);`)):(R.receiveShadows?D.fragment.code.add(E`float shadow = evaluateShadow();`):R.viewingMode===a.Global?D.fragment.code.add(E`float additionalAmbientScale = additionalDirectedAmbientLight(positionWorld());
-float shadow = lightingGlobalFactor * (1.0 - additionalAmbientScale);`):D.fragment.code.add(E`float shadow = 0.0;`),D.fragment.code.add(E`
+vec4 shadedColor = vec4(evaluateSceneLightingPBR(shadingNormal, materialColor.rgb, evaluateShadow(), ssao, additionalLight, viewDir, normalGround, mrr, emission, additionalIrradiance), materialColor.a);`)):(R.receiveShadows?W.fragment.code.add(E`float shadow = evaluateShadow();`):R.viewingMode===a.Global?W.fragment.code.add(E`float additionalAmbientScale = additionalDirectedAmbientLight(positionWorld());
+float shadow = lightingGlobalFactor * (1.0 - additionalAmbientScale);`):W.fragment.code.add(E`float shadow = 0.0;`),W.fragment.code.add(E`
       float ambientOcclusion = evaluateAmbientOcclusion();
       // At global scale we create some additional ambient light based on the main light to simulate global illumination
       vec3 additionalLight = evaluateAdditionalLighting(ambientOcclusion, positionWorld());
       vec4 shadedColor = vec4(evaluateSceneLighting(shadingNormalWorld(), materialColor.rgb, shadow, ambientOcclusion, additionalLight), materialColor.a);
-      ${W?E`
+      ${D?E`
           vec4 overlayWaterMask = getOverlayColor(ovNormalTex, vtcOverlay);
           float waterNormalLength = length(overlayWaterMask);
           if (waterNormalLength > 0.95) {
             mat3 tbnMatrix = mat3(tbnTangent, tbnBiTangent, groundNormal);
             vec4 waterOverlayColor = vec4(overlayColorOpaque.xyz, overlayColor.w);
-            vec4 waterColorLinear = getOverlayWaterColor(overlayWaterMask, waterOverlayColor, -normalize(vPositionWorldCameraRelative), shadow, groundNormal, tbnMatrix, positionView);
+            vec4 waterColorLinear = getOverlayWaterColor(overlayWaterMask, waterOverlayColor, -normalize(vPositionWorldCameraRelative), shadow, groundNormal, tbnMatrix, positionView, positionWorld());
             vec4 waterColorNonLinear = delinearizeGamma(vec4(waterColorLinear.xyz, 1.0));
             // un-gamma the ground color to mix in linear space
             shadedColor = mix(shadedColor, waterColorNonLinear, waterColorLinear.w);
           }`:""}
-      `)),D.fragment.code.add(E`
+      `)),W.fragment.code.add(E`
         gl_FragColor = highlightSlice(shadedColor, vPositionWorldCameraRelative);
-        ${R.OITEnabled?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}
+        ${R.oitEnabled?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}
       }
-    `)),R.output!==n.Depth&&R.output!==n.Shadow||(D.include(p,R),D.fragment.code.add(E`void main() {
+    `)),R.output!==n.Depth&&R.output!==n.Shadow||(W.include(p,R),W.fragment.code.add(E`void main() {
 discardBySlice(vPositionWorldCameraRelative);
 vec4 textureColor = readBaseColorTexture();
 discardOrAdjustAlpha(textureColor);
 outputDepth(linearDepth);
-}`)),R.output===n.Normal&&(D.include(y,R),D.fragment.code.add(E`
+}`)),R.output===n.Normal&&(W.include(y,R),W.fragment.code.add(E`
       void main() {
         discardBySlice(vPositionWorldCameraRelative);
 
@@ -133,10 +133,10 @@ outputDepth(linearDepth);
 
         // note: the alpha component needs to be 1.0 in order for this material
         // to influence ambient occlusion, see the ssao fragment shader
-        float alpha = ${R.normalType===c.Type.Ground?"0.0":"1.0"};
+        float alpha = ${R.normalType===c.Ground?"0.0":"1.0"};
         gl_FragColor = vec4(vec3(.5) + .5 * shadingNormal_view(), alpha);
       }
-    `)),R.output===n.Highlight&&(D.include(h),D.fragment.code.add(E`
+    `)),R.output===n.Highlight&&(W.include(h),W.fragment.code.add(E`
       void main() {
         discardBySlice(vPositionWorldCameraRelative);
 
@@ -153,4 +153,4 @@ outputDepth(linearDepth);
 
         outputHighlight();
       }
-    `)),D}const B=Object.freeze({__proto__:null,attributeLocations:D,build:W});export{B as C,D as a,W as b};
+    `)),W}const B=Object.freeze({__proto__:null,attributeLocations:W,build:D});export{B as C,W as a,D as b};

package/chunks/Compositing.glsl.js

@@ -8,7 +8,7 @@ gl_FragColor = texture2D(tex, uv) * opacity;
 gl_FragColor = texture2D(tex, uv);
 }`)),o.function===t.OverlayWithTransparency&&(n.fragment.uniforms.add("overlayIdx","int"),o.hasOpacityFactor&&n.fragment.uniforms.add("opacity","float"),n.fragment.code.add(e`
       void main() {
-        vec2 overlayUV = overlayIdx == 0 ? vec2(uv.x * 0.5, uv.y) : vec2(uv.x * 0.5+ 0.5, uv.y);
+        vec2 overlayUV = overlayIdx == 0 ? vec2(uv.x * 0.5, uv.y) : vec2(uv.x * 0.5 + 0.5, uv.y);
         gl_FragColor = texture2D(tex, overlayUV) ${o.hasOpacityFactor?"* opacity":""};
       }`)),o.function===t.TransparentToHUDVisibility&&n.fragment.code.add(e`void main() {
 gl_FragColor = vec4(1.0 - texture2D(tex, uv).a);

package/chunks/DefaultMaterial.glsl.js

@@ -2,83 +2,83 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/esri/copyright.txt for details.
 */
-import{ViewingMode as e}from"../views/ViewingMode.js";import{ForwardLinearDepth as r}from"../views/3d/webgl-engine/core/shaderLibrary/ForwardLinearDepth.glsl.js";import{Offset as o}from"../views/3d/webgl-engine/core/shaderLibrary/Offset.glsl.js";import{ShaderOutput as a}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutputOptions.js";import{Slice as i}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{Transform as l}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{InstancedDoublePrecision as t}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/InstancedDoublePrecision.glsl.js";import{NormalAttribute as n}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/NormalAttribute.glsl.js";import{PositionAttribute as s}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/PositionAttribute.glsl.js";import{SymbolColor as d}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/SymbolColor.glsl.js";import{TextureCoordinateAttribute as c}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/TextureCoordinateAttribute.glsl.js";import{VertexColor as m}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexColor.glsl.js";import{VertexNormal as g}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexNormal.glsl.js";import{VerticalOffset as v}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VerticalOffset.glsl.js";import{DefaultMaterialAuxiliaryPasses as p}from"../views/3d/webgl-engine/core/shaderLibrary/default/DefaultMaterialAuxiliaryPasses.glsl.js";import{ReadLinearDepth as u}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{ComputeNormalTexture as b}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeNormalTexture.glsl.js";import{EvaluateAmbientOcclusion as h}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientOcclusion.glsl.js";import{EvaluateSceneLighting as f}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{multipassTerrainTest as w}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{Normals as x}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Normals.glsl.js";import{PhysicallyBasedRendering as y}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRendering.glsl.js";import{PhysicallyBasedRenderingParameters as C,PBRMode as L}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{ReadShadowMap as T}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{VisualVariables as j}from"../views/3d/webgl-engine/core/shaderLibrary/shading/VisualVariables.glsl.js";import{symbolAlphaCutoff as M,DiscardOrAdjustAlpha as O}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{HeaderComment as E}from"../views/3d/webgl-engine/core/shaderLibrary/util/HeaderComment.glsl.js";import{MixExternalColor as A}from"../views/3d/webgl-engine/core/shaderLibrary/util/MixExternalColor.glsl.js";import{glsl as S}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as P}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as _}from"../views/3d/webgl-engine/lib/basicInterfaces.js";function N(N){const $=new P,D=$.vertex.code,B=$.fragment.code;$.include(E,{name:"Default Material Shader",output:N.output}),$.vertex.uniforms.add("proj","mat4").add("view","mat4").add("camPos","vec3").add("localOrigin","vec3");const F=N.hasModelTransformation;return F&&$.vertex.uniforms.add("model","mat4"),$.include(s),$.varyings.add("vpos","vec3"),$.include(j,N),$.include(t,N),$.include(v,N),N.output!==a.Color&&N.output!==a.Alpha||($.include(n,N),$.include(l,{linearDepth:!1,hasModelTransformation:F}),N.normalType===n.Type.Attribute&&N.offsetBackfaces&&$.include(o),$.include(b,N),$.include(g,N),N.instancedColor&&$.attributes.add(_.INSTANCECOLOR,"vec4"),$.varyings.add("localvpos","vec3"),$.include(c,N),$.include(r,N),$.include(d,N),$.include(m,N),$.vertex.uniforms.add("externalColor","vec4"),$.varyings.add("vcolorExt","vec4"),N.multipassTerrainEnabled&&$.varyings.add("depth","float"),D.add(S`
+import{ViewingMode as e}from"../views/ViewingMode.js";import{ForwardLinearDepth as r}from"../views/3d/webgl-engine/core/shaderLibrary/ForwardLinearDepth.glsl.js";import{Offset as o}from"../views/3d/webgl-engine/core/shaderLibrary/Offset.glsl.js";import{ShaderOutput as a}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutputOptions.js";import{Slice as i}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{Transform as l}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{InstancedDoublePrecision as t}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/InstancedDoublePrecision.glsl.js";import{NormalAttribute as n,NormalAttributeType as s}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/NormalAttribute.glsl.js";import{PositionAttribute as d}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/PositionAttribute.glsl.js";import{SymbolColor as c}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/SymbolColor.glsl.js";import{TextureCoordinateAttribute as m}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/TextureCoordinateAttribute.glsl.js";import{VertexColor as g}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexColor.glsl.js";import{VertexNormal as v}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexNormal.glsl.js";import{VerticalOffset as p}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VerticalOffset.glsl.js";import{DefaultMaterialAuxiliaryPasses as u}from"../views/3d/webgl-engine/core/shaderLibrary/default/DefaultMaterialAuxiliaryPasses.glsl.js";import{ReadLinearDepth as b}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{ComputeNormalTexture as h}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeNormalTexture.glsl.js";import{EvaluateAmbientOcclusion as f}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientOcclusion.glsl.js";import{EvaluateSceneLighting as w}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{multipassTerrainTest as x}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{Normals as y}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Normals.glsl.js";import{PhysicallyBasedRendering as C}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRendering.glsl.js";import{PhysicallyBasedRenderingParameters as L,PBRMode as j}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{ReadShadowMap as M}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{VisualVariables as T}from"../views/3d/webgl-engine/core/shaderLibrary/shading/VisualVariables.glsl.js";import{symbolAlphaCutoff as O,DiscardOrAdjustAlpha as E}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{HeaderComment as A}from"../views/3d/webgl-engine/core/shaderLibrary/util/HeaderComment.glsl.js";import{MixExternalColor as S}from"../views/3d/webgl-engine/core/shaderLibrary/util/MixExternalColor.glsl.js";import{glsl as P}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as _}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as N}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function $($){const D=new _,B=D.vertex.code,F=D.fragment.code;D.include(A,{name:"Default Material Shader",output:$.output}),D.vertex.uniforms.add("proj","mat4").add("view","mat4").add("cameraPosition","vec3").add("localOrigin","vec3");const V=$.hasModelTransformation;return V&&D.vertex.uniforms.add("model","mat4"),D.include(d),D.varyings.add("vpos","vec3"),D.include(T,$),D.include(t,$),D.include(p,$),$.output!==a.Color&&$.output!==a.Alpha||(D.include(n,$),D.include(l,{linearDepth:!1,hasModelTransformation:V}),$.normalType===s.Attribute&&$.offsetBackfaces&&D.include(o),D.include(h,$),D.include(v,$),$.instancedColor&&D.attributes.add(N.INSTANCECOLOR,"vec4"),D.varyings.add("localvpos","vec3"),D.include(m,$),D.include(r,$),D.include(c,$),D.include(g,$),D.vertex.uniforms.add("externalColor","vec4"),D.varyings.add("vcolorExt","vec4"),$.multipassTerrainEnabled&&D.varyings.add("depth","float"),B.add(P`
       void main(void) {
         forwardNormalizedVertexColor();
         vcolorExt = externalColor;
-        ${N.instancedColor?"vcolorExt *= instanceColor;":""}
+        ${$.instancedColor?"vcolorExt *= instanceColor;":""}
         vcolorExt *= vvColor();
         vcolorExt *= getSymbolColor();
         forwardColorMixMode();
 
-        if (vcolorExt.a < ${S.float(M)}) {
+        if (vcolorExt.a < ${P.float(O)}) {
           gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
         }
         else {
           vpos = calculateVPos();
           localvpos = vpos - view[3].xyz;
           vpos = subtractOrigin(vpos);
-          ${N.normalType===n.Type.Attribute?S`
+          ${$.normalType===s.Attribute?P`
           vNormalWorld = dpNormal(vvLocalNormal(normalModel()));`:""}
           vpos = addVerticalOffset(vpos, localOrigin);
-          ${N.vertexTangents?"vTangent = dpTransformVertexTangent(tangent);":""}
-          gl_Position = transformPosition(proj, view, ${F?"model,":""} vpos);
-          ${N.normalType===n.Type.Attribute&&N.offsetBackfaces?"gl_Position = offsetBackfacingClipPosition(gl_Position, vpos, vNormalWorld, camPos);":""}
+          ${$.vertexTangents?"vTangent = dpTransformVertexTangent(tangent);":""}
+          gl_Position = transformPosition(proj, view, ${V?"model,":""} vpos);
+          ${$.normalType===s.Attribute&&$.offsetBackfaces?"gl_Position = offsetBackfacingClipPosition(gl_Position, vpos, vNormalWorld, cameraPosition);":""}
         }
 
-        ${N.multipassTerrainEnabled?"depth = (view * vec4(vpos, 1.0)).z;":""}
+        ${$.multipassTerrainEnabled?"depth = (view * vec4(vpos, 1.0)).z;":""}
         forwardLinearDepth();
         forwardTextureCoordinates();
       }
-    `)),N.output===a.Alpha&&($.include(i,N),$.include(O,N),N.multipassTerrainEnabled&&($.fragment.include(u),$.include(w,N)),$.fragment.uniforms.add("camPos","vec3").add("localOrigin","vec3").add("opacity","float").add("layerOpacity","float"),N.hasColorTexture&&$.fragment.uniforms.add("tex","sampler2D"),$.fragment.include(A),B.add(S`
+    `)),$.output===a.Alpha&&(D.include(i,$),D.include(E,$),$.multipassTerrainEnabled&&(D.fragment.include(b),D.include(x,$)),D.fragment.uniforms.add("cameraPosition","vec3").add("localOrigin","vec3").add("opacity","float").add("layerOpacity","float"),$.hasColorTexture&&D.fragment.uniforms.add("tex","sampler2D"),D.fragment.include(S),F.add(P`
       void main() {
         discardBySlice(vpos);
-        ${N.multipassTerrainEnabled?"terrainDepthTest(gl_FragCoord, depth);":""}
-        ${N.hasColorTexture?S`
+        ${$.multipassTerrainEnabled?"terrainDepthTest(gl_FragCoord, depth);":""}
+        ${$.hasColorTexture?P`
         vec4 texColor = texture2D(tex, vuv0);
-        ${N.textureAlphaPremultiplied?"texColor.rgb /= texColor.a;":""}
-        discardOrAdjustAlpha(texColor);`:S`vec4 texColor = vec4(1.0);`}
-        ${N.attributeColor?S`
-        float opacity_ = layerOpacity * mixExternalOpacity(vColor.a * opacity, texColor.a, vcolorExt.a, int(colorMixMode));`:S`
+        ${$.textureAlphaPremultiplied?"texColor.rgb /= texColor.a;":""}
+        discardOrAdjustAlpha(texColor);`:P`vec4 texColor = vec4(1.0);`}
+        ${$.attributeColor?P`
+        float opacity_ = layerOpacity * mixExternalOpacity(vColor.a * opacity, texColor.a, vcolorExt.a, int(colorMixMode));`:P`
         float opacity_ = layerOpacity * mixExternalOpacity(opacity, texColor.a, vcolorExt.a, int(colorMixMode));
         `}
         gl_FragColor = vec4(opacity_);
       }
-    `)),N.output===a.Color&&($.include(i,N),$.include(f,N),$.include(h,N),$.include(O,N),N.receiveShadows&&$.include(T,N),N.multipassTerrainEnabled&&($.fragment.include(u),$.include(w,N)),$.fragment.uniforms.add("camPos","vec3").add("localOrigin","vec3").add("ambient","vec3").add("diffuse","vec3").add("opacity","float").add("layerOpacity","float"),N.hasColorTexture&&$.fragment.uniforms.add("tex","sampler2D"),$.include(C,N),$.include(y,N),$.fragment.include(A),$.include(x,N),B.add(S`
+    `)),$.output===a.Color&&(D.include(i,$),D.include(w,$),D.include(f,$),D.include(E,$),$.receiveShadows&&D.include(M,$),$.multipassTerrainEnabled&&(D.fragment.include(b),D.include(x,$)),D.fragment.uniforms.add("cameraPosition","vec3").add("localOrigin","vec3").add("ambient","vec3").add("diffuse","vec3").add("opacity","float").add("layerOpacity","float"),$.hasColorTexture&&D.fragment.uniforms.add("tex","sampler2D"),D.include(L,$),D.include(C,$),D.fragment.include(S),D.include(y,$),F.add(P`
       void main() {
         discardBySlice(vpos);
-        ${N.multipassTerrainEnabled?"terrainDepthTest(gl_FragCoord, depth);":""}
-        ${N.hasColorTexture?S`
+        ${$.multipassTerrainEnabled?"terrainDepthTest(gl_FragCoord, depth);":""}
+        ${$.hasColorTexture?P`
         vec4 texColor = texture2D(tex, vuv0);
-        ${N.textureAlphaPremultiplied?"texColor.rgb /= texColor.a;":""}
-        discardOrAdjustAlpha(texColor);`:S`vec4 texColor = vec4(1.0);`}
-        shadingParams.viewDirection = normalize(vpos - camPos);
-        ${N.normalType===n.Type.ScreenDerivative?S`
-        vec3 normal = screenDerivativeNormal(localvpos);`:S`
+        ${$.textureAlphaPremultiplied?"texColor.rgb /= texColor.a;":""}
+        discardOrAdjustAlpha(texColor);`:P`vec4 texColor = vec4(1.0);`}
+        shadingParams.viewDirection = normalize(vpos - cameraPosition);
+        ${$.normalType===s.ScreenDerivative?P`
+        vec3 normal = screenDerivativeNormal(localvpos);`:P`
         shadingParams.normalView = vNormalWorld;
         vec3 normal = shadingNormal(shadingParams);`}
-        ${N.pbrMode===L.Normal?"applyPBRFactors();":""}
+        ${$.pbrMode===j.Normal?"applyPBRFactors();":""}
         float ssao = evaluateAmbientOcclusionInverse();
         ssao *= getBakedOcclusion();
 
         float additionalAmbientScale = additionalDirectedAmbientLight(vpos + localOrigin);
         vec3 additionalLight = ssao * lightingMainIntensity * additionalAmbientScale * ambientBoostFactor * lightingGlobalFactor;
-        ${N.receiveShadows?"float shadow = readShadowMap(vpos, linearDepth);":N.viewingMode===e.Global?"float shadow = lightingGlobalFactor * (1.0 - additionalAmbientScale);":"float shadow = 0.0;"}
+        ${$.receiveShadows?"float shadow = readShadowMap(vpos, linearDepth);":$.viewingMode===e.Global?"float shadow = lightingGlobalFactor * (1.0 - additionalAmbientScale);":"float shadow = 0.0;"}
         vec3 matColor = max(ambient, diffuse);
-        ${N.attributeColor?S`
+        ${$.attributeColor?P`
         vec3 albedo_ = mixExternalColor(vColor.rgb * matColor, texColor.rgb, vcolorExt.rgb, int(colorMixMode));
-        float opacity_ = layerOpacity * mixExternalOpacity(vColor.a * opacity, texColor.a, vcolorExt.a, int(colorMixMode));`:S`
+        float opacity_ = layerOpacity * mixExternalOpacity(vColor.a * opacity, texColor.a, vcolorExt.a, int(colorMixMode));`:P`
         vec3 albedo_ = mixExternalColor(matColor, texColor.rgb, vcolorExt.rgb, int(colorMixMode));
         float opacity_ = layerOpacity * mixExternalOpacity(opacity, texColor.a, vcolorExt.a, int(colorMixMode));
         `}
-        ${N.hasNormalTexture?S`
-              mat3 tangentSpace = ${N.vertexTangents?"computeTangentSpace(normal);":"computeTangentSpace(normal, vpos, vuv0);"}
+        ${$.hasNormalTexture?P`
+              mat3 tangentSpace = ${$.vertexTangents?"computeTangentSpace(normal);":"computeTangentSpace(normal, vpos, vuv0);"}
               vec3 shadedNormal = computeTextureNormal(tangentSpace, vuv0);`:"vec3 shadedNormal = normal;"}
-        ${N.pbrMode===L.Normal||N.pbrMode===L.Schematic?N.viewingMode===e.Global?S`vec3 normalGround = normalize(vpos + localOrigin);`:S`vec3 normalGround = vec3(0.0, 0.0, 1.0);`:S``}
-        ${N.pbrMode===L.Normal||N.pbrMode===L.Schematic?S`
+        ${$.pbrMode===j.Normal||$.pbrMode===j.Schematic?$.viewingMode===e.Global?P`vec3 normalGround = normalize(vpos + localOrigin);`:P`vec3 normalGround = vec3(0.0, 0.0, 1.0);`:P``}
+        ${$.pbrMode===j.Normal||$.pbrMode===j.Schematic?P`
             float additionalAmbientIrradiance = additionalAmbientIrradianceFactor * lightingMainIntensity[2];
             vec3 shadedColor = evaluateSceneLightingPBR(shadedNormal, albedo_, shadow, 1.0 - ssao, additionalLight, shadingParams.viewDirection, normalGround, mrr, emission, additionalAmbientIrradiance);`:"vec3 shadedColor = evaluateSceneLighting(shadedNormal, albedo_, shadow, 1.0 - ssao, additionalLight);"}
         gl_FragColor = highlightSlice(vec4(shadedColor, opacity_), vpos);
-        ${N.OITEnabled?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}
+        ${$.oitEnabled?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}
       }
-    `)),$.include(p,N),$}const $=Object.freeze({__proto__:null,build:N});export{$ as D,N as b};
+    `)),D.include(u,$),D}const D=Object.freeze({__proto__:null,build:$});export{D,$ as b};

package/chunks/EdgeShaderProgram.glsl.js

@@ -2,7 +2,7 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/esri/copyright.txt for details.
 */
-import{Slice as e}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{ReadLinearDepth as i}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{multipassTerrainTest as o}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{glsl as s}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as n}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as d}from"../views/3d/webgl-engine/lib/basicInterfaces.js";import{AdjustProjectedPosition as t}from"../views/3d/webgl-engine/shaders/sources/edgeRenderer/AdjustProjectedPosition.glsl.js";import{DiscardByCoverage as a}from"../views/3d/webgl-engine/shaders/sources/edgeRenderer/DiscardByCoverage.glsl.js";import{DiscardNonSilhouetteEdges as l}from"../views/3d/webgl-engine/shaders/sources/edgeRenderer/DiscardNonSilhouetteEdges.glsl.js";import{DiscardShortEdges as r}from"../views/3d/webgl-engine/shaders/sources/edgeRenderer/DiscardShortEdges.glsl.js";import{EdgeUtil as c}from"../views/3d/webgl-engine/shaders/sources/edgeRenderer/EdgeUtil.glsl.js";import{LineAmplitude as P}from"../views/3d/webgl-engine/shaders/sources/edgeRenderer/LineAmplitude.glsl.js";import{LineOffset as u}from"../views/3d/webgl-engine/shaders/sources/edgeRenderer/LineOffset.glsl.js";import{UnpackAttributes as p}from"../views/3d/webgl-engine/shaders/sources/edgeRenderer/UnpackAttributes.glsl.js";function g(g){const v=new n,f=v.vertex,x=v.fragment;return g.legacy&&f.uniforms.add("uModel","mat4"),g.antialiasing&&(f.code.add(s`#define ANTIALIASING 1`),x.code.add(s`#define ANTIALIASING 1`)),v.include(t,g),v.include(P,g),v.include(c,g),v.include(p,g),v.include(u,g),v.include(e,g),v.include(l,g),v.include(a,g),v.include(r,g),v.varyings.add("vColor","vec4"),v.varyings.add("vRadius","float"),v.varyings.add("vPosition","vec3"),v.varyings.add("vWorldPosition","vec3"),v.varyings.add("vViewPos","vec3"),v.varyings.add("vLineLengthPixels","float"),v.varyings.add("vSizeFalloffFactor","float"),f.uniforms.add("uPixelToNDC","vec2"),f.uniforms.add("uNDCToPixel","vec2"),f.uniforms.add("uPixelRatio","float"),v.attributes.add(d.POSITION0,"vec3"),v.attributes.add(d.POSITION1,"vec3"),v.attributes.add(d.VARIANTOFFSET,"float"),v.attributes.add(d.VARIANTSTROKE,"float"),v.attributes.add(d.VARIANTEXTENSION,"float"),f.code.add(s`const float opaqueCutoff = 1.0 / 255.0;
+import{Slice as e}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{ReadLinearDepth as i}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{multipassTerrainTest as o}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{glsl as s}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as n}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as d}from"../views/3d/webgl-engine/lib/VertexAttribute.js";import{AdjustProjectedPosition as t}from"../views/3d/webgl-engine/shaders/sources/edgeRenderer/AdjustProjectedPosition.glsl.js";import{DiscardByCoverage as a}from"../views/3d/webgl-engine/shaders/sources/edgeRenderer/DiscardByCoverage.glsl.js";import{DiscardNonSilhouetteEdges as l}from"../views/3d/webgl-engine/shaders/sources/edgeRenderer/DiscardNonSilhouetteEdges.glsl.js";import{DiscardShortEdges as r}from"../views/3d/webgl-engine/shaders/sources/edgeRenderer/DiscardShortEdges.glsl.js";import{EdgeUtil as c}from"../views/3d/webgl-engine/shaders/sources/edgeRenderer/EdgeUtil.glsl.js";import{LineAmplitude as p}from"../views/3d/webgl-engine/shaders/sources/edgeRenderer/LineAmplitude.glsl.js";import{LineOffset as P}from"../views/3d/webgl-engine/shaders/sources/edgeRenderer/LineOffset.glsl.js";import{UnpackAttributes as u}from"../views/3d/webgl-engine/shaders/sources/edgeRenderer/UnpackAttributes.glsl.js";function g(g){const v=new n,f=v.vertex,x=v.fragment;return g.legacy&&f.uniforms.add("model","mat4"),g.antialiasing&&(f.code.add(s`#define ANTIALIASING 1`),x.code.add(s`#define ANTIALIASING 1`)),v.include(t,g),v.include(p,g),v.include(c,g),v.include(u,g),v.include(P,g),v.include(e,g),v.include(l,g),v.include(a,g),v.include(r,g),v.varyings.add("vColor","vec4"),v.varyings.add("vRadius","float"),v.varyings.add("vPosition","vec3"),v.varyings.add("vWorldPosition","vec3"),v.varyings.add("vViewPos","vec3"),v.varyings.add("vLineLengthPixels","float"),v.varyings.add("vSizeFalloffFactor","float"),f.uniforms.add("pixelToNDC","vec2"),f.uniforms.add("ndcToPixel","vec2"),f.uniforms.add("pixelRatio","float"),v.attributes.add(d.POSITION0,"vec3"),v.attributes.add(d.POSITION1,"vec3"),v.attributes.add(d.VARIANTOFFSET,"float"),v.attributes.add(d.VARIANTSTROKE,"float"),v.attributes.add(d.VARIANTEXTENSION,"float"),f.code.add(s`const float opaqueCutoff = 1.0 / 255.0;
 void calculateGeometricOutputs(vec3 viewPosV0, vec3 viewPosV1, vec3 worldPosV0, vec3 worldPosV1, vec3 worldNormal, UnpackedAttributes unpackedAttributes) {
 vec2 sideness = unpackedAttributes.sideness;
 vec2 sidenessNorm = unpackedAttributes.sidenessNorm;
@@ -13,15 +13,15 @@ vec4 projPosV0 = projFromViewPosition(viewPosV0);
 vec4 projPosV1 = projFromViewPosition(viewPosV1);
 vec4 projPos = projFromViewPosition(viewPos);
 vec3 screenSpaceLineNDC = (projPosV1.xyz / projPosV1.w - projPosV0.xyz / projPosV0.w);
-vec2 screenSpaceLinePixels = screenSpaceLineNDC.xy * uNDCToPixel;
+vec2 screenSpaceLinePixels = screenSpaceLineNDC.xy * ndcToPixel;
 float lineLengthPixels = length(screenSpaceLinePixels);
 float dzPerPixel = screenSpaceLineNDC.z / lineLengthPixels;
 vec2 screenSpaceDirection = screenSpaceLinePixels / lineLengthPixels;
 vec2 perpendicularScreenSpaceDirection = vec2(screenSpaceDirection.y, -screenSpaceDirection.x) * sideness.x;
-float falloffFactor = distanceBasedPerspectiveFactor(-viewPos.z) * uPixelRatio;
+float falloffFactor = distanceBasedPerspectiveFactor(-viewPos.z) * pixelRatio;
 float lineWidthPixels = unpackedAttributes.lineWidthPixels * falloffFactor;
 float extensionLengthPixels = calculateExtensionLength(unpackedAttributes.extensionLengthPixels, lineLengthPixels) * falloffFactor;
-float lineAmplitudePixels = calculateLineAmplitude(unpackedAttributes) * uPixelRatio;
+float lineAmplitudePixels = calculateLineAmplitude(unpackedAttributes) * pixelRatio;
 vSizeFalloffFactor = falloffFactor;
 float lineWidthAndAmplitudePixels = lineWidthPixels + lineAmplitudePixels + lineAmplitudePixels;
 float extendedLineLengthPixels = lineLengthPixels + extensionLengthPixels + extensionLengthPixels;
@@ -33,9 +33,9 @@ float aaPaddedRoundedCapSizePixels = lineWidthPixels * 0.5 + aaPaddingPixels;
 float halfAAPaddedLineWidthAndAmplitudePixels = max(lineWidthAndAmplitudePixels, 1.0) * 0.5;
 float aaPaddedRoundedCapSizePixels = max(lineWidthPixels, 1.0) * 0.5;
 #endif
-vec2 halfAAPaddedLineWidthAndAmplitudeNDC = halfAAPaddedLineWidthAndAmplitudePixels * uPixelToNDC;
-vec2 aaPaddedRoundedCapSizeNDC = aaPaddedRoundedCapSizePixels * uPixelToNDC;
-vec2 extensionLengthNDC = extensionLengthPixels * uPixelToNDC;
+vec2 halfAAPaddedLineWidthAndAmplitudeNDC = halfAAPaddedLineWidthAndAmplitudePixels * pixelToNDC;
+vec2 aaPaddedRoundedCapSizeNDC = aaPaddedRoundedCapSizePixels * pixelToNDC;
+vec2 extensionLengthNDC = extensionLengthPixels * pixelToNDC;
 vec2 ndcOffset = (
 screenSpaceDirection * sideness.y * (aaPaddedRoundedCapSizeNDC + extensionLengthNDC)
 + perpendicularScreenSpaceDirection * halfAAPaddedLineWidthAndAmplitudeNDC

package/chunks/Fog.glsl.js

@@ -2,13 +2,13 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/esri/copyright.txt for details.
 */
-import{TextureCoordinateAttribute as e}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/TextureCoordinateAttribute.glsl.js";import{ReadLinearDepth as r}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{Gamma as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js";import{glsl as t}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as o}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as i}from"../views/3d/webgl-engine/lib/basicInterfaces.js";function n(n){const d=new o;return d.attributes.add(i.POSITION,"vec2"),d.include(e,{attributeTextureCoordinates:e.AttributeType.Default}),d.varyings.add("worldRay","vec3"),d.varyings.add("eyeDir","vec3"),d.vertex.uniforms.add("projectionInverse","mat4"),d.vertex.uniforms.add("viewInverse","mat4"),d.vertex.code.add(t`void main(void) {
-vec3 posViewNear = (projectionInverse * vec4(position, -1, 1)).xyz;
+import{TextureCoordinateAttribute as e,TextureCoordinateAttributeType as r}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/TextureCoordinateAttribute.glsl.js";import{ReadLinearDepth as a}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{Gamma as t}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js";import{glsl as o}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as i}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as n}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function d(d){const l=new i;return l.attributes.add(n.POSITION,"vec2"),l.include(e,{attributeTextureCoordinates:r.Default}),l.varyings.add("worldRay","vec3"),l.varyings.add("eyeDir","vec3"),l.vertex.uniforms.add("inverseProjectionMatrix","mat4"),l.vertex.uniforms.add("inverseViewMatrix","mat4"),l.vertex.code.add(o`void main(void) {
+vec3 posViewNear = (inverseProjectionMatrix * vec4(position, -1, 1)).xyz;
 eyeDir = posViewNear;
-worldRay = (viewInverse * vec4(posViewNear, 0)).xyz;
+worldRay = (inverseViewMatrix * vec4(posViewNear, 0)).xyz;
 forwardTextureCoordinates();
 gl_Position = vec4(position, 1, 1);
-}`),d.fragment.uniforms.add("lightingMainDirection","vec3").add("atmosphereC","float").add("cameraPosition","vec3").add("nearFar","vec2").add("depthTex","sampler2D").add("strength","float").add("fogAmount","float"),d.include(a),d.fragment.include(r),d.fragment.code.add(t`vec2 sphereIntersect(vec3 start, vec3 dir) {
+}`),l.fragment.uniforms.add("lightingMainDirection","vec3").add("atmosphereC","float").add("cameraPosition","vec3").add("nearFar","vec2").add("depthTex","sampler2D").add("fogStrength","float").add("fogAmount","float"),l.include(t),l.fragment.include(a),l.fragment.code.add(o`vec2 sphereIntersect(vec3 start, vec3 dir) {
 float a = dot(dir, dir);
 float b = 2.0 * dot(dir, start);
 float d = (b * b) - 4.0 * a * atmosphereC;
@@ -16,7 +16,7 @@ if (d < 0.0) {
 return vec2(1e5, -1e5);
 }
 return vec2((-b - sqrt(d)) / (2.0 * a), (-b + sqrt(d)) / (2.0 * a));
-}`),d.fragment.code.add(t`
+}`),l.fragment.code.add(o`
     vec4 applyFog(float dist, vec3 rayDir){
       bool sky = false;
 
@@ -26,18 +26,16 @@ return vec2((-b - sqrt(d)) / (2.0 * a), (-b + sqrt(d)) / (2.0 * a));
         sky = true;
       }
 
-      float fogAmount = fogAmount * (1.0 - exp(-dist * strength));
-
+      float fogAmount = fogAmount * (1.0 - exp(-dist * fogStrength));
       float sunAmount = max(0.0, dot(rayDir, lightingMainDirection));
-
       float lightAngle = max(0.0, dot(normalize(cameraPosition + dist * rayDir), lightingMainDirection));
-      ${n.haze?t`vec3 fogColor = mix(vec3(0.0), vec3(0.24, 0.44, 0.8), lightAngle);`:t`vec3 fogColor = mix(vec3(0.1), vec3(1.5), lightAngle);`}
+      ${d.haze?o`vec3 fogColor = mix(vec3(0.0), vec3(0.24, 0.44, 0.8), lightAngle);`:o`vec3 fogColor = mix(vec3(0.1), vec3(1.5), lightAngle);`}
 
       float phase = sky ? pow(sunAmount, 16.0) : 0.0;
       vec3 col = (lightAngle * vec3(1.0, 0.6, 0.3) * phase + fogColor) * fogAmount;
       return vec4(col, fogAmount);
     }
-    `),d.fragment.code.add(t`
+    `),l.fragment.code.add(o`
     vec3 tonemapACES(vec3 x) {
       return clamp((x * (2.51 * x + 0.03)) / (x * (2.43 * x + 0.59) + 0.14), 0.0, 1.0);
     }
@@ -56,7 +54,7 @@ return vec2((-b - sqrt(d)) / (2.0 * a), (-b + sqrt(d)) / (2.0 * a));
         terrainDepth = max(0.0, length(cameraSpaceRay));
       }
 
-      ${n.haze?t`
+      ${d.haze?o`
           if(terrainDepth == -1.0){
             gl_FragColor = vec4(0);
             return;
@@ -66,4 +64,4 @@ return vec2((-b - sqrt(d)) / (2.0 * a), (-b + sqrt(d)) / (2.0 * a));
 
       gl_FragColor = delinearizeGamma(vec4(tonemapACES(fog.rgb), fog.a));
     }
-  `),d}const d=Object.freeze({__proto__:null,build:n});export{d as F,n as b};
+  `),l}const l=Object.freeze({__proto__:null,build:d});export{l as F,d as b};

package/chunks/HUDMaterial.glsl.js

@@ -2,7 +2,7 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/esri/copyright.txt for details.
 */
-import{c as e}from"./vec2.js";import{a as o}from"./vec2f64.js";import{Z as i}from"./vec4f64.js";import{ShaderOutput as r}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutputOptions.js";import{Slice as l}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{AlignPixel as t}from"../views/3d/webgl-engine/core/shaderLibrary/hud/AlignPixel.glsl.js";import{HUD as a}from"../views/3d/webgl-engine/core/shaderLibrary/hud/HUD.glsl.js";import{HUDOcclusionPass as s}from"../views/3d/webgl-engine/core/shaderLibrary/hud/HUDOcclusionPass.glsl.js";import{OutputHighlight as n}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{VisualVariables as c}from"../views/3d/webgl-engine/core/shaderLibrary/shading/VisualVariables.glsl.js";import{symbolAlphaCutoff as d,defaultMaskAlphaCutoff as u}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{ColorConversion as v}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{RgbaFloatEncoding as g}from"../views/3d/webgl-engine/core/shaderLibrary/util/RgbaFloatEncoding.glsl.js";import{ScreenSizePerspective as p}from"../views/3d/webgl-engine/core/shaderLibrary/util/ScreenSizePerspective.glsl.js";import{glsl as f}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as m}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as b}from"../views/3d/webgl-engine/lib/basicInterfaces.js";function h(e){const o=new m,i=e.signedDistanceFieldEnabled;if(o.include(t),o.include(a,e),o.include(l,e),e.output===r.Occlusion)return o.include(s,e),o;o.include(p),o.fragment.include(g),o.fragment.include(v),o.include(c,e),o.varyings.add("vcolor","vec4"),o.varyings.add("vtc","vec2"),o.varyings.add("vsize","vec2"),e.binaryHighlightOcclusionEnabled&&o.varyings.add("voccluded","float"),o.vertex.uniforms.add("screenOffset","vec2").add("anchorPos","vec2").add("textureCoordinateScaleFactor","vec2").add("materialColor","vec4"),i&&o.vertex.uniforms.add("outlineColor","vec4"),e.screenSizePerspectiveEnabled&&o.vertex.uniforms.add("screenSizePerspective","vec4"),(e.debugDrawLabelBorder||e.binaryHighlightOcclusionEnabled)&&o.varyings.add("debugBorderCoords","vec4"),o.attributes.add(b.UV0,"vec2"),o.attributes.add(b.COLOR,"vec4"),o.attributes.add(b.SIZE,"vec2"),o.attributes.add(b.AUXPOS2,"vec4"),o.vertex.code.add(f`
+import{c as e}from"./vec2.js";import{a as o}from"./vec2f64.js";import{Z as i}from"./vec4f64.js";import{ShaderOutput as r}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutputOptions.js";import{Slice as l}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{AlignPixel as t}from"../views/3d/webgl-engine/core/shaderLibrary/hud/AlignPixel.glsl.js";import{HUD as a}from"../views/3d/webgl-engine/core/shaderLibrary/hud/HUD.glsl.js";import{HUDOcclusionPass as s}from"../views/3d/webgl-engine/core/shaderLibrary/hud/HUDOcclusionPass.glsl.js";import{OutputHighlight as n}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{VisualVariables as c}from"../views/3d/webgl-engine/core/shaderLibrary/shading/VisualVariables.glsl.js";import{symbolAlphaCutoff as d,defaultMaskAlphaCutoff as u}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{ColorConversion as v}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{RgbaFloatEncoding as g}from"../views/3d/webgl-engine/core/shaderLibrary/util/RgbaFloatEncoding.glsl.js";import{ScreenSizePerspective as p}from"../views/3d/webgl-engine/core/shaderLibrary/util/ScreenSizePerspective.glsl.js";import{glsl as f}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as m}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as b}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function h(e){const o=new m,i=e.signedDistanceFieldEnabled;if(o.include(t),o.include(a,e),o.include(l,e),e.output===r.Occlusion)return o.include(s,e),o;o.include(p),o.fragment.include(g),o.fragment.include(v),o.include(c,e),o.varyings.add("vcolor","vec4"),o.varyings.add("vtc","vec2"),o.varyings.add("vsize","vec2"),e.binaryHighlightOcclusionEnabled&&o.varyings.add("voccluded","float"),o.vertex.uniforms.add("screenOffset","vec2").add("anchorPos","vec2").add("textureCoordinateScaleFactor","vec2").add("materialColor","vec4"),i&&o.vertex.uniforms.add("outlineColor","vec4"),e.screenSizePerspectiveEnabled&&o.vertex.uniforms.add("screenSizePerspective","vec4"),(e.debugDrawLabelBorder||e.binaryHighlightOcclusionEnabled)&&o.varyings.add("debugBorderCoords","vec4"),o.attributes.add(b.UV0,"vec2"),o.attributes.add(b.COLOR,"vec4"),o.attributes.add(b.SIZE,"vec2"),o.attributes.add(b.AUXPOS2,"vec4"),o.vertex.code.add(f`
     void main(void) {
       ProjectHUDAux projectAux;
       vec4 posProj = projectPositionHUD(projectAux);
@@ -131,7 +131,7 @@ posProj = alignToPixelOrigin(posProj, viewport.zw);
       `),e.output===r.Color&&o.fragment.code.add(f`
     void main() {
       ${S}
-      ${e.FrontFacePass?"gl_FragColor.rgb /= gl_FragColor.a;":""}
+      ${e.frontFacePass?"gl_FragColor.rgb /= gl_FragColor.a;":""}
     }
     `),e.output===r.Highlight&&(o.include(n),o.fragment.code.add(f`
     void main() {

package/chunks/HighlightComposition.glsl.js

@@ -2,7 +2,7 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/esri/copyright.txt for details.
 */
-import{glsl as e}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as i}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as t}from"../views/3d/webgl-engine/lib/basicInterfaces.js";var o;function r(r){const l=new i,a=l.vertex.code,n=l.fragment.code;return l.attributes.add(t.POSITION,"vec2"),r.highlightStage===o.Downsample&&(a.add(e`void main() {
+import{glsl as e}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as i}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as t}from"../views/3d/webgl-engine/lib/VertexAttribute.js";var o;function r(r){const l=new i,a=l.vertex.code,n=l.fragment.code;return l.attributes.add(t.POSITION,"vec2"),r.highlightStage===o.Downsample&&(a.add(e`void main() {
 gl_Position = vec4(vec2(1.0) - position * 2.0, 0.0, 1.0);
 }`),l.fragment.uniforms.add("tex","sampler2D"),l.fragment.uniforms.add("invFramebufferDim","vec2"),n.add(e`void main() {
 vec2 coord = gl_FragCoord.xy * invFramebufferDim;
@@ -62,7 +62,7 @@ gl_FragColor = vec4(ceil(value.r), mx, mx, 1.0);
             }`:""}
         gl_Position = vec4(position, 0.0, 1.0);
         uv = position.xy * 0.5 + vec2(0.5);
-      }`),l.fragment.uniforms.add("tex","sampler2D"),l.fragment.uniforms.add("origin","sampler2D"),l.fragment.uniforms.add("color","vec4"),l.fragment.uniforms.add("haloColor","vec4"),l.fragment.uniforms.add("outlineSize","float"),l.fragment.uniforms.add("blurSize","float"),l.fragment.uniforms.add("opacities","vec4"),n.add(e`void main() {
+      }`),l.fragment.uniforms.add("tex","sampler2D"),l.fragment.uniforms.add("origin","sampler2D"),l.fragment.uniforms.add("uColor","vec4"),l.fragment.uniforms.add("haloColor","vec4"),l.fragment.uniforms.add("outlineSize","float"),l.fragment.uniforms.add("blurSize","float"),l.fragment.uniforms.add("opacities","vec4"),n.add(e`void main() {
 vec4 blurredHighlightValue = texture2D(tex, uv);
 float highlightIntensity = blurredHighlightValue.a;
 if (highlightIntensity == 0.0) {
@@ -73,16 +73,16 @@ float outlineIntensity;
 float fillIntensity;
 if (blurredHighlightValue.g > blurredHighlightValue.b) {
 outlineIntensity = haloColor.w * opacities[1];
-fillIntensity = color.w * opacities[3];
+fillIntensity = uColor.w * opacities[3];
 }
 else {
 outlineIntensity = haloColor.w * opacities[0];
-fillIntensity = color.w * opacities[2];
+fillIntensity = uColor.w * opacities[2];
 }
 float inner = 1.0 - outlineSize / 9.0;
 float outer = 1.0 - (outlineSize + blurSize) / 9.0;
 float outlineFactor = smoothstep(outer, inner, highlightIntensity);
 float fillFactor = any(notEqual(origin_color, vec4(0.0, 0.0, 0.0, 0.0))) ? 1.0 : 0.0;
 float intensity = outlineIntensity * outlineFactor * (1.0 - fillFactor) + fillIntensity * fillFactor;
-gl_FragColor = vec4(mix(haloColor.rgb, color.rgb, fillFactor), intensity);
+gl_FragColor = vec4(mix(haloColor.rgb, uColor.rgb, fillFactor), intensity);
 }`)),l}!function(e){e[e.Blur=0]="Blur",e[e.Apply=1]="Apply",e[e.Downsample=2]="Downsample",e[e.COUNT=3]="COUNT"}(o||(o={}));const l=Object.freeze({__proto__:null,get HighlightCompositionPass(){return o},build:r});export{o as H,l as a,r as b};