npm - @arcgis/core - Versions diffs - 4.24.0-next.20220401 → 4.24.0-next.20220404 - Mend

@arcgis/core 4.24.0-next.20220401 → 4.24.0-next.20220404

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 (157) hide show

package/chunks/HighlightDownsample.glsl.js CHANGED Viewed

@@ -4,7 +4,7 @@ See https://js.arcgis.com/4.24/esri/copyright.txt for details.
 */
 import{a as e}from"./vec2f64.js";import{Float2Uniform as r}from"../views/3d/webgl-engine/core/shaderModules/Float2Uniform.js";import{NoParameters as o,glsl as i}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as t}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{Texture2DUniform as a}from"../views/3d/webgl-engine/core/shaderModules/Texture2DUniform.js";import{BindType as n}from"../views/3d/webgl-engine/core/shaderTechnique/BindType.js";import{VertexAttribute as s}from"../views/3d/webgl-engine/lib/VertexAttribute.js";class d extends o{constructor(){super(...arguments),this.invFramebufferDim=e()}}function m(){const e=new t,{vertex:o,fragment:d}=e,m=o.code,l=d.code;return e.attributes.add(s.POSITION,"vec2"),m.add(i`void main() {
 gl_Position = vec4(vec2(1.0) - position * 2.0, 0.0, 1.0);
-}`),e.fragment.uniforms.add(new a("tex",n.Draw,(e=>e.inputTexture))),e.fragment.uniforms.add(new r("invFramebufferDim",n.Draw,(e=>e.invFramebufferDim))),l.add(i`void main() {
+}`),d.uniforms.add(new a("tex",n.Draw,(e=>e.inputTexture))),d.uniforms.add(new r("invFramebufferDim",n.Draw,(e=>e.invFramebufferDim))),l.add(i`void main() {
 vec2 coord = gl_FragCoord.xy * invFramebufferDim;
 vec4 value = texture2D(tex, coord);
 float mx = floor(max(value.g, value.b));

package/chunks/ImageMaterial.glsl.js CHANGED Viewed

@@ -2,36 +2,36 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 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 o}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{multipassTerrainTest as i}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{defaultMaskAlphaCutoff as a}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{ColorConversion as s}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{addProjViewLocalOrigin as t}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float2Uniform as d}from"../views/3d/webgl-engine/core/shaderModules/Float2Uniform.js";import{FloatUniform as l}from"../views/3d/webgl-engine/core/shaderModules/FloatUniform.js";import{glsl as n}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as g}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{Texture2DUniform as p}from"../views/3d/webgl-engine/core/shaderModules/Texture2DUniform.js";import{BindType as c}from"../views/3d/webgl-engine/core/shaderTechnique/BindType.js";import{TransparencyPassType as m}from"../views/3d/webgl-engine/lib/basicInterfaces.js";import{VertexAttribute as v}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function u(u){const f=new g;return t(f,u),f.include(o),f.attributes.add(v.POSITION,"vec3"),f.attributes.add(v.UV0,"vec2"),f.varyings.add("vpos","vec3"),u.hasMultipassTerrain&&f.varyings.add("depth","float"),f.vertex.uniforms.add(new d("textureCoordinateScaleFactor")),f.vertex.code.add(n`
+import{isSome as e}from"../core/maybe.js";import{O as r}from"./vec2f64.js";import{ShaderOutput as o}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutputOptions.js";import{Slice as i}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{Transform as a}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{multipassTerrainTest as s}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{defaultMaskAlphaCutoff as t}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{addProjViewLocalOrigin as l}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float2Uniform as n}from"../views/3d/webgl-engine/core/shaderModules/Float2Uniform.js";import{FloatUniform as g}from"../views/3d/webgl-engine/core/shaderModules/FloatUniform.js";import{glsl as c}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as p}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{Texture2DUniform as m}from"../views/3d/webgl-engine/core/shaderModules/Texture2DUniform.js";import{BindType as u}from"../views/3d/webgl-engine/core/shaderTechnique/BindType.js";import{TransparencyPassType as v}from"../views/3d/webgl-engine/lib/basicInterfaces.js";import{VertexAttribute as f}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function w(w){const h=new p;l(h,w),h.include(a),h.attributes.add(f.POSITION,"vec3"),h.attributes.add(f.UV0,"vec2"),h.varyings.add("vpos","vec3"),w.hasMultipassTerrain&&h.varyings.add("depth","float");const{vertex:b,fragment:y}=h;return b.uniforms.add(new n("textureCoordinateScaleFactor",u.Pass,(o=>e(o.texture)&&e(o.texture.descriptor.textureCoordinateScaleFactor)?o.texture.descriptor.textureCoordinateScaleFactor:r))),b.code.add(c`
     void main(void) {
       vpos = position;
-      ${u.hasMultipassTerrain?"depth = (view * vec4(vpos, 1.0)).z;":""}
+      ${w.hasMultipassTerrain?"depth = (view * vec4(vpos, 1.0)).z;":""}
       vTexCoord = uv0 * textureCoordinateScaleFactor;
       gl_Position = transformPosition(proj, view, vpos);
     }
-  `),f.include(r,u),f.include(i,u),f.fragment.uniforms.add(new p("tex")),f.fragment.uniforms.add(new l("opacity",c.Pass,(e=>e.opacity))),f.varyings.add("vTexCoord","vec2"),u.output===e.Alpha?f.fragment.code.add(n`
+  `),h.include(i,w),h.include(s,w),y.uniforms.add([new m("tex",u.Pass,(e=>e.texture)),new g("opacity",u.Pass,(e=>e.opacity))]),h.varyings.add("vTexCoord","vec2"),w.output===o.Alpha?y.code.add(c`
     void main() {
       discardBySlice(vpos);
-      ${u.hasMultipassTerrain?"terrainDepthTest(gl_FragCoord, depth);":""}
+      ${w.hasMultipassTerrain?"terrainDepthTest(gl_FragCoord, depth);":""}
       float alpha = texture2D(tex, vTexCoord).a * opacity;
-      if (alpha  < ${n.float(a)}) {
+      if (alpha  < ${c.float(t)}) {
         discard;
       }
       gl_FragColor = vec4(alpha);
     }
-    `):(f.fragment.include(s),f.fragment.code.add(n`
+    `):(y.include(d),y.code.add(c`
     void main() {
       discardBySlice(vpos);
-      ${u.hasMultipassTerrain?"terrainDepthTest(gl_FragCoord, depth);":""}
+      ${w.hasMultipassTerrain?"terrainDepthTest(gl_FragCoord, depth);":""}
       gl_FragColor = texture2D(tex, vTexCoord) * opacity;
-      if (gl_FragColor.a < ${n.float(a)}) {
+      if (gl_FragColor.a < ${c.float(t)}) {
         discard;
       }
       gl_FragColor = highlightSlice(gl_FragColor, vpos);
-      ${u.transparencyPassType===m.Color?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}
+      ${w.transparencyPassType===v.Color?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}
     }
-    `)),f}const f=Object.freeze(Object.defineProperty({__proto__:null,build:u},Symbol.toStringTag,{value:"Module"}));export{f as I,u as b};
+    `)),h}const h=Object.freeze(Object.defineProperty({__proto__:null,build:w},Symbol.toStringTag,{value:"Module"}));export{h as I,w as b};

package/chunks/LineMarker.glsl.js CHANGED Viewed

@@ -2,29 +2,56 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.24/esri/copyright.txt for details.
 */
-import{MARKER_TEXTURE_SIZE as e,MARKER_THICKNESS as r}from"../views/3d/layers/support/markerUtils.js";import{ShaderOutput as o}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutputOptions.js";import{Slice as i}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{RibbonVertexPosition as s}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/RibbonVertexPosition.glsl.js";import{OutputDepth as t}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.glsl.js";import{multipassTerrainTest as a}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 l}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{addProjViewLocalOrigin as p}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float2Uniform as c}from"../views/3d/webgl-engine/core/shaderModules/Float2Uniform.js";import{Float4Uniform as v}from"../views/3d/webgl-engine/core/shaderModules/Float4Uniform.js";import{FloatUniform as g}from"../views/3d/webgl-engine/core/shaderModules/FloatUniform.js";import{glsl as m}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{Matrix4Uniform as u}from"../views/3d/webgl-engine/core/shaderModules/Matrix4Uniform.js";import{ShaderBuilder as f}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 w}from"../views/3d/webgl-engine/core/shaderTechnique/BindType.js";import{TransparencyPassType as b}from"../views/3d/webgl-engine/lib/basicInterfaces.js";import{VertexAttribute as y}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function x(x){const j=new f;j.include(s,x),x.output===o.Depth&&j.include(t,x);const{vertex:C,fragment:z}=j;return z.include(d),p(j,x),C.uniforms.add(new u("inverseProjectionMatrix",w.Pass,((e,r)=>r.camera.inverseProjectionMatrix))),C.uniforms.add(new c("nearFar",w.Pass,((e,r)=>r.camera.nearFar))),C.uniforms.add(new v("viewport",w.Pass,((e,r)=>r.camera.fullViewport))),z.uniforms.add(new h("tex")),j.attributes.add(y.POSITION,"vec3"),j.attributes.add(y.UV0,"vec2"),j.attributes.add(y.AUXPOS1,"vec3"),j.varyings.add("vColor","vec4"),j.varyings.add("vpos","vec3"),j.varyings.add("vUV","vec2"),j.varyings.add("vSize","float"),j.varyings.add("linearDepth","float"),x.hasMultipassTerrain&&j.varyings.add("depth","float"),C.code.add(m`#define PERPENDICULAR(v) vec2(v.y, -v.x);
+import{MARKER_TEXTURE_SIZE as e,MARKER_THICKNESS as r}from"../views/3d/layers/support/markerUtils.js";import{ShaderOutput as o}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutputOptions.js";import{Slice as i}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{RibbonVertexPosition as a}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/RibbonVertexPosition.glsl.js";import{OutputDepth as t}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.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 l}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{RgbaFloatEncoding as c}from"../views/3d/webgl-engine/core/shaderLibrary/util/RgbaFloatEncoding.glsl.js";import{addProjViewLocalOrigin as p}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float2Uniform as d}from"../views/3d/webgl-engine/core/shaderModules/Float2Uniform.js";import{Float4Uniform as v}from"../views/3d/webgl-engine/core/shaderModules/Float4Uniform.js";import{FloatUniform as g}from"../views/3d/webgl-engine/core/shaderModules/FloatUniform.js";import{glsl as m}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{Matrix4Uniform as f}from"../views/3d/webgl-engine/core/shaderModules/Matrix4Uniform.js";import{ShaderBuilder as h}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{Texture2DUniform as u}from"../views/3d/webgl-engine/core/shaderModules/Texture2DUniform.js";import{BindType as w}from"../views/3d/webgl-engine/core/shaderTechnique/BindType.js";import{TransparencyPassType as y}from"../views/3d/webgl-engine/lib/basicInterfaces.js";import{VertexAttribute as b}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function x(x){const P=new h;P.include(a,x),x.output===o.Depth&&P.include(t,x);const{vertex:S,fragment:j}=P;return j.include(c),p(P,x),P.attributes.add(b.POSITION,"vec3"),P.attributes.add(b.UV0,"vec2"),P.attributes.add(b.AUXPOS1,"vec3"),P.varyings.add("vColor","vec4"),P.varyings.add("vpos","vec3"),P.varyings.add("vUV","vec2"),P.varyings.add("vSize","float"),P.varyings.add("linearDepth","float"),x.hasMultipassTerrain&&P.varyings.add("depth","float"),S.code.add(m`#define PERPENDICULAR(v) vec2(v.y, -v.x)
 float interp(float ncp, vec4 a, vec4 b) {
 return (-ncp - a.z) / (b.z - a.z);
-}`),C.code.add(m`vec4 projectAndScale(vec4 pos) {
+}`),S.uniforms.add([new d("nearFar",w.Pass,((e,r)=>r.camera.nearFar)),new v("viewport",w.Pass,((e,r)=>r.camera.fullViewport))]),S.code.add(m`vec4 projectAndScale(vec4 pos) {
 vec4 posNdc = proj * pos;
 posNdc.xy *= viewport.zw / posNdc.w;
 return posNdc;
-}`),C.code.add(m`
-    void clipAndTransform(inout vec4 pos, inout vec4 prev) {
-      float vnp = nearFar[0] * 0.99;
-      if (prev.z > -nearFar[0]) {
-        //previous behind ncp
-        prev = mix(pos, prev, interp(vnp, pos, prev));
+}`),S.code.add(m`void clip(vec4 pos, inout vec4 prev) {
+float vnp = nearFar[0] * 0.99;
+if (prev.z > -nearFar[0]) {
+prev = mix(pos, prev, interp(vnp, pos, prev));
+}
+}`),x.draped||(S.uniforms.add(new f("inverseProjectionMatrix",w.Pass,((e,r)=>r.camera.inverseProjectionMatrix))),S.code.add(m`vec3 inverseProject(vec4 posScreen) {
+posScreen.xy = (posScreen.xy / viewport.zw) * posScreen.w;
+return (inverseProjectionMatrix * posScreen).xyz;
+}`),S.code.add(m`bool rayIntersectPlane(vec3 rayDir, vec3 planeOrigin, vec3 planeNormal, out vec3 intersection) {
+float cos = dot(rayDir, planeNormal);
+float t = dot(planeOrigin, planeNormal) / cos;
+intersection = t * rayDir;
+return abs(cos) > 0.001 && t > 0.0;
+}`),S.uniforms.add(new g("perScreenPixelRatio",w.Pass,((e,r)=>r.camera.perScreenPixelRatio))),S.code.add(m`
+      vec4 toFront(vec4 displacedPosScreen, vec3 posLeft, vec3 posRight, vec3 prev, float lineWidth) {
+        // Project displaced position back to camera space
+        vec3 displacedPos = inverseProject(displacedPosScreen);
+        // Calculate the plane that we want the marker to lie in. Note that this will always be an approximation since ribbon lines are generally
+        // not planar and we do not know the actual position of the displaced prev vertices (they are offset in screen space, too).
+        vec3 planeNormal = normalize(cross(posLeft - posRight, posLeft - prev));
+        vec3 planeOrigin = posLeft;
+        ${x.hasCap?"\n                if(prev.z > posLeft.z) {\n                  vec2 diff = posLeft.xy - posRight.xy;\n                  planeOrigin.xy += PERPENDICULAR(diff) / 2.0;\n                }\n              ":""};
+        // Move the plane towards the camera by a margin dependent on the line width (approximated in world space). This tolerance corrects for the
+        // non-planarity in most cases, but sharp joins can place the prev vertices at arbitrary positions so markers can still clip.
+        float offset = lineWidth * perScreenPixelRatio;
+        planeOrigin *= (1.0 - offset);
+        // Intersect camera ray with the plane and make sure it is within clip space
+        vec3 rayDir = normalize(displacedPos);
+        vec3 intersection;
+        if (rayIntersectPlane(rayDir, planeOrigin, planeNormal, intersection) && intersection.z < -nearFar[0] && intersection.z > -nearFar[1]) {
+          return vec4(intersection.xyz, 1.0);
+        }
+        // Fallback: use depth of pos or prev, whichever is closer to the camera
+        float minDepth = planeOrigin.z > prev.z ? length(planeOrigin) : length(prev);
+        displacedPos *= minDepth / length(displacedPos);
+        return vec4(displacedPos.xyz, 1.0);
       }
-      ${x.hasMultipassTerrain?"depth = pos.z;":""}
-      linearDepth = (-pos.z - nearFar[0]) / (nearFar[1] - nearFar[0]);
-      pos = projectAndScale(pos);
-      prev = projectAndScale(prev);
-    }
-  `),C.uniforms.add(new g("pixelRatio",w.Pass,((e,r)=>r.camera.pixelRatio))),C.code.add(m`
+  `)),S.uniforms.add(new g("pixelRatio",w.Pass,((e,r)=>r.camera.pixelRatio))),S.code.add(m`
     void main(void) {
       float coverage = 1.0;
@@ -41,35 +68,51 @@ return posNdc;
         vec4 pos  = view * vec4(position.xyz, 1.0);
         vec4 prev = view * vec4(auxpos1.xyz, 1.0);
-        clipAndTransform(pos, prev);
+        clip(pos, prev);
+        vec4 posScreen = projectAndScale(pos);
+        vec4 prevScreen = projectAndScale(prev);
+        vec2 segment = posScreen.xy - prevScreen.xy;
         // normalize vector along line segment
-        vec2 segment = pos.xy - prev.xy;
         float segmentLen = length(segment);
         segment = (segmentLen > 0.001) ? segment / segmentLen : vec2(0.0, 0.0);
         // displace according to position in the texture
-        vec2 displacementDirU = uv0.x * PERPENDICULAR(segment);
-        vec2 displacementDirV = uv0.y * segment;
+        vec2 displacementDirU = PERPENDICULAR(segment);
+        vec2 displacementDirV = segment;
+        float displacementLen = ${m.float(e/r)} * lineWidth;
-        vSize = ${m.float(e/r)} * lineWidth;
-        pos.xy += displacementDirU * vSize + displacementDirV * vSize;
+        vec4 displacedPosScreen = posScreen;
+        displacedPosScreen.xy += uv0.x * displacementDirU * displacementLen + uv0.y * displacementDirV * displacementLen;
+  `),x.draped||S.code.add(m`vec3 posRight = inverseProject(posScreen + vec4(displacementDirU.xy, 0.0, 0.0) * lineWidth);
+vec3 posLeft = pos.xyz + (pos.xyz - posRight);
+pos = toFront(displacedPosScreen, posLeft, posRight, prev.xyz, lineWidth);
+displacedPosScreen = projectAndScale(pos);`),S.code.add(m`
+        ${x.hasMultipassTerrain?"depth = pos.z;":""}
+        linearDepth = (-pos.z - nearFar[0]) / (nearFar[1] - nearFar[0]);
         // Convert back into NDC
-        pos.xy = (pos.xy / viewport.zw) * pos.w;
+        displacedPosScreen.xy = (displacedPosScreen.xy / viewport.zw) * displacedPosScreen.w;
-        // Convert texture coordinate into [0,1]
+        // Convert texture coordinate into [0,1] and cancel out perspective correct interpolation
         vUV = (uv0 + 1.0) / 2.0;
+        vUV *= displacedPosScreen.w;
+        vSize = displacementLen;
         vColor = getColor();
         vColor.a *= coverage;
-        // transform final position to camera space for slicing
-        vpos = (inverseProjectionMatrix * pos).xyz;
-        gl_Position = pos;
+        // Use camera space for slicing
+        vpos = pos.xyz;
+        gl_Position = displacedPosScreen;
       }
     }
-  `),j.include(a,x),j.include(i,x),z.uniforms.add(new v("intrinsicColor",w.Pass,(e=>e.color))),z.include(l),z.code.add(m`
+  `),P.include(s,x),P.include(i,x),j.uniforms.add([new v("intrinsicColor",w.Pass,(e=>e.color)),new u("tex",w.Pass,(e=>e.texture))]),j.include(l),j.code.add(m`
   void main() {
     discardBySlice(vpos);
     ${x.hasMultipassTerrain?"terrainDepthTest(gl_FragCoord, depth);":""}
@@ -78,7 +121,7 @@ return posNdc;
     // Offset texture coordinate s.t. we sample texel centers
     float texelSize = ${m.float(1/e)};
-    vec2 samplePos = vUV + vec2(0.5, -0.5) * texelSize;
+    vec2 samplePos = vUV * gl_FragCoord.w + vec2(0.5, -0.5) * texelSize;
     // Evaluate sdf
     float sdf = rgba2float(texture2D(tex, samplePos)) - 0.5;
@@ -96,8 +139,8 @@ return posNdc;
     ${x.output===o.Alpha?m`gl_FragColor = vec4(finalColor.a);`:""}
     ${x.output===o.Color?m`gl_FragColor = highlightSlice(finalColor, vpos);`:""}
-    ${x.output===o.Color&&x.transparencyPassType===b.Color?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}
+    ${x.output===o.Color&&x.transparencyPassType===y.Color?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}
     ${x.output===o.Highlight?m`gl_FragColor = vec4(1.0);`:""}
     ${x.output===o.Depth?m`outputDepth(linearDepth);`:""}
   }
-  `),j}const j=Object.freeze(Object.defineProperty({__proto__:null,build:x},Symbol.toStringTag,{value:"Module"}));export{j as L,x as b};
+  `),P}const P=Object.freeze(Object.defineProperty({__proto__:null,build:x},Symbol.toStringTag,{value:"Module"}));export{P as L,x as b};

package/chunks/RealisticTree.glsl.js CHANGED Viewed

@@ -2,16 +2,16 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.24/esri/copyright.txt for details.
 */
-import{ForwardLinearDepth as e}from"../views/3d/webgl-engine/core/shaderLibrary/ForwardLinearDepth.glsl.js";import{Offset as r}from"../views/3d/webgl-engine/core/shaderLibrary/Offset.glsl.js";import{ShaderOutput as o}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutputOptions.js";import{Slice as i}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{Transform as a}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{InstancedDoublePrecision as l}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/InstancedDoublePrecision.glsl.js";import{NormalAttribute as t}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/NormalAttribute.glsl.js";import{PositionAttribute as s}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/PositionAttribute.glsl.js";import{SymbolColor as n}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/SymbolColor.glsl.js";import{TextureCoordinateAttribute as d}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/TextureCoordinateAttribute.glsl.js";import{VertexColor as c}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexColor.glsl.js";import{VerticalOffset as g}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VerticalOffset.glsl.js";import{DefaultMaterialAuxiliaryPasses as m}from"../views/3d/webgl-engine/core/shaderLibrary/default/DefaultMaterialAuxiliaryPasses.glsl.js";import{EvaluateAmbientOcclusion as v}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientOcclusion.glsl.js";import{EvaluateSceneLighting as p}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{multipassTerrainTest as u}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{PhysicallyBasedRendering as f}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRendering.glsl.js";import{PhysicallyBasedRenderingParameters as b,PBRMode as h}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{ReadShadowMap as w}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{VisualVariables as x}from"../views/3d/webgl-engine/core/shaderLibrary/shading/VisualVariables.glsl.js";import{symbolAlphaCutoff as y,DiscardOrAdjustAlpha as C}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{MixExternalColor as M}from"../views/3d/webgl-engine/core/shaderLibrary/util/MixExternalColor.glsl.js";import{addProjViewLocalOrigin as L,addCameraPosition as j}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float3Uniform as O}from"../views/3d/webgl-engine/core/shaderModules/Float3Uniform.js";import{Float4Uniform as A}from"../views/3d/webgl-engine/core/shaderModules/Float4Uniform.js";import{FloatUniform as _}from"../views/3d/webgl-engine/core/shaderModules/FloatUniform.js";import{glsl as E}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{Matrix4Uniform as F}from"../views/3d/webgl-engine/core/shaderModules/Matrix4Uniform.js";import{ShaderBuilder as S}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{Texture2DUniform as P}from"../views/3d/webgl-engine/core/shaderModules/Texture2DUniform.js";import{TransparencyPassType as T}from"../views/3d/webgl-engine/lib/basicInterfaces.js";import{VertexAttribute as $}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function N(N){const D=new S,V=D.vertex.code,B=D.fragment.code,I=L(D,N);return D.include(s),D.varyings.add("vpos","vec3"),D.include(x,N),D.include(l,N),D.include(g,N),N.output!==o.Color&&N.output!==o.Alpha||(j(D.vertex.uniforms,N),D.include(t,N),D.include(a),N.offsetBackfaces&&D.include(r),N.instancedColor&&D.attributes.add($.INSTANCECOLOR,"vec4"),D.varyings.add("vNormalWorld","vec3"),D.varyings.add("localvpos","vec3"),N.hasMultipassTerrain&&D.varyings.add("depth","float"),D.include(d,N),D.include(e,N),D.include(n,N),D.include(c,N),D.vertex.uniforms.add(new A("externalColor")),D.varyings.add("vcolorExt","vec4"),V.add(E`
+import{ForwardLinearDepth as e}from"../views/3d/webgl-engine/core/shaderLibrary/ForwardLinearDepth.glsl.js";import{Offset as r}from"../views/3d/webgl-engine/core/shaderLibrary/Offset.glsl.js";import{ShaderOutput as o}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutputOptions.js";import{Slice as i}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{Transform as a}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{InstancedDoublePrecision as l}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/InstancedDoublePrecision.glsl.js";import{NormalAttribute as t}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/NormalAttribute.glsl.js";import{PositionAttribute as s}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/PositionAttribute.glsl.js";import{SymbolColor as n}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/SymbolColor.glsl.js";import{TextureCoordinateAttribute as d}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/TextureCoordinateAttribute.glsl.js";import{VertexColor as c}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexColor.glsl.js";import{VerticalOffset as g}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VerticalOffset.glsl.js";import{DefaultMaterialAuxiliaryPasses as m}from"../views/3d/webgl-engine/core/shaderLibrary/default/DefaultMaterialAuxiliaryPasses.glsl.js";import{EvaluateAmbientOcclusion as v}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientOcclusion.glsl.js";import{EvaluateSceneLighting as p}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{multipassTerrainTest as u}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{PhysicallyBasedRendering as b}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRendering.glsl.js";import{PhysicallyBasedRenderingParameters as h,PBRMode as w}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{ReadShadowMap as f}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{VisualVariables as x}from"../views/3d/webgl-engine/core/shaderLibrary/shading/VisualVariables.glsl.js";import{symbolAlphaCutoff as y,DiscardOrAdjustAlpha as C}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{MixExternalColor as M}from"../views/3d/webgl-engine/core/shaderLibrary/util/MixExternalColor.glsl.js";import{addProjViewLocalOrigin as L,addCameraPosition as j}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float3Uniform as O}from"../views/3d/webgl-engine/core/shaderModules/Float3Uniform.js";import{Float4Uniform as A}from"../views/3d/webgl-engine/core/shaderModules/Float4Uniform.js";import{FloatUniform as _}from"../views/3d/webgl-engine/core/shaderModules/FloatUniform.js";import{glsl as P}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{Matrix4Uniform as E}from"../views/3d/webgl-engine/core/shaderModules/Matrix4Uniform.js";import{ShaderBuilder as F}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{Texture2DUniform as S}from"../views/3d/webgl-engine/core/shaderModules/Texture2DUniform.js";import{BindType as T}from"../views/3d/webgl-engine/core/shaderTechnique/BindType.js";import{TransparencyPassType as $}from"../views/3d/webgl-engine/lib/basicInterfaces.js";import{VertexAttribute as N}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function D(D){const B=new F,V=B.vertex.code,I=B.fragment.code,R=L(B,D);return B.include(s),B.varyings.add("vpos","vec3"),B.include(x,D),B.include(l,D),B.include(g,D),D.output!==o.Color&&D.output!==o.Alpha||(j(B.vertex.uniforms,D),B.include(t,D),B.include(a),D.offsetBackfaces&&B.include(r),D.instancedColor&&B.attributes.add(N.INSTANCECOLOR,"vec4"),B.varyings.add("vNormalWorld","vec3"),B.varyings.add("localvpos","vec3"),D.hasMultipassTerrain&&B.varyings.add("depth","float"),B.include(d,D),B.include(e,D),B.include(n,D),B.include(c,D),B.vertex.uniforms.add(new A("externalColor")),B.varyings.add("vcolorExt","vec4"),V.add(P`
         void main(void) {
           forwardNormalizedVertexColor();
           vcolorExt = externalColor;
-          ${N.instancedColor?"vcolorExt *= instanceColor;":""}
+          ${D.instancedColor?"vcolorExt *= instanceColor;":""}
           vcolorExt *= vvColor();
           vcolorExt *= getSymbolColor();
           forwardColorMixMode();
-          if (vcolorExt.a < ${E.float(y)}) {
+          if (vcolorExt.a < ${P.float(y)}) {
             gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
           }
           else {
@@ -21,51 +21,51 @@ import{ForwardLinearDepth as e}from"../views/3d/webgl-engine/core/shaderLibrary/
             vNormalWorld = dpNormal(vvLocalNormal(normalModel()));
             vpos = addVerticalOffset(vpos, localOrigin);
             gl_Position = transformPosition(proj, view, vpos);
-            ${N.offsetBackfaces?"gl_Position = offsetBackfacingClipPosition(gl_Position, vpos, vNormalWorld, cameraPosition);":""}
+            ${D.offsetBackfaces?"gl_Position = offsetBackfacingClipPosition(gl_Position, vpos, vNormalWorld, cameraPosition);":""}
           }
-          ${N.hasMultipassTerrain?E`depth = (view * vec4(vpos, 1.0)).z;`:""}
+          ${D.hasMultipassTerrain?P`depth = (view * vec4(vpos, 1.0)).z;`:""}
           forwardLinearDepth();
           forwardTextureCoordinates();
         }
-      `)),N.output===o.Alpha&&(D.include(i,N),D.include(C,N),D.include(u,N),D.fragment.uniforms.add(new _("opacity")),D.fragment.uniforms.add(new _("layerOpacity")),D.fragment.uniforms.add(new F("view")),N.hasColorTexture&&D.fragment.uniforms.add(new P("tex")),D.fragment.include(M),B.add(E`
+      `)),D.output===o.Alpha&&(B.include(i,D),B.include(C,D),B.include(u,D),B.fragment.uniforms.add(new _("opacity")),B.fragment.uniforms.add(new _("layerOpacity")),B.fragment.uniforms.add(new E("view")),D.hasColorTexture&&B.fragment.uniforms.add(new S("tex",T.Pass,(e=>e.texture))),B.fragment.include(M),I.add(P`
       void main() {
         discardBySlice(vpos);
-        ${N.hasMultipassTerrain?E`terrainDepthTest(gl_FragCoord, depth);`:""}
-        ${N.hasColorTexture?E`
+        ${D.hasMultipassTerrain?P`terrainDepthTest(gl_FragCoord, depth);`:""}
+        ${D.hasColorTexture?P`
         vec4 texColor = texture2D(tex, vuv0);
-        ${N.textureAlphaPremultiplied?"texColor.rgb /= texColor.a;":""}
-        discardOrAdjustAlpha(texColor);`:E`vec4 texColor = vec4(1.0);`}
-        ${N.hasVertexColors?E`
-        float opacity_ = layerOpacity * mixExternalOpacity(vColor.a * opacity, texColor.a, vcolorExt.a, int(colorMixMode));`:E`
+        ${D.textureAlphaPremultiplied?"texColor.rgb /= texColor.a;":""}
+        discardOrAdjustAlpha(texColor);`:P`vec4 texColor = vec4(1.0);`}
+        ${D.hasVertexColors?P`
+        float opacity_ = layerOpacity * mixExternalOpacity(vColor.a * opacity, texColor.a, vcolorExt.a, int(colorMixMode));`:P`
         float opacity_ = layerOpacity * mixExternalOpacity(opacity, texColor.a, vcolorExt.a, int(colorMixMode));
         `}
         gl_FragColor = vec4(opacity_);
       }
-    `)),N.output===o.Color&&(D.include(i,N),D.include(p,N),D.include(v,N),D.include(C,N),D.include(w,N),D.include(u,N),j(D.fragment.uniforms,N),D.fragment.uniforms.add(I),D.fragment.uniforms.add(new O("ambient")),D.fragment.uniforms.add(new O("diffuse")),D.fragment.uniforms.add(new _("opacity")),D.fragment.uniforms.add(new _("layerOpacity")),D.fragment.uniforms.add(new F("view")),N.hasColorTexture&&D.fragment.uniforms.add(new P("tex")),D.include(b,N),D.include(f,N),D.fragment.include(M),B.add(E`
+    `)),D.output===o.Color&&(B.include(i,D),B.include(p,D),B.include(v,D),B.include(C,D),B.include(f,D),B.include(u,D),j(B.fragment.uniforms,D),B.fragment.uniforms.add([R,new O("ambient"),new O("diffuse"),new _("opacity"),new _("layerOpacity"),new E("view")]),D.hasColorTexture&&B.fragment.uniforms.add(new S("tex",T.Pass,(e=>e.texture))),B.include(h,D),B.include(b,D),B.fragment.include(M),I.add(P`
       void main() {
         discardBySlice(vpos);
-        ${N.hasMultipassTerrain?E`terrainDepthTest(gl_FragCoord, depth);`:""}
-        ${N.hasColorTexture?E`
+        ${D.hasMultipassTerrain?P`terrainDepthTest(gl_FragCoord, depth);`:""}
+        ${D.hasColorTexture?P`
         vec4 texColor = texture2D(tex, vuv0);
-        ${N.textureAlphaPremultiplied?"texColor.rgb /= texColor.a;":""}
-        discardOrAdjustAlpha(texColor);`:E`vec4 texColor = vec4(1.0);`}
+        ${D.textureAlphaPremultiplied?"texColor.rgb /= texColor.a;":""}
+        discardOrAdjustAlpha(texColor);`:P`vec4 texColor = vec4(1.0);`}
         vec3 viewDirection = normalize(vpos - cameraPosition);
-        ${N.pbrMode===h.Normal?"applyPBRFactors();":""}
+        ${D.pbrMode===w.Normal?"applyPBRFactors();":""}
         float ssao = evaluateAmbientOcclusionInverse();
         ssao *= getBakedOcclusion();
         float additionalAmbientScale = additionalDirectedAmbientLight(vpos + localOrigin);
         vec3 additionalLight = ssao * lightingMainIntensity * additionalAmbientScale * ambientBoostFactor * lightingGlobalFactor;
-        ${N.receiveShadows?"float shadow = readShadowMap(vpos, linearDepth);":N.spherical?"float shadow = lightingGlobalFactor * (1.0 - additionalAmbientScale);":"float shadow = 0.0;"}
+        ${D.receiveShadows?"float shadow = readShadowMap(vpos, linearDepth);":D.spherical?"float shadow = lightingGlobalFactor * (1.0 - additionalAmbientScale);":"float shadow = 0.0;"}
         vec3 matColor = max(ambient, diffuse);
-        ${N.hasVertexColors?E`
+        ${D.hasVertexColors?P`
         vec3 albedo_ = mixExternalColor(vColor.rgb * matColor, texColor.rgb, vcolorExt.rgb, int(colorMixMode));
-        float opacity_ = layerOpacity * mixExternalOpacity(vColor.a * opacity, texColor.a, vcolorExt.a, int(colorMixMode));`:E`
+        float opacity_ = layerOpacity * mixExternalOpacity(vColor.a * opacity, texColor.a, vcolorExt.a, int(colorMixMode));`:P`
         vec3 albedo_ = mixExternalColor(matColor, texColor.rgb, vcolorExt.rgb, int(colorMixMode));
         float opacity_ = layerOpacity * mixExternalOpacity(opacity, texColor.a, vcolorExt.a, int(colorMixMode));
         `}
-        ${E`
+        ${P`
         vec3 shadedNormal = normalize(vNormalWorld);
         albedo_ *= 1.2;
         vec3 viewForward = vec3(view[0][2], view[1][2], view[2][2]);
@@ -74,11 +74,11 @@ import{ForwardLinearDepth as e}from"../views/3d/webgl-engine/core/shaderLibrary/
         float treeRadialFalloff = vColor.r;
         float backLightFactor = 0.5 * treeRadialFalloff * alignmentLightView * transmittance * (1.0 - shadow);
         additionalLight += backLightFactor * lightingMainIntensity;`}
-        ${N.pbrMode===h.Normal||N.pbrMode===h.Schematic?N.spherical?E`vec3 normalGround = normalize(vpos + localOrigin);`:E`vec3 normalGround = vec3(0.0, 0.0, 1.0);`:E``}
-        ${N.pbrMode===h.Normal||N.pbrMode===h.Schematic?E`
+        ${D.pbrMode===w.Normal||D.pbrMode===w.Schematic?D.spherical?P`vec3 normalGround = normalize(vpos + localOrigin);`:P`vec3 normalGround = vec3(0.0, 0.0, 1.0);`:P``}
+        ${D.pbrMode===w.Normal||D.pbrMode===w.Schematic?P`
             float additionalAmbientIrradiance = additionalAmbientIrradianceFactor * lightingMainIntensity[2];
             vec3 shadedColor = evaluateSceneLightingPBR(shadedNormal, albedo_, shadow, 1.0 - ssao, additionalLight, viewDirection, normalGround, mrr, emission, additionalAmbientIrradiance);`:"vec3 shadedColor = evaluateSceneLighting(shadedNormal, albedo_, shadow, 1.0 - ssao, additionalLight);"}
         gl_FragColor = highlightSlice(vec4(shadedColor, opacity_), vpos);
-        ${N.transparencyPassType===T.Color?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}
+        ${D.transparencyPassType===$.Color?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}
       }
-    `)),D.include(m,N),D}const D=Object.freeze(Object.defineProperty({__proto__:null,build:N},Symbol.toStringTag,{value:"Module"}));export{D as R,N as b};
+    `)),B.include(m,D),B}const B=Object.freeze(Object.defineProperty({__proto__:null,build:D},Symbol.toStringTag,{value:"Module"}));export{B as R,D as b};

package/chunks/SMAA.glsl.js CHANGED Viewed

@@ -84,8 +84,8 @@ SMAAEdgeDetectionVS( fTexCoord );
       #define SMAA_AREATEX_PIXEL_SIZE ( 1.0 / vec2( 160.0, 560.0 ) )
       #define SMAA_AREATEX_SUBTEX_SIZE ( 1.0 / 7.0 )
-      vec4 SMAASampleLevelZeroOffset(sampler2D tex, vec2 coord, vec2 offset) {
-        return texture2D( tex, coord + offset.x * resolution.xy, 0.0 );
+      vec4 SMAASampleLevelZeroOffset(sampler2D texture, vec2 coord, vec2 offset) {
+        return texture2D(texture, coord + offset.x * resolution.xy, 0.0);
       }
       vec2 round( vec2 x ) {

package/chunks/SSAO.glsl.js CHANGED Viewed

@@ -2,7 +2,7 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.24/esri/copyright.txt for details.
 */
-import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.js";import{ReadLinearDepth as r}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{CameraSpace as o}from"../views/3d/webgl-engine/core/shaderLibrary/util/CameraSpace.glsl.js";import{Float2Uniform as a}from"../views/3d/webgl-engine/core/shaderModules/Float2Uniform.js";import{FloatUniform as t}from"../views/3d/webgl-engine/core/shaderModules/FloatUniform.js";import{glsl as n}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as i}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{Texture2DUniform as s}from"../views/3d/webgl-engine/core/shaderModules/Texture2DUniform.js";import{BindType as l}from"../views/3d/webgl-engine/core/shaderTechnique/BindType.js";import{SSAOOutput as c}from"../views/3d/webgl-engine/lib/SSAOTechniqueConfiguration.js";const d={samples:16,filterRadius:4};function f(f){const u=new i,p=u.fragment;if(u.include(e),f.output===c.Blur){const e=(d.filterRadius+1)/2,o=1/(2*e*e);p.include(r),p.uniforms.add(new s("normalMap")),p.uniforms.add(new s("depthMap")),p.uniforms.add(new s("tex")),p.uniforms.add(new a("blurSize")),p.uniforms.add(new t("projScale")),p.uniforms.add(new a("nearFar",l.Pass,((e,r)=>r.camera.nearFar))),p.code.add(n`
+import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.js";import{ReadLinearDepth as r}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{CameraSpace as o}from"../views/3d/webgl-engine/core/shaderLibrary/util/CameraSpace.glsl.js";import{Float2Uniform as t}from"../views/3d/webgl-engine/core/shaderModules/Float2Uniform.js";import{FloatUniform as a}from"../views/3d/webgl-engine/core/shaderModules/FloatUniform.js";import{glsl as n}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as i}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{Texture2DUniform as s}from"../views/3d/webgl-engine/core/shaderModules/Texture2DUniform.js";import{BindType as l}from"../views/3d/webgl-engine/core/shaderTechnique/BindType.js";import{SSAOOutput as c}from"../views/3d/webgl-engine/lib/SSAOTechniqueConfiguration.js";const d={samples:16,filterRadius:4};function f(f){const u=new i,p=u.fragment;if(u.include(e),f.output===c.Blur){const e=(d.filterRadius+1)/2,o=1/(2*e*e);p.include(r),p.uniforms.add([new s("normalMap"),new s("depthMap"),new s("tex"),new t("blurSize"),new a("projScale"),new t("nearFar",l.Pass,((e,r)=>r.camera.nearFar))]),p.code.add(n`
       void blurFunction(vec2 uv, float r, float center_d, float sharpness, inout float wTotal, inout float bTotal) {
         float c = texture2D(tex, uv).r;
         float d = linearDepthFromTexture(depthMap, uv, nearFar);
@@ -29,7 +29,7 @@ import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/Scr
         gl_FragColor = vec4(b / w_total);
       }
-    `)}return f.output===c.SSAO&&(p.include(r),u.include(o),p.uniforms.add(new s("normalMap")),p.uniforms.add(new s("depthMap")),p.uniforms.add(new s("rnm")),p.uniforms.add(new t("intensity")),p.uniforms.add(new t("projScale")),p.uniforms.add(new t("radius")),p.uniforms.add(new a("nearFar",l.Pass,((e,r)=>r.camera.nearFar))),p.uniforms.add(new a("screenSize")),p.uniforms.add(new a("rnmScale")),p.code.add(n`vec3 sphere[16];
+    `)}return f.output===c.SSAO&&(p.include(r),u.include(o),p.uniforms.add(new s("normalMap")),p.uniforms.add(new s("depthMap")),p.uniforms.add(new s("rnm")),p.uniforms.add(new a("intensity")),p.uniforms.add(new a("projScale")),p.uniforms.add(new a("radius")),p.uniforms.add(new t("nearFar",l.Pass,((e,r)=>r.camera.nearFar))),p.uniforms.add(new t("screenSize")),p.uniforms.add(new t("rnmScale")),p.code.add(n`vec3 sphere[16];
 void fillSphere() {
 sphere[0] = vec3(0.186937, 0.0, 0.0);
 sphere[1] = vec3(0.700542, 0.0, 0.0);

package/chunks/SimpleAtmosphere.glsl.js CHANGED Viewed

@@ -2,25 +2,25 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.24/esri/copyright.txt for details.
 */
-import{SimpleAtmosphereGeometry as e}from"../views/3d/environment/SimpleAtmosphereTechniqueConfiguration.js";import{Transform as o}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{Float2Uniform as i}from"../views/3d/webgl-engine/core/shaderModules/Float2Uniform.js";import{Float3Uniform as r}from"../views/3d/webgl-engine/core/shaderModules/Float3Uniform.js";import{FloatUniform as n}from"../views/3d/webgl-engine/core/shaderModules/FloatUniform.js";import{glsl as t}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{Matrix4Uniform as a}from"../views/3d/webgl-engine/core/shaderModules/Matrix4Uniform.js";import{ShaderBuilder as s}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{Texture2DUniform as d}from"../views/3d/webgl-engine/core/shaderModules/Texture2DUniform.js";import{BindType as l}from"../views/3d/webgl-engine/core/shaderTechnique/BindType.js";import{VertexAttribute as c}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function m(m){const g=new s,{vertex:f,fragment:p}=g;if(m.geometry===e.Underground)g.attributes.add(c.POSITION,"vec2"),g.varyings.add("color","vec4"),f.uniforms.add(new r("lightingMainDirection")),f.uniforms.add(new r("cameraPosition")),f.uniforms.add(new n("undergroundFadeAlpha")),f.code.add(t`void main(void) {
+import{SimpleAtmosphereGeometry as e}from"../views/3d/environment/SimpleAtmosphereTechniqueConfiguration.js";import{Transform as o}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{Float2Uniform as i}from"../views/3d/webgl-engine/core/shaderModules/Float2Uniform.js";import{Float3Uniform as r}from"../views/3d/webgl-engine/core/shaderModules/Float3Uniform.js";import{FloatUniform as n}from"../views/3d/webgl-engine/core/shaderModules/FloatUniform.js";import{NoParameters as t,glsl as s}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{Matrix4Uniform as a}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 l}from"../views/3d/webgl-engine/core/shaderModules/Texture2DUniform.js";import{BindType as c}from"../views/3d/webgl-engine/core/shaderTechnique/BindType.js";import{VertexAttribute as m}from"../views/3d/webgl-engine/lib/VertexAttribute.js";class g extends t{}function f(t){const g=new d,{vertex:f,fragment:p}=g;if(t.geometry===e.Underground)g.attributes.add(m.POSITION,"vec2"),g.varyings.add("color","vec4"),f.uniforms.add(new r("lightingMainDirection")),f.uniforms.add(new r("cameraPosition")),f.uniforms.add(new n("undergroundFadeAlpha")),f.code.add(s`void main(void) {
 float ndotl = dot(normalize(cameraPosition), lightingMainDirection);
 float lighting = max(0.0, smoothstep(-1.0, 0.8, 2.0 * ndotl));
 color = vec4(vec3(lighting), undergroundFadeAlpha);
 gl_Position = vec4(position.xy, 1.0, 1.0);
-}`),p.code.add(t`void main() {
+}`),p.code.add(s`void main() {
 gl_FragColor = color;
-}`);else{g.include(o),g.attributes.add(c.POSITION,"vec3"),g.varyings.add("vtc","vec2"),g.varyings.add("falloff","float");const s=m.geometry===e.Cylinder;f.uniforms.add(new a("proj",l.Pass,((e,o)=>o.camera.projectionMatrix))),f.uniforms.add(new a("view")),f.uniforms.add(new r("lightingMainDirection")),s||(g.varyings.add("innerFactor","float"),f.uniforms.add(new r("silCircleCenter")),f.uniforms.add(new r("silCircleV1")),f.uniforms.add(new r("silCircleV2")),f.uniforms.add(new i("texV")),f.uniforms.add(new n("innerScale")));const v=6.2831853,u=1/128;f.code.add(t`
+}`);else{g.include(o),g.attributes.add(m.POSITION,"vec3"),g.varyings.add("vtc","vec2"),g.varyings.add("falloff","float");const d=t.geometry===e.Cylinder;f.uniforms.add(new a("proj",c.Pass,((e,o)=>o.camera.projectionMatrix))),f.uniforms.add(new a("view")),f.uniforms.add(new r("lightingMainDirection")),d||(g.varyings.add("innerFactor","float"),f.uniforms.add(new r("silCircleCenter")),f.uniforms.add(new r("silCircleV1")),f.uniforms.add(new r("silCircleV2")),f.uniforms.add(new i("texV")),f.uniforms.add(new n("innerScale")));const u=6.2831853,v=1/128;f.code.add(s`
 		void main(void) {
-      ${s?t`
+      ${d?s`
       vec3 pos = position;
       float ndotl = lightingMainDirection.z;
-      vtc = vec2(0.0, position.z + 0.05);`:t`
+      vtc = vec2(0.0, position.z + 0.05);`:s`
       innerFactor = clamp(-position.z, 0.0, 1.0);
       float scale = position.y * (1.0 + innerFactor * innerScale);
-      float phi = position.x * ${t.float(v*u)} + 1.0;
+      float phi = position.x * ${s.float(u*v)} + 1.0;
       vec3 pos =  (silCircleCenter + sin(phi) * silCircleV1 + cos(phi) * silCircleV2) * scale;
       float ndotl = dot(normalize(position.y > 0.0 ? pos: silCircleCenter), lightingMainDirection);
-      vtc.x = position.x  * ${t.float(u)};
+      vtc.x = position.x  * ${s.float(v)};
       vtc.y = texV.x * (1.0 - position.z) + texV.y * position.z;
       `}
       falloff = max(0.0, smoothstep(-1.0, 0.8, 2.0 * ndotl));
@@ -28,11 +28,11 @@ gl_FragColor = color;
 		  gl_Position = transformPosition(proj, view, pos);
 		  gl_Position.z = gl_Position.w; // project atmosphere onto the far plane
     }
-	  `),p.uniforms.add(new d("tex")),s||p.uniforms.add(new n("altitudeFade")),p.code.add(t`
+	  `),p.uniforms.add(new l("tex",c.Pass,(e=>e.texture))),d||p.uniforms.add(new n("altitudeFade")),p.code.add(s`
 		void main() {
 			vec4 atmosphereColor = texture2D(tex, vtc) * falloff;
-      ${s?t`gl_FragColor = atmosphereColor;`:t`
+      ${d?s`gl_FragColor = atmosphereColor;`:s`
 			vec4 innerColor = vec4(atmosphereColor.rgb, 1.0 - altitudeFade);
 			gl_FragColor = mix(atmosphereColor, innerColor, smoothstep(0.0, 1.0, innerFactor));
       `}
-    }`)}return g}const g=Object.freeze(Object.defineProperty({__proto__:null,build:m},Symbol.toStringTag,{value:"Module"}));export{g as S,m as b};
+    }`)}return g}const p=Object.freeze(Object.defineProperty({__proto__:null,SimpleAtmospherePassParameters:g,build:f},Symbol.toStringTag,{value:"Module"}));export{g as S,p as a,f as b};

package/chunks/TextureOnly.glsl.js CHANGED Viewed

@@ -2,7 +2,7 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.24/esri/copyright.txt for details.
 */
-import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.js";import{Float4Uniform as r}from"../views/3d/webgl-engine/core/shaderModules/Float4Uniform.js";import{glsl as o}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";function d(){const d=new n;return d.include(e),d.fragment.uniforms.add(new i("tex")),d.fragment.uniforms.add(new r("uColor")),d.fragment.code.add(o`void main() {
+import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.js";import{Float4Uniform as r}from"../views/3d/webgl-engine/core/shaderModules/Float4Uniform.js";import{glsl as o}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";function s(){const s=new n;return s.include(e),s.fragment.uniforms.add([new i("tex"),new r("uColor")]),s.fragment.code.add(o`void main() {
 vec4 texColor = texture2D(tex, uv);
 gl_FragColor = texColor * uColor;
-}`),d}const s=Object.freeze(Object.defineProperty({__proto__:null,build:d},Symbol.toStringTag,{value:"Module"}));export{s as T,d as b};
+}`),s}const t=Object.freeze(Object.defineProperty({__proto__:null,build:s},Symbol.toStringTag,{value:"Module"}));export{t as T,s as b};

package/core/accessorSupport/Property.js CHANGED Viewed

@@ -2,4 +2,4 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.24/esri/copyright.txt for details.
 */
-import{OriginId as t}from"./PropertyOrigin.js";import{trackAccess as s,runTracked as e,trackExplicitDependencies as i,runUntracked as r}from"./tracking.js";import{Flags as n}from"./tracking/Flags.js";import{ObservationHandle as l}from"./tracking/ObservationHandle.js";class o{constructor(t,s,e){this.properties=t,this.propertyName=s,this.metadata=e,this._observers=null,this._accessed=null,this._handles=null,this.flags=n.Dirty|(e.nonNullable?n.NonNullable:0)|(e.hasOwnProperty("value")?n.HasDefaultValue:0)|(void 0===e.get?n.DepTrackingInitialized:0)|(void 0===e.dependsOn?n.AutoTracked:0)}destroy(){this._accessed=null,this._observers=null,this._clearObservationHandles()}getComputed(){s(this);const l=this.properties.store,o=this.propertyName,a=this.flags,h=l.get(o);if(a&n.Computing)return h;if(~a&n.Dirty&&l.has(o))return h;this.flags|=n.Computing;const d=this.properties.host;let c;a&n.AutoTracked?c=e(this,this.metadata.get,d):(i(d,this),c=this.metadata.get.call(d)),l.set(o,c,t.COMPUTED);const u=l.get(o);return u===h?this.flags&=~n.Dirty:r(this.commit,this),this.flags&=~n.Computing,u}onObservableAccessed(t){t!==this&&(null===this._accessed&&(this._accessed=[]),this._accessed.includes(t)||this._accessed.push(t))}onTrackingEnd(){this._clearObservationHandles(),this.flags|=n.DepTrackingInitialized;const t=this._accessed;if(null===t)return;let s=this._handles;null===s&&(s=this._handles=[]);for(let e=0;e<t.length;++e)s.push(t[e].observe(this));t.length=0}observe(t){return null===this._observers&&(this._observers=[]),this._observers.includes(t)||this._observers.push(t),new l(this._observers,t)}notifyChange(){this.onInvalidated(),this.onCommitted()}invalidate(){this.onInvalidated()}onInvalidated(){~this.flags&n.Overriden&&(this.flags|=n.Dirty);const t=this._observers;if(null!==t)for(let s=0;s<t.length;++s)t[s].onInvalidated()}commit(){this.flags&=~n.Dirty,this.onCommitted()}onCommitted(){if(null===this._observers)return;const t=this._observers.slice();for(let s=0;s<t.length;++s)t[s].onCommitted()}_clearObservationHandles(){const t=this._handles;if(null!==t){for(let s=0;s<t.length;++s)t[s].remove();t.length=0}}}export{o as Property};
+import{OriginId as s}from"./PropertyOrigin.js";import{trackAccess as t,runTracked as e,trackExplicitDependencies as i,runUntracked as r}from"./tracking.js";import{Flags as n}from"./tracking/Flags.js";import{ObservationHandle as o}from"./tracking/ObservationHandle.js";class l{constructor(s,t,e){this.properties=s,this.propertyName=t,this.metadata=e,this._observers=null,this._accessed=null,this._handles=null,this.flags=n.Dirty|(e.nonNullable?n.NonNullable:0)|(e.hasOwnProperty("value")?n.HasDefaultValue:0)|(void 0===e.get?n.DepTrackingInitialized:0)|(void 0===e.dependsOn?n.AutoTracked:0)}destroy(){if(this.flags&n.Dirty&&this._observers){const s=this._observers.slice();for(const t of s)t.onCommitted()}this._accessed=null,this._observers=null,this._clearObservationHandles()}getComputed(){t(this);const o=this.properties.store,l=this.propertyName,a=this.flags,h=o.get(l);if(a&n.Computing)return h;if(~a&n.Dirty&&o.has(l))return h;this.flags|=n.Computing;const d=this.properties.host;let c;a&n.AutoTracked?c=e(this,this.metadata.get,d):(i(d,this),c=this.metadata.get.call(d)),o.set(l,c,s.COMPUTED);const u=o.get(l);return u===h?this.flags&=~n.Dirty:r(this.commit,this),this.flags&=~n.Computing,u}onObservableAccessed(s){s!==this&&(null===this._accessed&&(this._accessed=[]),this._accessed.includes(s)||this._accessed.push(s))}onTrackingEnd(){this._clearObservationHandles(),this.flags|=n.DepTrackingInitialized;const s=this._accessed;if(null===s)return;let t=this._handles;null===t&&(t=this._handles=[]);for(let e=0;e<s.length;++e)t.push(s[e].observe(this));s.length=0}observe(s){return null===this._observers&&(this._observers=[]),this._observers.includes(s)||this._observers.push(s),new o(this._observers,s)}notifyChange(){this.onInvalidated(),this.onCommitted()}invalidate(){this.onInvalidated()}onInvalidated(){~this.flags&n.Overriden&&(this.flags|=n.Dirty);const s=this._observers;if(null!==s)for(let t=0;t<s.length;++t)s[t].onInvalidated()}commit(){this.flags&=~n.Dirty,this.onCommitted()}onCommitted(){if(null===this._observers)return;const s=this._observers.slice();for(let t=0;t<s.length;++t)s[t].onCommitted()}_clearObservationHandles(){const s=this._handles;if(null!==s){for(let t=0;t<s.length;++t)s[t].remove();s.length=0}}}export{l as Property};

package/interfaces.d.ts CHANGED Viewed

@@ -29432,7 +29432,7 @@ declare namespace __esri {
      *
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#fetchResources)
      */
-    fetchResources(params?: FetchResourcesParams, options?: PortalItemFetchResourcesOptions): FetchResourcesResult;
+    fetchResources(params?: FetchResourcesParams, options?: PortalItemFetchResourcesOptions): Promise<FetchResourcesResult>;
     /**
      * Get the URL to the thumbnail image for the item.
      *
@@ -34837,6 +34837,12 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#RequestOptions)
      */
     useProxy?: boolean;
+    /**
+     * Indicates if cross-site `Access-Control` requests should use credentials.
+     *
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#RequestOptions)
+     */
+    withCredentials?: boolean;
   }
   /**
@@ -71639,6 +71645,12 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#zoom)
      */
     zoom: number;
+    /**
+     * Internal method to take a screenshot.
+     *
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#_takeScreenshot)
+     */
+    _takeScreenshot(): void;
     /**
      * Sets the view to a given target.
      *
@@ -72424,6 +72436,12 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#zoom)
      */
     zoom: number;
+    /**
+     * Internal method to take a screenshot.
+     *
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#_takeScreenshot)
+     */
+    _takeScreenshot(): void;
     /**
      * Sets the view to a given target.
      *
@@ -84782,6 +84800,12 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-FeatureTable-FeatureTableViewModel.html#clearSelection)
      */
     clearSelection(): void;
+    /**
+     * Clears the current [filterBySelection](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-FeatureTable-FeatureTableViewModel.html#filterBySelection) so that the table displays all of the table rows.
+     *
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-FeatureTable-FeatureTableViewModel.html#clearSelectionFilter)
+     */
+    clearSelectionFilter(): void;
     /**
      * Unselects the specified rows within the table.
      *
@@ -84830,12 +84854,6 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-FeatureTable-FeatureTableViewModel.html#selectRows)
      */
     selectRows(params: number | Graphic | (number | Graphic)[]): void;
-    /**
-     * Clears the current [filterBySelection](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-FeatureTable-FeatureTableViewModel.html#filterBySelection) so that the table displays all of the table rows.
-     *
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-FeatureTable-FeatureTableViewModel.html#zoomToSelection)
-     */
-    zoomToSelection(): void;
     /**
      * Zooms the view to the extent of the current row selection.
      *

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@arcgis/core",
-  "version": "4.24.0-next.20220401",
+  "version": "4.24.0-next.20220404",
   "homepage": "https://js.arcgis.com",
   "description": "ArcGIS API for JavaScript: A complete 2D and 3D mapping and data visualization API",
   "keywords": [