@arcgis/core 4.33.0-next.20250409 → 4.33.0-next.20250411

package/chunks/BloomBlur.glsl.js

@@ -2,7 +2,7 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.33/esri/copyright.txt for details.
 */
-import{gauss as e}from"../core/mathUtils.js";import{ScreenSpacePass as r}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{Gamma as o}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js";import{FloatPassUniform as t}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 i}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{blurRadiusPresets as l}from"../views/3d/webgl-engine/effects/bloom/BloomPresets.glsl.js";import{NoParameters as n}from"../views/webgl/NoParameters.js";import{ShaderBuilder as a}from"../views/webgl/ShaderBuilder.js";var c;!function(e){e[e.Horizontal=0]="Horizontal",e[e.Vertical=1]="Vertical",e[e.COUNT=2]="COUNT"}(c||(c={}));class u extends n{constructor(){super(...arguments),this.blurRadius=l.sunny}}function m(l){const n=new a,u=n.fragment;n.include(r),n.include(o),u.uniforms.add(new i("colorTexture",(e=>e.color)),new t("blurRadius",(e=>e.blurRadius)));let m="";const d=15;for(let e=0;e<d;e++){m+=`locations1D[${e}] = ${(e/(d-1)*2-1).toFixed(3).toString()};`}const f=2;let v="";for(let r=0;r<d;r++){v+=`locations1DWeights[${r}] = ${e(r-Math.floor(d/2),f).toFixed(7).toString()};`}const g=l.bloomStage===c.Horizontal;return u.code.add(s`
+import{gauss as e}from"../core/mathUtils.js";import{ScreenSpacePass as r}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{Gamma as o}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js";import{FloatPassUniform as t}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 i}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{blurRadiusPresets as l}from"../views/3d/webgl-engine/effects/bloom/BloomPresets.glsl.js";import{NoParameters as a}from"../views/webgl/NoParameters.js";import{ShaderBuilder as n}from"../views/webgl/ShaderBuilder.js";var c;!function(e){e[e.Horizontal=0]="Horizontal",e[e.Vertical=1]="Vertical",e[e.COUNT=2]="COUNT"}(c||(c={}));class u extends a{constructor(){super(...arguments),this.blurRadius=l.sunny}}function m(l){const a=new n,u=a.fragment;a.include(r),a.include(o),u.uniforms.add(new i("colorTexture",(e=>e.color)),new t("blurRadius",(e=>e.blurRadius)));let m="";const d=15;for(let e=0;e<d;e++){m+=`locations1D[${e}] = ${(e/(d-1)*2-1).toFixed(3).toString()};`}const f=2;let v="";for(let r=0;r<d;r++){v+=`locations1DWeights[${r}] = ${e(r-Math.floor(d/2),f).toFixed(7).toString()};`}const g=l.bloomStage===c.Horizontal;return u.code.add(s`
     float locations1D[${s.int(d)}];
     float locations1DWeights[${s.int(d)}];
 
@@ -22,11 +22,9 @@ import{gauss as e}from"../core/mathUtils.js";import{ScreenSpacePass as r}from"..
 
         vec2 uvDistorted = uv + uvOffset * blurRadius * aspectCorrection;
         vec4 sampleColor = texture(toBlur, uvDistorted);
-        res += pow(sampleColor, vec4(GAMMA)) * locations1DWeights[i];
+        res += sampleColor * locations1DWeights[i];
       }
-      res = pow(res, vec4(INV_GAMMA));
-      res.a = 1.0;
-
+      res.a = clamp(res.a, 0.0, 1.0);
       return res;
     }
-  `).main.add(s`fragColor = blurUniformSamples(colorTexture);`),n}const d=Object.freeze(Object.defineProperty({__proto__:null,BloomBlurPassParameters:u,get BlurDirection(){return c},build:m},Symbol.toStringTag,{value:"Module"}));export{u as B,c as a,d as b,m as c};
+  `).main.add(s`fragColor = blurUniformSamples(colorTexture);`),a}const d=Object.freeze(Object.defineProperty({__proto__:null,BloomBlurPassParameters:u,get BlurDirection(){return c},build:m},Symbol.toStringTag,{value:"Module"}));export{u as B,c as a,d as b,m as c};

package/chunks/BloomComposition.glsl.js

@@ -2,16 +2,16 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.33/esri/copyright.txt for details.
 */
-import{ScreenSpacePass as o}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{ReadDepth as e}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{Float2BindUniform as l}from"../views/3d/webgl-engine/core/shaderModules/Float2BindUniform.js";import{FloatPassUniform as t}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{FloatsPassUniform as a}from"../views/3d/webgl-engine/core/shaderModules/FloatsPassUniform.js";import{glsl as s}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{IntegerPassUniform as d}from"../views/3d/webgl-engine/core/shaderModules/IntegerPassUniform.js";import{Texture2DBindUniform as i}from"../views/3d/webgl-engine/core/shaderModules/Texture2DBindUniform.js";import{Texture2DPassUniform as m}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{exposurePresets as n,lodFactorsPresets as c}from"../views/3d/webgl-engine/effects/bloom/BloomPresets.glsl.js";import{NoParameters as u}from"../views/webgl/NoParameters.js";import{ShaderBuilder as p}from"../views/webgl/ShaderBuilder.js";class f extends u{constructor(o=n.sunny,e=c.sunny.far,r=c.sunny.near){super(),this.exposure=o,this.lodFactors=e,this.lodFactorsFront=r}}const g=new f;class b extends f{constructor(){super(...arguments),this.bloomLod=-1}}function F(){const n=new p,c=n.fragment;return n.include(o),n.include(r),c.include(e),c.uniforms.add(new m("colorTexture",(o=>o.color)),new m("bloomTexture0",(o=>o.bloomTexture0)),new m("bloomTexture1",(o=>o.bloomTexture1)),new m("bloomTexture2",(o=>o.bloomTexture2)),new m("bloomTexture3",(o=>o.bloomTexture3)),new m("bloomTexture4",(o=>o.bloomTexture4)),new t("exposure",(o=>o.exposure)),new d("bloomLod",(o=>o.bloomLod)),new i("depthTexture",(o=>o.mainDepth)),new l("nearFar",(o=>o.camera.nearFar)),new a("lodFactors",(o=>o.lodFactors),5),new a("lodFactorsFront",(o=>o.lodFactorsFront),5)).code.add(s`vec3 simpleExposureTonemap(vec3 hdrColor, float exposure) {
+import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{ReadDepth as o}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{Float2BindUniform as l}from"../views/3d/webgl-engine/core/shaderModules/Float2BindUniform.js";import{FloatPassUniform as t}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{FloatsPassUniform as a}from"../views/3d/webgl-engine/core/shaderModules/FloatsPassUniform.js";import{glsl as s}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{IntegerPassUniform as d}from"../views/3d/webgl-engine/core/shaderModules/IntegerPassUniform.js";import{Texture2DBindUniform as n}from"../views/3d/webgl-engine/core/shaderModules/Texture2DBindUniform.js";import{Texture2DPassUniform as m}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{defaultExposure as i,lodFactorsPresets as u}from"../views/3d/webgl-engine/effects/bloom/BloomPresets.glsl.js";import{NoParameters as c}from"../views/webgl/NoParameters.js";import{ShaderBuilder as p}from"../views/webgl/ShaderBuilder.js";class f extends c{constructor(e=i,o=u.sunny.far,r=u.sunny.near){super(),this.exposure=e,this.lodFactors=o,this.lodFactorsFront=r}}const g=new f;class b extends f{constructor(){super(...arguments),this.bloomLod=-1}}function w(){const i=new p,u=i.fragment;return i.include(e),i.include(r),u.include(o),u.uniforms.add(new m("colorTexture",(e=>e.color)),new m("bloomTexture0",(e=>e.bloomTexture0)),new m("bloomTexture1",(e=>e.bloomTexture1)),new m("bloomTexture2",(e=>e.bloomTexture2)),new m("bloomTexture3",(e=>e.bloomTexture3)),new m("bloomTexture4",(e=>e.bloomTexture4)),new t("exposure",(e=>e.exposure)),new d("bloomLod",(e=>e.bloomLod)),new n("depthTexture",(e=>e.mainDepth)),new l("nearFar",(e=>e.camera.nearFar)),new a("lodFactors",(e=>e.lodFactors),5),new a("lodFactorsFront",(e=>e.lodFactorsFront),5)).code.add(s`vec3 simpleExposureTonemap(vec3 hdrColor, float exposure) {
 vec3 mapped = vec3(1.0) - exp(-hdrColor * exposure);
 return mapped;
 }`).main.add(s`vec4 color = texture(colorTexture, uv);
 color = vec4(linearizeGamma(color.rgb), color.a);
-vec4 lod0 = pow(texture(bloomTexture0, uv), vec4(GAMMA));
-vec4 lod1 = pow(texture(bloomTexture1, uv), vec4(GAMMA));
-vec4 lod2 = pow(texture(bloomTexture2, uv), vec4(GAMMA));
-vec4 lod3 = pow(texture(bloomTexture3, uv), vec4(GAMMA));
-vec4 lod4 = pow(texture(bloomTexture4, uv), vec4(GAMMA));
+vec4 lod0 = texture(bloomTexture0, uv);
+vec4 lod1 = texture(bloomTexture1, uv);
+vec4 lod2 = texture(bloomTexture2, uv);
+vec4 lod3 = texture(bloomTexture3, uv);
+vec4 lod4 = texture(bloomTexture4, uv);
 float depthSample = depthFromTexture(depthTexture, uv);
 float modifierFactors = 0.0;
 float linearDepthNorm = 0.0;
@@ -21,12 +21,12 @@ float distNearFar = (nearFar[1] - nearFar[0]);
 linearDepthNorm = 1.0 - ((linearDepth - nearFar[0]) / distNearFar);
 modifierFactors = pow(linearDepthNorm, 8.0);
 }
-fragColor = mix(lodFactors[0], lodFactorsFront[0],  modifierFactors) * lod0;
-fragColor += mix(lodFactors[1], lodFactorsFront[1],  modifierFactors) * lod1;
-fragColor += mix(lodFactors[2], lodFactorsFront[2],  modifierFactors) * lod2;
-fragColor += mix(lodFactors[3], lodFactorsFront[3],  modifierFactors) * lod3;
-fragColor += mix(lodFactors[4], lodFactorsFront[4],  modifierFactors) * lod4;
+fragColor =  lodFactors[0] * lod0;
+fragColor += lodFactors[1] * lod1;
+fragColor += lodFactors[2] * lod2;
+fragColor += lodFactors[3] * lod3;
+fragColor += lodFactors[4] * lod4;
 fragColor = bloomLod == 0 ? lodFactors[0] * lod0 : bloomLod == 1 ? lodFactors[1] * lod1 : bloomLod == 2 ? lodFactors[2] * lod2 : bloomLod == 3 ? lodFactors[3] * lod3 : bloomLod == 4 ? lodFactors[4] * lod4 : fragColor;
 fragColor = vec4(simpleExposureTonemap(fragColor.rgb, exposure), fragColor.a);
 fragColor += color;
-fragColor = delinearizeGamma(fragColor);`),n}const w=Object.freeze(Object.defineProperty({__proto__:null,BloomCompositionPassParameters:b,build:F,defaultCompositionParameters:g},Symbol.toStringTag,{value:"Module"}));export{b as B,w as a,F as b,g as d};
+fragColor = delinearizeGamma(fragColor);`),i}const x=Object.freeze(Object.defineProperty({__proto__:null,BloomCompositionPassParameters:b,build:w,defaultCompositionParameters:g},Symbol.toStringTag,{value:"Module"}));export{b as B,x as a,w as b,g as d};