@arcgis/core 4.34.0-next.25 → 4.34.0-next.27

package/views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js

@@ -2,19 +2,19 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.34/esri/copyright.txt for details.
 */
-import{colorGamma as i}from"../../../../../../colorUtils.js";import"../../../../../../core/has.js";import{EvaluateAmbientLighting as n}from"./EvaluateAmbientLighting.glsl.js";import{EvaluateAmbientOcclusion as e}from"./EvaluateAmbientOcclusion.glsl.js";import{addMainLightDirection as o,addMainLightIntensity as t,applyShading as a}from"./MainLighting.glsl.js";import{PhysicallyBasedRendering as r}from"./PhysicallyBasedRendering.glsl.js";import{PBRMode as l}from"./PhysicallyBasedRenderingParameters.glsl.js";import{PiUtils as c}from"./PiUtils.glsl.js";import{BooleanBindUniform as d}from"../../shaderModules/BooleanBindUniform.js";import{FloatBindUniform as s}from"../../shaderModules/FloatBindUniform.js";import{glsl as m,If as g}from"../../shaderModules/glsl.js";import{ambientBoost as h}from"../../../lighting/SceneLighting.js";import{BlackLevelLightSoftCompression as u}from"../../../shaders/BlackLevelLightSoftCompression.glsl.js";import{ToneMapping as p}from"../../../shaders/ToneMapping.glsl.js";function v(i){i.constants.add("ambientBoostFactor","float",h)}function f(i){i.uniforms.add(new s("lightingGlobalFactor",i=>i.lighting.globalFactor))}function L(h,L){const b=h.fragment,{pbrMode:C,spherical:N,hasColorTexture:R}=L;b.include(e,L),C!==l.Disabled&&b.include(r,L),h.include(n,L),b.include(c),b.include(p,L);const D=!(C===l.Schematic&&!R);switch(D&&b.include(u),b.code.add(m`
-    const float GAMMA_SRGB = ${m.float(i)};
+import{colorGamma as i}from"../../../../../../colorUtils.js";import"../../../../../../core/has.js";import{EvaluateAmbientLighting as n}from"./EvaluateAmbientLighting.glsl.js";import{EvaluateAmbientOcclusion as o}from"./EvaluateAmbientOcclusion.glsl.js";import{addMainLightDirection as e,addMainLightIntensity as t,applyShading as a}from"./MainLighting.glsl.js";import{PhysicallyBasedRendering as r}from"./PhysicallyBasedRendering.glsl.js";import{PiUtils as l}from"./PiUtils.glsl.js";import{BooleanBindUniform as c}from"../../shaderModules/BooleanBindUniform.js";import{FloatBindUniform as d}from"../../shaderModules/FloatBindUniform.js";import{glsl as s,If as m}from"../../shaderModules/glsl.js";import{ambientBoost as g}from"../../../lighting/SceneLighting.js";import{BlackLevelLightSoftCompression as h}from"../../../shaders/BlackLevelLightSoftCompression.glsl.js";import{ToneMapping as u}from"../../../shaders/ToneMapping.glsl.js";function p(i){i.constants.add("ambientBoostFactor","float",g)}function v(i){i.uniforms.add(new d("lightingGlobalFactor",i=>i.lighting.globalFactor))}function f(g,f){const L=g.fragment,{pbrMode:b,spherical:C,hasColorTexture:N}=f;L.include(o,f),0!==b&&L.include(r,f),g.include(n,f),L.include(l),L.include(u,f);const R=!(2===b&&!N);switch(R&&L.include(h),L.code.add(s`
+    const float GAMMA_SRGB = ${s.float(i)};
     const float INV_GAMMA_SRGB = 0.4761904;
-    ${g(C!==l.Disabled,"const float GROUND_REFLECTANCE = 0.2;")}
-  `),v(b),f(b),o(b),b.code.add(m`
+    ${m(0!==b,"const float GROUND_REFLECTANCE = 0.2;")}
+  `),p(L),v(L),e(L),L.code.add(s`
     float additionalDirectedAmbientLight(vec3 vPosWorld) {
-      float vndl = dot(${N?m`normalize(vPosWorld)`:m`vec3(0.0, 0.0, 1.0)`}, mainLightDirection);
+      float vndl = dot(${C?s`normalize(vPosWorld)`:s`vec3(0.0, 0.0, 1.0)`}, mainLightDirection);
       return smoothstep(0.0, 1.0, clamp(vndl * 2.5, 0.0, 1.0));
     }
-  `),t(b),b.code.add(m`vec3 evaluateAdditionalLighting(float ambientOcclusion, vec3 vPosWorld) {
+  `),t(L),L.code.add(s`vec3 evaluateAdditionalLighting(float ambientOcclusion, vec3 vPosWorld) {
 float additionalAmbientScale = additionalDirectedAmbientLight(vPosWorld);
 return (1.0 - ambientOcclusion) * additionalAmbientScale * ambientBoostFactor * lightingGlobalFactor * mainLightIntensity;
-}`),C){case l.Disabled:case l.WaterOnIntegratedMesh:case l.Water:h.include(a),b.code.add(m`vec3 evaluateSceneLighting(vec3 normalWorld, vec3 albedo, float shadow, float ssao, vec3 additionalLight) {
+}`),b){case 0:case 4:case 3:g.include(a),L.code.add(s`vec3 evaluateSceneLighting(vec3 normalWorld, vec3 albedo, float shadow, float ssao, vec3 additionalLight) {
 vec3 mainLighting = applyShading(normalWorld, shadow);
 vec3 ambientLighting = calculateAmbientIrradiance(normalWorld, ssao);
 vec3 albedoLinear = pow(albedo, vec3(GAMMA_SRGB));
@@ -22,7 +22,7 @@ vec3 totalLight = mainLighting + ambientLighting + additionalLight;
 totalLight = min(totalLight, vec3(PI));
 vec3 outColor = vec3((albedoLinear / PI) * totalLight);
 return pow(outColor, vec3(INV_GAMMA_SRGB));
-}`);break;case l.Normal:case l.Schematic:b.code.add(m`const float fillLightIntensity = 0.25;
+}`);break;case 1:case 2:L.code.add(s`const float fillLightIntensity = 0.25;
 const float horizonLightDiffusion = 0.4;
 const float additionalAmbientIrradianceFactor = 0.02;
 vec3 evaluateSceneLightingPBR(vec3 normal, vec3 albedo, float shadow, float ssao, vec3 additionalLight,
@@ -38,9 +38,9 @@ inputs.RdotNG = clamp(dot(reflectedView, groundNormal), -1.0, 1.0);
 inputs.albedoLinear = pow(albedo, vec3(GAMMA_SRGB));
 inputs.ssao = ssao;
 inputs.metalness = mrr[0];
-inputs.roughness = clamp(mrr[1] * mrr[1], 0.001, 0.99);`),b.code.add(m`inputs.f0 = (0.16 * mrr[2] * mrr[2]) * (1.0 - inputs.metalness) + inputs.albedoLinear * inputs.metalness;
+inputs.roughness = clamp(mrr[1] * mrr[1], 0.001, 0.99);`),L.code.add(s`inputs.f0 = (0.16 * mrr[2] * mrr[2]) * (1.0 - inputs.metalness) + inputs.albedoLinear * inputs.metalness;
 inputs.f90 = vec3(clamp(dot(inputs.f0, vec3(50.0 * 0.33)), 0.0, 1.0));
-inputs.diffuseColor = inputs.albedoLinear * (vec3(1.0) - inputs.f0) * (1.0 - inputs.metalness);`),L.useFillLights?b.uniforms.add(new d("hasFillLights",i=>i.enableFillLights)):b.constants.add("hasFillLights","bool",!1),b.code.add(m`vec3 ambientDir = vec3(5.0 * groundNormal[1] - groundNormal[0] * groundNormal[2], - 5.0 * groundNormal[0] - groundNormal[2] * groundNormal[1], groundNormal[1] * groundNormal[1] + groundNormal[0] * groundNormal[0]);
+inputs.diffuseColor = inputs.albedoLinear * (vec3(1.0) - inputs.f0) * (1.0 - inputs.metalness);`),f.useFillLights?L.uniforms.add(new c("hasFillLights",i=>i.enableFillLights)):L.constants.add("hasFillLights","bool",!1),L.code.add(s`vec3 ambientDir = vec3(5.0 * groundNormal[1] - groundNormal[0] * groundNormal[2], - 5.0 * groundNormal[0] - groundNormal[2] * groundNormal[1], groundNormal[1] * groundNormal[1] + groundNormal[0] * groundNormal[0]);
 ambientDir = ambientDir != vec3(0.0) ? normalize(ambientDir) : normalize(vec3(5.0, -1.0, 0.0));
 inputs.NdotAmbDir = hasFillLights ? abs(dot(normal, ambientDir)) : 1.0;
 float NdotL = clamp(dot(normal, mainLightDirection), 0.001, 1.0);
@@ -48,7 +48,7 @@ vec3 mainLightIrradianceComponent = NdotL * (1.0 - shadow) * mainLightIntensity;
 vec3 fillLightsIrradianceComponent = inputs.NdotAmbDir * mainLightIntensity * fillLightIntensity;
 vec3 ambientLightIrradianceComponent = calculateAmbientIrradiance(normal, ssao) + additionalLight;
 inputs.skyIrradianceToSurface = ambientLightIrradianceComponent + mainLightIrradianceComponent + fillLightsIrradianceComponent ;
-inputs.groundIrradianceToSurface = GROUND_REFLECTANCE * ambientLightIrradianceComponent + mainLightIrradianceComponent + fillLightsIrradianceComponent ;`),b.uniforms.add(new s("lightingSpecularStrength",i=>i.lighting.mainLight.specularStrength),new s("lightingEnvironmentStrength",i=>i.lighting.mainLight.environmentStrength)).code.add(m`vec3 horizonRingDir = inputs.RdotNG * groundNormal - reflectedView;
+inputs.groundIrradianceToSurface = GROUND_REFLECTANCE * ambientLightIrradianceComponent + mainLightIrradianceComponent + fillLightsIrradianceComponent ;`),L.uniforms.add(new d("lightingSpecularStrength",i=>i.lighting.mainLight.specularStrength),new d("lightingEnvironmentStrength",i=>i.lighting.mainLight.environmentStrength)).code.add(s`vec3 horizonRingDir = inputs.RdotNG * groundNormal - reflectedView;
 vec3 horizonRingH = normalize(viewDirection + horizonRingDir);
 inputs.NdotH_Horizon = dot(normal, horizonRingH);
 float NdotH = clamp(dot(normal, h), 0.0, 1.0);
@@ -58,15 +58,15 @@ vec3 ambientLightRadianceComponent = lightingEnvironmentStrength * calculateAmbi
 float normalDirectionModifier = mix(1., min(mix(0.1, 2.0, (inputs.NdotNG + 1.) * 0.5), 1.0), clamp(inputs.roughness * 5.0, 0.0 , 1.0));
 inputs.skyRadianceToSurface = (ambientLightRadianceComponent + horizonLightRadianceComponent) * normalDirectionModifier + mainLightRadianceComponent;
 inputs.groundRadianceToSurface = 0.5 * GROUND_REFLECTANCE * (ambientLightRadianceComponent + horizonLightRadianceComponent) * normalDirectionModifier + mainLightRadianceComponent;
-inputs.averageAmbientRadiance = ambientLightIrradianceComponent[1] * (1.0 + GROUND_REFLECTANCE);`),b.code.add(m`
+inputs.averageAmbientRadiance = ambientLightIrradianceComponent[1] * (1.0 + GROUND_REFLECTANCE);`),L.code.add(s`
         vec3 reflectedColorComponent = evaluateEnvironmentIllumination(inputs);
         vec3 additionalMaterialReflectanceComponent = inputs.albedoLinear * additionalAmbientIrradiance;
         vec3 emissionComponent = _emission.rgb == vec3(0.0) ? _emission.rgb : tonemapACES(pow(_emission.rgb, vec3(GAMMA_SRGB)));
         vec3 outColorLinear = reflectedColorComponent + additionalMaterialReflectanceComponent + emissionComponent;
-        ${D?m`vec3 outColor = pow(blackLevelSoftCompression(outColorLinear, inputs.averageAmbientRadiance), vec3(INV_GAMMA_SRGB));`:m`vec3 outColor = pow(max(vec3(0.0), outColorLinear - 0.005 * inputs.averageAmbientRadiance), vec3(INV_GAMMA_SRGB));`}
+        ${R?s`vec3 outColor = pow(blackLevelSoftCompression(outColorLinear, inputs.averageAmbientRadiance), vec3(INV_GAMMA_SRGB));`:s`vec3 outColor = pow(max(vec3(0.0), outColorLinear - 0.005 * inputs.averageAmbientRadiance), vec3(INV_GAMMA_SRGB));`}
         return outColor;
       }
-    `);break;case l.Simplified:case l.TerrainWithWater:o(b),t(b),b.code.add(m`const float roughnessTerrain = 0.5;
+    `);break;case 5:case 6:e(L),t(L),L.code.add(s`const float roughnessTerrain = 0.5;
 const float specularityTerrain = 0.5;
 const vec3 fresnelReflectionTerrain = vec3(0.04);
 vec3 evaluatePBRSimplifiedLighting(vec3 n, vec3 c, float shadow, float ssao, vec3 al, vec3 vd, vec3 nup) {
@@ -92,4 +92,4 @@ vec3 specularComponent = specularityTerrain * specularColor * mainLightRadianceC
 vec3 outColorLinear = outDiffColor + specularComponent;
 vec3 outColor = pow(outColorLinear, vec3(INV_GAMMA_SRGB));
 return outColor;
-}`);default:case l.COUNT:}}export{L as EvaluateSceneLighting,v as addAmbientBoostFactor,f as addLightingGlobalFactor};
+}`)}}export{f as EvaluateSceneLighting,p as addAmbientBoostFactor,v as addLightingGlobalFactor};

package/views/3d/webgl-engine/core/shaderLibrary/shading/MarkerSizing.glsl.js

@@ -2,12 +2,12 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.34/esri/copyright.txt for details.
 */
-import{markerSizePerLineWidth as e}from"../../../../support/engineContent/marker.js";import{addPixelRatio as r}from"../util/View.glsl.js";import{FloatBindUniform as o}from"../../shaderModules/FloatBindUniform.js";import{glsl as t}from"../../shaderModules/glsl.js";import{LineMarkerSpace as a}from"../../../shaders/LineMarkerTechniqueConfiguration.js";function n(n,i){const d=n.vertex;r(d),null==d.uniforms.get("markerScale")&&d.constants.add("markerScale","float",1),d.constants.add("markerSizePerLineWidth","float",e).code.add(t`float getLineWidth() {
+import{markerSizePerLineWidth as e}from"../../../../support/engineContent/marker.js";import{addPixelRatio as r}from"../util/View.glsl.js";import{FloatBindUniform as t}from"../../shaderModules/FloatBindUniform.js";import{glsl as o}from"../../shaderModules/glsl.js";function a(a,n){const i=a.vertex;r(i),null==i.uniforms.get("markerScale")&&i.constants.add("markerScale","float",1),i.constants.add("markerSizePerLineWidth","float",e).code.add(o`float getLineWidth() {
 return max(getSize(), 1.0) * pixelRatio;
 }
 float getScreenMarkerSize() {
 return markerSizePerLineWidth * markerScale * getLineWidth();
-}`),i.space===a.World&&(d.constants.add("maxSegmentLengthFraction","float",.45),d.uniforms.add(new o("perRenderPixelRatio",e=>e.camera.perRenderPixelRatio)),d.code.add(t`bool areWorldMarkersHidden(vec4 pos, vec4 other) {
+}`),2===n.space&&(i.constants.add("maxSegmentLengthFraction","float",.45),i.uniforms.add(new t("perRenderPixelRatio",e=>e.camera.perRenderPixelRatio)),i.code.add(o`bool areWorldMarkersHidden(vec4 pos, vec4 other) {
 vec3 midPoint = mix(pos.xyz, other.xyz, 0.5);
 float distanceToCamera = length(midPoint);
 float screenToWorldRatio = perRenderPixelRatio * distanceToCamera * 0.5;
@@ -19,4 +19,4 @@ float getWorldMarkerSize(vec4 pos) {
 float distanceToCamera = length(pos.xyz);
 float screenToWorldRatio = perRenderPixelRatio * distanceToCamera * 0.5;
 return getScreenMarkerSize() * screenToWorldRatio;
-}`))}export{n as MarkerSizing};
+}`))}export{a as MarkerSizing};

package/views/3d/webgl-engine/core/shaderLibrary/shading/Normals.glsl.js

@@ -2,13 +2,13 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.34/esri/copyright.txt for details.
 */
-import{neverReached as a}from"../../../../../../core/compilerUtils.js";import{glsl as r}from"../../shaderModules/glsl.js";function e(e,o){const n=e.fragment;switch(n.code.add(r`struct ShadingNormalParameters {
+import{neverReached as a}from"../../../../../../core/compilerUtils.js";import{glsl as r}from"../../shaderModules/glsl.js";function e(e,o){const m=e.fragment;switch(m.code.add(r`struct ShadingNormalParameters {
 vec3 normalView;
 vec3 viewDirection;
-} shadingParams;`),o.doubleSidedMode){case i.None:n.code.add(r`vec3 shadingNormal(ShadingNormalParameters params) {
+} shadingParams;`),o.doubleSidedMode){case 0:m.code.add(r`vec3 shadingNormal(ShadingNormalParameters params) {
 return normalize(params.normalView);
-}`);break;case i.View:n.code.add(r`vec3 shadingNormal(ShadingNormalParameters params) {
+}`);break;case 1:m.code.add(r`vec3 shadingNormal(ShadingNormalParameters params) {
 return dot(params.normalView, params.viewDirection) > 0.0 ? normalize(-params.normalView) : normalize(params.normalView);
-}`);break;case i.WindingOrder:n.code.add(r`vec3 shadingNormal(ShadingNormalParameters params) {
+}`);break;case 2:m.code.add(r`vec3 shadingNormal(ShadingNormalParameters params) {
 return gl_FrontFacing ? normalize(params.normalView) : normalize(-params.normalView);
-}`);break;default:a(o.doubleSidedMode);case i.COUNT:}}var i;!function(a){a[a.None=0]="None",a[a.View=1]="View",a[a.WindingOrder=2]="WindingOrder",a[a.COUNT=3]="COUNT"}(i||(i={}));export{e as Normals,i as NormalsDoubleSidedMode};
+}`);break;default:a(o.doubleSidedMode);case 3:}}export{e as Normals};

package/views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRendering.glsl.js

@@ -2,19 +2,19 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.34/esri/copyright.txt for details.
 */
-import{AnalyticalSkyModel as e}from"./AnalyticalSkyModel.glsl.js";import{PBRMode as o}from"./PhysicallyBasedRenderingParameters.glsl.js";import{PiUtils as t}from"./PiUtils.glsl.js";import{glsl as a}from"../../shaderModules/glsl.js";function n(n,r){n.include(t),r.pbrMode!==o.Normal&&r.pbrMode!==o.Schematic&&r.pbrMode!==o.Simplified&&r.pbrMode!==o.TerrainWithWater||(n.code.add(a`float normalDistribution(float NdotH, float roughness)
+import{AnalyticalSkyModel as e}from"./AnalyticalSkyModel.glsl.js";import{PiUtils as o}from"./PiUtils.glsl.js";import{glsl as t}from"../../shaderModules/glsl.js";function n(n,a){n.include(o),1!==a.pbrMode&&2!==a.pbrMode&&5!==a.pbrMode&&6!==a.pbrMode||(n.code.add(t`float normalDistribution(float NdotH, float roughness)
 {
 float a = NdotH * roughness;
 float b = roughness / (1.0 - NdotH * NdotH + a * a);
 return b * b * INV_PI;
-}`),n.code.add(a`const vec4 c0 = vec4(-1.0, -0.0275, -0.572,  0.022);
+}`),n.code.add(t`const vec4 c0 = vec4(-1.0, -0.0275, -0.572,  0.022);
 const vec4 c1 = vec4( 1.0,  0.0425,  1.040, -0.040);
 const vec2 c2 = vec2(-1.04, 1.04);
 vec2 prefilteredDFGAnalytical(float roughness, float NdotV) {
 vec4 r = roughness * c0 + c1;
 float a004 = min(r.x * r.x, exp2(-9.28 * NdotV)) * r.x + r.y;
 return c2 * a004 + r.zw;
-}`)),r.pbrMode!==o.Normal&&r.pbrMode!==o.Schematic||(n.include(e),n.code.add(a`struct PBRShadingInfo
+}`)),1!==a.pbrMode&&2!==a.pbrMode||(n.include(e),n.code.add(t`struct PBRShadingInfo
 {
 float NdotV;
 float LdotH;
@@ -34,7 +34,7 @@ vec3 f90;
 vec3 diffuseColor;
 float metalness;
 float roughness;
-};`),n.code.add(a`vec3 evaluateEnvironmentIllumination(PBRShadingInfo inputs) {
+};`),n.code.add(t`vec3 evaluateEnvironmentIllumination(PBRShadingInfo inputs) {
 vec3 indirectDiffuse = evaluateDiffuseIlluminationHemisphere(inputs.groundIrradianceToSurface, inputs.skyIrradianceToSurface, inputs.NdotNG);
 vec3 indirectSpecular = evaluateSpecularIlluminationHemisphere(inputs.groundRadianceToSurface, inputs.skyRadianceToSurface, inputs.RdotNG, inputs.roughness);
 vec3 diffuseComponent = inputs.diffuseColor * indirectDiffuse * INV_PI;
@@ -42,7 +42,7 @@ vec2 dfg = prefilteredDFGAnalytical(inputs.roughness, inputs.NdotV);
 vec3 specularColor = inputs.f0 * dfg.x + inputs.f90 * dfg.y;
 vec3 specularComponent = specularColor * indirectSpecular;
 return (diffuseComponent + specularComponent);
-}`))}function r(e,o){e.include(t),e.code.add(a`
+}`))}function a(e,n){e.include(o),e.code.add(t`
   struct PBRShadingWater {
       float NdotL;   // cos angle between normal and light direction
       float NdotV;   // cos angle between normal and view direction
@@ -52,17 +52,17 @@ return (diffuseComponent + specularComponent);
       float VdotN;   // cos angle between view direction and normal vector
   };
 
-  float dtrExponent = ${o.useCustomDTRExponentForWater?"2.2":"2.0"};
-  `),e.code.add(a`vec3 fresnelReflection(float angle, vec3 f0, float f90) {
+  float dtrExponent = ${n.useCustomDTRExponentForWater?"2.2":"2.0"};
+  `),e.code.add(t`vec3 fresnelReflection(float angle, vec3 f0, float f90) {
 return f0 + (f90 - f0) * pow(1.0 - angle, 5.0);
-}`),e.code.add(a`float normalDistributionWater(float NdotH, float roughness) {
+}`),e.code.add(t`float normalDistributionWater(float NdotH, float roughness) {
 float r2 = roughness * roughness;
 float NdotH2 = NdotH * NdotH;
 float denom = pow((NdotH2 * (r2 - 1.0) + 1.0), dtrExponent) * PI;
 return r2 / denom;
-}`),e.code.add(a`float geometricOcclusionKelemen(float LoH) {
+}`),e.code.add(t`float geometricOcclusionKelemen(float LoH) {
 return 0.25 / (LoH * LoH);
-}`),e.code.add(a`vec3 brdfSpecularWater(in PBRShadingWater props, float roughness, vec3 F0, float F0Max) {
+}`),e.code.add(t`vec3 brdfSpecularWater(in PBRShadingWater props, float roughness, vec3 F0, float F0Max) {
 vec3  F = fresnelReflection(props.VdotH, F0, F0Max);
 float dSun = normalDistributionWater(props.NdotH, roughness);
 float V = geometricOcclusionKelemen(props.LdotH);
@@ -70,4 +70,4 @@ float diffusionSunHaze = mix(roughness + 0.045, roughness + 0.385, 1.0 - props.V
 float strengthSunHaze  = 1.2;
 float dSunHaze = normalDistributionWater(props.NdotH, diffusionSunHaze) * strengthSunHaze;
 return ((dSun + dSunHaze) * V) * F;
-}`)}export{n as PhysicallyBasedRendering,r as PhysicallyBasedRenderingWater};
+}`)}export{n as PhysicallyBasedRendering,a as PhysicallyBasedRenderingWater};

package/views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js

@@ -2,29 +2,29 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.34/esri/copyright.txt for details.
 */
-import{VertexTextureCoordinates as e}from"../attributes/VertexTextureCoordinates.glsl.js";import{Float3DrawUniform as r}from"../../shaderModules/Float3DrawUniform.js";import{Float3PassUniform as o}from"../../shaderModules/Float3PassUniform.js";import{glsl as s,If as t}from"../../shaderModules/glsl.js";import{Texture2DDrawUniform as a}from"../../shaderModules/Texture2DDrawUniform.js";import{Texture2DPassUniform as i}from"../../shaderModules/Texture2DPassUniform.js";import{schematicMRRFactors as c}from"../../../materials/pbrUtils.js";import{BindType as l}from"../../../../../webgl/BindType.js";import{NoParameters as u}from"../../../../../webgl/NoParameters.js";var n;!function(e){e[e.Disabled=0]="Disabled",e[e.Normal=1]="Normal",e[e.Schematic=2]="Schematic",e[e.Water=3]="Water",e[e.WaterOnIntegratedMesh=4]="WaterOnIntegratedMesh",e[e.Simplified=5]="Simplified",e[e.TerrainWithWater=6]="TerrainWithWater",e[e.COUNT=7]="COUNT"}(n||(n={}));class d extends u{constructor(e,r){super(),this.textureOcclusion=e,this.textureMetallicRoughness=r,this.mrrFactors=c}}function m(c,u){const d=u.pbrMode,m=c.fragment;if(d!==n.Schematic&&d!==n.Disabled&&d!==n.Normal)return void m.code.add(s`void applyPBRFactors() {}`);if(d===n.Disabled)return void m.code.add(s`void applyPBRFactors() {}
-float getBakedOcclusion() { return 1.0; }`);if(d===n.Schematic)return void m.code.add(s`vec3 mrr = vec3(0.0, 0.6, 0.2);
+import{VertexTextureCoordinates as e}from"../attributes/VertexTextureCoordinates.glsl.js";import{Float3DrawUniform as o}from"../../shaderModules/Float3DrawUniform.js";import{Float3PassUniform as r}from"../../shaderModules/Float3PassUniform.js";import{glsl as s,If as t}from"../../shaderModules/glsl.js";import{Texture2DDrawUniform as c}from"../../shaderModules/Texture2DDrawUniform.js";import{Texture2DPassUniform as l}from"../../shaderModules/Texture2DPassUniform.js";import{schematicMRRFactors as u}from"../../../materials/pbrUtils.js";import{NoParameters as a}from"../../../../../webgl/NoParameters.js";class i extends a{constructor(e,o){super(),this.textureOcclusion=e,this.textureMetallicRoughness=o,this.mrrFactors=u}}function n(u,a){const i=a.pbrMode,n=u.fragment;if(2!==i&&0!==i&&1!==i)return void n.code.add(s`void applyPBRFactors() {}`);if(0===i)return void n.code.add(s`void applyPBRFactors() {}
+float getBakedOcclusion() { return 1.0; }`);if(2===i)return void n.code.add(s`vec3 mrr = vec3(0.0, 0.6, 0.2);
 float occlusion = 1.0;
 void applyPBRFactors() {}
-float getBakedOcclusion() { return 1.0; }`);const{hasMetallicRoughnessTexture:p,hasMetallicRoughnessTextureTransform:h,hasOcclusionTexture:f,hasOcclusionTextureTransform:g,bindType:v}=u;(p||f)&&c.include(e,u),m.code.add(s`vec3 mrr;
-float occlusion;`),p&&m.uniforms.add(v===l.Pass?new i("texMetallicRoughness",e=>e.textureMetallicRoughness):new a("texMetallicRoughness",e=>e.textureMetallicRoughness)),f&&m.uniforms.add(v===l.Pass?new i("texOcclusion",e=>e.textureOcclusion):new a("texOcclusion",e=>e.textureOcclusion)),m.uniforms.add(v===l.Pass?new o("mrrFactors",e=>e.mrrFactors):new r("mrrFactors",e=>e.mrrFactors)),m.code.add(s`
-    ${t(p,s`void applyMetallicRoughness(vec2 uv) {
+float getBakedOcclusion() { return 1.0; }`);const{hasMetallicRoughnessTexture:d,hasMetallicRoughnessTextureTransform:m,hasOcclusionTexture:p,hasOcclusionTextureTransform:f,bindType:h}=a;(d||p)&&u.include(e,a),n.code.add(s`vec3 mrr;
+float occlusion;`),d&&n.uniforms.add(1===h?new l("texMetallicRoughness",e=>e.textureMetallicRoughness):new c("texMetallicRoughness",e=>e.textureMetallicRoughness)),p&&n.uniforms.add(1===h?new l("texOcclusion",e=>e.textureOcclusion):new c("texOcclusion",e=>e.textureOcclusion)),n.uniforms.add(1===h?new r("mrrFactors",e=>e.mrrFactors):new o("mrrFactors",e=>e.mrrFactors)),n.code.add(s`
+    ${t(d,s`void applyMetallicRoughness(vec2 uv) {
             vec3 metallicRoughness = textureLookup(texMetallicRoughness, uv).rgb;
             mrr[0] *= metallicRoughness.b;
             mrr[1] *= metallicRoughness.g;
           }`)}
 
-    ${t(f,"void applyOcclusion(vec2 uv) { occlusion *= textureLookup(texOcclusion, uv).r; }")}
+    ${t(p,"void applyOcclusion(vec2 uv) { occlusion *= textureLookup(texOcclusion, uv).r; }")}
 
     float getBakedOcclusion() {
-      return ${f?"occlusion":"1.0"};
+      return ${p?"occlusion":"1.0"};
     }
 
     void applyPBRFactors() {
       mrr = mrrFactors;
       occlusion = 1.0;
 
-      ${t(p,`applyMetallicRoughness(${h?"metallicRoughnessUV":"vuv0"});`)}
-      ${t(f,`applyOcclusion(${g?"occlusionUV":"vuv0"});`)}
+      ${t(d,`applyMetallicRoughness(${m?"metallicRoughnessUV":"vuv0"});`)}
+      ${t(p,`applyOcclusion(${f?"occlusionUV":"vuv0"});`)}
     }
-  `)}export{n as PBRMode,d as PBRRenderingParameters,m as PhysicallyBasedRenderingParameters};
+  `)}export{i as PBRRenderingParameters,n as PhysicallyBasedRenderingParameters};

package/views/3d/webgl-engine/core/shaderLibrary/shading/ReadBaseColorTexture.glsl.js

@@ -2,8 +2,8 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.34/esri/copyright.txt for details.
 */
-import{isColorOrColorEmission as e}from"../ShaderOutput.js";import{VertexTextureCoordinates as r}from"../attributes/VertexTextureCoordinates.glsl.js";import{glsl as o}from"../../shaderModules/glsl.js";import{Texture2DDrawUniform as t}from"../../shaderModules/Texture2DDrawUniform.js";import{AlphaDiscardMode as s}from"../../../lib/basicInterfaces.js";function u(u,a){const d=a.hasColorTexture&&(e(a.output)||a.alphaDiscardMode!==s.Opaque);d&&(u.include(r,a),u.fragment.uniforms.add(new t("baseColorTexture",e=>e.texture))),u.fragment.code.add(o`
+import{isColorOrColorEmission as e}from"../ShaderOutput.js";import{VertexTextureCoordinates as r}from"../attributes/VertexTextureCoordinates.glsl.js";import{glsl as o}from"../../shaderModules/glsl.js";import{Texture2DDrawUniform as t}from"../../shaderModules/Texture2DDrawUniform.js";function u(u,s){const a=s.hasColorTexture&&(e(s.output)||1!==s.alphaDiscardMode);a&&(u.include(r,s),u.fragment.uniforms.add(new t("baseColorTexture",e=>e.texture))),u.fragment.code.add(o`
     vec4 readBaseColorTexture() {
-      return ${d?"textureLookup(baseColorTexture, vuv0)":"vec4(1.0)"};
+      return ${a?"textureLookup(baseColorTexture, vuv0)":"vec4(1.0)"};
     }
   `)}export{u as ReadBaseColorTexture};

package/views/3d/webgl-engine/core/shaderLibrary/shading/TextureTransformUV.glsl.js

@@ -2,14 +2,14 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.34/esri/copyright.txt for details.
 */
-import{IDENTITY as r}from"../../../../../../core/libs/gl-matrix-2/factories/mat3f64.js";import{TextureCoordinateType as e}from"../attributes/TextureCoordinateAttribute.glsl.js";import{glsl as o}from"../../shaderModules/glsl.js";import{Matrix3PassUniform as a}from"../../shaderModules/Matrix3PassUniform.js";function s(e,s){s.hasColorTextureTransform?(e.varyings.add("colorUV","vec2"),e.vertex.uniforms.add(new a("colorTextureTransformMatrix",e=>e.colorTextureTransformMatrix??r)).code.add(o`void forwardColorUV(){
+import{IDENTITY as r}from"../../../../../../core/libs/gl-matrix-2/factories/mat3f64.js";import{glsl as e}from"../../shaderModules/glsl.js";import{Matrix3PassUniform as o}from"../../shaderModules/Matrix3PassUniform.js";function a(a,s){s.hasColorTextureTransform?(a.varyings.add("colorUV","vec2"),a.vertex.uniforms.add(new o("colorTextureTransformMatrix",e=>e.colorTextureTransformMatrix??r)).code.add(e`void forwardColorUV(){
 colorUV = (colorTextureTransformMatrix * vec3(vuv0, 1.0)).xy;
-}`)):e.vertex.code.add(o`void forwardColorUV(){}`)}function i(s,i){i.hasNormalTextureTransform&&i.textureCoordinateType!==e.None?(s.varyings.add("normalUV","vec2"),s.vertex.uniforms.add(new a("normalTextureTransformMatrix",e=>e.normalTextureTransformMatrix??r)).code.add(o`void forwardNormalUV(){
+}`)):a.vertex.code.add(e`void forwardColorUV(){}`)}function s(a,s){s.hasNormalTextureTransform&&0!==s.textureCoordinateType?(a.varyings.add("normalUV","vec2"),a.vertex.uniforms.add(new o("normalTextureTransformMatrix",e=>e.normalTextureTransformMatrix??r)).code.add(e`void forwardNormalUV(){
 normalUV = (normalTextureTransformMatrix * vec3(vuv0, 1.0)).xy;
-}`)):s.vertex.code.add(o`void forwardNormalUV(){}`)}function t(s,i){i.hasEmissionTextureTransform&&i.textureCoordinateType!==e.None?(s.varyings.add("emissiveUV","vec2"),s.vertex.uniforms.add(new a("emissiveTextureTransformMatrix",e=>e.emissiveTextureTransformMatrix??r)).code.add(o`void forwardEmissiveUV(){
+}`)):a.vertex.code.add(e`void forwardNormalUV(){}`)}function i(a,s){s.hasEmissionTextureTransform&&0!==s.textureCoordinateType?(a.varyings.add("emissiveUV","vec2"),a.vertex.uniforms.add(new o("emissiveTextureTransformMatrix",e=>e.emissiveTextureTransformMatrix??r)).code.add(e`void forwardEmissiveUV(){
 emissiveUV = (emissiveTextureTransformMatrix * vec3(vuv0, 1.0)).xy;
-}`)):s.vertex.code.add(o`void forwardEmissiveUV(){}`)}function d(s,i){i.hasOcclusionTextureTransform&&i.textureCoordinateType!==e.None?(s.varyings.add("occlusionUV","vec2"),s.vertex.uniforms.add(new a("occlusionTextureTransformMatrix",e=>e.occlusionTextureTransformMatrix??r)).code.add(o`void forwardOcclusionUV(){
+}`)):a.vertex.code.add(e`void forwardEmissiveUV(){}`)}function d(a,s){s.hasOcclusionTextureTransform&&0!==s.textureCoordinateType?(a.varyings.add("occlusionUV","vec2"),a.vertex.uniforms.add(new o("occlusionTextureTransformMatrix",e=>e.occlusionTextureTransformMatrix??r)).code.add(e`void forwardOcclusionUV(){
 occlusionUV = (occlusionTextureTransformMatrix * vec3(vuv0, 1.0)).xy;
-}`)):s.vertex.code.add(o`void forwardOcclusionUV(){}`)}function n(s,i){i.hasMetallicRoughnessTextureTransform&&i.textureCoordinateType!==e.None?(s.varyings.add("metallicRoughnessUV","vec2"),s.vertex.uniforms.add(new a("metallicRoughnessTextureTransformMatrix",e=>e.metallicRoughnessTextureTransformMatrix??r)).code.add(o`void forwardMetallicRoughnessUV(){
+}`)):a.vertex.code.add(e`void forwardOcclusionUV(){}`)}function t(a,s){s.hasMetallicRoughnessTextureTransform&&0!==s.textureCoordinateType?(a.varyings.add("metallicRoughnessUV","vec2"),a.vertex.uniforms.add(new o("metallicRoughnessTextureTransformMatrix",e=>e.metallicRoughnessTextureTransformMatrix??r)).code.add(e`void forwardMetallicRoughnessUV(){
 metallicRoughnessUV = (metallicRoughnessTextureTransformMatrix * vec3(vuv0, 1.0)).xy;
-}`)):s.vertex.code.add(o`void forwardMetallicRoughnessUV(){}`)}export{s as colorTextureUV,t as emissiveTextureUV,n as metallicRoughnessTextureUV,i as normalTextureUV,d as occlusionTextureUV};
+}`)):a.vertex.code.add(e`void forwardMetallicRoughnessUV(){}`)}export{a as colorTextureUV,i as emissiveTextureUV,t as metallicRoughnessTextureUV,s as normalTextureUV,d as occlusionTextureUV};

package/views/3d/webgl-engine/core/shaderLibrary/shading/VisualVariables.glsl.js

@@ -2,7 +2,7 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.34/esri/copyright.txt for details.
 */
-import{MaskedColorDefinition as o,MultiplyMaskedColors as r,CreateMaskedFromNaNColor as e}from"../attributes/MaskedColor.glsl.js";import{Float3PassUniform as v}from"../../shaderModules/Float3PassUniform.js";import{Float4PassUniform as a}from"../../shaderModules/Float4PassUniform.js";import{Float4sPassUniform as t}from"../../shaderModules/Float4sPassUniform.js";import{FloatsPassUniform as l}from"../../shaderModules/FloatsPassUniform.js";import{glsl as i}from"../../shaderModules/glsl.js";import{Matrix3PassUniform as s}from"../../shaderModules/Matrix3PassUniform.js";import{VertexAttribute as n}from"../../../lib/VertexAttribute.js";import{vvColorNumber as u}from"../../../materials/VisualVariablePassParameters.js";function c(c,m){const{vertex:d,attributes:f}=c;m.hasVvInstancing&&(m.vvSize||m.vvColor)&&f.add(n.INSTANCEFEATUREATTRIBUTE,"vec4"),m.vvSize?(d.uniforms.add(new v("vvSizeMinSize",o=>o.vvSize.minSize)),d.uniforms.add(new v("vvSizeMaxSize",o=>o.vvSize.maxSize)),d.uniforms.add(new v("vvSizeOffset",o=>o.vvSize.offset)),d.uniforms.add(new v("vvSizeFactor",o=>o.vvSize.factor)),d.uniforms.add(new v("vvSizeFallback",o=>o.vvSize.fallback)),d.uniforms.add(new s("vvSymbolRotationMatrix",o=>o.vvSymbolRotationMatrix)),d.uniforms.add(new v("vvSymbolAnchor",o=>o.vvSymbolAnchor)),d.code.add(i`vec3 vvScale(vec4 _featureAttribute) {
+import{MaskedColorDefinition as o,MultiplyMaskedColors as e,CreateMaskedFromNaNColor as r}from"../attributes/MaskedColor.glsl.js";import{Float3PassUniform as v}from"../../shaderModules/Float3PassUniform.js";import{Float4PassUniform as a}from"../../shaderModules/Float4PassUniform.js";import{Float4sPassUniform as t}from"../../shaderModules/Float4sPassUniform.js";import{FloatsPassUniform as l}from"../../shaderModules/FloatsPassUniform.js";import{glsl as i}from"../../shaderModules/glsl.js";import{Matrix3PassUniform as s}from"../../shaderModules/Matrix3PassUniform.js";import{vvColorNumber as n}from"../../../materials/VisualVariablePassParameters.js";function u(u,c){const{vertex:m,attributes:d}=u;c.hasVvInstancing&&(c.vvSize||c.vvColor)&&d.add("instanceFeatureAttribute","vec4"),c.vvSize?(m.uniforms.add(new v("vvSizeMinSize",o=>o.vvSize.minSize)),m.uniforms.add(new v("vvSizeMaxSize",o=>o.vvSize.maxSize)),m.uniforms.add(new v("vvSizeOffset",o=>o.vvSize.offset)),m.uniforms.add(new v("vvSizeFactor",o=>o.vvSize.factor)),m.uniforms.add(new v("vvSizeFallback",o=>o.vvSize.fallback)),m.uniforms.add(new s("vvSymbolRotationMatrix",o=>o.vvSymbolRotationMatrix)),m.uniforms.add(new v("vvSymbolAnchor",o=>o.vvSymbolAnchor)),m.code.add(i`vec3 vvScale(vec4 _featureAttribute) {
 if (isnan(_featureAttribute.x)) {
 return vvSizeFallback;
 }
@@ -10,14 +10,14 @@ return clamp(vvSizeOffset + _featureAttribute.x * vvSizeFactor, vvSizeMinSize, v
 }
 vec4 vvTransformPosition(vec3 position, vec4 _featureAttribute) {
 return vec4(vvSymbolRotationMatrix * ( vvScale(_featureAttribute) * (position + vvSymbolAnchor)), 1.0);
-}`),d.code.add(i`
+}`),m.code.add(i`
       const float eps = 1.192092896e-07;
       vec4 vvTransformNormal(vec3 _normal, vec4 _featureAttribute) {
         vec3 scale = max(vvScale(_featureAttribute), eps);
         return vec4(vvSymbolRotationMatrix * _normal / scale, 1.0);
       }
 
-      ${m.hasVvInstancing?i`
+      ${c.hasVvInstancing?i`
       vec4 vvLocalNormal(vec3 _normal) {
         return vvTransformNormal(_normal, instanceFeatureAttribute);
       }
@@ -25,8 +25,8 @@ return vec4(vvSymbolRotationMatrix * ( vvScale(_featureAttribute) * (position +
       vec4 localPosition() {
         return vvTransformPosition(position, instanceFeatureAttribute);
       }`:""}
-    `)):d.code.add(i`vec4 localPosition() { return vec4(position, 1.0); }
-vec4 vvLocalNormal(vec3 _normal) { return vec4(_normal, 1.0); }`),c.vertex.include(o),m.vvColor?(d.constants.add("vvColorNumber","int",u),d.uniforms.add(new l("vvColorValues",o=>o.vvColor.values,u),new t("vvColorColors",o=>o.vvColor.colors,u),new a("vvColorFallback",o=>o.vvColor.fallback,{supportsNaN:!0})),m.hasVvInstancing&&(c.vertex.include(r),c.vertex.include(e)),d.code.add(i`
+    `)):m.code.add(i`vec4 localPosition() { return vec4(position, 1.0); }
+vec4 vvLocalNormal(vec3 _normal) { return vec4(_normal, 1.0); }`),u.vertex.include(o),c.vvColor?(m.constants.add("vvColorNumber","int",n),m.uniforms.add(new l("vvColorValues",o=>o.vvColor.values,n),new t("vvColorColors",o=>o.vvColor.colors,n),new a("vvColorFallback",o=>o.vvColor.fallback,{supportsNaN:!0})),c.hasVvInstancing&&(u.vertex.include(e),u.vertex.include(r)),m.code.add(i`
       vec4 interpolateVVColor(float value) {
         if (isnan(value)) {
           return vvColorFallback;
@@ -49,7 +49,7 @@ vec4 vvLocalNormal(vec3 _normal) { return vec4(_normal, 1.0); }`),c.vertex.inclu
         return interpolateVVColor(featureAttribute.y);
       }
 
-      ${m.hasVvInstancing?i`
+      ${c.hasVvInstancing?i`
             vec4 vvColor() {
               return vvGetColor(instanceFeatureAttribute);
             }
@@ -66,9 +66,9 @@ vec4 vvLocalNormal(vec3 _normal) { return vec4(_normal, 1.0); }`),c.vertex.inclu
               return color;
             }
             `}
-    `)):d.code.add(i`vec4 vvColor() {
+    `)):m.code.add(i`vec4 vvColor() {
 return vec4(1.0);
 }
 MaskedColor applyVVColor(MaskedColor color) {
 return color;
-}`)}export{c as VisualVariables};
+}`)}export{u as VisualVariables};

package/views/3d/webgl-engine/core/shaderLibrary/terrain/BaseOpacityMode.js

@@ -2,4 +2,3 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.34/esri/copyright.txt for details.
 */
-var e;!function(e){e[e.NotRequired=0]="NotRequired",e[e.Required=1]="Required",e[e.COUNT=2]="COUNT"}(e||(e={}));export{e as BaseOpacityMode};

package/views/3d/webgl-engine/core/shaderLibrary/terrain/BlendLayersOutput.js

@@ -2,4 +2,3 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.34/esri/copyright.txt for details.
 */
-var o;!function(o){o[o.Draw=0]="Draw",o[o.Composite=1]="Composite",o[o.ColorComposite=2]="ColorComposite",o[o.GridComposite=3]="GridComposite",o[o.GroupBackgroundComposite=4]="GroupBackgroundComposite",o[o.COUNT=5]="COUNT"}(o||(o={}));export{o as BlendLayersOutput};

package/views/3d/webgl-engine/core/shaderLibrary/terrain/Overlay.glsl.js

@@ -2,9 +2,9 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.34/esri/copyright.txt for details.
 */
-import{create as e}from"../../../../../../core/libs/gl-matrix-2/factories/vec4f64.js";import{hasArea as o,width as r,height as t}from"../../../../../../geometry/support/aaBoundingRect.js";import{OverlayIndex as a}from"../../../../terrain/interfaces.js";import{OverlayContent as l}from"../../../../terrain/OverlayContent.js";import{RenderPassIdentifier as i}from"../../renderPasses/RenderPassIdentifier.js";import{ShaderOutput as n,isColorOrColorEmission as d}from"../ShaderOutput.js";import{addMainLightDirection as s,addMainLightIntensity as v}from"../shading/MainLighting.glsl.js";import{PBRMode as c}from"../shading/PhysicallyBasedRenderingParameters.glsl.js";import{Water as u}from"../shading/Water.glsl.js";import{Float4DrawUniform as x}from"../../shaderModules/Float4DrawUniform.js";import{FloatPassUniform as y}from"../../shaderModules/FloatPassUniform.js";import{glsl as m}from"../../shaderModules/glsl.js";import{Texture2DPassUniform as p}from"../../shaderModules/Texture2DPassUniform.js";import{Texture2DUintPassUniform as g}from"../../shaderModules/Texture2DUintPassUniform.js";import{Uniform as f}from"../../../../../webgl/Uniform.js";var h;function C(e,o){const{vertex:r,fragment:t}=e;r.uniforms.add(new x("overlayTexOffset",(e,o)=>I(e,o)),new x("overlayTexScale",(e,o)=>V(e,o))),t.constants.add("overlayOpacity","float",1),t.uniforms.add(new p("ovColorTex",(e,o)=>O(e,o))),b(e,o)}function O(e,o){return e.identifier===i.Material&&d(e.output)?e.occludedGround?o.overlay?.allSourcesOccludees?o.overlay?.getTexture(l.ColorNoRasterImage):o.overlay?.getTexture(l.Occluded):o.overlay?.getTexture(l.ColorNoRasterImage):e.identifier===i.Material&&e.output===n.ObjectAndLayerIdColor?o.overlay?.getTexture(l.ObjectAndLayerIdColor):e.identifier===i.Highlight?o.overlay?.getTexture(l.Highlight):null}function T(e,o){const{vertex:r,fragment:t}=e,{output:a}=o;r.uniforms.add(new M("overlayTexOffset"),new M("overlayTexScale")),t.uniforms.add(new y("overlayOpacity",e=>e.overlayOpacity)),a!==n.Highlight&&t.uniforms.add(new p("ovColorTex",(e,o)=>o.overlay?.getTexture(e.overlayContent))),b(e,o)}function b(e,o){const r=o.pbrMode===c.Water||o.pbrMode===c.WaterOnIntegratedMesh||o.pbrMode===c.TerrainWithWater;r&&e.include(u,o);const{vertex:t,fragment:a,varyings:i}=e;i.add("vtcOverlay","vec4");const{output:d}=o,x=d===n.Highlight;t.code.add(m`void setOverlayVTC(in vec2 uv) {
+import{create as e}from"../../../../../../core/libs/gl-matrix-2/factories/vec4f64.js";import{hasArea as o,width as r,height as t}from"../../../../../../geometry/support/aaBoundingRect.js";import{isColorOrColorEmission as l}from"../ShaderOutput.js";import{addMainLightDirection as a,addMainLightIntensity as c}from"../shading/MainLighting.glsl.js";import{Water as i}from"../shading/Water.glsl.js";import{Float4DrawUniform as v}from"../../shaderModules/Float4DrawUniform.js";import{FloatPassUniform as s}from"../../shaderModules/FloatPassUniform.js";import{glsl as n}from"../../shaderModules/glsl.js";import{Texture2DPassUniform as d}from"../../shaderModules/Texture2DPassUniform.js";import{Texture2DUintPassUniform as u}from"../../shaderModules/Texture2DUintPassUniform.js";import{Uniform as x}from"../../../../../webgl/Uniform.js";function y(e,o){const{vertex:r,fragment:t}=e;r.uniforms.add(new v("overlayTexOffset",(e,o)=>C(e,o)),new v("overlayTexScale",(e,o)=>h(e,o))),t.constants.add("overlayOpacity","float",1),t.uniforms.add(new d("ovColorTex",(e,o)=>p(e,o))),g(e,o)}function p(e,o){return 0===e.identifier&&l(e.output)?e.occludedGround?o.overlay?.allSourcesOccluders?o.overlay?.getTexture(1):o.overlay?.getTexture(4):o.overlay?.getTexture(1):0===e.identifier&&9===e.output?o.overlay?.getTexture(5):2===e.identifier?o.overlay?.getTexture(2):null}function m(e,o){const{vertex:r,fragment:t}=e,{output:l}=o;r.uniforms.add(new T("overlayTexOffset"),new T("overlayTexScale")),t.uniforms.add(new s("overlayOpacity",e=>e.overlayOpacity)),8!==l&&t.uniforms.add(new d("ovColorTex",(e,o)=>o.overlay?.getTexture(e.overlayContent))),g(e,o)}function f(e,o){switch(e){case 0:case 1:return 8!==o.slot||o.overlay?.allSourcesOccluders?0:4;case 2:case 3:return 0;case 8:return 2;case 4:case 6:case 7:return null;case 9:return 5}return null}function g(e,o){const r=3===o.pbrMode||4===o.pbrMode||6===o.pbrMode;r&&e.include(i,o);const{vertex:t,fragment:l,varyings:v}=e;v.add("vtcOverlay","vec4");const{output:s}=o,d=8===s;t.code.add(n`void setOverlayVTC(in vec2 uv) {
 vtcOverlay = vec4(uv, uv) * overlayTexScale + overlayTexOffset;
-}`),a.code.add(m`bool isValid(vec2 uv, vec2 dxdy) {
+}`),l.code.add(n`bool isValid(vec2 uv, vec2 dxdy) {
 return (uv.x >= 0.0 + dxdy.x) && (uv.x <= 1.0 - dxdy.x) && (uv.y >= 0.0 + dxdy.y) && (uv.y <= 1.0 - dxdy.y);
 }
 vec4 getOverlayColor(sampler2D ov0Tex, vec4 texCoords) {
@@ -13,7 +13,7 @@ vec4 color1 = texture(ov0Tex, vec2(texCoords.z * 0.5 + 0.5, texCoords.w));
 bool isValid0 = isValid(texCoords.xy, fwidth(texCoords.xy));
 bool isValid1 = isValid(texCoords.zw, vec2(0.0, 0.0));
 return mix(color1 * float(isValid1), color0, float(isValid0));
-}`),x?a.uniforms.add(new g("overlayHighlightTexture",(e,o)=>o.overlay?.getTexture(l.Highlight))).code.add(m`uvec2 getAllOverlayHighlightValuesEncoded() {
+}`),d?l.uniforms.add(new u("overlayHighlightTexture",(e,o)=>o.overlay?.getTexture(2))).code.add(n`uvec2 getAllOverlayHighlightValuesEncoded() {
 vec4 texCoords = vtcOverlay;
 vec2 uvInner = texCoords.xy;
 vec2 uvOuter = texCoords.zw;
@@ -28,9 +28,9 @@ return
 isValidInner ? texelValueInner :
 isValidOuter ? texelValueOuter :
 uvec2(0);
-}`):(a.code.add(m`vec4 getCombinedOverlayColor() {
+}`):(l.code.add(n`vec4 getCombinedOverlayColor() {
 return overlayOpacity * getOverlayColor(ovColorTex, vtcOverlay);
-}`),a.code.add(m`vec4 getOverlayColorTexel() {
+}`),l.code.add(n`vec4 getOverlayColorTexel() {
 vec4 texCoords = vtcOverlay;
 vec2 texDim =  vec2(textureSize(ovColorTex, 0));
 vec4 color0 = texelFetch(ovColorTex, ivec2(vec2(texCoords.x * 0.5, texCoords.y) * texDim), 0);
@@ -38,10 +38,10 @@ vec4 color1 = texelFetch(ovColorTex, ivec2(vec2(texCoords.z * 0.5 + 0.5, texCoor
 bool isValid0 = isValid(texCoords.xy, fwidth(texCoords.xy));
 bool isValid1 = isValid(texCoords.zw, vec2(0.0, 0.0));
 return mix(color1 * float(isValid1), color0, float(isValid0));
-}`)),r&&(s(a),v(a),a.code.add(m`vec4 getOverlayWaterColor(vec4 maskInput, vec4 colorInput, vec3 vposEyeDir,
+}`)),r&&(a(l),c(l),l.code.add(n`vec4 getOverlayWaterColor(vec4 maskInput, vec4 colorInput, vec3 vposEyeDir,
 float shadow, vec3 localUp, mat3 tbn, vec3 position, vec3 positionWorld) {
 vec3 n = normalize(tbn *  (2.0 * maskInput.rgb - vec3(1.0)));
 vec3 v = vposEyeDir;
 vec3 final = getSeaColor(n, v, mainLightDirection, colorInput.rgb, mainLightIntensity, localUp, 1.0 - shadow, maskInput.w, position, positionWorld);
 return vec4(final, colorInput.w);
-}`))}function I(e,l){const i=l.overlay?.overlays[a.INNER]?.extent;o(i)&&(w[0]=e.toMapSpace[0]/r(i)-i[0]/r(i),w[1]=e.toMapSpace[1]/t(i)-i[1]/t(i));const n=l.overlay?.overlays[a.OUTER]?.extent;return o(n)&&(w[2]=e.toMapSpace[0]/r(n)-n[0]/r(n),w[3]=e.toMapSpace[1]/t(n)-n[1]/t(n)),w}function V(e,l){const i=l.overlay?.overlays[a.INNER]?.extent;o(i)&&(w[0]=e.toMapSpace[2]/r(i),w[1]=e.toMapSpace[3]/t(i));const n=l.overlay?.overlays[a.OUTER]?.extent;return o(n)&&(w[2]=e.toMapSpace[2]/r(n),w[3]=e.toMapSpace[3]/t(n)),w}!function(e){e[e.Disabled=0]="Disabled",e[e.Enabled=1]="Enabled",e[e.EnabledWithWater=2]="EnabledWithWater",e[e.COUNT=3]="COUNT"}(h||(h={}));const w=e();class M extends f{constructor(e){super(e,"vec4")}}export{C as OverlayIM,h as OverlayMode,T as OverlayTerrain,O as getIMColorTexture};
+}`))}function C(e,l){const a=l.overlay?.overlays[0]?.extent;o(a)&&(O[0]=e.toMapSpace[0]/r(a)-a[0]/r(a),O[1]=e.toMapSpace[1]/t(a)-a[1]/t(a));const c=l.overlay?.overlays[1]?.extent;return o(c)&&(O[2]=e.toMapSpace[0]/r(c)-c[0]/r(c),O[3]=e.toMapSpace[1]/t(c)-c[1]/t(c)),O}function h(e,l){const a=l.overlay?.overlays[0]?.extent;o(a)&&(O[0]=e.toMapSpace[2]/r(a),O[1]=e.toMapSpace[3]/t(a));const c=l.overlay?.overlays[1]?.extent;return o(c)&&(O[2]=e.toMapSpace[2]/r(c),O[3]=e.toMapSpace[3]/t(c)),O}const O=e();class T extends x{constructor(e){super(e,"vec4")}}export{y as OverlayIM,m as OverlayTerrain,p as getIMColorTexture,f as getOverlayContentForOutputTerrain};

package/views/3d/webgl-engine/core/shaderLibrary/terrain/PremultipliedAlphaSource.js

@@ -2,4 +2,3 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.34/esri/copyright.txt for details.
 */
-var O;!function(O){O[O.Off=0]="Off",O[O.On=1]="On",O[O.COUNT=2]="COUNT"}(O||(O={}));export{O as PremultipliedAlphaSource};

package/views/3d/webgl-engine/core/shaderLibrary/terrain/TerrainTexture.glsl.js

@@ -2,25 +2,25 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.34/esri/copyright.txt for details.
 */
-import{ReadShadowMapPassParameters as e}from"../shading/ReadShadowMap.glsl.js";import{BackgroundGrid as t}from"./BackgroundGrid.glsl.js";import{TileBlendInput as o}from"./TileBlendInput.js";import{If as r,glsl as c}from"../../shaderModules/glsl.js";import{Uniform as n}from"../../../../../webgl/Uniform.js";class s extends e{constructor(){super(...arguments),this.overlayOpacity=1}}function d(e,n){const{vertex:s,fragment:d,varyings:x}=e;x.add("vtc","vec2"),s.uniforms.add(new l("texOffsetAndScale")),d.uniforms.add(new u("tex")),d.uniforms.add(new i("textureOpacities"));const f=n.textureFadingEnabled&&!n.renderOccluded;f&&(s.uniforms.add(new l("nextTexOffsetAndScale")),x.add("nvtc","vec2"),d.uniforms.add(new u("texNext")),d.uniforms.add(new i("nextTexOpacities")),d.uniforms.add(new a("fadeFactor")));const v=n.tileBlendInput===o.ColorComposite,p=n.tileBlendInput===o.GridComposite;p&&d.include(t),v&&d.uniforms.add(new i("backgroundColor")),s.code.add(c`
+import{ReadShadowMapPassParameters as e}from"../shading/ReadShadowMap.glsl.js";import{BackgroundGrid as t}from"./BackgroundGrid.glsl.js";import{If as o,glsl as r}from"../../shaderModules/glsl.js";import{Uniform as c}from"../../../../../webgl/Uniform.js";class n extends e{constructor(){super(...arguments),this.overlayOpacity=1}}function s(e,c){const{vertex:n,fragment:s,varyings:u}=e;u.add("vtc","vec2"),n.uniforms.add(new i("texOffsetAndScale")),s.uniforms.add(new l("tex")),s.uniforms.add(new d("textureOpacities"));const x=c.textureFadingEnabled&&!c.renderOccluded;x&&(n.uniforms.add(new i("nextTexOffsetAndScale")),u.add("nvtc","vec2"),s.uniforms.add(new l("texNext")),s.uniforms.add(new d("nextTexOpacities")),s.uniforms.add(new a("fadeFactor")));const f=1===c.tileBlendInput,v=2===c.tileBlendInput;v&&s.include(t),f&&s.uniforms.add(new d("backgroundColor")),n.code.add(r`
   void forwardTextureCoordinatesWithTransform(in vec2 uv) {
     vtc = texOffsetAndScale.xy + uv * texOffsetAndScale.zw;
-    ${r(f,"nvtc = nextTexOffsetAndScale.xy + uv * nextTexOffsetAndScale.zw;")}
-  }`),d.code.add(c`
+    ${o(x,"nvtc = nextTexOffsetAndScale.xy + uv * nextTexOffsetAndScale.zw;")}
+  }`),s.code.add(r`
     vec4 getColor(vec4 color, vec2 uv, vec3 opacities) {
-      ${r(p||v,c`if (opacities.y <= 0.0) {
+      ${o(v||f,r`if (opacities.y <= 0.0) {
            return color * opacities.z * opacities.x;
          }
-         vec4 bg = vec4(${v?c`backgroundColor`:c`gridColor(uv)`} * opacities.y, opacities.y);
+         vec4 bg = vec4(${f?r`backgroundColor`:r`gridColor(uv)`} * opacities.y, opacities.y);
          vec4 layer = color * opacities.z;
          return (bg * (1.0 - layer.a) + layer) * opacities.x;`,"return color;")}
-    }`),f?d.code.add(c`vec4 getTileColor() {
+    }`),x?s.code.add(r`vec4 getTileColor() {
 vec4 color = getColor(texture(tex, vtc), vtc, textureOpacities);
 if (fadeFactor >= 1.0) {
 return color;
 }
 vec4 nextColor = getColor(texture(texNext, nvtc), nvtc, nextTexOpacities);
 return mix(nextColor, color, fadeFactor);
-}`):d.code.add(c`vec4 getTileColor() {
+}`):s.code.add(r`vec4 getTileColor() {
 return getColor(texture(tex, vtc), vtc, textureOpacities);
-}`)}class a extends n{constructor(e){super(e,"float")}}class i extends n{constructor(e){super(e,"vec3")}}class l extends n{constructor(e){super(e,"vec4")}}class u extends n{constructor(e){super(e,"sampler2D")}}export{i as Float3Uniform,s as OverlayTerrainPassParameters,d as TerrainTexture,u as Texture2DUniform};
+}`)}class a extends c{constructor(e){super(e,"float")}}class d extends c{constructor(e){super(e,"vec3")}}class i extends c{constructor(e){super(e,"vec4")}}class l extends c{constructor(e){super(e,"sampler2D")}}export{d as Float3Uniform,n as OverlayTerrainPassParameters,s as TerrainTexture,l as Texture2DUniform};

package/views/3d/webgl-engine/core/shaderLibrary/terrain/TileBackground.glsl.js

@@ -2,19 +2,19 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.34/esri/copyright.txt for details.
 */
-import"../../../../../../core/has.js";import{ZEROS as o}from"../../../../../../core/libs/gl-matrix-2/factories/vec3f64.js";import{LayerBlendMode as r}from"../output/BlendOptions.js";import{BackgroundGrid as e}from"./BackgroundGrid.glsl.js";import{BaseOpacityMode as a}from"./BaseOpacityMode.js";import{BlendLayersOutput as c}from"./BlendLayersOutput.js";import{PremultipliedAlphaSource as s}from"./PremultipliedAlphaSource.js";import{BlendModes as t}from"../util/BlendModes.glsl.js";import{Float3PassUniform as l}from"../../shaderModules/Float3PassUniform.js";import{FloatPassUniform as i}from"../../shaderModules/FloatPassUniform.js";import{glsl as p,If as d}from"../../shaderModules/glsl.js";import{Texture2DPassUniform as m}from"../../shaderModules/Texture2DPassUniform.js";import{NoParameters as u}from"../../../../../webgl/NoParameters.js";class n extends u{constructor(){super(...arguments),this.baseOpacity=1,this.backgroundColor=o,this.fboTexture=null}}function b(o,u){const{output:n,blendMode:b,baseOpacityMode:g,premultipliedSource:f}=u,y=o.fragment,C=g===a.Required;C&&y.uniforms.add(new i("baseOpacity",o=>o.baseOpacity));const v=b!==r.Normal,h=f===s.On,j=n===c.Composite,k=n===c.GroupBackgroundComposite,B=!v&&!h&&(j&&!C||k);y.include(t,u);let L="";switch(n){case c.GroupBackgroundComposite:case c.Draw:L=p`vec4(0.0)`;break;case c.ColorComposite:y.uniforms.add(new l("backgroundColor",o=>o.backgroundColor)),L=p`vec4(backgroundColor, 1.0)`;break;case c.GridComposite:y.include(e),L=p`vec4(gridColor(uv), 1.0)`;break;case c.Composite:y.uniforms.add(new m("fboColor",o=>o.fboTexture)),L=p`texelFetch(fboColor, ivec2(gl_FragCoord.xy), 0)`;case c.COUNT:}y.code.add(p`
+import"../../../../../../core/has.js";import{ZEROS as o}from"../../../../../../core/libs/gl-matrix-2/factories/vec3f64.js";import{BackgroundGrid as r}from"./BackgroundGrid.glsl.js";import{BlendModes as e}from"../util/BlendModes.glsl.js";import{Float3PassUniform as a}from"../../shaderModules/Float3PassUniform.js";import{FloatPassUniform as c}from"../../shaderModules/FloatPassUniform.js";import{glsl as l,If as s}from"../../shaderModules/glsl.js";import{Texture2DPassUniform as t}from"../../shaderModules/Texture2DPassUniform.js";import{NoParameters as i}from"../../../../../webgl/NoParameters.js";class d extends i{constructor(){super(...arguments),this.baseOpacity=1,this.backgroundColor=o,this.fboTexture=null}}function b(o,i){const{output:d,blendMode:b,baseOpacityMode:g,premultipliedSource:n}=i,u=o.fragment,p=1===g;p&&u.uniforms.add(new c("baseOpacity",o=>o.baseOpacity));const m=0!==b,f=!m&&!(1===n)&&(1===d&&!p||4===d);u.include(e,i);let y="";switch(d){case 4:case 0:y=l`vec4(0.0)`;break;case 2:u.uniforms.add(new a("backgroundColor",o=>o.backgroundColor)),y=l`vec4(backgroundColor, 1.0)`;break;case 3:u.include(r),y=l`vec4(gridColor(uv), 1.0)`;break;case 1:u.uniforms.add(new t("fboColor",o=>o.fboTexture)),y=l`texelFetch(fboColor, ivec2(gl_FragCoord.xy), 0)`}u.code.add(l`
     vec4 getBackground(vec2 uv) {
-      return ${d(C,p`baseOpacity *`)} ${L};
+      return ${s(p,l`baseOpacity *`)} ${y};
     }
 
     vec4 blendLayers(vec2 bgUV, vec4 colorLayer, float opacity) {
-      ${v?p`
+      ${m?l`
           vec3 cl = colorLayer.a == 0.0 ? colorLayer.rgb : colorLayer.rgb / colorLayer.a;
           vec4 bgColor = getBackground(bgUV);
           vec3 cb = bgColor.a == 0.0 ? bgColor.rgb : bgColor.rgb / bgColor.a;
-          return applyBlendMode(clamp(cl, vec3(0.0), vec3(1.0)), colorLayer.a * opacity, cb, bgColor.a);`:p`
+          return applyBlendMode(clamp(cl, vec3(0.0), vec3(1.0)), colorLayer.a * opacity, cb, bgColor.a);`:l`
           float composeAlpha = colorLayer.a * opacity;
-          ${B?p`return colorLayer * opacity;`:p`
+          ${f?l`return colorLayer * opacity;`:l`
             vec4 bgColor = getBackground(bgUV);
             return bgColor * (1.0 - composeAlpha) + colorLayer * opacity;`}`}
-    }`)}export{b as TileBackground,n as TileBackgroundPassParameters};
+    }`)}export{b as TileBackground,d as TileBackgroundPassParameters};

package/views/3d/webgl-engine/core/shaderLibrary/terrain/TileBlendInput.js

@@ -2,4 +2,3 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.34/esri/copyright.txt for details.
 */
-var o;!function(o){o[o.LayerOnly=0]="LayerOnly",o[o.ColorComposite=1]="ColorComposite",o[o.GridComposite=2]="GridComposite",o[o.COUNT=3]="COUNT"}(o||(o={}));export{o as TileBlendInput};

package/views/3d/webgl-engine/core/shaderLibrary/terrain/TileComposite.glsl.js

@@ -2,6 +2,6 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.34/esri/copyright.txt for details.
 */
-import{ZEROS as s}from"../../../../../../core/libs/gl-matrix-2/factories/vec2f64.js";import{Float2PassUniform as e}from"../../shaderModules/Float2PassUniform.js";import{FloatPassUniform as o}from"../../shaderModules/FloatPassUniform.js";import{glsl as t}from"../../shaderModules/glsl.js";import{VertexAttribute as r}from"../../../lib/VertexAttribute.js";import{NoParameters as a}from"../../../../../webgl/NoParameters.js";class i extends a{constructor(){super(...arguments),this.scale=1,this.offset=s}}function f(s){s.attributes.add(r.POSITION,"vec2"),s.attributes.add(r.UV0,"vec2"),s.varyings.add("uv","vec2"),s.varyings.add("vuv","vec2"),s.vertex.uniforms.add(new o("scale",s=>s.scale),new e("offset",s=>s.offset)).main.add(t`gl_Position = vec4(position, 0.0, 1.0);
+import{ZEROS as s}from"../../../../../../core/libs/gl-matrix-2/factories/vec2f64.js";import{Float2PassUniform as e}from"../../shaderModules/Float2PassUniform.js";import{FloatPassUniform as o}from"../../shaderModules/FloatPassUniform.js";import{glsl as t}from"../../shaderModules/glsl.js";import{NoParameters as r}from"../../../../../webgl/NoParameters.js";class a extends r{constructor(){super(...arguments),this.scale=1,this.offset=s}}function i(s){s.attributes.add("position","vec2"),s.attributes.add("uv0","vec2"),s.varyings.add("uv","vec2"),s.varyings.add("vuv","vec2"),s.vertex.uniforms.add(new o("scale",s=>s.scale),new e("offset",s=>s.offset)).main.add(t`gl_Position = vec4(position, 0.0, 1.0);
 uv = uv0 * scale + offset;
-vuv = uv0;`)}export{f as TileComposite,i as TileCompositePassParameters};
+vuv = uv0;`)}export{i as TileComposite,a as TileCompositePassParameters};

package/views/3d/webgl-engine/core/shaderLibrary/util/BlendLayers.glsl.js

@@ -2,4 +2,4 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.34/esri/copyright.txt for details.
 */
-import"../terrain/BackgroundGrid.glsl.js";import"../terrain/BlendLayersOutput.js";import"../terrain/TileBackground.glsl.js";import"../terrain/TileComposite.glsl.js";import"../../shaderModules/Float3PassUniform.js";import"../../shaderModules/FloatPassUniform.js";import"../../shaderModules/glsl.js";import"../../shaderModules/Texture2DPassUniform.js";import"../../../../../webgl/ShaderBuilder.js";export{a as BackgroundMode,b as build}from"../../../../../../chunks/BlendLayers.glsl.js";
+import"../terrain/BackgroundGrid.glsl.js";import"../terrain/TileBackground.glsl.js";import"../terrain/TileComposite.glsl.js";import"../../shaderModules/Float3PassUniform.js";import"../../shaderModules/FloatPassUniform.js";import"../../shaderModules/glsl.js";import"../../shaderModules/Texture2DPassUniform.js";import"../../../../../webgl/ShaderBuilder.js";export{b as build}from"../../../../../../chunks/BlendLayers.glsl.js";