npm - @arcgis/core - Versions diffs - 6.0.0-next.8 → 6.0.0-next.9 - Mend

@arcgis/core 6.0.0-next.8 → 6.0.0-next.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (330) hide show

package/chunks/AtmosphereCompositing.glsl.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{glsl as t}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DBindUniform as n}from"../views/3d/webgl-engine/core/shaderModules/Texture2DBindUniform.js";import{Texture2DPassUniform as r}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{NoParameters as i}from"../views/webgl/NoParameters.js";import{ShaderBuilder as a}from"../views/webgl/ShaderBuilder.js";class o extends i{}function s(){let i=new a;return i.include(e),i.fragment.uniforms.add(new r(`colorTexture`,e=>e.color),new n(`depthTexture`,e=>e.mainDepth)),i.fragment.main.add(t`float depthSample = texture(depthTexture, uv).r;
+import{mainDepth as e}from"../views/3d/webgl-engine/core/shaderLibrary/bindUniforms.js";import{ScreenSpacePass as t}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{glsl as n}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DPassUniform as r}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{NoParameters as i}from"../views/webgl/NoParameters.js";import{ShaderBuilder as a}from"../views/webgl/ShaderBuilder.js";class o extends i{}function s(){let i=new a;return i.include(t),i.fragment.uniforms.add(new r(`colorTexture`,e=>e.color),e).main.add(n`float depthSample = texture(mainDepth, uv).r;
 if (depthSample != 1.0 ) {
 fragColor = vec4(0);
 return;

package/chunks/ChapmanAtmosphere.glsl.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{Gamma as e}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js";import{mainLightDirection as t}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{BooleanPassUniform as n}from"../views/3d/webgl-engine/core/shaderModules/BooleanPassUniform.js";import{Float2PassUniform as r}from"../views/3d/webgl-engine/core/shaderModules/Float2PassUniform.js";import{Float3BindUniform as i}from"../views/3d/webgl-engine/core/shaderModules/Float3BindUniform.js";import{Float3PassUniform as a}from"../views/3d/webgl-engine/core/shaderModules/Float3PassUniform.js";import{Float4PassUniform as o}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatPassUniform as s}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{FloatsPassUniform as c}from"../views/3d/webgl-engine/core/shaderModules/FloatsPassUniform.js";import{glsl as l}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DBindUniform as u}from"../views/3d/webgl-engine/core/shaderModules/Texture2DBindUniform.js";import{getHeightParameters as d}from"../views/3d/webgl-engine/effects/atmosphere/ChapmanApproximation.glsl.js";import{ChapmanRaymarching as f}from"../views/3d/webgl-engine/effects/atmosphere/ChapmanRaymarching.glsl.js";import{ScreenSpacePassAtmosphere as p}from"../views/3d/webgl-engine/shaders/ScreenSpacePassAtmosphere.glsl.js";import{SphereIntersect as m}from"../views/3d/webgl-engine/shaders/SphereIntersect.glsl.js";import{ToneMapping as h}from"../views/3d/webgl-engine/shaders/ToneMapping.glsl.js";import{ShaderBuilder as g}from"../views/webgl/ShaderBuilder.js";function _(){let _=new g;_.include(p);let{fragment:v}=_;return v.include(e),v.include(m),v.include(h),v.include(f,!1),v.uniforms.add(t,new n(`reduced`,({reduced:e})=>e),new c(`heightParameters`,5,(e,t)=>d(t,e)),new r(`radii`,e=>e.radii),new i(`cameraPosition`,e=>e.camera.eye),new s(`innerFadeDistance`,e=>e.innerFadeDistance),new o(`undergroundColor`,e=>e.undergroundColor),new s(`altitudeFade`,e=>e.altitudeFade)).code.add(l`vec4 applyUndergroundAtmosphere(vec3 rayDir, vec3 lightDirection, vec4 fragColor) {
+import{mainDepth as e}from"../views/3d/webgl-engine/core/shaderLibrary/bindUniforms.js";import{Gamma as t}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js";import{mainLightDirection as n}from"../views/3d/webgl-engine/core/shaderLibrary/shading/lightingUniforms.js";import{cameraPosition as r}from"../views/3d/webgl-engine/core/shaderLibrary/util/cameraUniforms.js";import{BooleanPassUniform as i}from"../views/3d/webgl-engine/core/shaderModules/BooleanPassUniform.js";import{Float2PassUniform as a}from"../views/3d/webgl-engine/core/shaderModules/Float2PassUniform.js";import{Float3PassUniform as o}from"../views/3d/webgl-engine/core/shaderModules/Float3PassUniform.js";import{Float4PassUniform as s}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatPassUniform as c}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{FloatsPassUniform as l}from"../views/3d/webgl-engine/core/shaderModules/FloatsPassUniform.js";import{glsl as u}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{getHeightParameters as d}from"../views/3d/webgl-engine/effects/atmosphere/ChapmanApproximation.glsl.js";import{ChapmanRaymarching as f}from"../views/3d/webgl-engine/effects/atmosphere/ChapmanRaymarching.glsl.js";import{ScreenSpacePassAtmosphere as p}from"../views/3d/webgl-engine/shaders/ScreenSpacePassAtmosphere.glsl.js";import{SphereIntersect as m}from"../views/3d/webgl-engine/shaders/SphereIntersect.glsl.js";import{ToneMapping as h}from"../views/3d/webgl-engine/shaders/ToneMapping.glsl.js";import{ShaderBuilder as g}from"../views/webgl/ShaderBuilder.js";function _(){let _=new g;_.include(p);let{fragment:v}=_;return v.include(t),v.include(m),v.include(h),v.include(f,!1),v.uniforms.add(n,new i(`reduced`,({reduced:e})=>e),new l(`heightParameters`,5,(e,t)=>d(t,e)),new a(`radii`,e=>e.radii),r,new c(`innerFadeDistance`,e=>e.innerFadeDistance),new s(`undergroundColor`,e=>e.undergroundColor),new c(`altitudeFade`,e=>e.altitudeFade)).code.add(u`vec4 applyUndergroundAtmosphere(vec3 rayDir, vec3 lightDirection, vec4 fragColor) {
 float rayPlanetDistance = heightParameters[3];
 vec2 rayPlanetIntersect = sphereIntersect(cameraPosition, rayDir, rayPlanetDistance);
 if (!((rayPlanetIntersect.x <= rayPlanetIntersect.y) && rayPlanetIntersect.y > 0.0)) {
@@ -24,8 +24,8 @@ vec3 sunTransmittance = exp(-(mix(betaCombined, betaRayleigh, 0.5)) * max(0.0, s
 float mu = clamp(dot(rayDir, lightDir), 0.0, 1.0);
 float sunDisc = 256.0 * smoothstep(0.0, 128.0, clamp(getGlow(1.0 - mu, 3e-5, 3.0), 0.0, 128.0));
 return normalize(sunTransmittance) * sunDisc;
-}`),v.uniforms.add(new a(`backgroundColor`,e=>e.backgroundColor),new u(`depthTexture`,e=>e.mainDepth)).main.add(l`vec3 rayDir = normalize(worldRay);
-float depthSample = reduced ? 1.0 : texture(depthTexture, uv).r;
+}`),v.uniforms.add(new o(`backgroundColor`,e=>e.backgroundColor),e).main.add(u`vec3 rayDir = normalize(worldRay);
+float depthSample = reduced ? 1.0 : texture(mainDepth, uv).r;
 if (depthSample != 1.0) {
 fragColor = vec4(0.0);
 return;

package/chunks/CloudsComposition.glsl.js CHANGED Viewed

@@ -1,3 +1,3 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{Gamma as e}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js";import{PiUtils as t}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 r}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{Float3BindUniform as i}from"../views/3d/webgl-engine/core/shaderModules/Float3BindUniform.js";import{FloatBindUniform as a}from"../views/3d/webgl-engine/core/shaderModules/FloatBindUniform.js";import{glsl as o}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{ScreenSpacePassAtmosphere as s}from"../views/3d/webgl-engine/shaders/ScreenSpacePassAtmosphere.glsl.js";import{ShaderBuilder as c}from"../views/webgl/ShaderBuilder.js";function l(l){let u=new c,{fragment:d}=u;return u.include(s,{needUVs:!1,needEyeDirection:!1}),d.include(r),d.include(t),d.include(e),u.include(n,l),d.uniforms.add(new i(`cameraPosition`,e=>e.camera.eye),new a(`cloudsOpacity`,e=>e.clouds.opacity)).main.add(o`vec4 cloudsColor = renderClouds(normalize(worldRay), cameraPosition);
+import{Gamma as e}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js";import{PiUtils as t}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PiUtils.glsl.js";import{cameraPosition as n}from"../views/3d/webgl-engine/core/shaderLibrary/util/cameraUniforms.js";import{CloudsParallaxShading as r,cloudsOpacity as i}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{glsl as o}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{ScreenSpacePassAtmosphere as s}from"../views/3d/webgl-engine/shaders/ScreenSpacePassAtmosphere.glsl.js";import{ShaderBuilder as c}from"../views/webgl/ShaderBuilder.js";function l(l){let u=new c,{fragment:d}=u;return u.include(s,{needUVs:!1,needEyeDirection:!1}),d.include(a),d.include(t),d.include(e),u.include(r,l),d.uniforms.add(n,i).main.add(o`vec4 cloudsColor = renderClouds(normalize(worldRay), cameraPosition);
 fragColor = vec4(cloudsOpacity * cloudsColor.rgb, cloudsColor.a);`),u}const u=Object.freeze(Object.defineProperty({__proto__:null,build:l},Symbol.toStringTag,{value:`Module`}));export{u as C,l as b};

package/chunks/Component.glsl.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{ComponentData as e}from"../views/3d/webgl-engine/collections/Component/Material/ComponentData.glsl.js";import{forwardLinearDepthToWriteShadow as ee}from"../views/3d/webgl-engine/core/shaderLibrary/forwardLinearDepthToWriteShadow.glsl.js";import{isColor as te,isShadow as ne}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutput.js";import{slicePass as t}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{TextureCoordinateAttribute as n}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/TextureCoordinateAttribute.glsl.js";import{VertexColor as r}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexColor.glsl.js";import{VertexNormal as i}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexNormal.glsl.js";import{VertexPosition as a}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexPosition.glsl.js";import{DepthConversion as o}from"../views/3d/webgl-engine/core/shaderLibrary/output/DepthConversion.glsl.js";import{outputDepth as s}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.glsl.js";import{OutputHighlight as c}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{OutputHighlightOverlay as l}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlightOverlay.js";import{computeFragmentNormals as u}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeFragmentNormals.glsl.js";import{ComputeMaterialColor as d}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeMaterialColor.glsl.js";import{ComputeNormalTextureDraw as re}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeNormalTexture.glsl.js";import{EvaluateSceneLighting as f,lightingGlobalFactor as p}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{mainLightIntensity as ie,mainLightDirection as ae}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{NormalUtils as m}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{pbrGlobals as h}from"../views/3d/webgl-engine/core/shaderLibrary/shading/pbrGlobals.glsl.js";import{PhysicallyBasedRenderingParameters as g}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{ReadBaseColorTexture as _}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadBaseColorTexture.glsl.js";import{readShadowPass as v}from"../views/3d/webgl-engine/core/shaderLibrary/shading/readShadow.glsl.js";import{OverlayIM as oe}from"../views/3d/webgl-engine/core/shaderLibrary/terrain/Overlay.glsl.js";import{DiscardOrAdjustAlphaDraw as se}from"../views/3d/webgl-engine/core/shaderLibrary/util/DiscardOrAdjustAlpha.glsl.js";import{BooleanDrawUniform as ce}from"../views/3d/webgl-engine/core/shaderModules/BooleanDrawUniform.js";import{FloatDrawUniform as y}from"../views/3d/webgl-engine/core/shaderModules/FloatDrawUniform.js";import{If as b,glsl as x}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DBindUniform as le}from"../views/3d/webgl-engine/core/shaderModules/Texture2DBindUniform.js";import{SnowCover as ue}from"../views/3d/webgl-engine/effects/snowcover/SnowCover.glsl.js";import{alphaCutoff as S}from"../views/3d/webgl-engine/shaders/alphaCutoff.glsl.js";import{outputColorHighlightOLID as de}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{getPlanetRadius as C,sphereDepthInterpolate as w}from"../views/3d/webgl-engine/shaders/SphereDepthInterpolate.glsl.js";import{ShaderBuilder as T}from"../views/webgl/ShaderBuilder.js";function E(E){let D=new T,{vertex:O,fragment:k}=D;D.include(a,E),D.include(i,E),D.include(r,E),D.include(n,E),D.include(e,E),D.include(se,E),k.include(t,E),D.include(_,E);let{output:A,pbrMode:j,hasNormalTexture:M,snowCover:N,receiveShadows:P,shadeNormals:F,spherical:I,sphericalSR:L,overlayEnabled:R,componentDataType:fe,vertexDiscardMode:z,renderOccluded:B,isGroundSlice:V,groundTransparencyMode:pe}=E,H=te(A),U=j===1||j===2,W=pe===2,G=W&&(A===3||A===4);U&&(D.include(g,E),M&&D.include(re,E));let K=ne(A),q=A===11,me=A===10,J=A===4,he=K&&fe===1,Y=C(E),X=(R||G)&&I,Z=L===1;(H||J)&&(D.include(d,E),k.include(S)),(R||G)&&(k.include(f,E),D.include(oe,E),X?(D.varyings.add(`vPositionForDraping`,`vec3`),k.uniforms.add(new ce(`useENUForGlobalOverlayUV`,e=>e.useENUForGlobalOverlayUV),new y(`overlayMapScaleU`,e=>e.toMapSpace[2]),new y(`overlayReferenceU`,e=>e.toMapSpace[0])),k.constants.add(`overlayWorldWidth`,`float`,Z?2*Math.PI*Y:360),Z?(k.constants.add(`pRadius`,`float`,Y),k.constants.add(`halfSemiMajorAxis`,`float`,.5*Y)):k.constants.add(`rad2deg1`,`float`,180/Math.PI),k.constants.add(`invRadius`,`float`,1/Y).code.add(x`
+import{ComponentData as e}from"../views/3d/webgl-engine/collections/Component/Material/ComponentData.glsl.js";import{waterNormals as t}from"../views/3d/webgl-engine/core/shaderLibrary/bindUniforms.js";import{forwardLinearDepthToWriteShadow as ee}from"../views/3d/webgl-engine/core/shaderLibrary/forwardLinearDepthToWriteShadow.glsl.js";import{isColor as te,isShadow as n}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutput.js";import{slicePass as r}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{TextureCoordinateAttribute as i}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/TextureCoordinateAttribute.glsl.js";import{VertexColor as a}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexColor.glsl.js";import{VertexNormal as o}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexNormal.glsl.js";import{VertexPosition as s}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexPosition.glsl.js";import{DepthConversion as c}from"../views/3d/webgl-engine/core/shaderLibrary/output/DepthConversion.glsl.js";import{outputDepth as l}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.glsl.js";import{OutputHighlight as u}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{OutputHighlightOverlay as ne}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlightOverlay.js";import{computeFragmentNormals as d}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeFragmentNormals.glsl.js";import{ComputeMaterialColor as re}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeMaterialColor.glsl.js";import{ComputeNormalTextureDraw as ie}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeNormalTexture.glsl.js";import{EvaluateSceneLighting as f}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{lightingGlobalFactor as p,mainLightIntensity as m,mainLightDirection as h}from"../views/3d/webgl-engine/core/shaderLibrary/shading/lightingUniforms.js";import{NormalUtils as ae}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{pbrGlobals as oe}from"../views/3d/webgl-engine/core/shaderLibrary/shading/pbrGlobals.glsl.js";import{PhysicallyBasedRenderingParameters as se}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{ReadBaseColorTexture as g}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadBaseColorTexture.glsl.js";import{readShadowPass as _}from"../views/3d/webgl-engine/core/shaderLibrary/shading/readShadow.glsl.js";import{OverlayIM as ce}from"../views/3d/webgl-engine/core/shaderLibrary/terrain/Overlay.glsl.js";import{DiscardOrAdjustAlphaDraw as v}from"../views/3d/webgl-engine/core/shaderLibrary/util/DiscardOrAdjustAlpha.glsl.js";import{BooleanDrawUniform as y}from"../views/3d/webgl-engine/core/shaderModules/BooleanDrawUniform.js";import{FloatDrawUniform as b}from"../views/3d/webgl-engine/core/shaderModules/FloatDrawUniform.js";import{If as x,glsl as S}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{SnowCover as le}from"../views/3d/webgl-engine/effects/snowcover/SnowCover.glsl.js";import{alphaCutoff as C}from"../views/3d/webgl-engine/shaders/alphaCutoff.glsl.js";import{outputColorHighlightOLID as ue}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{getPlanetRadius as de,sphereDepthInterpolate as w}from"../views/3d/webgl-engine/shaders/SphereDepthInterpolate.glsl.js";import{ShaderBuilder as T}from"../views/webgl/ShaderBuilder.js";function E(E){let D=new T,{vertex:O,fragment:k}=D;D.include(s,E),D.include(o,E),D.include(a,E),D.include(i,E),D.include(e,E),D.include(v,E),k.include(r,E),D.include(g,E);let{output:A,pbrMode:j,hasNormalTexture:M,snowCover:N,receiveShadows:P,shadeNormals:F,spherical:I,sphericalSR:L,overlayEnabled:R,componentDataType:fe,vertexDiscardMode:z,renderOccluded:B,isGroundSlice:V,groundTransparencyMode:pe}=E,H=te(A),U=j===1||j===2,W=pe===2,G=W&&(A===3||A===4);U&&(D.include(se,E),M&&D.include(ie,E));let K=n(A),q=A===11,me=A===10,J=A===4,he=K&&fe===1,Y=de(E),X=(R||G)&&I,Z=L===1;(H||J)&&(D.include(re,E),k.include(C)),(R||G)&&(k.include(f,E),D.include(ce,E),X?(D.varyings.add(`vPositionForDraping`,`vec3`),k.uniforms.add(new y(`useENUForGlobalOverlayUV`,e=>e.useENUForGlobalOverlayUV),new b(`overlayMapScaleU`,e=>e.toMapSpace[2]),new b(`overlayReferenceU`,e=>e.toMapSpace[0])),k.constants.add(`overlayWorldWidth`,`float`,Z?2*Math.PI*Y:360),Z?(k.constants.add(`pRadius`,`float`,Y),k.constants.add(`halfSemiMajorAxis`,`float`,.5*Y)):k.constants.add(`rad2deg1`,`float`,180/Math.PI),k.constants.add(`invRadius`,`float`,1/Y).code.add(S`
           vec2 projectOverlay(vec3 pos) { return pos.xy / (1.0 + invRadius * pos.z); }
           vec2 selectOverlayUVNorm(vec2 normUV, float offsetUNorm) {
@@ -31,12 +31,12 @@ import{ComponentData as e}from"../views/3d/webgl-engine/collections/Component/Ma
             float sinLat = wPos.z / oRadius;
             vec2 posMap;
-            ${b(Z,x`
+            ${x(Z,S`
                 posMap = vec2(
                   oLonRad * pRadius,
                   halfSemiMajorAxis * log((1.0 + sinLat) / (1.0 - sinLat))
                 );
-              `,x`
+              `,S`
                 float oLatRad = asin(clamp(sinLat,-1.0,1.0));
                 posMap = vec2(rad2deg1 * oLonRad, rad2deg1 * oLatRad);
               `)}
@@ -49,14 +49,14 @@ import{ComponentData as e}from"../views/3d/webgl-engine/collections/Component/Ma
               ? selectLocalOverlayUVs(projectOverlay(vPositionForDraping))
               : selectMapOverlayUVs(overlayMapUVFromWorldPosition());
           }
-        `)):O.code.add(`vec2 projectOverlay(vec3 pos) { return pos.xy; }`));let Q=R&&H&&j===4;Q&&(D.varyings.add(`tbnTangent`,`vec3`),D.varyings.add(`tbnBiTangent`,`vec3`),D.varyings.add(`upNormal`,`vec3`));let ge=z===0,_e=z===2;if(D.include(v,E),D.include(ee,E),O.include(S),O.main.add(x`
+        `)):O.code.add(`vec2 projectOverlay(vec3 pos) { return pos.xy; }`));let Q=R&&H&&j===4;Q&&(D.varyings.add(`tbnTangent`,`vec3`),D.varyings.add(`tbnBiTangent`,`vec3`),D.varyings.add(`upNormal`,`vec3`));let ge=z===0,_e=z===2;if(D.include(_,E),D.include(ee,E),O.include(C),O.main.add(S`
     bool castShadows;
     vec4 externalColor = forwardExternalColor(castShadows);
-    ${b(he,`if(!castShadows) { gl_Position = vec4(vec3(1e38), 1.0); return; }`)}
-    ${b(!ge,`if (externalColor.a ${_e?`>`:`<=`} opacityCutoff) {
+    ${x(he,`if(!castShadows) { gl_Position = vec4(vec3(1e38), 1.0); return; }`)}
+    ${x(!ge,`if (externalColor.a ${_e?`>`:`<=`} opacityCutoff) {
          gl_Position = vec4(vec3(1e38), 1.0); return;
        }`)}
-    ${b(q,`externalColor.a = 1.0;`)}
+    ${x(q,`externalColor.a = 1.0;`)}
     forwardPosition(readElevationOffset());
     forwardNormal();
@@ -66,14 +66,14 @@ import{ComponentData as e}from"../views/3d/webgl-engine/collections/Component/Ma
     forwardLinearDepthToWriteShadow();
     forwardEmissiveStrength();
     forwardObjectAndLayerIdColor();
-    ${b(Q,I?x`
+    ${x(Q,I?S`
             upNormal = normalize(positionWorld());
             tbnTangent = normalize(cross(vec3(0.0, 0.0, 1.0), upNormal));
-            tbnBiTangent = normalize(cross(upNormal, tbnTangent));`:x`
+            tbnBiTangent = normalize(cross(upNormal, tbnTangent));`:S`
             upNormal = vec3(0.0, 0.0, 1.0);
             tbnTangent = vec3(1.0, 0.0, 0.0);
             tbnBiTangent = vec3(0.0, 1.0, 0.0);`)}
-    ${b(R||G,b(I,`vPositionForDraping = positionForDraping();
+    ${x(R||G,x(I,`vPositionForDraping = positionForDraping();
          vtcOverlay = vec4(0.0);`,`setOverlayVTC(projectOverlay(positionForDraping()));`))}
     if (externalColor.a < alphaCutoff) {
@@ -81,12 +81,12 @@ import{ComponentData as e}from"../views/3d/webgl-engine/collections/Component/Ma
       gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
       return;
     }
-  `),H)return D.include(u,E),D.include(de,E),k.include(f,E),k.include(ue,E),k.include(m,E),k.code.add(x`
+  `),H)return D.include(d,E),D.include(ue,E),k.include(f,E),k.include(le,E),k.include(ae,E),k.code.add(S`
       float evaluateShadow() {
         return ${P?`readShadowMap(vPositionWorldCameraRelative)`:`0.0`};
       }
-    `).main.add(x`
-      ${b(!V,`discardBySlice(vPositionWorldCameraRelative);`)}
+    `).main.add(S`
+      ${x(!V,`discardBySlice(vPositionWorldCameraRelative);`)}
       vec4 textureColor = readBaseColorTexture();
       discardOrAdjustAlpha(textureColor);
@@ -94,15 +94,15 @@ import{ComponentData as e}from"../views/3d/webgl-engine/collections/Component/Ma
       // When rendering the occluded overlay, we still need to read the base color texture because we need to use the
       // same discard logic. However after that to render only the draped overlay, we simply set the base texture color
       // to zero.
-      ${b(B,x`textureColor = vec4(0);`)}
+      ${x(B,S`textureColor = vec4(0);`)}
-      ${b(R,x`
+      ${x(R,S`
         vec4 overlayUVs = ${X?`componentOverlayUVs()`:`vtcOverlay`};
         vec4 overlayColor = getCombinedOverlayColor(overlayUVs);
         /* Early discard to only emit when we have overlay */
-        ${b(B,x`if (overlayColor.a < alphaCutoff) { discard; }`)}
+        ${x(B,S`if (overlayColor.a < alphaCutoff) { discard; }`)}
         `)}
       vec4 externalColor;
@@ -110,36 +110,36 @@ import{ComponentData as e}from"../views/3d/webgl-engine/collections/Component/Ma
       readExternalColor(externalColor, externalColorMixMode);
       vec4 materialColor = computeMaterialColor(textureColor, externalColor, externalColorMixMode);
-      ${b(W,`materialColor = vec4(0.0);`)}
-    `),U?(I&&k.uniforms.add(p),k.include(h),k.uniforms.add(ie).main.add(x`
+      ${x(W,`materialColor = vec4(0.0);`)}
+    `),U?(I&&k.uniforms.add(p),k.include(oe),k.uniforms.add(m).main.add(S`
         applyPBRFactors();
-        ${b(j===1,`if (externalColorMixMode == 3) mrr = vec3(0.0, 0.6, 0.2);`)}
-        ${b(M,`mat3 tangentSpace = computeTangentSpace(fragmentFaceNormal, vPositionWorldCameraRelative, vuv0);`)}
+        ${x(j===1,`if (externalColorMixMode == 3) mrr = vec3(0.0, 0.6, 0.2);`)}
+        ${x(M,`mat3 tangentSpace = computeTangentSpace(fragmentFaceNormal, vPositionWorldCameraRelative, vuv0);`)}
         vec3 viewDirection = normalize(vPositionWorldCameraRelative);
         vec3 upNormal = getLocalUp(positionWorld());
         vec3 shadingNormal = ${M?`computeTextureNormal(tangentSpace, vuv0)`:`fragmentShadingNormal`};
         float ssao = 1.0 - occlusion * evaluateAmbientOcclusionInverse();
-        ${b(N,x`float snow = getSnow(fragmentFaceNormal, normalize(positionWorld()));
+        ${x(N,S`float snow = getSnow(fragmentFaceNormal, normalize(positionWorld()));
                  materialColor.rgb = mix(materialColor.rgb, vec3(1.1), snow);
                  ssao = mix(ssao, 0.5 * ssao, snow);
                  shadingNormal = mix(shadingNormal, fragmentFaceNormal, snow);`)}
-        ${b(R,`materialColor = compositeOverlayUnpremultiplied(materialColor, overlayColor);`)}
+        ${x(R,`materialColor = compositeOverlayUnpremultiplied(materialColor, overlayColor);`)}
         vec3 additionalLight = evaluateAdditionalLighting(ssao, positionWorld());
-        ${b(I,`float additionalAmbientScale = additionalDirectedAmbientLight(positionWorld());`)}
-        ${b(I,`float shadow = max(lightingGlobalFactor * (1.0 - additionalAmbientScale), evaluateShadow());`,`float shadow = evaluateShadow();`)}
+        ${x(I,`float additionalAmbientScale = additionalDirectedAmbientLight(positionWorld());`)}
+        ${x(I,`float shadow = max(lightingGlobalFactor * (1.0 - additionalAmbientScale), evaluateShadow());`,`float shadow = evaluateShadow();`)}
         vec4 shadedColor = vec4(evaluateSceneLighting(shadingNormal, materialColor.rgb, shadow, ssao, additionalLight, viewDirection, upNormal), materialColor.a);
-      `)):(I&&k.uniforms.add(p),Q&&k.uniforms.add(new le(`ovNormalTex`,e=>e.overlay?.getTexture(3))),k.uniforms.add(ae).main.add(x`
-        ${b(I,`float additionalAmbientScale = additionalDirectedAmbientLight(positionWorld());`)}
+      `)):(I&&k.uniforms.add(p),Q&&k.uniforms.add(t),k.uniforms.add(h).main.add(S`
+        ${x(I,`float additionalAmbientScale = additionalDirectedAmbientLight(positionWorld());`)}
         float shadow = ${P?I?`max(lightingGlobalFactor * (1.0 - additionalAmbientScale), evaluateShadow())`:`evaluateShadow()`:I?`lightingGlobalFactor * (1.0 - additionalAmbientScale)`:`0.0`};
-        ${b(P&&F!==1,x`
+        ${x(P&&F!==1,S`
             float dotFL = dot(fragmentFaceNormal, mainLightDirection);
             if( dotFL <= 0.0) shadow = 1.0;
         `)}
-        ${b(N,x`float snow = getSnow(fragmentFaceNormal, normalize(positionWorld()));
+        ${x(N,S`float snow = getSnow(fragmentFaceNormal, normalize(positionWorld()));
                materialColor.rgb = mix(materialColor.rgb, vec3(1), snow);`)}
         vec3 viewDirection = normalize(vPositionWorldCameraRelative);
@@ -149,10 +149,10 @@ import{ComponentData as e}from"../views/3d/webgl-engine/collections/Component/Ma
         float ssao = evaluateAmbientOcclusion();
         vec3 additionalLight = evaluateAdditionalLighting(ssao, positionWorld());
-        ${b(R,`materialColor = compositeOverlayUnpremultiplied(materialColor, overlayColor);`)}
+        ${x(R,`materialColor = compositeOverlayUnpremultiplied(materialColor, overlayColor);`)}
         vec4 shadedColor = vec4(evaluateSceneLighting(fragmentShadingNormal, materialColor.rgb, shadow, ssao, additionalLight, viewDirection, upNormal), materialColor.a);
-        ${b(Q,x`vec4 overlayWaterMask = getOverlayColor(ovNormalTex, overlayUVs);
+        ${x(Q,S`vec4 overlayWaterMask = getOverlayColor(waterNormals, overlayUVs);
                  float waterNormalLength = length(overlayWaterMask);
                  if (waterNormalLength > 0.95) {
                    mat3 tbnMatrix = mat3(tbnTangent, tbnBiTangent, upNormal);
@@ -162,32 +162,32 @@ import{ComponentData as e}from"../views/3d/webgl-engine/collections/Component/Ma
                    shadedColor = mix(shadedColor, waterColorNonLinear, waterColorLinear.w);
                  }`)}
       `)),k.main.add(`
-      ${b(V,`if(rejectBySlice(vPositionWorldCameraRelative)) shadedColor.a *= groundSliceOpacity;`)}
+      ${x(V,`if(rejectBySlice(vPositionWorldCameraRelative)) shadedColor.a *= groundSliceOpacity;`)}
-      outputColorHighlightOLID(applySlice(shadedColor, vPositionWorldCameraRelative), materialColor.rgb ${b(N,`, snow`)});
-    `),E.sphereDepthInterpolate&&(D.include(w,E),D.fragment.include(o),k.main.add(x`vec3 worldRay = normalize(vPositionWorldCameraRelative);
+      outputColorHighlightOLID(applySlice(shadedColor, vPositionWorldCameraRelative), materialColor.rgb ${x(N,`, snow`)});
+    `),E.sphereDepthInterpolate&&(D.include(w,E),D.fragment.include(c),k.main.add(S`vec3 worldRay = normalize(vPositionWorldCameraRelative);
 vec3 viewRay = normalize(vPosition_view);
-gl_FragDepth = delinearizeDepth(sphereDepthInterpolate(worldRay, viewRay, linearizeDepth(gl_FragCoord.z)));`)),D;let $=K||A===8;return $&&D.include(s,E),J&&D.include(u,E),R&&D.include(l,E),D.include(c,E),k.main.add(x`
-    ${b(!V,`discardBySlice(vPositionWorldCameraRelative);`)}
+gl_FragDepth = delinearizeDepth(sphereDepthInterpolate(worldRay, viewRay, linearizeDepth(gl_FragCoord.z)));`)),D;let $=K||A===8;return $&&D.include(l,E),J&&D.include(d,E),R&&D.include(ne,E),D.include(u,E),k.main.add(S`
+    ${x(!V,`discardBySlice(vPositionWorldCameraRelative);`)}
     vec4 textureColor = readBaseColorTexture();
     discardOrAdjustAlpha(textureColor);
-    ${b(G,x`
+    ${x(G,S`
       vec4 overlayUVs = ${X?`componentOverlayUVs()`:`vtcOverlay`};
       if (getCombinedOverlayColor(overlayUVs).a < alphaCutoff) {
         discard;
       }
       `)}
-    ${b($,`outputDepth(linearDepth);`)}
-    ${b(J,x`
+    ${x($,`outputDepth(linearDepth);`)}
+    ${x(J,S`
         vec4 externalColor;
         int externalColorMixMode;
         readExternalColor(externalColor, externalColorMixMode);
         vec4 materialColor = computeMaterialColor(textureColor, externalColor, externalColorMixMode);
-        ${b(V,x`
+        ${x(V,S`
             if (rejectBySlice(vPositionWorldCameraRelative)) {
               materialColor.a *= groundSliceOpacity;
             }
@@ -195,5 +195,5 @@ gl_FragDepth = delinearizeDepth(sphereDepthInterpolate(worldRay, viewRay, linear
         fragColor = vec4(vec3(0.5) + 0.5 * fragmentFaceNormalView, materialColor.a);
       `)}
-    ${b(q,R?X?`fragColor = getOverlayColorTexel(componentOverlayUVs());`:`fragColor = getOverlayColorTexel();`:`outputObjectAndLayerIdColor();`)}
-    ${b(me,b(R,X?x`calculateOcclusionAndOutputHighlight(getAllOverlayHighlightValuesEncoded(componentOverlayUVs()));`:x`calculateOcclusionAndOutputHighlight(getAllOverlayHighlightValuesEncoded());`,x`calculateOcclusionAndOutputHighlight();`))}`),D}const D=Object.freeze(Object.defineProperty({__proto__:null,build:E},Symbol.toStringTag,{value:`Module`}));export{D as C,E as b};
+    ${x(q,R?X?`fragColor = getOverlayColorTexel(componentOverlayUVs());`:`fragColor = getOverlayColorTexel();`:`outputObjectAndLayerIdColor();`)}
+    ${x(me,x(R,X?S`calculateOcclusionAndOutputHighlight(getAllOverlayHighlightValuesEncoded(componentOverlayUVs()));`:S`calculateOcclusionAndOutputHighlight(getAllOverlayHighlightValuesEncoded());`,S`calculateOcclusionAndOutputHighlight();`))}`),D}const D=Object.freeze(Object.defineProperty({__proto__:null,build:E},Symbol.toStringTag,{value:`Module`}));export{D as C,E as b};

package/chunks/DefaultMaterial.glsl.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{Offset as e}from"../views/3d/webgl-engine/core/shaderLibrary/Offset.glsl.js";import{isColor as t}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutput.js";import{sliceDraw as n}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{Transform as r}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{InstancedDoublePrecision as i}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/InstancedDoublePrecision.glsl.js";import{NormalAttribute as a}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/NormalAttribute.glsl.js";import{TextureCoordinateAttribute as o}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/TextureCoordinateAttribute.glsl.js";import{VertexNormal as s}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexNormal.glsl.js";import{VerticalOffset as c}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VerticalOffset.glsl.js";import{DefaultMaterialAuxiliaryPasses as l}from"../views/3d/webgl-engine/core/shaderLibrary/default/DefaultMaterialAuxiliaryPasses.glsl.js";import{DefaultMaterialExternalColor as u}from"../views/3d/webgl-engine/core/shaderLibrary/default/DefaultMaterialExternalColor.glsl.js";import{ComputeNormalTexturePass as ee}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeNormalTexture.glsl.js";import{EvaluateAmbientOcclusion as d}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientOcclusion.glsl.js";import{EvaluateSceneLighting as f,addAmbientBoostFactor as p,lightingGlobalFactor as m}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{mainLightIntensity as h}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{Normals as g}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Normals.glsl.js";import{NormalUtils as _}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{PhysicallyBasedRendering as v}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRendering.glsl.js";import{PhysicallyBasedRenderingParameters as y}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{readShadowPass as b,readShadowDraw as x}from"../views/3d/webgl-engine/core/shaderLibrary/shading/readShadow.glsl.js";import{colorTextureUV as S,normalTextureUV as C,emissiveTextureUV as w,occlusionTextureUV as T,metallicRoughnessTextureUV as E}from"../views/3d/webgl-engine/core/shaderLibrary/shading/TextureTransformUV.glsl.js";import{VisualVariables as D}from"../views/3d/webgl-engine/core/shaderLibrary/shading/VisualVariables.glsl.js";import{DiscardOrAdjustAlphaPass as O}from"../views/3d/webgl-engine/core/shaderLibrary/util/DiscardOrAdjustAlpha.glsl.js";import{addProjViewLocalOrigin as k,addCameraPosition as A}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float3PassUniform as j}from"../views/3d/webgl-engine/core/shaderModules/Float3PassUniform.js";import{If as M,glsl as N}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DPassUniform as P}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{SnowCover as F}from"../views/3d/webgl-engine/effects/snowcover/SnowCover.glsl.js";import{outputColorHighlightOLID as I}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{ShaderBuilder as te}from"../views/webgl/ShaderBuilder.js";function L(L){let R=new te,{attributes:z,vertex:B,fragment:V,varyings:H}=R,{output:U,normalType:W,offsetBackfaces:G,snowCover:K,pbrMode:q,textureAlphaPremultiplied:J,instancedDoublePrecision:Y,hasVertexColors:X,hasVertexTangents:Z,hasColorTexture:Q,hasNormalTexture:ne,hasNormalTextureTransform:re,hasColorTextureTransform:ie}=L;if(k(B,L),z.add(`position`,`vec3`),B.inputs.add(`position`,()=>`position`),H.add(`vpos`,`vec3`,{invariant:!0}),R.include(D,L),R.include(i,L),R.include(c,L),R.include(S,L),!t(U))return R.include(l,L),R;R.include(C,L),R.include(w,L),R.include(T,L),R.include(E,L),A(B,L),R.include(a,L),R.include(r);let $=W===0||W===1;return $&&G&&R.include(e),R.include(ee,L),R.include(s,L),H.add(`vPositionLocal`,`vec3`),R.include(o,L),R.include(u,L),R.include(Y?b:x,L),B.main.add(N`
+import{Offset as e}from"../views/3d/webgl-engine/core/shaderLibrary/Offset.glsl.js";import{isColor as t}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutput.js";import{sliceDraw as n}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{Transform as r}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{InstancedDoublePrecision as i}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/InstancedDoublePrecision.glsl.js";import{NormalAttribute as a}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/NormalAttribute.glsl.js";import{TextureCoordinateAttribute as o}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/TextureCoordinateAttribute.glsl.js";import{VertexNormal as s}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexNormal.glsl.js";import{VerticalOffset as c}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VerticalOffset.glsl.js";import{DefaultMaterialAuxiliaryPasses as l}from"../views/3d/webgl-engine/core/shaderLibrary/default/DefaultMaterialAuxiliaryPasses.glsl.js";import{DefaultMaterialExternalColor as u}from"../views/3d/webgl-engine/core/shaderLibrary/default/DefaultMaterialExternalColor.glsl.js";import{ComputeNormalTexturePass as ee}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeNormalTexture.glsl.js";import{EvaluateAmbientOcclusion as d}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientOcclusion.glsl.js";import{EvaluateSceneLighting as f,addAmbientBoostFactor as p}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{lightingGlobalFactor as m,mainLightIntensity as h}from"../views/3d/webgl-engine/core/shaderLibrary/shading/lightingUniforms.js";import{Normals as g}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Normals.glsl.js";import{NormalUtils as _}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{PhysicallyBasedRendering as v}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRendering.glsl.js";import{PhysicallyBasedRenderingParameters as y}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{readShadowPass as b,readShadowDraw as x}from"../views/3d/webgl-engine/core/shaderLibrary/shading/readShadow.glsl.js";import{colorTextureUV as S,normalTextureUV as C,emissiveTextureUV as w,occlusionTextureUV as T,metallicRoughnessTextureUV as E}from"../views/3d/webgl-engine/core/shaderLibrary/shading/TextureTransformUV.glsl.js";import{VisualVariables as D}from"../views/3d/webgl-engine/core/shaderLibrary/shading/VisualVariables.glsl.js";import{DiscardOrAdjustAlphaPass as O}from"../views/3d/webgl-engine/core/shaderLibrary/util/DiscardOrAdjustAlpha.glsl.js";import{addProjViewLocalOrigin as k,addCameraPosition as A}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float3PassUniform as j}from"../views/3d/webgl-engine/core/shaderModules/Float3PassUniform.js";import{If as M,glsl as N}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DPassUniform as P}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{SnowCover as F}from"../views/3d/webgl-engine/effects/snowcover/SnowCover.glsl.js";import{outputColorHighlightOLID as I}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{ShaderBuilder as te}from"../views/webgl/ShaderBuilder.js";function L(L){let R=new te,{attributes:z,vertex:B,fragment:V,varyings:H}=R,{output:U,normalType:W,offsetBackfaces:G,snowCover:K,pbrMode:q,textureAlphaPremultiplied:J,instancedDoublePrecision:Y,hasVertexColors:X,hasVertexTangents:Z,hasColorTexture:Q,hasNormalTexture:ne,hasNormalTextureTransform:re,hasColorTextureTransform:ie}=L;if(k(B,L),z.add(`position`,`vec3`),B.inputs.add(`position`,()=>`position`),H.add(`vpos`,`vec3`,{invariant:!0}),R.include(D,L),R.include(i,L),R.include(c,L),R.include(S,L),!t(U))return R.include(l,L),R;R.include(C,L),R.include(w,L),R.include(T,L),R.include(E,L),A(B,L),R.include(a,L),R.include(r);let $=W===0||W===1;return $&&G&&R.include(e),R.include(ee,L),R.include(s,L),H.add(`vPositionLocal`,`vec3`),R.include(o,L),R.include(u,L),R.include(Y?b:x,L),B.main.add(N`
     forwardDefaultMaterialExternalColor();
     vpos = getVertexInLocalOriginSpace();
@@ -22,7 +22,7 @@ import{Offset as e}from"../views/3d/webgl-engine/core/shaderLibrary/Offset.glsl.
       gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
     }
     forwardLinearDepthToReadShadow();
-  `),V.include(f,L),V.include(d,L),R.include(O,L),V.include(n,L),R.include(I,L),A(V,L),V.uniforms.add(B.uniforms.get(`localOrigin`),new j(`ambient`,e=>e.ambient),new j(`diffuse`,e=>e.diffuse)),Q&&V.uniforms.add(new P(`tex`,e=>e.texture)),R.include(y,L),V.include(v,L),R.include(g,L),V.include(F,L),V.include(_,L),p(V),V.uniforms.add(m),V.uniforms.add(h).main.add(N`
+  `),V.include(f,L),V.include(d,L),R.include(O,L),V.include(n,L),R.include(I,L),A(V,L),V.uniforms.add(B.uniforms.get(`localOrigin`),new j(`ambient`,e=>e.ambient),new j(`diffuse`,e=>e.diffuse)),Q&&V.uniforms.add(new P(`tex`,e=>e.texture)),R.include(y,L),V.include(v,L),R.include(g,L),V.include(F,L),V.include(_,L),p(V),V.uniforms.add(m,h).main.add(N`
     discardBySlice(vpos);
     ${Q?N`
             vec4 texColor = texture(tex, ${ie?`colorUV`:`vuv0`});

package/chunks/EdgeShader.glsl.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{set as e}from"../core/libs/gl-matrix-2/math/vec2.js";import{create as t}from"../core/libs/gl-matrix-2/factories/vec2f64.js";import{sliceDraw as n}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{viewport as r,pixelRatio as i}from"../views/3d/webgl-engine/core/shaderLibrary/util/cameraUniforms.js";import{Float2BindUniform as a}from"../views/3d/webgl-engine/core/shaderModules/Float2BindUniform.js";import{FloatPassUniform as o}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as s,If as c}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{AdjustProjectedPosition as l}from"../views/3d/webgl-engine/lib/edgeRendering/AdjustProjectedPosition.glsl.js";import{DiscardNonSilhouetteEdges as u}from"../views/3d/webgl-engine/lib/edgeRendering/DiscardNonSilhouetteEdges.glsl.js";import{EdgeUtil as d}from"../views/3d/webgl-engine/lib/edgeRendering/EdgeUtil.glsl.js";import{LineAmplitude as f}from"../views/3d/webgl-engine/lib/edgeRendering/LineAmplitude.glsl.js";import{LineOffset as p}from"../views/3d/webgl-engine/lib/edgeRendering/LineOffset.glsl.js";import{UnpackAttributes as m}from"../views/3d/webgl-engine/lib/edgeRendering/UnpackAttributes.glsl.js";import{ShaderBuilder as h}from"../views/webgl/ShaderBuilder.js";import{Uniform as g}from"../views/webgl/Uniform.js";function _(t){let g=new h,{vertex:_,fragment:b,varyings:x,attributes:S}=g;t.legacy&&_.uniforms.add(new y(`model`),new y(`localView`)),g.include(l,t),g.include(d,t),g.include(f,t),g.include(m,t),g.include(p,t),b.include(n,t),g.include(u,t),x.add(`vColor`,`vec4`),x.add(`vRadius`,`float`),x.add(`vPosition`,`vec3`,{invariant:!0}),x.add(`vWorldPosition`,`vec3`,{invariant:!0}),x.add(`vLineLengthPixels`,`float`),x.add(`vSizeFalloffFactor`,`float`),_.uniforms.add(new a(`pixelToNDC`,({camera:t})=>e(v,2/t.fullViewport[2],2/t.fullViewport[3])),r,i),S.add(`position0`,`vec3`),S.add(`position1`,`vec3`),S.add(`variantOffset`,`float`),S.add(`variantStroke`,`float`),S.add(`variantExtension`,`float`);let C=t.type===1,w=t.type===2;return _.uniforms.add(new o(`distanceFalloffFactor`,e=>e.distanceFalloffFactor)).code.add(s`
+import{sliceDraw as e}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{pixelToNDC as t,viewport as n,pixelRatio as r}from"../views/3d/webgl-engine/core/shaderLibrary/util/cameraUniforms.js";import{FloatPassUniform as i}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as a,If as o}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{AdjustProjectedPosition as s}from"../views/3d/webgl-engine/lib/edgeRendering/AdjustProjectedPosition.glsl.js";import{DiscardNonSilhouetteEdges as c}from"../views/3d/webgl-engine/lib/edgeRendering/DiscardNonSilhouetteEdges.glsl.js";import{EdgeUtil as l}from"../views/3d/webgl-engine/lib/edgeRendering/EdgeUtil.glsl.js";import{LineAmplitude as u}from"../views/3d/webgl-engine/lib/edgeRendering/LineAmplitude.glsl.js";import{LineOffset as d}from"../views/3d/webgl-engine/lib/edgeRendering/LineOffset.glsl.js";import{UnpackAttributes as f}from"../views/3d/webgl-engine/lib/edgeRendering/UnpackAttributes.glsl.js";import{ShaderBuilder as p}from"../views/webgl/ShaderBuilder.js";import{Uniform as m}from"../views/webgl/Uniform.js";function h(m){let h=new p,{vertex:_,fragment:v,varyings:y,attributes:b}=h;m.legacy&&_.uniforms.add(new g(`model`),new g(`localView`)),h.include(s,m),h.include(l,m),h.include(u,m),h.include(f,m),h.include(d,m),v.include(e,m),h.include(c,m),y.add(`vColor`,`vec4`),y.add(`vRadius`,`float`),y.add(`vPosition`,`vec3`,{invariant:!0}),y.add(`vWorldPosition`,`vec3`,{invariant:!0}),y.add(`vLineLengthPixels`,`float`),y.add(`vSizeFalloffFactor`,`float`),_.uniforms.add(t,n,r),b.add(`position0`,`vec3`),b.add(`position1`,`vec3`),b.add(`variantOffset`,`float`),b.add(`variantStroke`,`float`),b.add(`variantExtension`,`float`);let x=m.type===1,S=m.type===2;return _.uniforms.add(new i(`distanceFalloffFactor`,e=>e.distanceFalloffFactor)).code.add(a`
     float distanceBasedPerspectiveFactor(float distance) {
       return clamp(sqrt(distanceFalloffFactor / distance), 0.0, 1.0);
     }
@@ -37,8 +37,8 @@ import{set as e}from"../core/libs/gl-matrix-2/math/vec2.js";import{create as t}f
       float extendedLineLengthPixels = lineLengthPixels + extensionLengthPixels + extensionLengthPixels;
       // Line size with padding
-      float halfAAPaddedLineWidthAndAmplitudePixels = lineWidthAndAmplitudePixels * 0.5 + ${s.float(1)};
-      float aaPaddedRoundedCapSizePixels = lineWidthPixels * 0.5 + ${s.float(1)};
+      float halfAAPaddedLineWidthAndAmplitudePixels = lineWidthAndAmplitudePixels * 0.5 + ${a.float(1)};
+      float aaPaddedRoundedCapSizePixels = lineWidthPixels * 0.5 + ${a.float(1)};
       // Half line width in NDC including padding for anti aliasing
       vec2 halfAAPaddedLineWidthAndAmplitudeNDC = halfAAPaddedLineWidthAndAmplitudePixels * pixelToNDC;
@@ -73,12 +73,12 @@ import{set as e}from"../core/libs/gl-matrix-2/math/vec2.js";import{create as t}f
       vLineLengthPixels = extendedLineLengthPixels;
       // discard short edges below a certain length threshold
-      ${c(C||w,s`if (lineLengthPixels <= 3.0 ${c(w,` && unpackedAttributes.type <= 0.0`)}) {
+      ${o(x||S,a`if (lineLengthPixels <= 3.0 ${o(S,` && unpackedAttributes.type <= 0.0`)}) {
                 gl_Position = vec4(10.0, 10.0, 10.0, 1.0);
                 return;
              }`)}
       gl_Position = projPos;
-    }`),_.main.add(s`
+    }`),_.main.add(a`
     ComponentData component = readComponentData();
     UnpackedAttributes unpackedAttributes = unpackAttributes(component);
@@ -90,7 +90,7 @@ import{set as e}from"../core/libs/gl-matrix-2/math/vec2.js";import{create as t}f
     vColor = component.color;
     // Discard fully transparent edges
-    if (vColor.a < ${s.float(.00392156862745098)}) {
+    if (vColor.a < ${a.float(.00392156862745098)}) {
       gl_Position = vec4(10.0, 10.0, 10.0, 1.0);
       return;
     }
@@ -103,7 +103,7 @@ import{set as e}from"../core/libs/gl-matrix-2/math/vec2.js";import{create as t}f
     calculateGeometricOutputs(viewPosV0, viewPosV1, worldPosV0, worldPosV1, worldNormal(component), unpackedAttributes);
     // Specific computation for different edge styles
-    calculateStyleOutputs(unpackedAttributes);`),b.code.add(s`float lineWithCapsDistance(float radius, vec2 position, float lineLength) {
+    calculateStyleOutputs(unpackedAttributes);`),v.code.add(a`float lineWithCapsDistance(float radius, vec2 position, float lineLength) {
 float positionX = position.x - calculateLineOffset();
 if (radius < 1.0) {
 float coverageX = clamp(min(radius, positionX + 0.5) - max(-radius, positionX - 0.5), 0.0, 1.0);
@@ -114,8 +114,8 @@ else {
 float positionOnCap = position.y - clamp(position.y, 0.0, lineLength);
 return length(vec2(positionX, positionOnCap)) - radius;
 }
-}`),b.main.add(s`float radius = vRadius * calculateLinePressure();
+}`),v.main.add(a`float radius = vRadius * calculateLinePressure();
 float distance = lineWithCapsDistance(radius, vPosition.xy, vLineLengthPixels);
 float coverage = clamp(0.5 - distance, 0.0, 1.0);
 discardBySlice(vWorldPosition);
-fragColor = vec4(vColor.rgb, vColor.a * coverage);`),g}const v=t();class y extends g{constructor(e){super(e,`mat4`)}}const b=Object.freeze(Object.defineProperty({__proto__:null,build:_},Symbol.toStringTag,{value:`Module`}));export{b as E,_ as b};
+fragColor = vec4(vColor.rgb, vColor.a * coverage);`),h}class g extends m{constructor(e){super(e,`mat4`)}}const _=Object.freeze(Object.defineProperty({__proto__:null,build:h},Symbol.toStringTag,{value:`Module`}));export{_ as E,h as b};

package/chunks/Fog.glsl.js CHANGED Viewed

@@ -1,14 +1,14 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{create as e}from"../core/libs/gl-matrix-2/factories/vec3f64.js";import{ReadDepth as t}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadDepth.glsl.js";import{Gamma as n}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js";import{ColorConversion as r}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{Float3PassUniform as i}from"../views/3d/webgl-engine/core/shaderModules/Float3PassUniform.js";import{FloatPassUniform as a}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as o}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DBindUniform as s}from"../views/3d/webgl-engine/core/shaderModules/Texture2DBindUniform.js";import{Texture2DPassUniform as c}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{BlurEmissionPassParameters as l,applyEmissiveGlow as u}from"../views/3d/webgl-engine/effects/glow/applyEmissiveGlow.glsl.js";import{getDistanceFalloff as d}from"../views/3d/webgl-engine/effects/raymarching/DistanceFalloff.glsl.js";import{ScreenSpacePassAtmosphere as f}from"../views/3d/webgl-engine/shaders/ScreenSpacePassAtmosphere.glsl.js";import{ToneMapping as p}from"../views/3d/webgl-engine/shaders/ToneMapping.glsl.js";import{ShaderBuilder as m}from"../views/webgl/ShaderBuilder.js";class h extends l{constructor(){super(...arguments),this.fogColor=e(),this.strength=0,this.amount=0,this.fogColorDistanceWeight=.85,this.inputScale=1}}function g(e){let l=new m,{outputs:h,fragment:g}=l;h.add(`fragColor`,`vec4`,0),l.include(f,{needUVs:!0,needEyeDirection:!0}),g.uniforms.add(new s(`depthTexture`,e=>e.mainDepth),new a(`fogStrength`,e=>e.strength),new a(`fogAmount`,e=>e.amount),new i(`fogColor`,e=>e.fogColor),new a(`fogColorDistanceWeight`,e=>e.fogColorDistanceWeight)).constants.add(`f16Epsilon`,`float`,6103515625e-14),g.include(d),g.include(n),g.include(p),g.include(t),g.include(r),g.main.add(o`float mainDepth = -1.0;
-float depthSample = depthFromTexture(depthTexture, uv);
+import{create as e}from"../core/libs/gl-matrix-2/factories/vec3f64.js";import{mainDepth as t}from"../views/3d/webgl-engine/core/shaderLibrary/bindUniforms.js";import{ReadDepth as n}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadDepth.glsl.js";import{Gamma as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js";import{ColorConversion as i}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{Float3PassUniform as a}from"../views/3d/webgl-engine/core/shaderModules/Float3PassUniform.js";import{FloatPassUniform as o}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as s}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DPassUniform as c}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{BlurEmissionPassParameters as l,applyEmissiveGlow as u}from"../views/3d/webgl-engine/effects/glow/applyEmissiveGlow.glsl.js";import{getDistanceFalloff as d}from"../views/3d/webgl-engine/effects/raymarching/DistanceFalloff.glsl.js";import{ScreenSpacePassAtmosphere as f}from"../views/3d/webgl-engine/shaders/ScreenSpacePassAtmosphere.glsl.js";import{ToneMapping as p}from"../views/3d/webgl-engine/shaders/ToneMapping.glsl.js";import{ShaderBuilder as m}from"../views/webgl/ShaderBuilder.js";class h extends l{constructor(){super(...arguments),this.fogColor=e(),this.strength=0,this.amount=0,this.fogColorDistanceWeight=.85,this.inputScale=1}}function g(e){let l=new m,{outputs:h,fragment:g}=l;h.add(`fragColor`,`vec4`,0),l.include(f,{needUVs:!0,needEyeDirection:!0}),g.uniforms.add(t,new o(`fogStrength`,e=>e.strength),new o(`fogAmount`,e=>e.amount),new a(`fogColor`,e=>e.fogColor),new o(`fogColorDistanceWeight`,e=>e.fogColorDistanceWeight)).constants.add(`f16Epsilon`,`float`,6103515625e-14),g.include(d),g.include(r),g.include(p),g.include(n),g.include(i),g.main.add(s`float depth = -1.0;
+float depthSample = depthFromTexture(mainDepth, uv);
 if(depthSample < 1.0 && depthSample > 0.0){
 vec3 cameraSpaceRay = normalize(eyeDir);
 cameraSpaceRay /= cameraSpaceRay.z;
 cameraSpaceRay *= linearizeDepth(depthSample);
-mainDepth = max(0.0, length(cameraSpaceRay));
+depth = max(0.0, length(cameraSpaceRay));
 }
 vec3 rayDir = normalize(worldRay);
-float amount = fogAmount * getDistanceFalloff(mainDepth, rayDir, fogStrength);`);let{hasEmissive:_,useFloatBlend:v}=e;return _&&(h.add(`fragEmission`,`vec4`,1),g.include(u,e),g.uniforms.add(new a(`inputScale`,({inputScale:e})=>e)).main.add(o`vec3 emission = applyEmissiveGlow();
+float amount = fogAmount * getDistanceFalloff(depth, rayDir, fogStrength);`);let{hasEmissive:_,useFloatBlend:v}=e;return _&&(h.add(`fragEmission`,`vec4`,1),g.include(u,e),g.uniforms.add(new o(`inputScale`,({inputScale:e})=>e)).main.add(s`vec3 emission = applyEmissiveGlow();
 vec3 emissionHSV = rgb2hsv((emission));
 vec3 fogHSV = rgb2hsv(fogColor);
 float light = emissionHSV.b;
@@ -18,6 +18,6 @@ emissionHSV.g * saturation,
 fogHSV.b + light);
 fogColor = hsv2rgb(fogColor);
 float damping = amount < 1.0 ? min(-log(1.0 - amount) * 0.1, 16.0) : 16.0;
-fragEmission = vec4(max(emission - damping, 0.0) / inputScale, 1.0);`)),v||!_?g.main.add(`fragColor = delinearizeGamma(vec4(tonemapKhronosNeutral(fogColor * amount), amount));`):(g.uniforms.add(new c(`colorTexture`,({color:e})=>e?.attachment)),g.main.add(o`vec4 src = delinearizeGamma(vec4(tonemapKhronosNeutral(fogColor * amount), amount));
+fragEmission = vec4(max(emission - damping, 0.0) / inputScale, 1.0);`)),v||!_?g.main.add(`fragColor = delinearizeGamma(vec4(tonemapKhronosNeutral(fogColor * amount), amount));`):(g.uniforms.add(new c(`colorTexture`,({color:e})=>e?.attachment)),g.main.add(s`vec4 src = delinearizeGamma(vec4(tonemapKhronosNeutral(fogColor * amount), amount));
 vec4 dst = texture(colorTexture, uv);
 fragColor = vec4(vec3(src.rgb * src.a + dst.rgb * (1.0 - src.a)), dst.a);`)),l}const _=Object.freeze(Object.defineProperty({__proto__:null,FogPassParameters:h,build:g},Symbol.toStringTag,{value:`Module`}));export{h as F,_ as a,g as b};

package/chunks/GaussianSplat.glsl.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{calculateUVZShadowPass as e}from"../views/3d/webgl-engine/core/shaderLibrary/shading/calculateUVZShadow.glsl.js";import{EvaluateSceneLighting as t,addAmbientBoostFactor as n,lightingGlobalFactor as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{NormalUtils as i}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{readShadowPass as a,readShadowMaps as o}from"../views/3d/webgl-engine/core/shaderLibrary/shading/readShadow.glsl.js";import{RgbNormalizedDepthEncoding as s}from"../views/3d/webgl-engine/core/shaderLibrary/util/RgbNormalizedDepthEncoding.glsl.js";import{Float3BindUniform as c}from"../views/3d/webgl-engine/core/shaderModules/Float3BindUniform.js";import{glsl as l,If as u}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{gaussianSplatFirstHitAlpha as d}from"../views/3d/webgl-engine/shaders/GaussianSplatDepthPolicy.js";import{GaussianSplatPerspectivePass as f,GaussianSplatFading as p,gaussianSplatPerspectiveVertex as m}from"../views/3d/webgl-engine/shaders/GaussianSplatPass.glsl.js";import{getGaussianSplatAlphaCutoffValue as h}from"../views/3d/webgl-engine/shaders/GaussianSplatTechniqueConfiguration.js";import{ShaderBuilder as g}from"../views/webgl/ShaderBuilder.js";function _(_){let{receiveShadows:v,spherical:y}=_,b=v&&_.fragmentShading,x=b&&_.preciseDepth,S=new g,{varyings:C,vertex:w,fragment:T,outputs:E}=S;C.add(`vColor`,`vec4`),x&&C.add(`shadowReceiverRay`,`vec3`),S.include(f,_),_.fadingEnabled&&w.include(p),w.uniforms.add(new c(`cameraPosition`,e=>e.camera.eye));let D=b?T:w;D.uniforms.add(new c(`cameraPosition`,e=>e.camera.eye)),D.include(t,_),D.include(i,_),n(D),D.uniforms.add(r),b?S.include(a,_):v&&(w.include(e),_.hasShadowHighlights&&w.code.add(l`ivec2 getShadowHighlightCoordinates() {
+import{calculateUVZShadowPass as e}from"../views/3d/webgl-engine/core/shaderLibrary/shading/calculateUVZShadow.glsl.js";import{EvaluateSceneLighting as t,addAmbientBoostFactor as n}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{lightingGlobalFactor as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/lightingUniforms.js";import{NormalUtils as i}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{readShadowPass as a,readShadowMaps as o}from"../views/3d/webgl-engine/core/shaderLibrary/shading/readShadow.glsl.js";import{cameraPosition as s}from"../views/3d/webgl-engine/core/shaderLibrary/util/cameraUniforms.js";import{RgbNormalizedDepthEncoding as c}from"../views/3d/webgl-engine/core/shaderLibrary/util/RgbNormalizedDepthEncoding.glsl.js";import{glsl as l,If as u}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{gaussianSplatFirstHitAlpha as d}from"../views/3d/webgl-engine/shaders/GaussianSplatDepthPolicy.js";import{GaussianSplatPerspectivePass as f,GaussianSplatFading as p,gaussianSplatPerspectiveVertex as m}from"../views/3d/webgl-engine/shaders/GaussianSplatPass.glsl.js";import{getGaussianSplatAlphaCutoffValue as h}from"../views/3d/webgl-engine/shaders/GaussianSplatTechniqueConfiguration.js";import{ShaderBuilder as g}from"../views/webgl/ShaderBuilder.js";function _(_){let{receiveShadows:v,spherical:y}=_,b=v&&_.fragmentShading,x=b&&_.preciseDepth,S=new g,{varyings:C,vertex:w,fragment:T,outputs:E}=S;C.add(`vColor`,`vec4`),x&&C.add(`shadowReceiverRay`,`vec3`),S.include(f,_),_.fadingEnabled&&w.include(p),w.uniforms.add(s);let D=b?T:w;D.uniforms.add(s),D.include(t,_),D.include(i,_),n(D),D.uniforms.add(r),b?S.include(a,_):v&&(w.include(e),_.hasShadowHighlights&&w.code.add(l`ivec2 getShadowHighlightCoordinates() {
 vec2 screenUV = gl_Position.xy / gl_Position.w * 0.5 + 0.5;
 ivec2 screenPixel = ivec2(screenUV / inverseScreenSize);
 return clamp(screenPixel, ivec2(0), textureSize(shadowHighlight, 0) - 1);
@@ -51,7 +51,7 @@ vColor.a = opacity;`)}
     // Per-fragment lighting preserves crisp shadow borders; vertex lighting reduces overdraw cost.
     ${u(b,`forwardLinearDepth(-viewPos.z);`,A)}
-  `),T.include(s),T.main.add(`
+  `),T.include(c),T.main.add(`
     float gaussianFalloff = exp(gaussianExponent);
     // Cap at 0.99 to avoid blending issues, such as seams between overlapping Gaussians.

package/chunks/GlobalIllumination.glsl.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{ReadDepthLastFrame as t}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadDepthLastFrame.glsl.js";import{Gamma as n}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js";import{mainLightDirection as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{ScreenSpaceRayMarching as i}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ScreenSpaceRayMarching.glsl.js";import{CameraSpace as a}from"../views/3d/webgl-engine/core/shaderLibrary/util/CameraSpace.glsl.js";import{viewMatrix as o}from"../views/3d/webgl-engine/core/shaderLibrary/util/cameraUniforms.js";import{FloatBindUniform as s}from"../views/3d/webgl-engine/core/shaderModules/FloatBindUniform.js";import{FloatPassUniform as c}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as l,If as u}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Matrix4BindUniform as d}from"../views/3d/webgl-engine/core/shaderModules/Matrix4BindUniform.js";import{Texture2DBindUniform as f}from"../views/3d/webgl-engine/core/shaderModules/Texture2DBindUniform.js";import{Texture2DPassUniform as p}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{GlobalIlluminationColorQuantization as m}from"../views/3d/webgl-engine/effects/globalIllumination/GlobalIlluminationColorQuantization.glsl.js";import{floatBlendReductionFactor as h}from"../views/3d/webgl-engine/shaders/floatBlendScale.glsl.js";import{ToneMapping as g}from"../views/3d/webgl-engine/shaders/ToneMapping.glsl.js";import{ColorAttachment1 as _,SizedPixelFormat as v}from"../views/webgl/enums.js";import{NoParameters as y}from"../views/webgl/NoParameters.js";import{ShaderBuilder as b}from"../views/webgl/ShaderBuilder.js";const x=2.5,S=0,C=.8,w=25,T=.15,E=.5,D=1,O=1,k=16;class A extends y{constructor(){super(...arguments),this.projScale=1,this.resolutionScale=1,this.accumulatedFrames=0,this.temporalSampleFrame=0,this.glowBoost=0,this.rayMarchMinReach=T,this.rayMarchMaxReach=E,this.rayMarchWorldReach=25,this.rayMarchMinReachEmissionWeight=1,this.rayMarchMaxReachEmissionWeight=1,this.rayMarchMaxSteps=16,this.colorBleedWeight=0,this.highQualityIdleColorBlendStart=.3,this.emissionBoostFactor=x,this.factorDaylightDirectional=C}}function j(y){let x=new b,S=x.fragment;x.include(e),x.include(a),S.include(t),S.include(n),S.include(m),S.include(g),x.include(i,y),S.uniforms.add(r,o,new p(`normalMap`,e=>e.normalTexture),new p(`depthMap`,e=>e.depthTexture),new p(`lastFrameGlobalIlluminationTexture`,(e,t)=>e.globalIllumination??t.globalIllumination?.getTexture()),new p(`lastFrameGlobalIlluminationWeightTexture`,(e,t)=>e.globalIlluminationWeights??t.globalIllumination?.getTexture(_)),new f(`lastFrameColorTexture`,e=>e.reprojection.lastFrameColor?.getTexture()),new f(`lastFrameDepthTexture`,e=>e.reprojection.lastFrameDepth?.attachment),new d(`reprojectionProjectionMatrix`,e=>e.reprojection.lastFrameCamera.projectionMatrix),new d(`reprojectionViewMatrix`,e=>e.reprojection.viewMatrix),new c(`accumulatedFrames`,e=>e.accumulatedFrames),new c(`temporalSampleFrame`,e=>e.temporalSampleFrame),new c(`resolutionScale`,e=>e.resolutionScale)),S.uniforms.add(new c(`rayMarchMinReach`,e=>e.rayMarchMinReach),new c(`rayMarchMaxReach`,e=>e.rayMarchMaxReach),new c(`rayMarchWorldReach`,e=>e.rayMarchWorldReach),new c(`rayMarchMinReachEmissionWeight`,e=>e.rayMarchMinReachEmissionWeight),new c(`rayMarchMaxReachEmissionWeight`,e=>e.rayMarchMaxReachEmissionWeight),new c(`rayMarchMaxSteps`,e=>e.rayMarchMaxSteps),new c(`colorBleedWeight`,e=>e.colorBleedWeight),new c(`highQualityIdleColorBlendStart`,e=>e.highQualityIdleColorBlendStart),new c(`emissionBoostFactor`,e=>e.emissionBoostFactor+e.glowBoost),new c(`factorDaylightDirectional`,e=>e.factorDaylightDirectional));let{hasEmission:C,hasColor:w}=y;return C&&(S.uniforms.add(new s(`inputScale`,e=>e.reprojection.lastFrameEmission?.getTexture()?.descriptor.internalFormat===v.RGBA8?h:1),new f(`lastFrameEmissionTexture`,e=>e.reprojection.lastFrameEmission?.getTexture())),S.code.add(l`bool hasHitReprojectionMismatch(vec3 hit, vec2 hitReprojectedCoordinate, float colorBlendWeight) {
+import{lastFrameColorTexture as e}from"../views/3d/webgl-engine/core/shaderLibrary/lastFrameUniforms.js";import{ScreenSpacePass as t}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{ReadDepthLastFrame as n}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadDepthLastFrame.glsl.js";import{Gamma as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js";import{mainLightDirection as i}from"../views/3d/webgl-engine/core/shaderLibrary/shading/lightingUniforms.js";import{ScreenSpaceRayMarching as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ScreenSpaceRayMarching.glsl.js";import{CameraSpace as o}from"../views/3d/webgl-engine/core/shaderLibrary/util/CameraSpace.glsl.js";import{viewMatrix as s}from"../views/3d/webgl-engine/core/shaderLibrary/util/cameraUniforms.js";import{FloatBindUniform as c}from"../views/3d/webgl-engine/core/shaderModules/FloatBindUniform.js";import{FloatPassUniform as l}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as u,If as d}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Matrix4BindUniform as f}from"../views/3d/webgl-engine/core/shaderModules/Matrix4BindUniform.js";import{Texture2DBindUniform as p}from"../views/3d/webgl-engine/core/shaderModules/Texture2DBindUniform.js";import{Texture2DPassUniform as m}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{GlobalIlluminationColorQuantization as h}from"../views/3d/webgl-engine/effects/globalIllumination/GlobalIlluminationColorQuantization.glsl.js";import{floatBlendReductionFactor as g}from"../views/3d/webgl-engine/shaders/floatBlendScale.glsl.js";import{ToneMapping as _}from"../views/3d/webgl-engine/shaders/ToneMapping.glsl.js";import{ColorAttachment1 as v,SizedPixelFormat as y}from"../views/webgl/enums.js";import{NoParameters as b}from"../views/webgl/NoParameters.js";import{ShaderBuilder as x}from"../views/webgl/ShaderBuilder.js";const S=2.5,C=0,w=.8,T=25,E=.15,D=.5,O=1,k=1,A=16;class j extends b{constructor(){super(...arguments),this.projScale=1,this.resolutionScale=1,this.accumulatedFrames=0,this.temporalSampleFrame=0,this.glowBoost=0,this.rayMarchMinReach=E,this.rayMarchMaxReach=D,this.rayMarchWorldReach=25,this.rayMarchMinReachEmissionWeight=1,this.rayMarchMaxReachEmissionWeight=1,this.rayMarchMaxSteps=16,this.colorBleedWeight=0,this.highQualityIdleColorBlendStart=.3,this.emissionBoostFactor=S,this.factorDaylightDirectional=w}}function M(b){let S=new x,C=S.fragment;S.include(t),S.include(o),C.include(n),C.include(r),C.include(h),C.include(_),S.include(a,b),C.uniforms.add(i,s,new m(`normalMap`,e=>e.normalTexture),new m(`depthMap`,e=>e.depthTexture),new m(`lastFrameGlobalIlluminationTexture`,(e,t)=>e.globalIllumination??t.globalIllumination?.getTexture()),new m(`lastFrameGlobalIlluminationWeightTexture`,(e,t)=>e.globalIlluminationWeights??t.globalIllumination?.getTexture(v)),e,new p(`lastFrameDepthTexture`,e=>e.reprojection.lastFrameDepth?.attachment),new f(`reprojectionProjectionMatrix`,e=>e.reprojection.lastFrameCamera.projectionMatrix),new f(`reprojectionViewMatrix`,e=>e.reprojection.viewMatrix),new l(`accumulatedFrames`,e=>e.accumulatedFrames),new l(`temporalSampleFrame`,e=>e.temporalSampleFrame),new l(`resolutionScale`,e=>e.resolutionScale)),C.uniforms.add(new l(`rayMarchMinReach`,e=>e.rayMarchMinReach),new l(`rayMarchMaxReach`,e=>e.rayMarchMaxReach),new l(`rayMarchWorldReach`,e=>e.rayMarchWorldReach),new l(`rayMarchMinReachEmissionWeight`,e=>e.rayMarchMinReachEmissionWeight),new l(`rayMarchMaxReachEmissionWeight`,e=>e.rayMarchMaxReachEmissionWeight),new l(`rayMarchMaxSteps`,e=>e.rayMarchMaxSteps),new l(`colorBleedWeight`,e=>e.colorBleedWeight),new l(`highQualityIdleColorBlendStart`,e=>e.highQualityIdleColorBlendStart),new l(`emissionBoostFactor`,e=>e.emissionBoostFactor+e.glowBoost),new l(`factorDaylightDirectional`,e=>e.factorDaylightDirectional));let{hasEmission:w,hasColor:T}=b;return w&&(C.uniforms.add(new c(`inputScale`,e=>e.reprojection.lastFrameEmission?.getTexture()?.descriptor.internalFormat===y.RGBA8?g:1),new p(`lastFrameEmissionTexture`,e=>e.reprojection.lastFrameEmission?.getTexture())),C.code.add(u`bool hasHitReprojectionMismatch(vec3 hit, vec2 hitReprojectedCoordinate, float colorBlendWeight) {
 if (colorBlendWeight != 1.0) {
 return false;
 }
@@ -19,7 +19,7 @@ hitReprojectedCoordinate
 float relativeDepthMismatch = abs(storedLastFrameDepth - expectedLastFrameDepth) /
 max(max(storedLastFrameDepth, expectedLastFrameDepth), 0.00001);
 return relativeDepthMismatch > reprojectionMismatchThreshold;
-}`)),S.constants.add(`highQualityIdleColorBlendEnd`,`float`,.008),S.constants.add(`highQualityIdleColorBlendFrames`,`float`,150),S.constants.add(`highQualityIdleOcclusionBlendEnd`,`float`,.008),S.constants.add(`highQualityIdleOcclusionBlendExponent`,`float`,2),S.constants.add(`highQualityIdleOcclusionBlendFrames`,`float`,60),S.constants.add(`highQualityIdleOcclusionBlendStart`,`float`,.095),S.constants.add(`fullColorBleedBlendWeight`,`float`,.012),S.constants.add(`accumulationDitherScale`,`float`,.0039),S.constants.add(`lowQualityColorBlendWeight`,`float`,.0028),S.constants.add(`lowQualityColorDitherScale`,`float`,.25),S.constants.add(`lowQualityOcclusionBlendWeight`,`float`,.008),S.constants.add(`reprojectionMismatchThreshold`,`float`,.01),S.constants.add(`reprojectionMismatchColorScale`,`float`,.45),S.constants.add(`stableHistoryColorBlendWeight`,`float`,.008),S.constants.add(`strongHistoryOcclusionThreshold`,`float`,.02),S.constants.add(`weakHistoryOcclusionBlendWeight`,`float`,.1),S.constants.add(`weakHistoryOcclusionThreshold`,`float`,.5),S.constants.add(`storedColorBlendWeightScale`,`float`,6),S.code.add(l`float computeIdleColorBlendWeight(float accumulatedFrames) {
+}`)),C.constants.add(`highQualityIdleColorBlendEnd`,`float`,.008),C.constants.add(`highQualityIdleColorBlendFrames`,`float`,150),C.constants.add(`highQualityIdleOcclusionBlendEnd`,`float`,.008),C.constants.add(`highQualityIdleOcclusionBlendExponent`,`float`,2),C.constants.add(`highQualityIdleOcclusionBlendFrames`,`float`,60),C.constants.add(`highQualityIdleOcclusionBlendStart`,`float`,.095),C.constants.add(`fullColorBleedBlendWeight`,`float`,.012),C.constants.add(`accumulationDitherScale`,`float`,.0039),C.constants.add(`lowQualityColorBlendWeight`,`float`,.0028),C.constants.add(`lowQualityColorDitherScale`,`float`,.25),C.constants.add(`lowQualityOcclusionBlendWeight`,`float`,.008),C.constants.add(`reprojectionMismatchThreshold`,`float`,.01),C.constants.add(`reprojectionMismatchColorScale`,`float`,.45),C.constants.add(`stableHistoryColorBlendWeight`,`float`,.008),C.constants.add(`strongHistoryOcclusionThreshold`,`float`,.02),C.constants.add(`weakHistoryOcclusionBlendWeight`,`float`,.1),C.constants.add(`weakHistoryOcclusionThreshold`,`float`,.5),C.constants.add(`storedColorBlendWeightScale`,`float`,6),C.code.add(u`float computeIdleColorBlendWeight(float accumulatedFrames) {
 float idleColorBlendProgress = clamp(accumulatedFrames / highQualityIdleColorBlendFrames, 0.0, 1.0);
 return mix(highQualityIdleColorBlendStart, highQualityIdleColorBlendEnd, pow(idleColorBlendProgress, 1./5.)
 );
@@ -69,7 +69,7 @@ blueNoiseDitherValue(pixel, frame, vec2(0.25881904, 0.9659258), 0.37),
 blueNoiseDitherValue(pixel, frame, vec2(1.0, 0.0), 0.61)
 );
 return value * 2.0 - 1.0;
-}`),x.outputs.add(`fragGlobalIllumination`,`vec4`,0),x.outputs.add(`fragWeight`,`vec2`,1),S.main.add(l`
+}`),S.outputs.add(`fragGlobalIllumination`,`vec4`,0),S.outputs.add(`fragWeight`,`vec2`,1),C.main.add(u`
     float depth = depthFromTexture(depthMap, uv);
     // Early out if depth is out of range, such as in the sky
@@ -177,17 +177,17 @@ return value * 2.0 - 1.0;
         // 0.0 alpha excludes the surface as a receiver (e.g. water), but a valid ray hit still occludes as opaque
         hitOpacity = storedHitOpacity == 0.0 ? 1.0 : storedHitOpacity;
-        ${u(w,l`
+        ${d(T,u`
           // Emission and color bleed - Reproject the current receiver and sampled hit to estimate bounced color
           vec3 receiverColor = texture(lastFrameColorTexture, reprojectedCoordinate.xy).rgb;
           vec2 hitReprojectedCoordinate = reprojectionCoordinate(hit);
           vec3 sourceColor = texture(lastFrameColorTexture, hitReprojectedCoordinate).rgb;
           vec3 sourceColorLinear = linearizeGamma(sourceColor);
-          ${u(C,l`
+          ${d(w,u`
             bool rejectReprojectedHitEmission = hasHitReprojectionMismatch(hit, hitReprojectedCoordinate, colorBlendWeight);
             `)}
-          vec3 sourceEmission = ${u(C,`rejectReprojectedHitEmission
+          vec3 sourceEmission = ${d(w,`rejectReprojectedHitEmission
               ? vec3(0.0)
               : texture(lastFrameEmissionTexture, hitReprojectedCoordinate).xyz * inputScale`,`vec3(0.0)`)};
@@ -220,7 +220,7 @@ return value * 2.0 - 1.0;
       ? receiverOpacity * randomDirectionSample.b * accumulationDitherScale
       : 0.0;
-    ${u(w,l`
+    ${d(T,u`
       // Accumulate color
       vec3 lastFrameColor = lastFrameGlobalIllumination.rgb;
       float colorDitherScale = isScaledGlobalIllumination ? lowQualityColorDitherScale : 1.0;
@@ -233,7 +233,7 @@ return value * 2.0 - 1.0;
       if (hasReprojectionMismatch) {
         fragGlobalIllumination.rgb *= reprojectionMismatchColorScale;
       }
-      `,l`
+      `,u`
       fragGlobalIllumination.rgb = vec3(0.0);
       `)}
@@ -247,4 +247,4 @@ return value * 2.0 - 1.0;
     fragGlobalIllumination = quantizeGlobalIlluminationColor(fragGlobalIllumination);
     fragWeight = vec2(occlusionBlendWeight, colorBlendWeight * storedColorBlendWeightScale);
-  `),x}const M=Object.freeze(Object.defineProperty({__proto__:null,GlobalIlluminationPassParameters:A,build:j,defaultColorBleedWeight:0,defaultEmissionBoostFactor:x,defaultFactorDaylightDirectional:C,defaultRayMarchMaxReach:E,defaultRayMarchMaxReachEmissionWeight:1,defaultRayMarchMaxSteps:16,defaultRayMarchMinReach:T,defaultRayMarchMinReachEmissionWeight:1,defaultRayMarchWorldReach:25},Symbol.toStringTag,{value:`Module`}));export{A as G,M as a,k as b,j as c,E as d,S as e,x as f,C as g,O as h,T as i,D as j,w as k};
+  `),S}const N=Object.freeze(Object.defineProperty({__proto__:null,GlobalIlluminationPassParameters:j,build:M,defaultColorBleedWeight:0,defaultEmissionBoostFactor:S,defaultFactorDaylightDirectional:w,defaultRayMarchMaxReach:D,defaultRayMarchMaxReachEmissionWeight:1,defaultRayMarchMaxSteps:16,defaultRayMarchMinReach:E,defaultRayMarchMinReachEmissionWeight:1,defaultRayMarchWorldReach:25},Symbol.toStringTag,{value:`Module`}));export{j as G,N as a,A as b,M as c,D as d,C as e,S as f,w as g,k as h,E as i,O as j,T as k};