@arcgis/core 4.23.0-next.20220123 → 4.23.0-next.20220128

package/chunks/RibbonLine.glsl.js

@@ -2,7 +2,7 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/esri/copyright.txt for details.
 */
-import{ShaderOutput as e}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutputOptions.js";import{Slice as t}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{RibbonVertexPosition as i}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/RibbonVertexPosition.glsl.js";import{OutputDepth as n}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.glsl.js";import{ReadLinearDepth as r}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{LineStipple as o}from"../views/3d/webgl-engine/core/shaderLibrary/shading/LineStipple.glsl.js";import{multipassTerrainTest as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{PiUtils as s}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PiUtils.glsl.js";import{symbolAlphaCutoff as l}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{ColorConversion as p}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{glsl as d}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as c}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as m}from"../views/3d/webgl-engine/lib/basicInterfaces.js";const g=1;var v;function f(f){const h=new c,D=f.capType!==v.BUTT,u=f.capType===v.ROUND,x=f.stippleEnabled&&u,S=f.falloffEnabled||x,b=f.innerColorEnabled||u,L=f.stippleEnabled&&f.stippleScaleWithLineWidth||u,y=f.stippleEnabled&&f.stippleScaleWithLineWidth,C=f.stippleEnabled||u;return h.include(s),h.include(i,f),h.include(o,{...f,stippleRequiresStretchMeasure:!0}),f.output===e.Depth&&h.include(n,f),h.vertex.uniforms.add("proj","mat4").add("view","mat4").add("cameraNearFar","vec2").add("pixelRatio","float").add("miterLimit","float").add("screenSize","vec2"),h.attributes.add(m.POSITION,"vec3"),h.attributes.add(m.SUBDIVISIONFACTOR,"float"),h.attributes.add(m.UV0,"vec2"),h.attributes.add(m.AUXPOS1,"vec3"),h.attributes.add(m.AUXPOS2,"vec3"),h.varyings.add("vColor","vec4"),h.varyings.add("vpos","vec3"),h.varyings.add("linearDepth","float"),f.multipassTerrainEnabled&&h.varyings.add("depth","float"),L&&h.varyings.add("vLineWidth","float"),y&&h.varyings.add("vLineSizeInv","float"),b&&h.varyings.add("vLineDistance","float"),S&&h.varyings.add("vLineDistanceNorm","float"),f.falloffEnabled&&h.fragment.uniforms.add("falloff","float"),f.innerColorEnabled&&(h.fragment.uniforms.add("innerColor","vec4"),h.fragment.uniforms.add("innerWidth","float")),u&&h.varyings.add("vSegmentSDF","float"),h.vertex.code.add(d`#define PERPENDICULAR(v) vec2(v.y, -v.x);
+import{ShaderOutput as e}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutputOptions.js";import{Slice as t}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{RibbonVertexPosition as i}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/RibbonVertexPosition.glsl.js";import{OutputDepth as n}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.glsl.js";import{ReadLinearDepth as r}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{LineStipple as o}from"../views/3d/webgl-engine/core/shaderLibrary/shading/LineStipple.glsl.js";import{multipassTerrainTest as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{PiUtils as s}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PiUtils.glsl.js";import{symbolAlphaCutoff as l}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{ColorConversion as p}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{glsl as d}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as c}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as g}from"../views/3d/webgl-engine/lib/VertexAttribute.js";const v=1;var m;function f(f){const h=new c,D=f.capType!==m.BUTT,u=f.capType===m.ROUND,x=f.stippleEnabled&&u,S=f.falloffEnabled||x,b=f.innerColorEnabled||u,L=f.stippleEnabled&&f.stippleScaleWithLineWidth||u,y=f.stippleEnabled&&f.stippleScaleWithLineWidth,C=f.stippleEnabled||u;return h.include(s),h.include(i,f),h.include(o,{...f,stippleRequiresStretchMeasure:!0}),f.output===e.Depth&&h.include(n,f),h.vertex.uniforms.add("proj","mat4").add("view","mat4").add("nearFar","vec2").add("pixelRatio","float").add("miterLimit","float").add("screenSize","vec2"),h.attributes.add(g.POSITION,"vec3"),h.attributes.add(g.SUBDIVISIONFACTOR,"float"),h.attributes.add(g.UV0,"vec2"),h.attributes.add(g.AUXPOS1,"vec3"),h.attributes.add(g.AUXPOS2,"vec3"),h.varyings.add("vColor","vec4"),h.varyings.add("vpos","vec3"),h.varyings.add("linearDepth","float"),f.multipassTerrainEnabled&&h.varyings.add("depth","float"),L&&h.varyings.add("vLineWidth","float"),y&&h.varyings.add("vLineSizeInv","float"),b&&h.varyings.add("vLineDistance","float"),S&&h.varyings.add("vLineDistanceNorm","float"),f.falloffEnabled&&h.fragment.uniforms.add("falloff","float"),f.innerColorEnabled&&(h.fragment.uniforms.add("innerColor","vec4"),h.fragment.uniforms.add("innerWidth","float")),u&&h.varyings.add("vSegmentSDF","float"),h.vertex.code.add(d`#define PERPENDICULAR(v) vec2(v.y, -v.x);
 float interp(float ncp, vec4 a, vec4 b) {
 return (-ncp - a.z) / (b.z - a.z);
 }
@@ -17,13 +17,13 @@ posNdc.xy *= screenSize / posNdc.w;
 return posNdc;
 }`),h.vertex.code.add(d`
     void clipAndTransform(inout vec4 pos, inout vec4 prev, inout vec4 next, in bool isStartVertex) {
-      float vnp = cameraNearFar[0] * 0.99;
+      float vnp = nearFar[0] * 0.99;
 
       //current pos behind ncp --> we need to clip
-      if(pos.z > -cameraNearFar[0]) {
+      if(pos.z > -nearFar[0]) {
         if (!isStartVertex) {
           //previous in front of ncp
-          if(prev.z < -cameraNearFar[0]) {
+          if(prev.z < -nearFar[0]) {
             pos = mix(prev, pos, interp(vnp, prev, pos));
             next = pos;
           } else {
@@ -32,7 +32,7 @@ return posNdc;
         }
         //next in front of ncp
         if(isStartVertex) {
-          if(next.z < -cameraNearFar[0]) {
+          if(next.z < -nearFar[0]) {
             pos = mix(pos, next, interp(vnp, pos, next));
             prev = pos;
           } else {
@@ -42,17 +42,17 @@ return posNdc;
       } else {
         //current position visible
         //previous behind ncp
-        if (prev.z > -cameraNearFar[0]) {
+        if (prev.z > -nearFar[0]) {
           prev = mix(pos, prev, interp(vnp, pos, prev));
         }
         //next behind ncp
-        if (next.z > -cameraNearFar[0]) {
+        if (next.z > -nearFar[0]) {
           next = mix(next, pos, interp(vnp, next, pos));
         }
       }
 
       ${f.multipassTerrainEnabled?"depth = pos.z;":""}
-      linearDepth = (-pos.z - cameraNearFar[0]) / (cameraNearFar[1] - cameraNearFar[0]);
+      linearDepth = (-pos.z - nearFar[0]) / (nearFar[1] - nearFar[0]);
 
       pos = projectAndScale(pos);
       next = projectAndScale(next);
@@ -147,7 +147,7 @@ if (isOutside && (displacementLen > miterLimit * lineWidth)) {`),f.roundJoins?h.
         endDir = normalize(endDir);
         endDir = PERPENDICULAR(endDir);
 
-        float factor = ${f.stippleEnabled?d`min(1.0, subdivisionFactor * ${d.float((g+2)/(g+1))})`:d`subdivisionFactor`};
+        float factor = ${f.stippleEnabled?d`min(1.0, subdivisionFactor * ${d.float((v+2)/(v+1))})`:d`subdivisionFactor`};
 
         float rotationAngle = acos(clamp(dot(startDir, endDir), -1.0, 1.0));
         joinDisplacementDir = rotate(startDir, -sign(uv0.y) * factor * rotationAngle);
@@ -280,8 +280,8 @@ color = mix(color, vec4(innerColor.rgb, innerAlpha), innerAA);`),h.fragment.code
 
     ${f.output===e.Alpha?d`gl_FragColor = vec4(finalColor.a);`:""}
     ${f.output===e.Color?d`gl_FragColor = highlightSlice(finalColor, vpos);`:""}
-    ${f.output===e.Color&&f.OITEnabled?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}
+    ${f.output===e.Color&&f.oitEnabled?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}
     ${f.output===e.Highlight?d`gl_FragColor = vec4(1.0);`:""}
     ${f.output===e.Depth?d`outputDepth(linearDepth);`:""}
   }
-  `),h}!function(e){e[e.BUTT=0]="BUTT",e[e.SQUARE=1]="SQUARE",e[e.ROUND=2]="ROUND",e[e.COUNT=3]="COUNT"}(v||(v={}));const h=Object.freeze({__proto__:null,NUM_ROUND_JOIN_SUBDIVISIONS:g,get CapType(){return v},build:f});export{v as C,g as N,h as R,f as b};
+  `),h}!function(e){e[e.BUTT=0]="BUTT",e[e.SQUARE=1]="SQUARE",e[e.ROUND=2]="ROUND",e[e.COUNT=3]="COUNT"}(m||(m={}));const h=Object.freeze({__proto__:null,NUM_ROUND_JOIN_SUBDIVISIONS:v,get CapType(){return m},build:f});export{m as C,v as N,h as R,f as b};

package/chunks/SMAA.glsl.js

@@ -2,10 +2,10 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/esri/copyright.txt for details.
 */
-import{glsl as e}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as o}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as t}from"../views/3d/webgl-engine/lib/basicInterfaces.js";var r;function d(d){const s=new o;return d.output===r.EdgeDetector&&(s.attributes.add(t.POSITION,"vec2"),s.vertex.uniforms.add("uResolution","vec4"),s.varyings.add("fTexCoord","vec2"),s.varyings.add("fOffset[3]","vec4"),s.vertex.code.add(e`void SMAAEdgeDetectionVS( vec2 texcoord ) {
-fOffset[0] = texcoord.xyxy + uResolution.xyxy * vec4( -1.0, 0.0, 0.0,  1.0 );
-fOffset[1] = texcoord.xyxy + uResolution.xyxy * vec4(  1.0, 0.0, 0.0, -1.0 );
-fOffset[2] = texcoord.xyxy + uResolution.xyxy * vec4( -2.0, 0.0, 0.0,  2.0 );
+import{glsl as e}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as o}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as t}from"../views/3d/webgl-engine/lib/VertexAttribute.js";var r;function d(d){const s=new o;return d.output===r.EdgeDetector&&(s.attributes.add(t.POSITION,"vec2"),s.vertex.uniforms.add("resolution","vec4"),s.varyings.add("fTexCoord","vec2"),s.varyings.add("fOffset[3]","vec4"),s.vertex.code.add(e`void SMAAEdgeDetectionVS( vec2 texcoord ) {
+fOffset[0] = texcoord.xyxy + resolution.xyxy * vec4( -1.0, 0.0, 0.0,  1.0 );
+fOffset[1] = texcoord.xyxy + resolution.xyxy * vec4(  1.0, 0.0, 0.0, -1.0 );
+fOffset[2] = texcoord.xyxy + resolution.xyxy * vec4( -2.0, 0.0, 0.0,  2.0 );
 }
 void main() {
 fTexCoord = (position + 1.0 ) * 0.5;
@@ -67,12 +67,12 @@ SMAAEdgeDetectionVS( fTexCoord );
       void main() {
         gl_FragColor = SMAAColorEdgeDetectionPS( fTexCoord, fOffset, tColor );
       }
-    `)),d.output===r.BlendWeight&&(s.attributes.add(t.POSITION,"vec2"),s.vertex.uniforms.add("uResolution","vec4"),s.varyings.add("fTexCoord","vec2"),s.varyings.add("fOffset[3]","vec4"),s.varyings.add("fPixCoord","vec2"),s.vertex.code.add(e`
+    `)),d.output===r.BlendWeight&&(s.attributes.add(t.POSITION,"vec2"),s.vertex.uniforms.add("resolution","vec4"),s.varyings.add("fTexCoord","vec2"),s.varyings.add("fOffset[3]","vec4"),s.varyings.add("fPixCoord","vec2"),s.vertex.code.add(e`
       void SMAABlendingWeightCalculationVS( vec2 texcoord ) {
-        fPixCoord = texcoord * uResolution.zw;
-        fOffset[0] = texcoord.xyxy + uResolution.xyxy * vec4( -0.25, 0.125, 1.25, 0.125 );
-        fOffset[1] = texcoord.xyxy + uResolution.xyxy * vec4( -0.125, 0.25, -0.125, -1.25 );
-        fOffset[2] = vec4( fOffset[0].xz, fOffset[1].yw ) + vec4( -2.0, 2.0, -2.0, 2.0 ) * uResolution.xxyy * float( ${e.int(d.maxSearchSteps)} );
+        fPixCoord = texcoord * resolution.zw;
+        fOffset[0] = texcoord.xyxy + resolution.xyxy * vec4( -0.25, 0.125, 1.25, 0.125 );
+        fOffset[1] = texcoord.xyxy + resolution.xyxy * vec4( -0.125, 0.25, -0.125, -1.25 );
+        fOffset[2] = vec4( fOffset[0].xz, fOffset[1].yw ) + vec4( -2.0, 2.0, -2.0, 2.0 ) * resolution.xxyy * float( ${e.int(d.maxSearchSteps)} );
       }
 
       void main() {
@@ -80,12 +80,12 @@ SMAAEdgeDetectionVS( fTexCoord );
         gl_Position = vec4(position, 0, 1);
         SMAABlendingWeightCalculationVS( fTexCoord );
       }
-    `),s.fragment.uniforms.add("tEdges","sampler2D").add("tArea","sampler2D").add("tSearch","sampler2D").add("tColor","sampler2D").add("uResolution","vec4"),s.fragment.code.add(e`
+    `),s.fragment.uniforms.add("tEdges","sampler2D").add("tArea","sampler2D").add("tSearch","sampler2D").add("tColor","sampler2D").add("resolution","vec4"),s.fragment.code.add(e`
       #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 * uResolution.xy, 0.0 );
+        return texture2D( tex, coord + offset.x * resolution.xy, 0.0 );
       }
 
       vec2 round( vec2 x ) {
@@ -101,13 +101,13 @@ SMAAEdgeDetectionVS( fTexCoord );
         vec2 e = vec2( 0.0, 1.0 );
         for ( int i = 0; i < ${e.int(d.maxSearchSteps)}; i ++ ) {
           e = texture2D( edgesTex, texcoord, 0.0 ).rg;
-          texcoord -= vec2( 2.0, 0.0 ) * uResolution.xy;
+          texcoord -= vec2( 2.0, 0.0 ) * resolution.xy;
           if ( ! ( texcoord.x > end && e.g > 0.8281 && e.r == 0.0 ) ) break;
         }
-        texcoord.x += 0.25 * uResolution.x;
-        texcoord.x += uResolution.x;
-        texcoord.x += 2.0 * uResolution.x;
-        texcoord.x -= uResolution.x * SMAASearchLength(searchTex, e, 0.0, 0.5);
+        texcoord.x += 0.25 * resolution.x;
+        texcoord.x += resolution.x;
+        texcoord.x += 2.0 * resolution.x;
+        texcoord.x -= resolution.x * SMAASearchLength(searchTex, e, 0.0, 0.5);
         return texcoord.x;
       }
 
@@ -115,13 +115,13 @@ SMAAEdgeDetectionVS( fTexCoord );
         vec2 e = vec2( 0.0, 1.0 );
         for ( int i = 0; i < ${e.int(d.maxSearchSteps)}; i ++ ) {
           e = texture2D( edgesTex, texcoord, 0.0 ).rg;
-          texcoord += vec2( 2.0, 0.0 ) * uResolution.xy;
+          texcoord += vec2( 2.0, 0.0 ) * resolution.xy;
           if ( ! ( texcoord.x < end && e.g > 0.8281 && e.r == 0.0 ) ) break;
         }
-        texcoord.x -= 0.25 * uResolution.x;
-        texcoord.x -= uResolution.x;
-        texcoord.x -= 2.0 * uResolution.x;
-        texcoord.x += uResolution.x * SMAASearchLength( searchTex, e, 0.5, 0.5 );
+        texcoord.x -= 0.25 * resolution.x;
+        texcoord.x -= resolution.x;
+        texcoord.x -= 2.0 * resolution.x;
+        texcoord.x += resolution.x * SMAASearchLength( searchTex, e, 0.5, 0.5 );
         return texcoord.x;
       }
 
@@ -129,13 +129,13 @@ SMAAEdgeDetectionVS( fTexCoord );
         vec2 e = vec2( 1.0, 0.0 );
         for ( int i = 0; i < ${e.int(d.maxSearchSteps)}; i ++ ) {
           e = texture2D( edgesTex, texcoord, 0.0 ).rg;
-          texcoord += vec2( 0.0, 2.0 ) * uResolution.xy;
+          texcoord += vec2( 0.0, 2.0 ) * resolution.xy;
           if ( ! ( texcoord.y > end && e.r > 0.8281 && e.g == 0.0 ) ) break;
         }
-        texcoord.y -= 0.25 * uResolution.y;
-        texcoord.y -= uResolution.y;
-        texcoord.y -= 2.0 * uResolution.y;
-        texcoord.y += uResolution.y * SMAASearchLength( searchTex, e.gr, 0.0, 0.5 );
+        texcoord.y -= 0.25 * resolution.y;
+        texcoord.y -= resolution.y;
+        texcoord.y -= 2.0 * resolution.y;
+        texcoord.y += resolution.y * SMAASearchLength( searchTex, e.gr, 0.0, 0.5 );
         return texcoord.y;
       }
 
@@ -143,13 +143,13 @@ SMAAEdgeDetectionVS( fTexCoord );
         vec2 e = vec2( 1.0, 0.0 );
         for ( int i = 0; i < ${e.int(d.maxSearchSteps)}; i ++ ) {
           e = texture2D( edgesTex, texcoord, 0.0 ).rg;
-          texcoord -= vec2( 0.0, 2.0 ) * uResolution.xy;
+          texcoord -= vec2( 0.0, 2.0 ) * resolution.xy;
           if ( ! ( texcoord.y < end && e.r > 0.8281 && e.g == 0.0 ) ) break;
         }
-        texcoord.y += 0.25 * uResolution.y;
-        texcoord.y += uResolution.y;
-        texcoord.y += 2.0 * uResolution.y;
-        texcoord.y -= uResolution.y * SMAASearchLength( searchTex, e.gr, 0.5, 0.5 );
+        texcoord.y += 0.25 * resolution.y;
+        texcoord.y += resolution.y;
+        texcoord.y += 2.0 * resolution.y;
+        texcoord.y -= resolution.y * SMAASearchLength( searchTex, e.gr, 0.5, 0.5 );
         return texcoord.y;
       }
 
@@ -172,9 +172,9 @@ SMAAEdgeDetectionVS( fTexCoord );
           float e1 = texture2D( edgesTex, coords, 0.0 ).r;
           coords.x = SMAASearchXRight( edgesTex, searchTex, offset[ 0 ].zw, offset[ 2 ].y );
           d.y = coords.x;
-          d = d * uResolution.z - pixcoord.x;
+          d = d * resolution.z - pixcoord.x;
           vec2 sqrt_d = sqrt( abs( d ) );
-          coords.y -= 1.0 * uResolution.y;
+          coords.y -= 1.0 * resolution.y;
           float e2 = SMAASampleLevelZeroOffset( edgesTex, coords, vec2( 1.0, 0.0 ) ).r;
           weights.rg = SMAAArea( areaTex, sqrt_d, e1, e2, float( subsampleIndices.y ) );
         }
@@ -188,9 +188,9 @@ SMAAEdgeDetectionVS( fTexCoord );
           float e1 = texture2D( edgesTex, coords, 0.0 ).g;
           coords.y = SMAASearchYDown( edgesTex, searchTex, offset[ 1 ].zw, offset[ 2 ].w );
           d.y = coords.y;
-          d = d * uResolution.w - pixcoord.y;
+          d = d * resolution.w - pixcoord.y;
           vec2 sqrt_d = sqrt( abs( d ) );
-          coords.y -= 1.0 * uResolution.y;
+          coords.y -= 1.0 * resolution.y;
           float e2 = SMAASampleLevelZeroOffset( edgesTex, coords, vec2( 0.0, 1.0 ) ).g;
           weights.ba = SMAAArea( areaTex, sqrt_d, e1, e2, float( subsampleIndices.x ) );
 
@@ -205,15 +205,15 @@ SMAAEdgeDetectionVS( fTexCoord );
       void main() {
         gl_FragColor = SMAABlendingWeightCalculationPS( fTexCoord, fPixCoord, fOffset, tEdges, tArea, tSearch, ivec4( 0.0 ) );
       }
-    `)),d.output===r.Blur&&(s.attributes.add(t.POSITION,"vec2"),s.vertex.uniforms.add("uResolution","vec4"),s.varyings.add("fTexCoord","vec2"),s.varyings.add("fOffset[2]","vec4"),s.vertex.code.add(e`void SMAANeighborhoodBlendingVS( vec2 texcoord ) {
-fOffset[0] = texcoord.xyxy + uResolution.xyxy * vec4( -1.0, 0.0, 0.0, 1.0 );
-fOffset[1] = texcoord.xyxy + uResolution.xyxy * vec4( 1.0, 0.0, 0.0, -1.0 );
+    `)),d.output===r.Blur&&(s.attributes.add(t.POSITION,"vec2"),s.vertex.uniforms.add("resolution","vec4"),s.varyings.add("fTexCoord","vec2"),s.varyings.add("fOffset[2]","vec4"),s.vertex.code.add(e`void SMAANeighborhoodBlendingVS( vec2 texcoord ) {
+fOffset[0] = texcoord.xyxy + resolution.xyxy * vec4( -1.0, 0.0, 0.0, 1.0 );
+fOffset[1] = texcoord.xyxy + resolution.xyxy * vec4( 1.0, 0.0, 0.0, -1.0 );
 }
 void main() {
 fTexCoord = (position + 1.0 ) * 0.5;
 gl_Position = vec4(position, 0, 1);
 SMAANeighborhoodBlendingVS(fTexCoord);
-}`),s.fragment.uniforms.add("tBlendWeights","sampler2D"),s.fragment.uniforms.add("tColor","sampler2D"),s.fragment.uniforms.add("uResolution","vec4"),s.fragment.code.add(e`vec4 SMAANeighborhoodBlendingPS( vec2 texcoord, vec4 offset[ 2 ], sampler2D colorTex, sampler2D blendTex ) {
+}`),s.fragment.uniforms.add("tBlendWeights","sampler2D"),s.fragment.uniforms.add("tColor","sampler2D"),s.fragment.uniforms.add("resolution","vec4"),s.fragment.code.add(e`vec4 SMAANeighborhoodBlendingPS( vec2 texcoord, vec4 offset[ 2 ], sampler2D colorTex, sampler2D blendTex ) {
 vec4 a;
 a.xz = texture2D( blendTex, texcoord ).xz;
 a.y = texture2D( blendTex, offset[ 1 ].zw ).g;
@@ -230,7 +230,7 @@ offset.y = 0.0;
 offset.x = 0.0;
 }
 vec4 C = texture2D( colorTex, texcoord, 0.0 );
-texcoord += sign( offset ) * uResolution.xy;
+texcoord += sign( offset ) * resolution.xy;
 vec4 Cop = texture2D( colorTex, texcoord, 0.0 );
 float s = abs( offset.x ) > abs( offset.y ) ? abs( offset.x ) : abs( offset.y );
 vec4 mixed = mix(C, Cop, s);

package/chunks/ShadedColorMaterial.glsl.js

@@ -2,26 +2,26 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/esri/copyright.txt for details.
 */
-import{ScreenSizeScaling as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSizeScaling.glsl.js";import{ShaderOutput as r}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 o}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{ReadLinearDepth as a}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{multipassTerrainTest as d}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{symbolAlphaCutoff as l}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{ColorConversion as n}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{glsl as s}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as t}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as c}from"../views/3d/webgl-engine/lib/basicInterfaces.js";function g(g){const m=new t;return m.include(o,{linearDepth:!1}),m.include(e,{}),m.include(i,g),m.fragment.include(n),m.vertex.uniforms.add("proj","mat4").add("view","mat4"),m.fragment.uniforms.add("color","vec4"),m.attributes.add(c.POSITION,"vec3"),m.varyings.add("vWorldPosition","vec3"),g.multipassTerrainEnabled&&m.varyings.add("depth","float"),g.screenSizeEnabled&&m.attributes.add(c.OFFSET,"vec3"),g.shadingEnabled&&(m.vertex.uniforms.add("viewNormal","mat4"),m.fragment.uniforms.add("shadedColor","vec4").add("shadingDirection","vec3"),m.attributes.add(c.NORMAL,"vec3"),m.varyings.add("vViewNormal","vec3")),m.vertex.code.add(s`
+import{ScreenSizeScaling as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSizeScaling.glsl.js";import{ShaderOutput as r}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 o}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{ReadLinearDepth as a}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{multipassTerrainTest as d}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{symbolAlphaCutoff as l}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{ColorConversion as n}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{glsl as s}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as t}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as g}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function m(m){const c=new t;return c.include(o,{linearDepth:!1}),c.include(e,{}),c.include(i,m),c.fragment.include(n),c.vertex.uniforms.add("proj","mat4").add("view","mat4"),c.fragment.uniforms.add("uColor","vec4"),c.attributes.add(g.POSITION,"vec3"),c.varyings.add("vWorldPosition","vec3"),m.multipassTerrainEnabled&&c.varyings.add("depth","float"),m.screenSizeEnabled&&c.attributes.add(g.OFFSET,"vec3"),m.shadingEnabled&&(c.vertex.uniforms.add("viewNormal","mat4"),c.fragment.uniforms.add("shadedColor","vec4").add("shadingDirection","vec3"),c.attributes.add(g.NORMAL,"vec3"),c.varyings.add("vViewNormal","vec3")),c.vertex.code.add(s`
     void main(void) {
-      vWorldPosition = ${g.screenSizeEnabled?"screenSizeScaling(offset, position)":"position"};
-  `),g.shadingEnabled&&m.vertex.code.add(s`vec3 worldNormal = normal;
-vViewNormal = (viewNormal * vec4(worldNormal, 1)).xyz;`),m.vertex.code.add(s`
-    ${g.multipassTerrainEnabled?"depth = (view * vec4(vWorldPosition, 1.0)).z;":""}
+      vWorldPosition = ${m.screenSizeEnabled?"screenSizeScaling(offset, position)":"position"};
+  `),m.shadingEnabled&&c.vertex.code.add(s`vec3 worldNormal = normal;
+vViewNormal = (viewNormal * vec4(worldNormal, 1)).xyz;`),c.vertex.code.add(s`
+    ${m.multipassTerrainEnabled?"depth = (view * vec4(vWorldPosition, 1.0)).z;":""}
     gl_Position = transformPosition(proj, view, vWorldPosition);
   }
-  `),g.multipassTerrainEnabled&&(m.fragment.include(a),m.include(d,g)),m.fragment.code.add(s`
+  `),m.multipassTerrainEnabled&&(c.fragment.include(a),c.include(d,m)),c.fragment.code.add(s`
     void main() {
       discardBySlice(vWorldPosition);
-      ${g.multipassTerrainEnabled?"terrainDepthTest(gl_FragCoord, depth);":""}
-    `),g.shadingEnabled?m.fragment.code.add(s`vec3 viewNormalNorm = normalize(vViewNormal);
+      ${m.multipassTerrainEnabled?"terrainDepthTest(gl_FragCoord, depth);":""}
+    `),m.shadingEnabled?c.fragment.code.add(s`vec3 viewNormalNorm = normalize(vViewNormal);
 float shadingFactor = 1.0 - clamp(-dot(viewNormalNorm, shadingDirection), 0.0, 1.0);
-vec4 finalColor = mix(color, shadedColor, shadingFactor);`):m.fragment.code.add(s`vec4 finalColor = color;`),m.fragment.code.add(s`
+vec4 finalColor = mix(uColor, shadedColor, shadingFactor);`):c.fragment.code.add(s`vec4 finalColor = uColor;`),c.fragment.code.add(s`
       if (finalColor.a < ${s.float(l)}) {
         discard;
       }
-      ${g.output===r.Alpha?s`gl_FragColor = vec4(finalColor.a);`:""}
+      ${m.output===r.Alpha?s`gl_FragColor = vec4(finalColor.a);`:""}
 
-      ${g.output===r.Color?s`gl_FragColor = highlightSlice(finalColor, vWorldPosition); ${g.OITEnabled?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}`:""}
+      ${m.output===r.Color?s`gl_FragColor = highlightSlice(finalColor, vWorldPosition); ${m.oitEnabled?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}`:""}
     }
-    `),m}const m=Object.freeze({__proto__:null,build:g});export{m as S,g as b};
+    `),c}const c=Object.freeze({__proto__:null,build:m});export{c as S,m as b};

package/chunks/ShadowCast.glsl.js

@@ -2,7 +2,7 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/esri/copyright.txt for details.
 */
-import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.js";import{ReadLinearDepth as a}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{ReadShadowMap as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{CameraSpace as o}from"../views/3d/webgl-engine/core/shaderLibrary/util/CameraSpace.glsl.js";import{RgbaFloatEncoding as t}from"../views/3d/webgl-engine/core/shaderLibrary/util/RgbaFloatEncoding.glsl.js";import{glsl as s}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as i}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";var d,n;!function(e){e[e.Accumulate=0]="Accumulate",e[e.Visualize=1]="Visualize",e[e.VisualizeCurrent=2]="VisualizeCurrent",e[e.COUNT=3]="COUNT"}(d||(d={})),function(e){e[e.Gradient=0]="Gradient",e[e.Threshold=1]="Threshold"}(n||(n={}));const l=255,c=1/l;function u(u){const h=new i;h.fragment.include(t),h.fragment.include(a),h.include(o),h.include(e);const{pass:p}=u;if(p===d.Visualize){const{visualization:e,bandsEnabled:a}=u;h.fragment.constants.add("inverseSampleValue","float",l),h.fragment.uniforms.add("shadowCastMap","sampler2D"),h.fragment.uniforms.add("sampleScale","float"),h.fragment.uniforms.add("opacityFromElevation","float");const r=e===n.Gradient,o=e===n.Threshold;h.fragment.uniforms.add("color","vec4"),r?a&&h.fragment.uniforms.add("bandSize","float"):o&&h.fragment.uniforms.add("threshold","float"),h.fragment.code.add(s`
+import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.js";import{ReadLinearDepth as a}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{ReadShadowMap as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{CameraSpace as o}from"../views/3d/webgl-engine/core/shaderLibrary/util/CameraSpace.glsl.js";import{RgbaFloatEncoding as t}from"../views/3d/webgl-engine/core/shaderLibrary/util/RgbaFloatEncoding.glsl.js";import{glsl as s}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as i}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";var d,n;!function(e){e[e.Accumulate=0]="Accumulate",e[e.Visualize=1]="Visualize",e[e.VisualizeCurrent=2]="VisualizeCurrent",e[e.COUNT=3]="COUNT"}(d||(d={})),function(e){e[e.Gradient=0]="Gradient",e[e.Threshold=1]="Threshold"}(n||(n={}));const l=255,c=1/l;function u(u){const h=new i;h.fragment.include(t),h.fragment.include(a),h.include(o),h.include(e);const{pass:p}=u;if(p===d.Visualize){const{visualization:e,bandsEnabled:a}=u;h.fragment.constants.add("inverseSampleValue","float",l),h.fragment.uniforms.add("shadowCastMap","sampler2D"),h.fragment.uniforms.add("sampleScale","float"),h.fragment.uniforms.add("opacityFromElevation","float");const r=e===n.Gradient,o=e===n.Threshold;h.fragment.uniforms.add("uColor","vec4"),r?a&&h.fragment.uniforms.add("bandSize","float"):o&&h.fragment.uniforms.add("threshold","float"),h.fragment.code.add(s`
       void main(void) {
         vec4 record = texture2D(shadowCastMap, uv);
         float pixelSamples = record.r * inverseSampleValue;
@@ -20,9 +20,9 @@ import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/Scr
 
         ${r&&a?s`strength = ceil(strength / bandSize) * bandSize;`:""}
 
-        gl_FragColor = vec4(color.xyz, color.a * opacityFromElevation ${r?s`* strength`:""});
+        gl_FragColor = vec4(uColor.xyz, uColor.a * opacityFromElevation ${r?s`* strength`:""});
       }
-    `)}else p!==d.Accumulate&&p!==d.VisualizeCurrent||(h.include(r),h.fragment.uniforms.add("depthMap","sampler2D"),h.fragment.uniforms.add("inverseView","mat4"),h.fragment.uniforms.add("nearFar","vec2"),p===d.Accumulate?h.fragment.constants.add("sampleValue","float",c):h.fragment.constants.add("shadowColor","vec4",[0,0,0,.8]),h.fragment.code.add(s`
+    `)}else p!==d.Accumulate&&p!==d.VisualizeCurrent||(h.include(r),h.fragment.uniforms.add("depthMap","sampler2D"),h.fragment.uniforms.add("inverseViewMatrix","mat4"),h.fragment.uniforms.add("nearFar","vec2"),p===d.Accumulate?h.fragment.constants.add("sampleValue","float",c):h.fragment.constants.add("shadowColor","vec4",[0,0,0,.8]),h.fragment.code.add(s`
       void main(void) {
 
         float depth = rgba2float(texture2D(depthMap, uv));
@@ -38,13 +38,13 @@ import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/Scr
         }
 
         vec4 currentPixelPos = vec4(reconstructPosition(gl_FragCoord.xy, currentPixelDepth), 1.0);
-        vec4 worldSpacePos = inverseView * currentPixelPos;
+        vec4 worldSpacePos = inverseViewMatrix * currentPixelPos;
 
         mat4 shadowMatrix;
         float linearDepth = -currentPixelDepth;
         int i = chooseCascade(linearDepth, shadowMatrix);
 
-        if (i >= uShadowMapNum) {
+        if (i >= numCascades) {
           discard;
         }
 
@@ -57,7 +57,7 @@ import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/Scr
 
         vec2 uvShadow = cascadeCoordinates(i, lvpos);
 
-        float depthShadow = readShadowMapDepth(uvShadow, uShadowMapTex);
+        float depthShadow = readShadowMapDepth(uvShadow, shadowMapTex);
         bool shadow = depthShadow < lvpos.z;
 
         if (!shadow) {

package/chunks/ShadowHighlight.glsl.js

@@ -2,7 +2,7 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/esri/copyright.txt for details.
 */
-import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.js";import{unoccludedHighlightFlag as o}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{ReadLinearDepth as a}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{ReadShadowMap as t}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{CameraSpace as r}from"../views/3d/webgl-engine/core/shaderLibrary/util/CameraSpace.glsl.js";import{RgbaFloatEncoding as i}from"../views/3d/webgl-engine/core/shaderLibrary/util/RgbaFloatEncoding.glsl.js";import{glsl as l}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as d}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";function h(h){const c=new d;return c.include(t),c.fragment.include(i),c.fragment.include(a),c.include(r),c.include(e),c.fragment.uniforms.add("defaultDepthTex","sampler2D").add("highlightDepthTex","sampler2D").add("depthMap","sampler2D").add("highlightMap","sampler2D").add("color","vec4").add("nearFar","vec2").add("opacity","float").add("occludedOpacity","float").add("terminationFactor","float").add("inverseView","mat4").add("lightingMainDirectionView","vec3").add("texelSize","vec2"),c.fragment.constants.add("unoccludedHighlightFlag","vec4",o).add("highlightedThreshold","float",h.highlightedThreshold).add("selfShadowThreshold","float",h.selfShadowThreshold),c.fragment.code.add(l`vec3 normalFromDepth(vec3 pixelPos, vec2 fragCoord, vec2 uv, vec2 texelSize, sampler2D depthMap, vec2 nearFar) {
+import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.js";import{unoccludedHighlightFlag as a}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{ReadLinearDepth as o}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{ReadShadowMap as t}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{CameraSpace as r}from"../views/3d/webgl-engine/core/shaderLibrary/util/CameraSpace.glsl.js";import{RgbaFloatEncoding as i}from"../views/3d/webgl-engine/core/shaderLibrary/util/RgbaFloatEncoding.glsl.js";import{glsl as l}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as d}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";function h(h){const c=new d;return c.include(t),c.fragment.include(i),c.fragment.include(o),c.include(r),c.include(e),c.fragment.uniforms.add("defaultDepthTex","sampler2D").add("highlightDepthTex","sampler2D").add("depthMap","sampler2D").add("highlightMap","sampler2D").add("uColor","vec4").add("nearFar","vec2").add("opacity","float").add("occludedOpacity","float").add("terminationFactor","float").add("inverseViewMatrix","mat4").add("lightingMainDirectionView","vec3").add("texelSize","vec2"),c.fragment.constants.add("unoccludedHighlightFlag","vec4",a).add("highlightedThreshold","float",h.highlightedThreshold).add("selfShadowThreshold","float",h.selfShadowThreshold),c.fragment.code.add(l`vec3 normalFromDepth(vec3 pixelPos, vec2 fragCoord, vec2 uv, vec2 texelSize, sampler2D depthMap, vec2 nearFar) {
 float leftPixelDepth = linearDepthFromTexture(depthMap, uv + vec2(-1.0, 0.0) * texelSize, nearFar);
 float rightPixelDepth = linearDepthFromTexture(depthMap, uv + vec2(1.0, 0.0) * texelSize, nearFar);
 float bottomPixelDepth = linearDepthFromTexture(depthMap, uv + vec2(0.0, -1.0) * texelSize, nearFar);
@@ -34,11 +34,11 @@ if (-currentPixelDepth>nearFar.y || -currentPixelDepth<nearFar.x) {
 discard;
 }
 vec4 currentPixelPos = vec4(reconstructPosition(gl_FragCoord.xy, currentPixelDepth), 1.0);
-vec4 worldSpacePos = inverseView * currentPixelPos;
+vec4 worldSpacePos = inverseViewMatrix * currentPixelPos;
 mat4 shadowMatrix;
 float linearDepth = -currentPixelDepth;
 int i = chooseCascade(linearDepth, shadowMatrix);
-if (i >= uShadowMapNum) {
+if (i >= numCascades) {
 discard;
 }
 vec3 lvpos = lightSpacePosition(worldSpacePos.xyz, shadowMatrix);
@@ -58,5 +58,5 @@ bool shaded = dot(normal, lightingMainDirectionView) < selfShadowThreshold;
 float differenceOpacity = opacity;
 float bothOpacity = occludedOpacity;
 float fragOpacity = (shadowDefault || shaded) ? bothOpacity : differenceOpacity;
-gl_FragColor = vec4(color.rgb, color.a * fragOpacity * terminationFactor);
+gl_FragColor = vec4(uColor.rgb, uColor.a * fragOpacity * terminationFactor);
 }`),c}const c=Object.freeze({__proto__:null,build:h});export{c as S,h as b};

package/chunks/SimpleAtmosphere.glsl.js

@@ -2,14 +2,14 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/esri/copyright.txt for details.
 */
-import{Transform as e}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{glsl as o}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as i}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as r}from"../views/3d/webgl-engine/lib/basicInterfaces.js";var t;function n(n){const a=new i;if(n.geometry===t.Underground)a.attributes.add(r.POSITION,"vec2"),a.varyings.add("color","vec4"),a.vertex.uniforms.add("lightingMainDirection","vec3").add("cameraPosition","vec3").add("undergroundFadeAlpha","float"),a.vertex.code.add(o`void main(void) {
+import{Transform as e}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{glsl as o}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as i}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as t}from"../views/3d/webgl-engine/lib/VertexAttribute.js";var r;function n(n){const a=new i;if(n.geometry===r.Underground)a.attributes.add(t.POSITION,"vec2"),a.varyings.add("color","vec4"),a.vertex.uniforms.add("lightingMainDirection","vec3").add("cameraPosition","vec3").add("undergroundFadeAlpha","float"),a.vertex.code.add(o`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);
 }`),a.fragment.code.add(o`void main() {
 gl_FragColor = color;
-}`);else{a.include(e,{linearDepth:!1}),a.attributes.add(r.POSITION,"vec3"),a.varyings.add("vtc","vec2"),a.varyings.add("falloff","float");const i=n.geometry===t.Cylinder;a.vertex.uniforms.add("proj","mat4").add("view","mat4").add("lightingMainDirection","vec3"),i||(a.varyings.add("innerFactor","float"),a.vertex.uniforms.add("silCircleCenter","vec3").add("silCircleV1","vec3").add("silCircleV2","vec3").add("texV","vec2").add("innerScale","float"));const l=6.2831853,d=1/128;a.vertex.code.add(o`
+}`);else{a.include(e,{linearDepth:!1}),a.attributes.add(t.POSITION,"vec3"),a.varyings.add("vtc","vec2"),a.varyings.add("falloff","float");const i=n.geometry===r.Cylinder;a.vertex.uniforms.add("proj","mat4").add("view","mat4").add("lightingMainDirection","vec3"),i||(a.varyings.add("innerFactor","float"),a.vertex.uniforms.add("silCircleCenter","vec3").add("silCircleV1","vec3").add("silCircleV2","vec3").add("texV","vec2").add("innerScale","float"));const l=6.2831853,d=1/128;a.vertex.code.add(o`
 		void main(void) {
       ${i?o`
       vec3 pos = position;
@@ -35,4 +35,4 @@ gl_FragColor = color;
 			vec4 innerColor = vec4(atmosphereColor.rgb, 1.0 - altitudeFade);
 			gl_FragColor = mix(atmosphereColor, innerColor, smoothstep(0.0, 1.0, innerFactor));
       `}
-    }`)}return a}!function(e){e[e.Cone=0]="Cone",e[e.Cylinder=1]="Cylinder",e[e.Underground=2]="Underground",e[e.COUNT=3]="COUNT"}(t||(t={}));const a=Object.freeze({__proto__:null,get SimpleAtmosphereGeometry(){return t},build:n});export{t as S,a,n as b};
+    }`)}return a}!function(e){e[e.Cone=0]="Cone",e[e.Cylinder=1]="Cylinder",e[e.Underground=2]="Underground",e[e.COUNT=3]="COUNT"}(r||(r={}));const a=Object.freeze({__proto__:null,get SimpleAtmosphereGeometry(){return r},build:n});export{r as S,a,n as b};

package/chunks/SlicePlaneMaterial.glsl.js

@@ -2,10 +2,10 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/esri/copyright.txt for details.
 */
-import{glsl as d}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as e}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as r}from"../views/3d/webgl-engine/lib/basicInterfaces.js";function a(){const a=new e;return a.extensions.add("GL_OES_standard_derivatives"),a.vertex.uniforms.add("proj","mat4").add("view","mat4"),a.attributes.add(r.POSITION,"vec3"),a.attributes.add(r.UV0,"vec2"),a.varyings.add("vUV","vec2"),a.vertex.code.add(d`void main(void) {
+import{glsl as d}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as e}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as r}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function i(){const i=new e;return i.extensions.add("GL_OES_standard_derivatives"),i.vertex.uniforms.add("proj","mat4").add("view","mat4"),i.attributes.add(r.POSITION,"vec3"),i.attributes.add(r.UV0,"vec2"),i.varyings.add("vUV","vec2"),i.vertex.code.add(d`void main(void) {
 vUV = uv0;
 gl_Position = proj * view * vec4(position, 1.0);
-}`),a.fragment.uniforms.add("backgroundColor","vec4").add("gridColor","vec4").add("ratio","float").add("gridWidth","float"),a.fragment.code.add(d`void main() {
+}`),i.fragment.uniforms.add("backgroundColor","vec4").add("gridColor","vec4").add("ratio","float").add("gridWidth","float"),i.fragment.code.add(d`void main() {
 const float LINE_WIDTH = 1.0;
 vec2 uvScaled = vUV * gridWidth;
 vec2 gridUV = (fract(uvScaled + 0.5) - 0.5) / (LINE_WIDTH * fwidth(uvScaled));
@@ -17,4 +17,4 @@ float gridAlpha = gridColor.a * gridFade;
 gl_FragColor =
 vec4(backgroundColor.rgb * backgroundColor.a, backgroundColor.a) * (1.0 - gridAlpha) +
 vec4(gridColor.rgb, 1.0) * gridAlpha;
-}`),a}const i=Object.freeze({__proto__:null,build:a});export{i as S,a as b};
+}`),i}const a=Object.freeze({__proto__:null,build:i});export{a as S,i as b};

package/chunks/Stars.glsl.js

@@ -2,13 +2,13 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/esri/copyright.txt for details.
 */
-import{AlignPixel as e}from"../views/3d/webgl-engine/core/shaderLibrary/hud/AlignPixel.glsl.js";import{glsl as o}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as a}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as i}from"../views/3d/webgl-engine/lib/basicInterfaces.js";function r(){const r=new a;return r.attributes.add(i.POSITION,"vec3"),r.attributes.add(i.COLOR,"vec4"),r.attributes.add(i.SIZE,"float"),r.varyings.add("vcolor","vec4"),r.varyings.add("vsize","float"),r.vertex.uniforms.add("transform","mat4").add("viewport","vec4").add("pixelRatio","float"),r.include(e),r.vertex.code.add(o`void main(void) {
+import{AlignPixel as e}from"../views/3d/webgl-engine/core/shaderLibrary/hud/AlignPixel.glsl.js";import{glsl as o}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as i}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as a}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function t(){const t=new i;return t.attributes.add(a.POSITION,"vec3"),t.attributes.add(a.COLOR,"vec4"),t.attributes.add(a.SIZE,"float"),t.varyings.add("vcolor","vec4"),t.varyings.add("vsize","float"),t.vertex.uniforms.add("transform","mat4").add("viewport","vec4").add("pixelRatio","float"),t.include(e),t.vertex.code.add(o`void main(void) {
 vec4 posProj = transform * vec4(position, 0);
 gl_Position = alignToPixelCenter(posProj, viewport.zw);
 vcolor = color / 1.2;
 vsize = size * 5.0 * pixelRatio;
 gl_PointSize = vsize;
-}`),r.fragment.code.add(o`void main() {
+}`),t.fragment.code.add(o`void main() {
 float cap = 0.7;
 float scale = 1.0 / cap;
 float helper = clamp(length(abs(gl_PointCoord - vec2(0.5))), 0.0, cap);
@@ -18,4 +18,4 @@ if (vsize < 3.0) {
 intensity *= 0.5;
 }
 gl_FragColor = vec4(vcolor.xyz, intensity);
-}`),r}const t=Object.freeze({__proto__:null,build:r});export{t as S,r as b};
+}`),t}const r=Object.freeze({__proto__:null,build:t});export{r as S,t as b};

package/chunks/Terrain.glsl.js

@@ -2,7 +2,7 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/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{VertexTangent as a}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexTangent.glsl.js";import{OutputDepth as i}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.glsl.js";import{OutputHighlight as l}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{EvaluateSceneLighting as t}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{NormalUtils as n}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{PBRMode as s}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{OverlayMode as v,Overlay as d}from"../views/3d/webgl-engine/core/shaderLibrary/terrain/Overlay.glsl.js";import{Skirts as c}from"../views/3d/webgl-engine/core/shaderLibrary/terrain/Skirts.glsl.js";import{TerrainTexture as g}from"../views/3d/webgl-engine/core/shaderLibrary/terrain/TerrainTexture.glsl.js";import{HeaderComment as m}from"../views/3d/webgl-engine/core/shaderLibrary/util/HeaderComment.glsl.js";import{glsl as p}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as u}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as h}from"../views/3d/webgl-engine/lib/basicInterfaces.js";function w(w){const y=new u;if(y.include(m,{name:"Terrain Shader",output:w.output}),y.include(c),y.attributes.add(h.POSITION,"vec3"),y.attributes.add(h.UV0,"vec2"),y.vertex.uniforms.add("proj","mat4").add("view","mat4").add("origin","vec3").add("skirtScale","float"),w.output===e.Color){y.include(o,{linearDepth:!1}),y.include(n,w),y.include(g,w);const e=w.overlayMode!==v.Disabled,i=w.overlayMode===v.EnabledWithWater;e&&y.include(d,{pbrMode:s.Water,useCustomDTRExponentForWater:!1,ssrEnabled:w.ssrEnabled,highStepCount:w.highStepCount}),i&&y.include(a,w),y.varyings.add("vnormal","vec3"),y.varyings.add("vpos","vec3"),y.vertex.uniforms.add("viewNormal","mat4"),w.receiveShadows&&y.varyings.add("linearDepth","float"),w.tileBorders&&y.varyings.add("vuv","vec2"),w.atmosphere&&(y.vertex.uniforms.add("lightingMainDirection","vec3"),y.varyings.add("wnormal","vec3"),y.varyings.add("wlight","vec3")),w.screenSizePerspective&&(y.vertex.uniforms.add("screenSizePerspective","vec4"),y.varyings.add("screenSizeDistanceToCamera","float"),y.varyings.add("screenSizeCosAngle","float")),y.vertex.code.add(p`
+import{ShaderOutput as e}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutputOptions.js";import{Slice as r}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{Transform as o}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{VertexTangent as a}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexTangent.glsl.js";import{OutputDepth as i}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.glsl.js";import{OutputHighlight as l}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{EvaluateSceneLighting as t}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{NormalUtils as n}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{PBRMode as s}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{OverlayMode as v,Overlay as d}from"../views/3d/webgl-engine/core/shaderLibrary/terrain/Overlay.glsl.js";import{Skirts as c}from"../views/3d/webgl-engine/core/shaderLibrary/terrain/Skirts.glsl.js";import{TerrainTexture as g}from"../views/3d/webgl-engine/core/shaderLibrary/terrain/TerrainTexture.glsl.js";import{HeaderComment as m}from"../views/3d/webgl-engine/core/shaderLibrary/util/HeaderComment.glsl.js";import{glsl as p}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as u}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as h}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function w(w){const y=new u;if(y.include(m,{name:"Terrain Shader",output:w.output}),y.include(c),y.attributes.add(h.POSITION,"vec3"),y.attributes.add(h.UV0,"vec2"),y.vertex.uniforms.add("proj","mat4").add("view","mat4").add("origin","vec3").add("skirtScale","float"),y.fragment.uniforms.add("origin","vec3"),w.output===e.Color){y.include(o,{linearDepth:!1}),y.include(n,w),y.include(g,w),y.include(t,w);const e=w.overlayMode!==v.Disabled,i=w.overlayMode===v.EnabledWithWater;e&&y.include(d,{pbrMode:s.Water,useCustomDTRExponentForWater:!1,ssrEnabled:w.ssrEnabled,highStepCount:w.highStepCount}),i&&y.include(a,w),y.varyings.add("vnormal","vec3"),y.varyings.add("vpos","vec3"),y.vertex.uniforms.add("viewNormal","mat4"),w.receiveShadows&&y.varyings.add("linearDepth","float"),w.tileBorders&&y.varyings.add("vuv","vec2"),w.atmosphere&&(y.vertex.uniforms.add("lightingMainDirection","vec3"),y.varyings.add("wnormal","vec3"),y.varyings.add("wlight","vec3")),w.screenSizePerspective&&(y.vertex.uniforms.add("screenSizePerspective","vec4"),y.varyings.add("screenSizeDistanceToCamera","float"),y.varyings.add("screenSizeCosAngle","float")),y.vertex.code.add(p`
       void main(void) {
         vpos = position;
         vnormal = getLocalUp(vpos, origin);
@@ -24,7 +24,7 @@ import{ShaderOutput as e}from"../views/3d/webgl-engine/core/shaderLibrary/Shader
         ${e?p`setOverlayVTC(uv);`:""}
         ${i?p`forwardVertexTangent(vnormal);`:p``}
       }
-    `),y.extensions.add("GL_OES_standard_derivatives"),y.extensions.add("GL_EXT_shader_texture_lod"),y.include(r,w),y.include(t,w),y.fragment.uniforms.add("camPos","vec3").add("viewDirection","vec3").add("ssaoTex","sampler2D").add("viewportPixelSz","vec4"),w.screenSizePerspective&&y.fragment.uniforms.add("screenSizePerspective","vec4"),i&&(y.fragment.uniforms.add("ovWaterTex","sampler2D"),y.fragment.uniforms.add("view","mat4")),y.fragment.code.add(p`const float sliceOpacity = 0.2;
+    `),y.extensions.add("GL_OES_standard_derivatives"),y.extensions.add("GL_EXT_shader_texture_lod"),y.include(r,w),y.include(t,w),y.fragment.uniforms.add("cameraPosition","vec3").add("viewDirection","vec3").add("ssaoTex","sampler2D").add("viewportPixelSz","vec4"),w.screenSizePerspective&&y.fragment.uniforms.add("screenSizePerspective","vec4"),i&&(y.fragment.uniforms.add("ovWaterTex","sampler2D"),y.fragment.uniforms.add("view","mat4")),y.fragment.code.add(p`const float sliceOpacity = 0.2;
 float lum(vec3 c) {
 return (min(min(c.r, c.g), c.b) + max(max(c.r, c.g), c.b)) * 0.5;
 }`),y.fragment.code.add(p`
@@ -64,7 +64,7 @@ return (min(min(c.r, c.g), c.b) + max(max(c.r, c.g), c.b)) * 0.5;
               mat3 tbnMatrix = mat3(tbnTangent, tbnBiTangent, vnormal);
               vec4 waterOverlayColor = vec4(overlayColor.w > 0.0 ? overlayColorOpaque.xyz/overlayColor.w : vec3(1.0), overlayColor.w);
               vec4 viewPosition = view*vec4(vpos, 1.0);
-              vec4 waterColorLinear = getOverlayWaterColor(overlayWaterMask, waterOverlayColor, -normalize(vpos - camPos), shadow, vnormal, tbnMatrix, viewPosition.xyz);
+              vec4 waterColorLinear = getOverlayWaterColor(overlayWaterMask, waterOverlayColor, -normalize(vpos - cameraPosition), shadow, vnormal, tbnMatrix, viewPosition.xyz,  vpos + origin);
               vec4 waterColorNonLinear = delinearizeGamma(vec4(waterColorLinear.xyz, 1.0));
               // un-gamma the ground color to mix in linear space
               gl_FragColor = mix(groundColor, waterColorNonLinear, waterColorLinear.w);

package/chunks/TextureOnly.glsl.js

@@ -2,7 +2,7 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/esri/copyright.txt for details.
 */
-import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.js";import{glsl as r}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as o}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";function n(){const n=new o;return n.include(e),n.fragment.uniforms.add("tex","sampler2D"),n.fragment.uniforms.add("color","vec4"),n.fragment.code.add(r`void main() {
+import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.js";import{glsl as r}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as o}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";function n(){const n=new o;return n.include(e),n.fragment.uniforms.add("tex","sampler2D"),n.fragment.uniforms.add("uColor","vec4"),n.fragment.code.add(r`void main() {
 vec4 texColor = texture2D(tex, uv);
-gl_FragColor = texColor * color;
+gl_FragColor = texColor * uColor;
 }`),n}const s=Object.freeze({__proto__:null,build:n});export{s as T,n as b};