@arcgis/core 4.23.3 → 4.24.0-next.20220329

package/chunks/ChapmanAtmosphere.glsl.js

@@ -1,14 +1,14 @@
 /*
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
-See https://js.arcgis.com/4.23/esri/copyright.txt for details.
+See https://js.arcgis.com/4.24/esri/copyright.txt for details.
 */
-import{TextureCoordinateAttribute as e,TextureCoordinateAttributeType as t}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 r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js";import{glsl as i}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 l}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function n(n){const s=new o;return s.attributes.add(l.POSITION,"vec2"),s.include(e,{attributeTextureCoordinates:t.Default}),s.varyings.add("worldRay","vec3"),s.varyings.add("eyeDir","vec3"),s.vertex.uniforms.add("inverseProjectionMatrix","mat4"),s.vertex.uniforms.add("inverseViewMatrix","mat4"),s.vertex.code.add(i`void main(void) {
+import{TextureCoordinateAttribute as e,TextureCoordinateAttributeType as t}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 r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js";import{Float2Uniform as i}from"../views/3d/webgl-engine/core/shaderModules/Float2Uniform.js";import{Float3Uniform as o}from"../views/3d/webgl-engine/core/shaderModules/Float3Uniform.js";import{Float4Uniform as n}from"../views/3d/webgl-engine/core/shaderModules/Float4Uniform.js";import{FloatUniform as s}from"../views/3d/webgl-engine/core/shaderModules/FloatUniform.js";import{glsl as l}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{Matrix4Uniform as c}from"../views/3d/webgl-engine/core/shaderModules/Matrix4Uniform.js";import{ShaderBuilder as d}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{Texture2DUniform as h}from"../views/3d/webgl-engine/core/shaderModules/Texture2DUniform.js";import{BindType as m}from"../views/3d/webgl-engine/core/shaderTechnique/BindType.js";import{VertexAttribute as p}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function g(g){const f=new d;f.attributes.add(p.POSITION,"vec2"),f.include(e,{textureCoordinateType:t.Default}),f.varyings.add("worldRay","vec3"),f.varyings.add("eyeDir","vec3");const{vertex:u,fragment:y}=f;return u.uniforms.add(new c("inverseProjectionMatrix",m.Pass,((e,t)=>t.camera.inverseProjectionMatrix))),u.uniforms.add(new c("inverseViewMatrix")),u.code.add(l`void main(void) {
 vec3 posViewNear = (inverseProjectionMatrix * vec4(position, -1, 1)).xyz;
 eyeDir = posViewNear;
 worldRay = (inverseViewMatrix * vec4(posViewNear, 0)).xyz;
 forwardTextureCoordinates();
 gl_Position = vec4(position, 1, 1);
-}`),s.fragment.uniforms.add("lightingMainDirection","vec3").add("radii","vec2").add("scaleHeight","float").add("cameraPosition","vec3").add("nearFar","vec2").add("heightParameters","vec4").add("innerFadeDistance","float").add("altitudeFade","float").add("depthTex","sampler2D").add("betaRayleigh","vec3").add("betaCombined","vec3").add("betaMie","float").add("hazeStrength","float"),s.include(r),n.haze&&s.fragment.include(a),s.fragment.code.add(i`vec2 sphereIntersect(vec3 start, vec3 dir, float radius, bool planet) {
+}`),y.uniforms.add(new o("lightingMainDirection")),y.uniforms.add(new i("radii")),y.uniforms.add(new s("scaleHeight")),y.uniforms.add(new o("cameraPosition")),y.uniforms.add(new n("heightParameters")),y.uniforms.add(new s("innerFadeDistance")),y.uniforms.add(new s("altitudeFade")),y.uniforms.add(new h("depthTex")),y.uniforms.add(new o("betaRayleigh")),y.uniforms.add(new o("betaCombined")),y.uniforms.add(new s("betaMie")),y.uniforms.add(new s("hazeStrength")),f.include(r),g.haze&&(y.include(a),y.uniforms.add(new i("nearFar",m.Pass,((e,t)=>t.camera.nearFar)))),y.code.add(l`vec2 sphereIntersect(vec3 start, vec3 dir, float radius, bool planet) {
 float a = dot(dir, dir);
 float b = 2.0 * dot(dir, start);
 float c = planet ? heightParameters[1] - radius * radius : heightParameters[2];
@@ -17,7 +17,7 @@ if (d < 0.0) {
 return vec2(1e5, -1e5);
 }
 return vec2((-b - sqrt(d)) / (2.0 * a), (-b + sqrt(d)) / (2.0 * a));
-}`),s.fragment.code.add(i`float chapmanApproximation(float X, float h, float cosZenith) {
+}`),y.code.add(l`float chapmanApproximation(float X, float h, float cosZenith) {
 float c = sqrt(X + h);
 float cExpH = c * exp(-h);
 if (cosZenith >= 0.0) {
@@ -27,9 +27,9 @@ float x0 = sqrt(1.0 - cosZenith * cosZenith) * (X + h);
 float c0 = sqrt(x0);
 return 2.0 * c0 * exp(X - x0) - cExpH / (1.0 - c * cosZenith);
 }
-}`),s.fragment.code.add(i`float getOpticalDepth(vec3 position, vec3 dir, float h) {
+}`),y.code.add(l`float getOpticalDepth(vec3 position, vec3 dir, float h) {
 return scaleHeight * chapmanApproximation(radii[0] / scaleHeight, h, dot(normalize(position), dir));
-}`),s.fragment.code.add(i`
+}`),y.code.add(l`
     const int STEPS = 6;
 
     float getGlow(float dist, float radius, float intensity) {
@@ -63,7 +63,7 @@ return scaleHeight * chapmanApproximation(radii[0] / scaleHeight, h, dot(normali
       float end = hitsPlanet ? rayPlanetIntersect.x : rayAtmosphereIntersect.y;
       float maxEnd = end;
 
-      ${n.haze?i`if (terrainDepth != -1.0) { end = terrainDepth; }`:""}
+      ${g.haze?l`if (terrainDepth != -1.0) { end = terrainDepth; }`:""}
 
       vec3 samplePoint = cameraPos + rayDir * end;
       float multiplier = hitsPlanet ? -1.0 : 1.0;
@@ -78,7 +78,7 @@ return scaleHeight * chapmanApproximation(radii[0] / scaleHeight, h, dot(normali
         float opticalDepth = multiplier * getOpticalDepth(samplePoint, rayDir * multiplier, scaleFract);
 
         if (i > 0) {
-          scattering *= ${n.haze?i``:" mix(2.5, 1.0, clamp((length(cameraPos) - radii[0]) / 50e3, 0.0, 1.0)) * "} exp(-(mix(betaCombined, betaRayleigh, 0.5) + betaMie) * max(0.0, (opticalDepth - lastOpticalDepth)));
+          scattering *= ${g.haze?l``:" mix(2.5, 1.0, clamp((length(cameraPos) - radii[0]) / 50e3, 0.0, 1.0)) * "} exp(-(mix(betaCombined, betaRayleigh, 0.5) + betaMie) * max(0.0, (opticalDepth - lastOpticalDepth)));
         }
 
         if (dot(normalize(samplePoint), lightDir) > -0.3) {
@@ -87,7 +87,7 @@ return scaleHeight * chapmanApproximation(radii[0] / scaleHeight, h, dot(normali
           float lightDepth = getOpticalDepth(samplePoint, lightDir, scaleFract);
 
           scattering += scale * exp(-(betaCombined + betaMie) * lightDepth);
-          ${n.haze?"":i`scattering += scale * exp(-(0.25 * betaCombined ) * lightDepth);`}
+          ${g.haze?"":l`scattering += scale * exp(-(0.25 * betaCombined ) * lightDepth);`}
         }
 
         lastOpticalDepth = opticalDepth;
@@ -99,7 +99,7 @@ return scaleHeight * chapmanApproximation(radii[0] / scaleHeight, h, dot(normali
 
       float phaseRayleigh = 0.05968310365 * mumu;
 
-      ${n.haze?i`return 3.0 * scattering * stepSize * phaseRayleigh * betaRayleigh;`:i`
+      ${g.haze?l`return 3.0 * scattering * stepSize * phaseRayleigh * betaRayleigh;`:l`
             const float g = 0.8;
             const float gg = g * g;
             float phaseMie = end == maxEnd ? 0.11936620731 * ((1.0 - gg) * mumu) / (pow(1.0 + gg - 2.0 * mu * g, 1.5) * (2.0 + gg)) : 0.0;
@@ -131,34 +131,34 @@ return scaleHeight * chapmanApproximation(radii[0] / scaleHeight, h, dot(normali
     void main() {
       vec3 rayDir = normalize(worldRay);
       float terrainDepth = -1.0;
-      ${n.haze?i`
+      ${g.haze?l`
           vec4 depthSample = texture2D(depthTex, vuv0).rgba;
           if (depthSample != vec4(0)) {
             vec3 cameraSpaceRay = normalize(eyeDir);
             cameraSpaceRay /= cameraSpaceRay.z;
             cameraSpaceRay *= -linearDepthFromTexture(depthTex, vuv0, nearFar);
             terrainDepth = max(0.0, length(cameraSpaceRay));
-          }`:i`
+          }`:l`
           float depthSample = texture2D(depthTex, vuv0).r;
           if (depthSample != 1.0) {
             gl_FragColor = vec4(0);
             return;
           }`}
 
-      ${n.haze?i`
+      ${g.haze?l`
             vec3 col = vec3(0);
             float fadeOut = smoothstep(-10000.0, -15000.0, heightParameters[0] - radii[0]);
             if(depthSample != vec4(0)){
               col = (1.0 - fadeOut) * hazeStrength * getAtmosphereColour(cameraPosition, rayDir, lightingMainDirection, terrainDepth);
             }
-            float alpha = 1.0 - fadeOut;`:i`
+            float alpha = 1.0 - fadeOut;`:l`
             vec3 col = getAtmosphereColour(cameraPosition, rayDir, lightingMainDirection, terrainDepth);;
             float alpha = smoothstep(0.0, mix(0.15, 0.01, heightParameters[3]), length(col));`}
       col = tonemapACES(col);
       gl_FragColor = delinearizeGamma(vec4(col, alpha));
-      ${n.haze?"":i`
+      ${g.haze?"":l`
           if (depthSample == 1.0) {
             gl_FragColor = applyUndergroundAtmosphere(rayDir, lightingMainDirection, gl_FragColor);
           }`}
     }
-  `),s}const s=Object.freeze({__proto__:null,build:n});export{s as C,n as b};
+  `),f}const f=Object.freeze(Object.defineProperty({__proto__:null,build:g},Symbol.toStringTag,{value:"Module"}));export{f as C,g as b};

package/chunks/CheckerBoard.glsl.js

@@ -1,16 +1,16 @@
 /*
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
-See https://js.arcgis.com/4.23/esri/copyright.txt for details.
+See https://js.arcgis.com/4.24/esri/copyright.txt for details.
 */
-import{ReadLinearDepth as e}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{multipassTerrainTest as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{ColorConversion as a}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{glsl as i}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as d}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as o}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function t(t){const s=new d;return s.extensions.add("GL_OES_standard_derivatives"),s.attributes.add(o.POSITION,"vec3"),s.attributes.add(o.UV0,"vec2"),s.vertex.uniforms.add("proj","mat4").add("view","mat4"),s.varyings.add("vUV","vec2"),t.multipassTerrainEnabled&&s.varyings.add("depth","float"),s.vertex.code.add(i`
+import{multipassTerrainTest as e}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{ColorConversion as r}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{addProjViewLocalOrigin as i}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float2Uniform as o}from"../views/3d/webgl-engine/core/shaderModules/Float2Uniform.js";import{Float4Uniform as a}from"../views/3d/webgl-engine/core/shaderModules/Float4Uniform.js";import{glsl as s}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as t}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{TransparencyPassType as d}from"../views/3d/webgl-engine/lib/basicInterfaces.js";import{VertexAttribute as l}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function n(n){const g=new t;return g.extensions.add("GL_OES_standard_derivatives"),i(g,n),g.attributes.add(l.POSITION,"vec3"),g.attributes.add(l.UV0,"vec2"),g.varyings.add("vUV","vec2"),n.hasMultipassTerrain&&g.varyings.add("depth","float"),g.vertex.code.add(s`
     void main(void) {
       vUV = uv0;
-      ${t.multipassTerrainEnabled?"depth = (view * vec4(position, 1.0)).z;":""}
+      ${n.hasMultipassTerrain?"depth = (view * vec4(position, 1.0)).z;":""}
       gl_Position = proj * view * vec4(position, 1.0);
     }
-  `),t.multipassTerrainEnabled&&(s.fragment.include(e),s.include(r,t)),s.fragment.uniforms.add("size","vec2").add("color1","vec4").add("color2","vec4"),s.fragment.include(a),s.fragment.code.add(i`
+  `),g.include(e,n),g.fragment.uniforms.add(new o("size")),g.fragment.uniforms.add(new a("color1")),g.fragment.uniforms.add(new a("color2")),g.fragment.include(r),g.fragment.code.add(s`
     void main() {
-      ${t.multipassTerrainEnabled?"terrainDepthTest(gl_FragCoord, depth);":""}
+      ${n.hasMultipassTerrain?"terrainDepthTest(gl_FragCoord, depth);":""}
       vec2 uvScaled = vUV / (2.0 * size);
 
       vec2 uv = fract(uvScaled - 0.25);
@@ -19,6 +19,6 @@ import{ReadLinearDepth as e}from"../views/3d/webgl-engine/core/shaderLibrary/out
       float t = mix(abs(ab.x + ab.y), 0.5, fade);
 
       gl_FragColor = mix(color2, color1, t);
-      ${t.oitEnabled?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}
+      ${n.transparencyPassType===d.Color?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}
     }
-  `),s}const s=Object.freeze({__proto__:null,build:t});export{s as C,t as b};
+  `),g}const g=Object.freeze(Object.defineProperty({__proto__:null,build:n},Symbol.toStringTag,{value:"Module"}));export{g as C,n as b};

package/chunks/Clouds.glsl.js

@@ -1,9 +1,9 @@
 /*
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
-See https://js.arcgis.com/4.23/esri/copyright.txt for details.
+See https://js.arcgis.com/4.24/esri/copyright.txt for details.
 */
-import{ATLAS_SIZE as t,TILE_ROWS as e,TILE_SIZE as a,TEXTURE_SCALE as o}from"../views/3d/environment/NoiseTextureAtlas.js";import{ScreenSpacePass as i}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.js";import{glsl as n}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as r}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";var l;function s(s){const c=new r;return c.include(i,!1),c.fragment.uniforms.add("cloudRadius","float").add("halfCubeMapSize","float").add("power","float").add("sigmaE","float").add("density","float").add("cloudSize","float").add("detailSize","float").add("smoothness","float").add("cloudHeight","float").add("coverage","float").add("view","mat3").add("cloudShapeTexture","sampler2D"),c.fragment.code.add(n`
-    const int STEPS = ${s.steps===l.SIXTEEN?n`16`:s.steps===l.HUNDRED?n`100`:n`200`};
+import{RayMarchingSteps as e}from"../views/3d/environment/CloudsTechniqueConfiguration.js";import{ATLAS_SIZE as t,TILE_ROWS as a,TILE_SIZE as o,TEXTURE_SCALE as i}from"../views/3d/environment/NoiseTextureAtlas.js";import{ScreenSpacePass as n}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.js";import{FloatUniform as r}from"../views/3d/webgl-engine/core/shaderModules/FloatUniform.js";import{glsl as s}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{Matrix3Uniform as l}from"../views/3d/webgl-engine/core/shaderModules/Matrix3Uniform.js";import{ShaderBuilder as c}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{Texture2DUniform as d}from"../views/3d/webgl-engine/core/shaderModules/Texture2DUniform.js";function u(u){const f=new c;return f.include(n,!1),f.fragment.uniforms.add(new r("cloudRadius")),f.fragment.uniforms.add(new r("halfCubeMapSize")),f.fragment.uniforms.add(new r("power")),f.fragment.uniforms.add(new r("sigmaE")),f.fragment.uniforms.add(new r("density")),f.fragment.uniforms.add(new r("cloudSize")),f.fragment.uniforms.add(new r("detailSize")),f.fragment.uniforms.add(new r("smoothness")),f.fragment.uniforms.add(new r("cloudHeight")),f.fragment.uniforms.add(new r("coverage")),f.fragment.uniforms.add(new l("view")),f.fragment.uniforms.add(new d("cloudShapeTexture")),f.fragment.code.add(s`
+    const int STEPS = ${u.steps===e.SIXTEEN?s`16`:u.steps===e.HUNDRED?s`100`:s`200`};
     const int STEPS_LIGHT = 6;
     const float stepL = 300.0 / float(STEPS_LIGHT);
 
@@ -20,15 +20,15 @@ import{ATLAS_SIZE as t,TILE_ROWS as e,TILE_SIZE as a,TEXTURE_SCALE as o}from"../
 
     float saturate(float x) {
       return clamp(x, 0.0, 1.0);
-    }`),c.fragment.code.add(n`
+    }`),f.fragment.code.add(s`
     float getCloudShape(vec3 pos, float pOffset) {
-      const float textureWidth = ${n.float(t)};
-      const float dataWidth = ${n.float(t)};
-      const float tileRows = ${n.float(e)};
-      const vec3 atlasDimensions = vec3(${n.float(a)}, ${n.float(a)}, tileRows * tileRows);
+      const float textureWidth = ${s.float(t)};
+      const float dataWidth = ${s.float(t)};
+      const float tileRows = ${s.float(a)};
+      const vec3 atlasDimensions = vec3(${s.float(o)}, ${s.float(o)}, tileRows * tileRows);
 
       //Change from Y being height to Z being height
-      vec3 p = float(${n.float(o)}) * pos.xzy;
+      vec3 p = float(${s.float(i)}) * pos.xzy;
 
       //Pixel coordinates of point in the 3D data
       vec3 coord = vec3(mod(p - pOffset * atlasDimensions, atlasDimensions));
@@ -43,7 +43,7 @@ import{ATLAS_SIZE as t,TILE_ROWS as e,TILE_SIZE as a,TEXTURE_SCALE as o}from"../
       vec2 data = texture2D(cloudShapeTexture, mod(pixel, dataWidth) / textureWidth).xy;
 
       return 1.0 - mix(data.x, data.y, f);
-    }`),c.fragment.code.add(n`float clouds(vec3 p) {
+    }`),f.fragment.code.add(s`float clouds(vec3 p) {
 float cloudVariations = getCloudShape(0.002 * p, 0.5);
 float cloud = saturate(0.5 * mix(0.0, 1.0, min(2.0 * coverage, 1.0)));
 cloud += (cloudVariations * 0.6 - 0.3) * ( -4.0 * (coverage * coverage - coverage));
@@ -56,7 +56,7 @@ if (cloud <= 0.0) {
 return 0.0;
 }
 return density * saturate(remap(cloud, smoothness * getCloudShape(detailSize * p, 0.0), 1.0, 0.0, 1.0));
-}`),c.fragment.code.add(n`vec2 sphereIntersections(vec3 start, vec3 dir, float radius) {
+}`),f.fragment.code.add(s`vec2 sphereIntersections(vec3 start, vec3 dir, float radius) {
 float a = dot(dir, dir);
 float b = 2.0 * dot(dir, start);
 float c = dot(start, start) - (radius * radius);
@@ -68,7 +68,7 @@ return vec2((-b - sqrt(d)) / (2.0 * a), (-b + sqrt(d)) / (2.0 * a));
 }
 float HenyeyGreenstein(float g, float costh) {
 return (1.0 / (4.0 * 3.1415))  * ((1.0 - g * g) / pow(1.0 + g * g - 2.0 * g * costh, 1.5));
-}`),c.fragment.code.add("\n    vec3 multipleOctaves(float extinction, float mu, float stepL) {\n      float attenuation = 1.0;\n      float contribution = 1.0;\n      float phaseAttenuation = 1.0;\n      vec3 luminance = vec3(0);\n\n      for (int i = 0; i < 4; i++) {\n        float phase = mix(HenyeyGreenstein(0.0, mu), HenyeyGreenstein(0.3 * phaseAttenuation, mu), 0.7);\n        luminance += contribution * phase * exp(-stepL * extinction * sigmaE * attenuation);\n        attenuation *= 0.2;\n        contribution *= 0.6;\n        phaseAttenuation *= 0.5;\n      }\n\n      return luminance;\n    }"),c.fragment.code.add(n`vec3 lightRay(vec3 org, vec3 p, float phaseFunction, float mu, vec3 sunDirection) {
+}`),f.fragment.code.add("\n    vec3 multipleOctaves(float extinction, float mu, float stepL) {\n      float attenuation = 1.0;\n      float contribution = 1.0;\n      float phaseAttenuation = 1.0;\n      vec3 luminance = vec3(0);\n\n      for (int i = 0; i < 4; i++) {\n        float phase = mix(HenyeyGreenstein(0.0, mu), HenyeyGreenstein(0.3 * phaseAttenuation, mu), 0.7);\n        luminance += contribution * phase * exp(-stepL * extinction * sigmaE * attenuation);\n        attenuation *= 0.2;\n        contribution *= 0.6;\n        phaseAttenuation *= 0.5;\n      }\n\n      return luminance;\n    }"),f.fragment.code.add(s`vec3 lightRay(vec3 org, vec3 p, float phaseFunction, float mu, vec3 sunDirection) {
 float lightRayDensity = clouds(p);
 lightRayDensity += clouds(p + sunDirection * 1.0 * stepL);
 lightRayDensity += clouds(p + sunDirection * 2.0 * stepL);
@@ -77,7 +77,7 @@ lightRayDensity += clouds(p + sunDirection * 4.0 * stepL);
 lightRayDensity += clouds(p + sunDirection * 5.0 * stepL);
 vec3 beersLaw = multipleOctaves(lightRayDensity, mu, stepL);
 return mix(beersLaw * 2.0 * (1.0 - (exp(-stepL * lightRayDensity * 2.0 * sigmaE ))), beersLaw, 0.5 + 0.5 * mu);
-}`),c.fragment.code.add(n`vec3 mainRay(vec3 org, vec3 dir, vec3 sunDirection, float distToStart, float totalDistance, out float totalTransmittance) {
+}`),f.fragment.code.add(s`vec3 mainRay(vec3 org, vec3 dir, vec3 sunDirection, float distToStart, float totalDistance, out float totalTransmittance) {
 if (dir.z < 0.0) {
 return vec3(0);
 }
@@ -107,7 +107,7 @@ dist += stepS;
 p = org + dir * dist;
 }
 return color;
-}`),c.fragment.code.add(n`void main() {
+}`),f.fragment.code.add(s`void main() {
 vec3 rayDir = rayDirection(gl_FragCoord.xy);
 rayDir = normalize(view * rayDir);
 vec3 viewPos = vec3(0, 0, cloudRadius + 1.0);
@@ -124,4 +124,4 @@ float totalTransmittance = 1.0;
 vec3 sunDirection = normalize(vec3(0, 0, 1));
 vec3 col = 0.5 * mainRay(viewPos, rayDir, sunDirection, distToStart, totalDistance, totalTransmittance).rgb;
 gl_FragColor = vec4(col, totalTransmittance);
-}`),c}!function(t){t[t.SIXTEEN=0]="SIXTEEN",t[t.HUNDRED=1]="HUNDRED",t[t.TWOHUNDRED=2]="TWOHUNDRED",t[t.COUNT=3]="COUNT"}(l||(l={}));const c=Object.freeze({__proto__:null,get RayMarchingSteps(){return l},build:s});export{c as C,l as R,s as b};
+}`),f}const f=Object.freeze(Object.defineProperty({__proto__:null,build:u},Symbol.toStringTag,{value:"Module"}));export{f as C,u as b};

package/chunks/CloudsComposition.glsl.js

@@ -1,12 +1,12 @@
 /*
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
-See https://js.arcgis.com/4.23/esri/copyright.txt for details.
+See https://js.arcgis.com/4.24/esri/copyright.txt for details.
 */
-import{EvaluateAmbientLighting as e}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientLighting.glsl.js";import{EvaluateMainLighting as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateMainLighting.glsl.js";import{Gamma as i}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js";import{PBRMode as o}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{PiUtils as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PiUtils.glsl.js";import{CloudsParallaxShading as n}from"../views/3d/webgl-engine/core/shaderLibrary/util/CloudsParallaxShading.glsl.js";import{ColorConversion as s}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{RgbaFloatEncoding as d}from"../views/3d/webgl-engine/core/shaderLibrary/util/RgbaFloatEncoding.glsl.js";import{glsl as l}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as t}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as g}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function c(){const c=new t;return c.attributes.add(g.POSITION,"vec2"),c.varyings.add("worldRay","vec3"),c.vertex.uniforms.add("inverseProjectionMatrix","mat4"),c.vertex.uniforms.add("inverseViewMatrix","mat4"),c.vertex.code.add(l`void main(void) {
+import{EvaluateAmbientLighting as e}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientLighting.glsl.js";import{EvaluateMainLighting as i}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateMainLighting.glsl.js";import{Gamma as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js";import{PBRMode as o}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{PiUtils as n}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PiUtils.glsl.js";import{CloudsParallaxShading as s}from"../views/3d/webgl-engine/core/shaderLibrary/util/CloudsParallaxShading.glsl.js";import{ColorConversion as a}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{RgbaFloatEncoding as d}from"../views/3d/webgl-engine/core/shaderLibrary/util/RgbaFloatEncoding.glsl.js";import{Float3Uniform as l}from"../views/3d/webgl-engine/core/shaderModules/Float3Uniform.js";import{glsl as t}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{Matrix4Uniform as g}from"../views/3d/webgl-engine/core/shaderModules/Matrix4Uniform.js";import{ShaderBuilder as c}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{BindType as m}from"../views/3d/webgl-engine/core/shaderTechnique/BindType.js";import{VertexAttribute as w}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function u(){const u=new c;u.attributes.add(w.POSITION,"vec2"),u.varyings.add("worldRay","vec3");const{vertex:b,fragment:v}=u;return b.uniforms.add(new g("inverseProjectionMatrix",m.Pass,((e,i)=>i.camera.inverseProjectionMatrix))),b.uniforms.add(new g("inverseViewMatrix")),b.code.add(t`void main(void) {
 vec3 posViewNear = (inverseProjectionMatrix * vec4(position, -1.0, 1.0)).xyz;
 worldRay = (inverseViewMatrix * vec4(posViewNear, 0.0)).xyz;
 gl_Position = vec4(position, 1.0, 1.0);
-}`),c.fragment.uniforms.add("lightingMainDirection","vec3"),c.fragment.include(s),c.fragment.include(d),c.include(r),c.include(e,{pbrMode:o.Disabled,lightingSphericalHarmonicsOrder:2}),c.include(a),c.include(i),c.include(n),c.fragment.code.add(l`void main() {
+}`),v.uniforms.add(new l("lightingMainDirection")),v.include(a),v.include(d),u.include(i),u.include(e,{pbrMode:o.Disabled,lightingSphericalHarmonicsOrder:2}),u.include(n),u.include(r),u.include(s,{instancedDoublePrecision:!1}),v.code.add(t`void main() {
 vec4 cloudsColor = crossFade == 0 ? renderCloud(normalize(worldRay), cameraPosition) : renderCloudCrossFade(normalize(worldRay), cameraPosition);
 gl_FragColor = vec4((1.0 - totalFadeInOut) * cloudsColor.rgb, cloudsColor.a);
-}`),c}const m=Object.freeze({__proto__:null,build:c});export{m as C,c as b};
+}`),u}const b=Object.freeze(Object.defineProperty({__proto__:null,build:u},Symbol.toStringTag,{value:"Module"}));export{b as C,u as b};

package/chunks/ColorMaterial.glsl.js

@@ -1,28 +1,28 @@
 /*
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
-See https://js.arcgis.com/4.23/esri/copyright.txt for details.
+See https://js.arcgis.com/4.24/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 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`
+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 o}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{VertexColor as i}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexColor.glsl.js";import{OutputDepth as s}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.glsl.js";import{OutputHighlight as t}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{multipassTerrainTest as l}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{symbolAlphaCutoff as a}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{addProjViewLocalOrigin as d}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float2Uniform as g}from"../views/3d/webgl-engine/core/shaderModules/Float2Uniform.js";import{Float4Uniform as p}from"../views/3d/webgl-engine/core/shaderModules/Float4Uniform.js";import{glsl as u}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as h}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{BindType as m}from"../views/3d/webgl-engine/core/shaderTechnique/BindType.js";import{TransparencyPassType as c}from"../views/3d/webgl-engine/lib/basicInterfaces.js";import{VertexAttribute as v}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function w(w){const f=new h,b=w.output===e.Depth;d(f,w),f.include(o,{hasModelTransformation:!1,linearDepth:b}),f.include(i,w),f.attributes.add(v.POSITION,"vec3"),f.varyings.add("vpos","vec3"),w.hasMultipassTerrain&&f.varyings.add("depth","float");const{vertex:j,fragment:C}=f;return b&&(f.include(s,w),j.uniforms.add(new g("nearFar",m.Pass,((e,r)=>r.camera.nearFar))),f.varyings.add("linearDepth","float")),j.code.add(u`
     void main(void) {
       vpos = position;
       forwardNormalizedVertexColor();
-      ${m.multipassTerrainEnabled?"depth = (view * vec4(vpos, 1.0)).z;":""}
-      gl_Position = ${v?p`transformPositionWithDepth(proj, view, vpos, nearFar, linearDepth);`:p`transformPosition(proj, view, vpos);`}
+      ${w.hasMultipassTerrain?"depth = (view * vec4(vpos, 1.0)).z;":""}
+      gl_Position = ${b?u`transformPositionWithDepth(proj, view, vpos, nearFar, linearDepth);`:u`transformPosition(proj, view, vpos);`}
     }
-  `),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`
+  `),f.include(r,w),f.include(l,w),C.include(n),C.uniforms.add(new p("eColor")),w.output===e.Highlight&&f.include(t),C.code.add(u`
   void main() {
     discardBySlice(vpos);
-    ${m.multipassTerrainEnabled?"terrainDepthTest(gl_FragCoord, depth);":""}
-    vec4 fColor = ${m.attributeColor?"vColor * eColor;":"eColor;"}
+    ${w.hasMultipassTerrain?"terrainDepthTest(gl_FragCoord, depth);":""}
+    vec4 fColor = ${w.hasVertexColors?"vColor * eColor;":"eColor;"}
 
-    if (fColor.a < ${p.float(n)}) {
+    if (fColor.a < ${u.float(a)}) {
       discard;
     }
 
-    ${m.output===e.Alpha?p`gl_FragColor = vec4(fColor.a);`:""}
+    ${w.output===e.Alpha?u`gl_FragColor = vec4(fColor.a);`:""}
 
-    ${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);`:""};
+    ${w.output===e.Color?u`gl_FragColor = highlightSlice(fColor, vpos); ${w.transparencyPassType===c.Color?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}`:""}
+    ${w.output===e.Highlight?u`outputHighlight();`:""};
+    ${w.output===e.Depth?u`outputDepth(linearDepth);`:""};
   }
-  `),h}const h=Object.freeze({__proto__:null,build:m});export{h as C,m as b};
+  `),f}const f=Object.freeze(Object.defineProperty({__proto__:null,build:w},Symbol.toStringTag,{value:"Module"}));export{f as C,w as b};

package/chunks/ComponentShader.glsl.js

@@ -1,13 +1,13 @@
 /*
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
-See https://js.arcgis.com/4.23/esri/copyright.txt for details.
+See https://js.arcgis.com/4.24/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 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))};
+import{earth as e,mars as r,moon as o}from"../geometry/support/Ellipsoid.js";import{IntegratedMeshMode as a}from"../views/3d/webgl-engine/collections/Component/Material/ComponentTechniqueConfiguration.js";import{ComponentData as i,ComponentDataType as t}from"../views/3d/webgl-engine/collections/Component/Material/shader/ComponentData.glsl.js";import{VertexDiscardByOpacity as l}from"../views/3d/webgl-engine/collections/Component/Material/shader/VertexDiscardByOpacity.glsl.js";import{ForwardLinearDepth as n}from"../views/3d/webgl-engine/core/shaderLibrary/ForwardLinearDepth.glsl.js";import{ShaderOutput as d}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 f}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeShadingNormal.glsl.js";import{EvaluateSceneLighting as y}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 j}from"../views/3d/webgl-engine/core/shaderLibrary/terrain/Overlay.glsl.js";import{DiscardOrAdjustAlpha as T,symbolAlphaCutoff as N}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 P}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{Matrix4Uniform as W}from"../views/3d/webgl-engine/core/shaderModules/Matrix4Uniform.js";import{ShaderBuilder as R}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{Texture2DUniform as D}from"../views/3d/webgl-engine/core/shaderModules/Texture2DUniform.js";import{TransparencyPassType as B}from"../views/3d/webgl-engine/lib/basicInterfaces.js";import{VertexAttribute as _}from"../views/3d/webgl-engine/lib/VertexAttribute.js";const V=new Map([[_.POSITION,0],[_.NORMAL,1],[_.NORMALCOMPRESSED,1],[_.COLOR,2],[_.UV0,3],[_.UVREGION,4],[_.COMPONENTINDEX,5]]);function $(_){const V=new R;V.include(u,_),V.include(v,_),V.include(m,_),V.include(g,_),V.include(n,_),V.include(i,_),V.include(T,_),V.include(s,_),V.include(L,_),V.include(l,_),V.fragment.uniforms.add(new W("view")),_.pbrMode!==M.Normal&&_.pbrMode!==M.Schematic||(V.include(O,_),_.hasNormalTexture&&V.include(b,_)),_.output===d.Shadow&&_.componentData===t.Varying?V.vertex.code.add(P`#define discardShadows(castShadows) { if(!castShadows) { gl_Position = vec4(1e38, 1e38, 1e38, 1.0); return; } }`):V.vertex.code.add(P`#define discardShadows(castShadows) {}`);const $=_.integratedMeshMode===a.ColorOverlay||_.integratedMeshMode===a.ColorOverlayWithWater,z=$&&_.output===d.Color&&_.pbrMode===M.WaterOnIntegratedMesh;return $&&(V.include(y,_),V.include(j,_),_.spherical?V.vertex.code.add(P`
+      const float invEllipsoidRadius = ${P.float(1/(_.ellipsoidMode===A.Earth?e.radius:_.ellipsoidMode===A.Mars?r.radius:o.radius))};
       vec2 projectOverlay(vec3 pos) {
         return pos.xy / (1.0 + invEllipsoidRadius * pos.z);
       }
-      `):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`
+      `):V.vertex.code.add(P`vec2 projectOverlay(vec3 pos) { return pos.xy; }`)),z&&(V.varyings.add("tbnTangent","vec3"),V.varyings.add("tbnBiTangent","vec3"),V.varyings.add("groundNormal","vec3"),V.varyings.add("positionView","vec3")),V.vertex.code.add(P`
     void main() {
       bool castShadows;
       vec4 externalColor = forwardExternalColor(castShadows);
@@ -15,33 +15,33 @@ import{earth as e,mars as r,moon as o}from"../geometry/support/Ellipsoid.js";imp
 
       vertexDiscardByOpacity(externalColor.a);
 
-      if (externalColor.a < ${E.float(j)}) {
+      if (externalColor.a < ${P.float(N)}) {
         // Discard this vertex
         gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
         return;
       }
       forwardPosition();
       forwardNormal();
-      ${D?E`
+      ${z?P`
         positionView = position_view();
-        ${R.viewingMode===a.Global?E`
+        ${_.spherical?P`
         groundNormal = normalize(positionWorld());
         tbnTangent = normalize(cross(vec3(0.0, 0.0, 1.0), groundNormal));
-        tbnBiTangent = normalize(cross(groundNormal, tbnTangent));`:E`
+        tbnBiTangent = normalize(cross(groundNormal, tbnTangent));`:P`
         groundNormal = vec3(0.0, 0.0, 1.0);
         tbnTangent = vec3(1.0, 0.0, 0.0);
         tbnBiTangent = normalize(cross(groundNormal, tbnTangent));`}
         `:""}
 
-      ${R.overlayEnabled?E`setOverlayVTC(projectOverlay(position));`:""}
+      ${$?P`setOverlayVTC(projectOverlay(position));`:""}
       forwardTextureCoordinates();
       forwardVertexColor();
       forwardLinearDepth(); // depends on forwardPosition()
     }
-  `),R.output===n.Alpha&&(W.fragment.include(C),R.multipassTerrainEnabled&&W.include(x,R),W.include(w,R),W.fragment.code.add(E`
+  `),_.output===d.Alpha&&(V.fragment.include(C),V.include(x,_),V.include(w,_),V.fragment.code.add(P`
       void main() {
         discardBySlice(vPositionWorldCameraRelative);
-        ${R.multipassTerrainEnabled?E`terrainDepthTest(gl_FragCoord, vPosition_view.z);`:""}
+        ${_.hasMultipassTerrain?P`terrainDepthTest(gl_FragCoord, vPosition_view.z);`:""}
 
         vec4 textureColor = readBaseColorTexture();
         discardOrAdjustAlpha(textureColor);
@@ -55,19 +55,19 @@ import{earth as e,mars as r,moon as o}from"../geometry/support/Ellipsoid.js";imp
           externalColor,
           externalColorMixMode
         );
-        ${R.overlayEnabled?E`
+        ${$?P`
         vec4 overlayColorOpaque = getOverlayColor(ovColorTex, vtcOverlay);
         vec4 overlayColor = overlayOpacity * overlayColorOpaque;
         materialColor = materialColor * (1.0 - overlayColor.a) + overlayColor;`:""}
 
         gl_FragColor = vec4(materialColor.a);
       }
-    `)),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() {
+    `)),_.output===d.Color&&(V.fragment.include(C),V.include(x,_),V.include(w,_),V.include(f,_),V.include(y,_),z&&V.fragment.uniforms.add(new D("ovNormalTex")),_.receiveShadows?(V.include(S,_),V.fragment.code.add(P`float evaluateShadow() {
 return readShadowMap(vPositionWorldCameraRelative, linearDepth);
-}`)):W.fragment.code.add(E`float evaluateShadow() { return 0.0; }`),W.fragment.code.add(E`
+}`)):V.fragment.code.add(P`float evaluateShadow() { return 0.0; }`),V.fragment.code.add(P`
       void main() {
         discardBySlice(vPositionWorldCameraRelative);
-        ${R.multipassTerrainEnabled?E`terrainDepthTest(gl_FragCoord, vPosition_view.z);`:""}
+        ${_.hasMultipassTerrain?P`terrainDepthTest(gl_FragCoord, vPosition_view.z);`:""}
 
         vec4 textureColor = readBaseColorTexture();
         discardOrAdjustAlpha(textureColor);
@@ -81,30 +81,30 @@ return readShadowMap(vPositionWorldCameraRelative, linearDepth);
           externalColor,
           externalColorMixMode
         );
-        ${R.overlayEnabled?E`
+        ${$?P`
         vec4 overlayColorOpaque = getOverlayColor(ovColorTex, vtcOverlay);
         vec4 overlayColor = overlayOpacity * overlayColorOpaque;
         materialColor = materialColor * (1.0 - overlayColor.a) + overlayColor;`:""}
-    `),R.pbrMode===M.Normal||R.pbrMode===M.Schematic?(W.fragment.code.add(E`
-        ${R.pbrMode===M.Normal?E`
+    `),_.pbrMode===M.Normal||_.pbrMode===M.Schematic?(V.fragment.code.add(P`
+        ${_.pbrMode===M.Normal?P`
         applyPBRFactors();
         if (int(externalColorMixMode) == 3) {
           mrr = vec3(0.0, 0.6, 0.2);
         }`:""}
         vec3 normalVertex = shadingNormalWorld();
         float additionalIrradiance = 0.02 * lightingMainIntensity[2];
-      `),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);
+      `),_.hasNormalTexture?V.fragment.code.add(P`mat3 tangentSpace = computeTangentSpace(normalVertex, vPositionWorldCameraRelative, vuv0);
+vec3 shadingNormal = computeTextureNormal(tangentSpace, vuv0);`):V.fragment.code.add(P`vec3 shadingNormal = normalVertex;`),V.fragment.code.add(P`${_.spherical?P`vec3 normalGround = normalize(positionWorld());`:P`vec3 normalGround = vec3(0.0, 0.0, 1.0);`}
+      `),V.fragment.code.add(P`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?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`
+vec4 shadedColor = vec4(evaluateSceneLightingPBR(shadingNormal, materialColor.rgb, evaluateShadow(), ssao, additionalLight, viewDir, normalGround, mrr, emission, additionalIrradiance), materialColor.a);`)):(_.receiveShadows?V.fragment.code.add(P`float shadow = evaluateShadow();`):_.spherical?V.fragment.code.add(P`float additionalAmbientScale = additionalDirectedAmbientLight(positionWorld());
+float shadow = lightingGlobalFactor * (1.0 - additionalAmbientScale);`):V.fragment.code.add(P`float shadow = 0.0;`),V.fragment.code.add(P`
       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);
-      ${D?E`
+      ${z?P`
           vec4 overlayWaterMask = getOverlayColor(ovNormalTex, vtcOverlay);
           float waterNormalLength = length(overlayWaterMask);
           if (waterNormalLength > 0.95) {
@@ -115,16 +115,16 @@ float shadow = lightingGlobalFactor * (1.0 - additionalAmbientScale);`):W.fragme
             // un-gamma the ground color to mix in linear space
             shadedColor = mix(shadedColor, waterColorNonLinear, waterColorLinear.w);
           }`:""}
-      `)),W.fragment.code.add(E`
+      `)),V.fragment.code.add(P`
         gl_FragColor = highlightSlice(shadedColor, vPositionWorldCameraRelative);
-        ${R.oitEnabled?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}
+        ${_.transparencyPassType===B.Color?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}
       }
-    `)),R.output!==n.Depth&&R.output!==n.Shadow||(W.include(p,R),W.fragment.code.add(E`void main() {
+    `)),_.output!==d.Depth&&_.output!==d.Shadow||(V.include(p,_),V.fragment.code.add(P`void main() {
 discardBySlice(vPositionWorldCameraRelative);
 vec4 textureColor = readBaseColorTexture();
 discardOrAdjustAlpha(textureColor);
 outputDepth(linearDepth);
-}`)),R.output===n.Normal&&(W.include(y,R),W.fragment.code.add(E`
+}`)),_.output===d.Normal&&(V.include(f,_),V.fragment.code.add(P`
       void main() {
         discardBySlice(vPositionWorldCameraRelative);
 
@@ -133,17 +133,17 @@ 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.Ground?"0.0":"1.0"};
+        float alpha = ${_.normalType===c.Ground?"0.0":"1.0"};
         gl_FragColor = vec4(vec3(.5) + .5 * shadingNormal_view(), alpha);
       }
-    `)),R.output===n.Highlight&&(W.include(h),W.fragment.code.add(E`
+    `)),_.output===d.Highlight&&(V.include(h),V.fragment.code.add(P`
       void main() {
         discardBySlice(vPositionWorldCameraRelative);
 
         vec4 textureColor = readBaseColorTexture();
         discardOrAdjustAlpha(textureColor);
 
-        ${R.overlayEnabled?E`
+        ${$?P`
         vec4 overlayColor = getCombinedOverlayColor();
 
         if (overlayColor.a == 0.0) {
@@ -153,4 +153,4 @@ outputDepth(linearDepth);
 
         outputHighlight();
       }
-    `)),W}const B=Object.freeze({__proto__:null,attributeLocations:W,build:D});export{B as C,W as a,D as b};
+    `)),V}const z=Object.freeze(Object.defineProperty({__proto__:null,attributeLocations:V,build:$},Symbol.toStringTag,{value:"Module"}));export{z as C,V as a,$ as b};

package/chunks/Compositing.glsl.js

@@ -1,18 +1,18 @@
 /*
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
-See https://js.arcgis.com/4.23/esri/copyright.txt for details.
+See https://js.arcgis.com/4.24/esri/copyright.txt for details.
 */
-import{ScreenSpacePass as r}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.js";import{glsl as e}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as a}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";var t;function o(o){const n=new a;return n.include(r),n.fragment.uniforms.add("tex","sampler2D"),o.function===t.Standard&&(o.hasOpacityFactor?(n.fragment.uniforms.add("opacity","float"),n.fragment.code.add(e`void main() {
+import{neverReached as e}from"../core/compilerUtils.js";import{ScreenSpacePass as r}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.js";import{FloatUniform as a}from"../views/3d/webgl-engine/core/shaderModules/FloatUniform.js";import{IntegerUniform as o}from"../views/3d/webgl-engine/core/shaderModules/IntegerUniform.js";import{glsl as t}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as n}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{Texture2DUniform as i}from"../views/3d/webgl-engine/core/shaderModules/Texture2DUniform.js";import{CompositingFunction as d}from"../views/3d/webgl-engine/shaders/CompositingTechniqueConfiguration.js";function s(s){const c=new n;switch(c.include(r),s.function){case d.Standard:c.fragment.uniforms.add(new i("tex")),s.hasOpacityFactor?(c.fragment.uniforms.add(new a("opacity")),c.fragment.code.add(t`void main() {
 gl_FragColor = texture2D(tex, uv) * opacity;
-}`)):n.fragment.code.add(e`void main() {
+}`)):c.fragment.code.add(t`void main() {
 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);
-        gl_FragColor = texture2D(tex, overlayUV) ${o.hasOpacityFactor?"* opacity":""};
-      }`)),o.function===t.TransparentToHUDVisibility&&n.fragment.code.add(e`void main() {
+}`);break;case d.OverlayWithTransparency:c.fragment.uniforms.add(new i("tex")),c.fragment.uniforms.add(new o("overlayIdx")),s.hasOpacityFactor&&c.fragment.uniforms.add(new a("opacity")),c.fragment.code.add(t`
+        void main() {
+          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) ${s.hasOpacityFactor?"* opacity":""};
+        }`);break;case d.TransparentToHUDVisibility:c.fragment.uniforms.add(new i("tex")),c.fragment.code.add(t`void main() {
 gl_FragColor = vec4(1.0 - texture2D(tex, uv).a);
-}`),o.function===t.Transparency&&(n.fragment.uniforms.add("colorTexture","sampler2D"),n.fragment.uniforms.add("alphaTexture","sampler2D"),n.fragment.uniforms.add("frontFaceTexture","sampler2D"),n.fragment.code.add(e`void main() {
+}`);break;case d.Transparency:c.fragment.uniforms.add(new i("colorTexture")),c.fragment.uniforms.add(new i("alphaTexture")),c.fragment.uniforms.add(new i("frontFaceTexture")),c.fragment.code.add(t`void main() {
 vec4 srcColor = texture2D(colorTexture, uv);
 float srcAlpha = texture2D(alphaTexture, uv).r;
 vec4 frontFace = texture2D(frontFaceTexture, uv);
@@ -20,4 +20,4 @@ if(srcColor.a <= 1e-5){
 discard;
 }
 gl_FragColor = vec4(mix(srcColor.rgb/srcColor.a, frontFace.rgb, frontFace.a), 1.0 - srcAlpha);
-}`)),n}!function(r){r[r.Standard=0]="Standard",r[r.TransparentToHUDVisibility=1]="TransparentToHUDVisibility",r[r.Transparency=2]="Transparency",r[r.OverlayWithTransparency=3]="OverlayWithTransparency",r[r.COUNT=4]="COUNT"}(t||(t={}));const n=Object.freeze({__proto__:null,get CompositingFunction(){return t},build:o});export{t as C,n as a,o as b};
+}`);break;case d.COUNT:break;default:e(s.function)}return c}const c=Object.freeze(Object.defineProperty({__proto__:null,build:s},Symbol.toStringTag,{value:"Module"}));export{c as C,s as b};