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

package/chunks/HUDMaterial.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{c as e}from"./vec2.js";import{a as o}from"./vec2f64.js";import{Z as i}from"./vec4f64.js";import{ShaderOutput as r}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutputOptions.js";import{Slice as l}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{AlignPixel as t}from"../views/3d/webgl-engine/core/shaderLibrary/hud/AlignPixel.glsl.js";import{HUD as a}from"../views/3d/webgl-engine/core/shaderLibrary/hud/HUD.glsl.js";import{HUDOcclusionPass as s}from"../views/3d/webgl-engine/core/shaderLibrary/hud/HUDOcclusionPass.glsl.js";import{OutputHighlight as n}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{VisualVariables as c}from"../views/3d/webgl-engine/core/shaderLibrary/shading/VisualVariables.glsl.js";import{symbolAlphaCutoff as d,defaultMaskAlphaCutoff as u}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{ColorConversion as v}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{RgbaFloatEncoding as g}from"../views/3d/webgl-engine/core/shaderLibrary/util/RgbaFloatEncoding.glsl.js";import{ScreenSizePerspective as p}from"../views/3d/webgl-engine/core/shaderLibrary/util/ScreenSizePerspective.glsl.js";import{glsl as f}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as m}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as b}from"../views/3d/webgl-engine/lib/basicInterfaces.js";function h(e){const o=new m,i=e.signedDistanceFieldEnabled;if(o.include(t),o.include(a,e),o.include(l,e),e.output===r.Occlusion)return o.include(s,e),o;o.include(p),o.fragment.include(g),o.fragment.include(v),o.include(c,e),o.varyings.add("vcolor","vec4"),o.varyings.add("vtc","vec2"),o.varyings.add("vsize","vec2"),e.binaryHighlightOcclusionEnabled&&o.varyings.add("voccluded","float"),o.vertex.uniforms.add("screenOffset","vec2").add("anchorPos","vec2").add("textureCoordinateScaleFactor","vec2").add("materialColor","vec4"),i&&o.vertex.uniforms.add("outlineColor","vec4"),e.screenSizePerspectiveEnabled&&o.vertex.uniforms.add("screenSizePerspective","vec4"),(e.debugDrawLabelBorder||e.binaryHighlightOcclusionEnabled)&&o.varyings.add("debugBorderCoords","vec4"),o.attributes.add(b.UV0,"vec2"),o.attributes.add(b.COLOR,"vec4"),o.attributes.add(b.SIZE,"vec2"),o.attributes.add(b.AUXPOS2,"vec4"),o.vertex.code.add(f`
+import{c as e}from"./vec2.js";import{a as o}from"./vec2f64.js";import{Z as i}from"./vec4f64.js";import{ShaderOutput as r}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutputOptions.js";import{Slice as l}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{AlignPixel as t}from"../views/3d/webgl-engine/core/shaderLibrary/hud/AlignPixel.glsl.js";import{HUD as a}from"../views/3d/webgl-engine/core/shaderLibrary/hud/HUD.glsl.js";import{HUDOcclusionPass as s}from"../views/3d/webgl-engine/core/shaderLibrary/hud/HUDOcclusionPass.glsl.js";import{OutputHighlight as n}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{VisualVariables as c}from"../views/3d/webgl-engine/core/shaderLibrary/shading/VisualVariables.glsl.js";import{symbolAlphaCutoff as d,defaultMaskAlphaCutoff as u}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{ColorConversion as v}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{RgbaFloatEncoding as g}from"../views/3d/webgl-engine/core/shaderLibrary/util/RgbaFloatEncoding.glsl.js";import{ScreenSizePerspective as p}from"../views/3d/webgl-engine/core/shaderLibrary/util/ScreenSizePerspective.glsl.js";import{glsl as f}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as m}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as b}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function h(e){const o=new m,i=e.signedDistanceFieldEnabled;if(o.include(t),o.include(a,e),o.include(l,e),e.output===r.Occlusion)return o.include(s,e),o;o.include(p),o.fragment.include(g),o.fragment.include(v),o.include(c,e),o.varyings.add("vcolor","vec4"),o.varyings.add("vtc","vec2"),o.varyings.add("vsize","vec2"),e.binaryHighlightOcclusionEnabled&&o.varyings.add("voccluded","float"),o.vertex.uniforms.add("screenOffset","vec2").add("anchorPos","vec2").add("textureCoordinateScaleFactor","vec2").add("materialColor","vec4"),i&&o.vertex.uniforms.add("outlineColor","vec4"),e.screenSizePerspectiveEnabled&&o.vertex.uniforms.add("screenSizePerspective","vec4"),(e.debugDrawLabelBorder||e.binaryHighlightOcclusionEnabled)&&o.varyings.add("debugBorderCoords","vec4"),o.attributes.add(b.UV0,"vec2"),o.attributes.add(b.COLOR,"vec4"),o.attributes.add(b.SIZE,"vec2"),o.attributes.add(b.AUXPOS2,"vec4"),o.vertex.code.add(f`
     void main(void) {
       ProjectHUDAux projectAux;
       vec4 posProj = projectPositionHUD(projectAux);
@@ -131,7 +131,7 @@ posProj = alignToPixelOrigin(posProj, viewport.zw);
       `),e.output===r.Color&&o.fragment.code.add(f`
     void main() {
       ${S}
-      ${e.FrontFacePass?"gl_FragColor.rgb /= gl_FragColor.a;":""}
+      ${e.frontFacePass?"gl_FragColor.rgb /= gl_FragColor.a;":""}
     }
     `),e.output===r.Highlight&&(o.include(n),o.fragment.code.add(f`
     void main() {

package/chunks/HighlightComposition.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{glsl as e}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/basicInterfaces.js";var o;function r(r){const l=new i,a=l.vertex.code,n=l.fragment.code;return l.attributes.add(t.POSITION,"vec2"),r.highlightStage===o.Downsample&&(a.add(e`void main() {
+import{glsl as e}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 o;function r(r){const l=new i,a=l.vertex.code,n=l.fragment.code;return l.attributes.add(t.POSITION,"vec2"),r.highlightStage===o.Downsample&&(a.add(e`void main() {
 gl_Position = vec4(vec2(1.0) - position * 2.0, 0.0, 1.0);
 }`),l.fragment.uniforms.add("tex","sampler2D"),l.fragment.uniforms.add("invFramebufferDim","vec2"),n.add(e`void main() {
 vec2 coord = gl_FragCoord.xy * invFramebufferDim;
@@ -62,7 +62,7 @@ gl_FragColor = vec4(ceil(value.r), mx, mx, 1.0);
             }`:""}
         gl_Position = vec4(position, 0.0, 1.0);
         uv = position.xy * 0.5 + vec2(0.5);
-      }`),l.fragment.uniforms.add("tex","sampler2D"),l.fragment.uniforms.add("origin","sampler2D"),l.fragment.uniforms.add("color","vec4"),l.fragment.uniforms.add("haloColor","vec4"),l.fragment.uniforms.add("outlineSize","float"),l.fragment.uniforms.add("blurSize","float"),l.fragment.uniforms.add("opacities","vec4"),n.add(e`void main() {
+      }`),l.fragment.uniforms.add("tex","sampler2D"),l.fragment.uniforms.add("origin","sampler2D"),l.fragment.uniforms.add("uColor","vec4"),l.fragment.uniforms.add("haloColor","vec4"),l.fragment.uniforms.add("outlineSize","float"),l.fragment.uniforms.add("blurSize","float"),l.fragment.uniforms.add("opacities","vec4"),n.add(e`void main() {
 vec4 blurredHighlightValue = texture2D(tex, uv);
 float highlightIntensity = blurredHighlightValue.a;
 if (highlightIntensity == 0.0) {
@@ -73,16 +73,16 @@ float outlineIntensity;
 float fillIntensity;
 if (blurredHighlightValue.g > blurredHighlightValue.b) {
 outlineIntensity = haloColor.w * opacities[1];
-fillIntensity = color.w * opacities[3];
+fillIntensity = uColor.w * opacities[3];
 }
 else {
 outlineIntensity = haloColor.w * opacities[0];
-fillIntensity = color.w * opacities[2];
+fillIntensity = uColor.w * opacities[2];
 }
 float inner = 1.0 - outlineSize / 9.0;
 float outer = 1.0 - (outlineSize + blurSize) / 9.0;
 float outlineFactor = smoothstep(outer, inner, highlightIntensity);
 float fillFactor = any(notEqual(origin_color, vec4(0.0, 0.0, 0.0, 0.0))) ? 1.0 : 0.0;
 float intensity = outlineIntensity * outlineFactor * (1.0 - fillFactor) + fillIntensity * fillFactor;
-gl_FragColor = vec4(mix(haloColor.rgb, color.rgb, fillFactor), intensity);
+gl_FragColor = vec4(mix(haloColor.rgb, uColor.rgb, fillFactor), intensity);
 }`)),l}!function(e){e[e.Blur=0]="Blur",e[e.Apply=1]="Apply",e[e.Downsample=2]="Downsample",e[e.COUNT=3]="COUNT"}(o||(o={}));const l=Object.freeze({__proto__:null,get HighlightCompositionPass(){return o},build:r});export{o as H,l as a,r as b};

package/chunks/ImageMaterial.glsl.js

@@ -2,36 +2,36 @@
 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 a}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{ReadLinearDepth as i}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{multipassTerrainTest as o}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{glsl as s}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as l}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as n}from"../views/3d/webgl-engine/lib/basicInterfaces.js";function g(g){const p=new l;return p.include(a,{linearDepth:!1}),p.vertex.uniforms.add("proj","mat4").add("view","mat4"),p.attributes.add(n.POSITION,"vec3"),p.attributes.add(n.UV0,"vec2"),p.varyings.add("vpos","vec3"),g.multipassTerrainEnabled&&p.varyings.add("depth","float"),p.vertex.uniforms.add("textureCoordinateScaleFactor","vec2"),p.vertex.code.add(s`
+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 a}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{ReadLinearDepth as i}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{multipassTerrainTest as o}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{glsl as l}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as s}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as n}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function g(g){const p=new s;return p.include(a,{linearDepth:!1}),p.vertex.uniforms.add("proj","mat4").add("view","mat4"),p.attributes.add(n.POSITION,"vec3"),p.attributes.add(n.UV0,"vec2"),p.varyings.add("vpos","vec3"),g.multipassTerrainEnabled&&p.varyings.add("depth","float"),p.vertex.uniforms.add("textureCoordinateScaleFactor","vec2"),p.vertex.code.add(l`
     void main(void) {
       vpos = position;
       ${g.multipassTerrainEnabled?"depth = (view * vec4(vpos, 1.0)).z;":""}
       vTexCoord = uv0 * textureCoordinateScaleFactor;
       gl_Position = transformPosition(proj, view, vpos);
     }
-  `),p.include(r,g),g.multipassTerrainEnabled&&(p.fragment.include(i),p.include(o,g)),p.fragment.uniforms.add("tex","sampler2D"),p.fragment.uniforms.add("opacity","float"),p.varyings.add("vTexCoord","vec2"),g.output===e.Alpha?p.fragment.code.add(s`
+  `),p.include(r,g),g.multipassTerrainEnabled&&(p.fragment.include(i),p.include(o,g)),p.fragment.uniforms.add("tex","sampler2D"),p.fragment.uniforms.add("opacity","float"),p.varyings.add("vTexCoord","vec2"),g.output===e.Alpha?p.fragment.code.add(l`
     void main() {
       discardBySlice(vpos);
       ${g.multipassTerrainEnabled?"terrainDepthTest(gl_FragCoord, depth);":""}
 
       float alpha = texture2D(tex, vTexCoord).a * opacity;
-      if (alpha  < ${s.float(t)}) {
+      if (alpha  < ${l.float(t)}) {
         discard;
       }
 
       gl_FragColor = vec4(alpha);
     }
-    `):(p.fragment.include(d),p.fragment.code.add(s`
+    `):(p.fragment.include(d),p.fragment.code.add(l`
     void main() {
       discardBySlice(vpos);
       ${g.multipassTerrainEnabled?"terrainDepthTest(gl_FragCoord, depth);":""}
       gl_FragColor = texture2D(tex, vTexCoord) * opacity;
 
-      if (gl_FragColor.a < ${s.float(t)}) {
+      if (gl_FragColor.a < ${l.float(t)}) {
         discard;
       }
 
       gl_FragColor = highlightSlice(gl_FragColor, vpos);
-      ${g.OITEnabled?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}
+      ${g.oitEnabled?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}
     }
     `)),p}const p=Object.freeze({__proto__:null,build:g});export{p as I,g as b};

package/chunks/LaserlinePath.glsl.js

@@ -2,20 +2,20 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/esri/copyright.txt for details.
 */
-import{Laserline as e}from"../views/3d/webgl-engine/core/shaderLibrary/Laserline.glsl.js";import{glsl as i}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as o}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as a}from"../views/3d/webgl-engine/lib/basicInterfaces.js";function t(t){const r=new o;return r.include(e,t),r.vertex.uniforms.add("uModelViewMatrix","mat4"),r.vertex.uniforms.add("uProjectionMatrix","mat4"),r.attributes.add(a.START,"vec3"),r.attributes.add(a.END,"vec3"),r.attributes.add(a.UP,"vec3"),r.attributes.add(a.EXTRUDE,"vec2"),r.varyings.add("uv","vec2"),r.varyings.add("vViewStart","vec3"),r.varyings.add("vViewEnd","vec3"),r.varyings.add("vViewPlane","vec4"),r.vertex.uniforms.add("glowWidth","float"),r.vertex.uniforms.add("pixelToNDC","vec2"),r.vertex.code.add(i`void main() {
+import{Laserline as e}from"../views/3d/webgl-engine/core/shaderLibrary/Laserline.glsl.js";import{glsl as i}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as o}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as a}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function t(t){const r=new o;return r.include(e,t),r.vertex.uniforms.add("modelView","mat4"),r.vertex.uniforms.add("proj","mat4"),r.attributes.add(a.START,"vec3"),r.attributes.add(a.END,"vec3"),r.attributes.add(a.UP,"vec3"),r.attributes.add(a.EXTRUDE,"vec2"),r.varyings.add("uv","vec2"),r.varyings.add("vViewStart","vec3"),r.varyings.add("vViewEnd","vec3"),r.varyings.add("vViewPlane","vec4"),r.vertex.uniforms.add("glowWidth","float"),r.vertex.uniforms.add("pixelToNDC","vec2"),r.vertex.code.add(i`void main() {
 vec3 pos = mix(start, end, extrude.x);
-vec4 viewPos = uModelViewMatrix * vec4(pos, 1);
-vec4 projPos = uProjectionMatrix * viewPos;
+vec4 viewPos = modelView * vec4(pos, 1);
+vec4 projPos = proj * viewPos;
 vec2 ndcPos = projPos.xy / projPos.w;
-vec3 viewUp = (uModelViewMatrix * vec4(extrude.y * up, 0)).xyz;
-vec4 projPosUp = uProjectionMatrix * vec4(viewPos.xyz + viewUp, 1);
+vec3 viewUp = (modelView * vec4(extrude.y * up, 0)).xyz;
+vec4 projPosUp = proj * vec4(viewPos.xyz + viewUp, 1);
 vec2 projExtrudeDir = normalize(projPosUp.xy / projPosUp.w - ndcPos);
 vec2 lxy = abs(sign(projExtrudeDir) - ndcPos);
 ndcPos += length(lxy) * projExtrudeDir;
 vec3 worldPlaneNormal = normalize(cross(up, normalize(end - start)));
-vec3 viewPlaneNormal = (uModelViewMatrix * vec4(worldPlaneNormal, 0)).xyz;
-vViewStart = (uModelViewMatrix * vec4(start, 1)).xyz;
-vViewEnd = (uModelViewMatrix * vec4(end, 1)).xyz;
+vec3 viewPlaneNormal = (modelView * vec4(worldPlaneNormal, 0)).xyz;
+vViewStart = (modelView * vec4(start, 1)).xyz;
+vViewEnd = (modelView * vec4(end, 1)).xyz;
 vViewPlane = vec4(viewPlaneNormal, -dot(viewPlaneNormal, vViewStart));
 float xPaddingPixels = sign(dot(viewPlaneNormal, viewPos.xyz)) * (extrude.x * 2.0 - 1.0) * glowWidth;
 ndcPos.x += xPaddingPixels * pixelToNDC.x;

package/chunks/LineCallout.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{Slice as e}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{AlignPixel as i}from"../views/3d/webgl-engine/core/shaderLibrary/hud/AlignPixel.glsl.js";import{HUD as o}from"../views/3d/webgl-engine/core/shaderLibrary/hud/HUD.glsl.js";import{multipassGeometryTest as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassGeometryTest.glsl.js";import{glsl as t}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as n}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as l}from"../views/3d/webgl-engine/lib/basicInterfaces.js";function a(a){const d=new n;return d.include(i),d.include(o,a),d.include(e,a),d.attributes.add(l.UV0,"vec2"),d.vertex.uniforms.add("lineSize","float").add("pixelToNDC","vec2").add("borderSize","float").add("screenOffset","vec2"),d.varyings.add("coverageSampling","vec4"),d.varyings.add("lineSizes","vec2"),a.multipassGeometryEnabled&&d.varyings.add("depth","float"),d.vertex.code.add(t`
+import{Slice as e}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{AlignPixel as i}from"../views/3d/webgl-engine/core/shaderLibrary/hud/AlignPixel.glsl.js";import{HUD as o}from"../views/3d/webgl-engine/core/shaderLibrary/hud/HUD.glsl.js";import{multipassGeometryTest as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassGeometryTest.glsl.js";import{glsl as t}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as n}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as l}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function a(a){const d=new n;return d.include(i),d.include(o,a),d.include(e,a),d.attributes.add(l.UV0,"vec2"),d.vertex.uniforms.add("lineSize","float").add("pixelToNDC","vec2").add("borderSize","float").add("screenOffset","vec2"),d.varyings.add("coverageSampling","vec4"),d.varyings.add("lineSizes","vec2"),a.multipassGeometryEnabled&&d.varyings.add("depth","float"),d.vertex.code.add(t`
     void main(void) {
       ProjectHUDAux projectAux;
       vec4 endPoint = projectPositionHUD(projectAux);
@@ -101,7 +101,7 @@ import{Slice as e}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js
 
       gl_Position = projectedPosition;
     }
-  `),d.fragment.uniforms.add("color","vec4"),d.fragment.uniforms.add("borderColor","vec4"),a.multipassGeometryEnabled&&(d.fragment.include(r,a),d.fragment.uniforms.add("inverseViewport","vec2")),d.fragment.code.add(t`
+  `),d.fragment.uniforms.add("uColor","vec4"),d.fragment.uniforms.add("borderColor","vec4"),a.multipassGeometryEnabled&&(d.fragment.include(r,a),d.fragment.uniforms.add("inverseViewport","vec2")),d.fragment.code.add(t`
     void main() {
       ${a.multipassGeometryEnabled?"if( geometryDepthTest(gl_FragCoord.xy * inverseViewport, depth) ){ discard; }":""}
 
@@ -114,8 +114,8 @@ import{Slice as e}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js
       //
       // Anti-alias by blending final result using the full (including optional border) coverage
       // and the color alpha
-      float borderAlpha = color.a * borderColor.a * coverage.y;
-      float colorAlpha = color.a * coverage.x;
+      float borderAlpha = uColor.a * borderColor.a * coverage.y;
+      float colorAlpha = uColor.a * coverage.x;
 
       float finalAlpha = mix(borderAlpha, 1.0, colorAlpha);
 
@@ -127,8 +127,8 @@ import{Slice as e}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js
       // Compute the finalRgb, but keep it pre-multiplied (for unpre-multiplied you
       // need to divide by finalAlpha). We avoid the division here by setting the
       // appropriate blending function in the material.
-      vec3 finalRgb = mix(borderColor.rgb * borderAlpha, color.rgb, colorAlpha);
+      vec3 finalRgb = mix(borderColor.rgb * borderAlpha, uColor.rgb, colorAlpha);
       gl_FragColor = vec4(finalRgb, finalAlpha);
       `}
   }
-  `),d}var d;function s(e,i,o){3===o.length?e.setUniform4f(i,o[0],o[1],o[2],1):e.setUniform4fv(i,o)}!function(e){function i(e,i,o){s(e,"color",i.color),e.setUniform1f("pixelRatio",o),e.setUniform2f("screenOffset",i.screenOffset[0]*o,i.screenOffset[1]*o),null!==i.borderColor?(s(e,"borderColor",i.borderColor),e.setUniform1f("borderSize",o)):(e.setUniform4f("borderColor",0,0,0,0),e.setUniform1f("borderSize",0))}e.bindUniforms=i}(d||(d={}));const c=Object.freeze({__proto__:null,build:a,get LineCallout(){return d}});export{d as L,c as a,a as b};
+  `),d}function d(e,i,o){s(e,"uColor",i.color),e.setUniform1f("pixelRatio",o),e.setUniform2f("screenOffset",i.screenOffset[0]*o,i.screenOffset[1]*o),null!==i.borderColor?(s(e,"borderColor",i.borderColor),e.setUniform1f("borderSize",o)):(e.setUniform4f("borderColor",0,0,0,0),e.setUniform1f("borderSize",0))}function s(e,i,o){3===o.length?e.setUniform4f(i,o[0],o[1],o[2],1):e.setUniform4fv(i,o)}const c=Object.freeze({__proto__:null,build:a,bindLineCalloutUniforms:d});export{c as L,a,d as b};

package/chunks/MeasurementArrow.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{glsl as e}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 o}from"../views/3d/webgl-engine/lib/basicInterfaces.js";function r(){const r=new t;r.vertex.uniforms.add("proj","mat4").add("view","mat4").add("width","float"),r.attributes.add(o.POSITION,"vec3"),r.attributes.add(o.NORMAL,"vec3"),r.attributes.add(o.UV0,"vec2"),r.attributes.add(o.AUXPOS1,"float"),r.varyings.add("vtc","vec2"),r.varyings.add("vlength","float"),r.varyings.add("vradius","float"),r.vertex.code.add(e`void main(void) {
+import{glsl as e}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 o}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function r(){const r=new t;r.vertex.uniforms.add("proj","mat4").add("view","mat4").add("width","float"),r.attributes.add(o.POSITION,"vec3"),r.attributes.add(o.NORMAL,"vec3"),r.attributes.add(o.UV0,"vec2"),r.attributes.add(o.AUXPOS1,"float"),r.varyings.add("vtc","vec2"),r.varyings.add("vlength","float"),r.varyings.add("vradius","float"),r.vertex.code.add(e`void main(void) {
 vec3 bitangent = normal;
 vtc = uv0;
 vlength = auxpos1;

package/chunks/NativeLine.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 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{VertexColor as t}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexColor.glsl.js";import{OutputHighlight as r}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{LineStipple as l}from"../views/3d/webgl-engine/core/shaderLibrary/shading/LineStipple.glsl.js";import{symbolAlphaCutoff as s}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{glsl as a}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as d}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as n}from"../views/3d/webgl-engine/lib/basicInterfaces.js";function p(p){const c=new d;return c.include(o,{linearDepth:!1}),c.include(t,p),c.include(l,{...p,stippleRequiresStretchMeasure:!1}),c.vertex.uniforms.add("proj","mat4").add("view","mat4"),p.stippleEnabled&&(c.vertex.uniforms.add("ndcToPixel","vec2"),c.attributes.add(n.UV0,"vec2"),c.attributes.add(n.AUXPOS1,"vec3")),c.attributes.add(n.POSITION,"vec3"),c.varyings.add("vpos","vec3"),c.vertex.code.add(a`void main(void) {
+import{ShaderOutput as e}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 t}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{VertexColor as o}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexColor.glsl.js";import{OutputHighlight as r}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{LineStipple as l}from"../views/3d/webgl-engine/core/shaderLibrary/shading/LineStipple.glsl.js";import{symbolAlphaCutoff as s}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{glsl as a}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as d}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as n}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function p(p){const c=new d;return c.include(t,{linearDepth:!1}),c.include(o,p),c.include(l,{...p,stippleRequiresStretchMeasure:!1}),c.vertex.uniforms.add("proj","mat4").add("view","mat4"),p.stippleEnabled&&(c.vertex.uniforms.add("ndcToPixel","vec2"),c.attributes.add(n.UV0,"vec2"),c.attributes.add(n.AUXPOS1,"vec3")),c.attributes.add(n.POSITION,"vec3"),c.varyings.add("vpos","vec3"),c.vertex.code.add(a`void main(void) {
 vpos = position;
 forwardNormalizedVertexColor();
 gl_Position = transformPosition(proj, view, vpos);`),p.stippleEnabled&&(c.vertex.code.add(a`vec4 vpos2 = transformPosition(proj, view, auxpos1);

package/chunks/Path.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{ViewingMode as e}from"../views/ViewingMode.js";import{ForwardLinearDepth as a}from"../views/3d/webgl-engine/core/shaderLibrary/ForwardLinearDepth.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 r}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{PathVertexPosition as l}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/PathVertexPosition.glsl.js";import{OutputDepth as d}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.glsl.js";import{OutputHighlight as n}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{ReadLinearDepth as t}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{EvaluateAmbientOcclusion as s}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientOcclusion.glsl.js";import{EvaluateSceneLighting as c}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{multipassTerrainTest as m}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{Normals as g}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Normals.glsl.js";import{NormalUtils as v}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{ReadShadowMap as p}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{ColorConversion as u}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{glsl as h}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as f}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";function b(b){const w=new f;return w.vertex.uniforms.add("proj","mat4").add("view","mat4").add("camPos","vec3").add("localOrigin","vec3"),w.varyings.add("vpos","vec3"),w.include(l,b),b.output!==o.Color&&b.output!==o.Alpha||(w.include(r,{linearDepth:!1}),b.receiveShadows&&w.include(p,b),w.include(a,b),w.varyings.add("vnormal","vec3"),w.varyings.add("vcolor","vec4"),b.multipassTerrainEnabled&&w.varyings.add("depth","float"),w.vertex.code.add(h`
+import{ViewingMode as e}from"../views/ViewingMode.js";import{ForwardLinearDepth as a}from"../views/3d/webgl-engine/core/shaderLibrary/ForwardLinearDepth.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 r}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{PathVertexPosition as l}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/PathVertexPosition.glsl.js";import{OutputDepth as d}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.glsl.js";import{OutputHighlight as n}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{ReadLinearDepth as t}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{EvaluateAmbientOcclusion as s}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientOcclusion.glsl.js";import{EvaluateSceneLighting as c}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{multipassTerrainTest as m}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{Normals as g}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Normals.glsl.js";import{NormalUtils as v}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{ReadShadowMap as p}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{ColorConversion as u}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{glsl as h}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as f}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";function b(b){const w=new f;return w.vertex.uniforms.add("proj","mat4").add("view","mat4").add("cameraPosition","vec3").add("localOrigin","vec3"),w.varyings.add("vpos","vec3"),w.include(l,b),b.output!==o.Color&&b.output!==o.Alpha||(w.include(r,{linearDepth:!1}),b.receiveShadows&&w.include(p,b),w.include(a,b),w.varyings.add("vnormal","vec3"),w.varyings.add("vcolor","vec4"),b.multipassTerrainEnabled&&w.varyings.add("depth","float"),w.vertex.code.add(h`
       void main() {
         vpos = calculateVPos();
         vnormal = normalize(localNormal());
@@ -14,19 +14,19 @@ import{ViewingMode as e}from"../views/ViewingMode.js";import{ForwardLinearDepth
 
         vcolor = getColor();
       }
-    `)),b.multipassTerrainEnabled&&(w.fragment.include(t),w.include(m,b)),b.output===o.Alpha&&(w.include(i,b),w.fragment.uniforms.add("camPos","vec3"),w.fragment.uniforms.add("localOrigin","vec3"),w.fragment.uniforms.add("opacity","float"),w.fragment.code.add(h`
+    `)),b.multipassTerrainEnabled&&(w.fragment.include(t),w.include(m,b)),b.output===o.Alpha&&(w.include(i,b),w.fragment.uniforms.add("cameraPosition","vec3"),w.fragment.uniforms.add("localOrigin","vec3"),w.fragment.uniforms.add("opacity","float"),w.fragment.code.add(h`
       void main() {
         discardBySlice(vpos);
         ${b.multipassTerrainEnabled?"terrainDepthTest(gl_FragCoord, depth);":""}
         float combinedOpacity = vcolor.a * opacity;
         gl_FragColor = vec4(combinedOpacity);
       }
-    `)),b.output===o.Color&&(w.include(i,b),w.include(c,b),w.include(s,b),b.receiveShadows&&w.include(p,b),w.include(g,b),w.fragment.uniforms.add("camPos","vec3").add("localOrigin","vec3").add("ambient","vec3").add("diffuse","vec3").add("specular","vec3").add("opacity","float"),w.fragment.include(u),w.fragment.code.add(h`
+    `)),b.output===o.Color&&(w.include(i,b),w.include(c,b),w.include(s,b),b.receiveShadows&&w.include(p,b),w.include(g,b),w.fragment.uniforms.add("cameraPosition","vec3").add("localOrigin","vec3").add("ambient","vec3").add("diffuse","vec3").add("specular","vec3").add("opacity","float"),w.fragment.include(u),w.fragment.code.add(h`
       void main() {
         discardBySlice(vpos);
         ${b.multipassTerrainEnabled?"terrainDepthTest(gl_FragCoord, depth);":""}
 
-        shadingParams.viewDirection = normalize(vpos - camPos);
+        shadingParams.viewDirection = normalize(vpos - cameraPosition);
         shadingParams.normalView = vnormal;
         vec3 normal = shadingNormal(shadingParams);
         float ssao = evaluateAmbientOcclusionInverse();
@@ -41,7 +41,7 @@ import{ViewingMode as e}from"../views/ViewingMode.js";import{ForwardLinearDepth
         vec3 shadedColor = evaluateSceneLighting(normal, albedo, shadow, 1.0 - ssao, additionalLight);
         gl_FragColor = vec4(shadedColor, combinedOpacity);
         gl_FragColor = highlightSlice(gl_FragColor, vpos);
-        ${b.OITEnabled?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}
+        ${b.oitEnabled?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}
       }
     `)),b.output!==o.Depth&&b.output!==o.Shadow||(w.include(r,{linearDepth:!0}),w.vertex.uniforms.add("nearFar","vec2"),w.varyings.add("depth","float"),w.vertex.code.add(h`void main() {
 vpos = calculateVPos();

package/chunks/Pattern.glsl.js

@@ -2,9 +2,9 @@
 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{Transform as a}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{VertexColor as o}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexColor.glsl.js";import{OutputDepth as r}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.glsl.js";import{OutputHighlight as i}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{ReadLinearDepth as n}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{multipassTerrainTest as l}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{symbolAlphaCutoff as d}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{ColorConversion as c}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 p}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as v}from"../views/3d/webgl-engine/lib/basicInterfaces.js";import{Style as g}from"../views/3d/webgl-engine/materials/PatternStyle.js";const m=.70710678118,u=m,f=.08715574274;function h(h){const b=new p;h.draped||b.extensions.add("GL_OES_standard_derivatives");const y=h.output===e.Depth;b.include(a,{linearDepth:y}),b.include(o,h),b.vertex.uniforms.add("proj","mat4"),b.vertex.uniforms.add("view","mat4"),y&&(b.include(r,h),b.vertex.uniforms.add("cameraNearFar","vec2"),b.varyings.add("linearDepth","float")),h.draped?b.vertex.uniforms.add("worldToScreenRatio","float"):(b.vertex.uniforms.add("worldToScreenPerDistanceRatio","float"),b.vertex.uniforms.add("camPos","vec3"),b.attributes.add(v.BOUNDINGRECT,"mat3")),b.attributes.add(v.POSITION,"vec3"),b.attributes.add(v.UVMAPSPACE,"vec4"),b.varyings.add("vpos","vec3"),b.varyings.add("vuv","vec2"),h.multipassTerrainEnabled&&b.varyings.add("depth","float");const x=h.style===g.ForwardDiagonal||h.style===g.BackwardDiagonal||h.style===g.DiagonalCross;return x&&b.vertex.code.add(s`
-      const mat2 rotate45 = mat2(${s.float(m)}, ${s.float(-u)},
-                                 ${s.float(u)}, ${s.float(m)});
+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{Transform as o}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{VertexColor as r}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexColor.glsl.js";import{OutputDepth as a}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.glsl.js";import{OutputHighlight as i}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{ReadLinearDepth as n}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{multipassTerrainTest as l}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{symbolAlphaCutoff as d}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{ColorConversion as c}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 p}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as v}from"../views/3d/webgl-engine/lib/VertexAttribute.js";import{Style as g}from"../views/3d/webgl-engine/materials/PatternStyle.js";const u=.70710678118,m=u,f=.08715574274;function h(h){const b=new p;h.draped||b.extensions.add("GL_OES_standard_derivatives");const y=h.output===e.Depth;b.include(o,{linearDepth:y}),b.include(r,h),b.vertex.uniforms.add("proj","mat4"),b.vertex.uniforms.add("view","mat4"),y&&(b.include(a,h),b.vertex.uniforms.add("nearFar","vec2"),b.varyings.add("linearDepth","float")),h.draped?b.vertex.uniforms.add("worldToScreenRatio","float"):(b.vertex.uniforms.add("worldToScreenPerDistanceRatio","float"),b.vertex.uniforms.add("cameraPosition","vec3"),b.attributes.add(v.BOUNDINGRECT,"mat3")),b.attributes.add(v.POSITION,"vec3"),b.attributes.add(v.UVMAPSPACE,"vec4"),b.varyings.add("vpos","vec3"),b.varyings.add("vuv","vec2"),h.multipassTerrainEnabled&&b.varyings.add("depth","float");const x=h.style===g.ForwardDiagonal||h.style===g.BackwardDiagonal||h.style===g.DiagonalCross;return x&&b.vertex.code.add(s`
+      const mat2 rotate45 = mat2(${s.float(u)}, ${s.float(-m)},
+                                 ${s.float(m)}, ${s.float(u)});
     `),h.draped||(b.vertex.code.add(s`vec3 projectPointToLineSegment(vec3 center, vec3 halfVector, vec3 point) {
 float projectedLength = dot(halfVector, point - center) / dot(halfVector, halfVector);
 return center + halfVector * clamp(projectedLength, -1.0, 1.0);
@@ -31,7 +31,7 @@ return rayOrigin + t * rayDir;
         }
 
         // intersect view direction with infinite plane that contains bounding rect
-        vec3 planeProjected = intersectRayPlane(viewDir, camPos, n, center);
+        vec3 planeProjected = intersectRayPlane(viewDir, cameraPosition, n, center);
 
         // clip to bounds by projecting to u and v line segments individually
         vec3 uProjected = projectPointToLineSegment(center, halfU, planeProjected);
@@ -40,7 +40,7 @@ return rayOrigin + t * rayDir;
         // use to calculate the closest point to camera on bounding rect
         vec3 closestPoint = uProjected + vProjected - center;
 
-        return length(closestPoint - camPos);
+        return length(closestPoint - cameraPosition);
       }
     `)),b.vertex.code.add(s`
     vec2 scaledUV() {
@@ -67,9 +67,9 @@ return rayOrigin + t * rayDir;
       vpos = position;
       ${h.multipassTerrainEnabled?"depth = (view * vec4(vpos, 1.0)).z;":""}
       forwardNormalizedVertexColor();
-      gl_Position = ${y?s`transformPositionWithDepth(proj, view, vpos, cameraNearFar, linearDepth);`:s`transformPosition(proj, view, vpos);`}
+      gl_Position = ${y?s`transformPositionWithDepth(proj, view, vpos, nearFar, linearDepth);`:s`transformPosition(proj, view, vpos);`}
     }
-  `),b.include(t,h),b.fragment.include(c),b.fragment.uniforms.add("matColor","vec4"),h.draped&&b.fragment.uniforms.add("texelSize","float"),h.output===e.Highlight&&b.include(i),h.multipassTerrainEnabled&&(b.fragment.include(n),b.include(l,h)),h.output!==e.Highlight&&(b.fragment.code.add(s`
+  `),b.include(t,h),b.fragment.include(c),b.fragment.uniforms.add("uColor","vec4"),h.draped&&b.fragment.uniforms.add("texelSize","float"),h.output===e.Highlight&&b.include(i),h.multipassTerrainEnabled&&(b.fragment.include(n),b.include(l,h)),h.output!==e.Highlight&&(b.fragment.code.add(s`
       const float lineWidth = ${s.float(h.lineWidth)};
       const float spacing = ${s.float(h.patternSpacing)};
       const float spacingINV = ${s.float(1/h.patternSpacing)};
@@ -113,7 +113,7 @@ return accumulator;
     void main() {
       discardBySlice(vpos);
       ${h.multipassTerrainEnabled?"terrainDepthTest(gl_FragCoord, depth);":""}
-      vec4 color = ${h.attributeColor?"vColor * matColor;":"matColor;"}
+      vec4 color = ${h.attributeColor?"vColor * uColor;":"uColor;"}
       color = highlightSlice(color, vpos);
 
       ${h.output!==e.Highlight?s`color.a *= ${w(h)};`:""}
@@ -124,7 +124,7 @@ return accumulator;
 
       ${h.output===e.Alpha?s`gl_FragColor = vec4(color.a);`:""}
 
-      ${h.output===e.Color?s`gl_FragColor = color; ${h.OITEnabled?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}`:""}
+      ${h.output===e.Color?s`gl_FragColor = color; ${h.oitEnabled?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}`:""}
       ${h.output===e.Highlight?s`outputHighlight();`:""}
       ${h.output===e.Depth?s`outputDepth(linearDepth);`:""};
     }

package/chunks/PointRenderer.glsl.js

@@ -2,11 +2,11 @@
 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 i}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{OutputHighlight as o}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{RgbaFloatEncoding as t}from"../views/3d/webgl-engine/core/shaderLibrary/util/RgbaFloatEncoding.glsl.js";import{glsl as r}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 n}from"../views/3d/webgl-engine/lib/basicInterfaces.js";function s(s){const d=new a,c=s.output===e.Color,l=s.output===e.Depth,p=s.output===e.Highlight;return d.extensions.add("GL_OES_standard_derivatives"),d.include(i,s),d.attributes.add(n.POSITION,"vec3"),d.attributes.add(n.COLOR,"vec3"),d.vertex.uniforms.add("uModelViewMatrix","mat4").add("uProjectionMatrix","mat4").add("uScreenMinMaxSize","vec2").add("uPointScale","vec2").add("uClipMin","vec3").add("uClipMax","vec3"),l?(d.vertex.uniforms.add("nearFar","vec2"),d.varyings.add("depth","float")):s.output!==e.Highlight&&d.varyings.add("vColor","vec3"),d.vertex.code.add(r`
+import{ShaderOutput as e}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutputOptions.js";import{Slice as i}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{OutputHighlight as o}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{RgbaFloatEncoding as t}from"../views/3d/webgl-engine/core/shaderLibrary/util/RgbaFloatEncoding.glsl.js";import{glsl as r}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 n}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function s(s){const c=new a,d=s.output===e.Color,l=s.output===e.Depth,p=s.output===e.Highlight;return c.extensions.add("GL_OES_standard_derivatives"),c.include(i,s),c.attributes.add(n.POSITION,"vec3"),c.attributes.add(n.COLOR,"vec3"),c.vertex.uniforms.add("modelView","mat4").add("proj","mat4").add("screenMinMaxSize","vec2").add("pointScale","vec2").add("clipMin","vec3").add("clipMax","vec3"),l?(c.vertex.uniforms.add("nearFar","vec2"),c.varyings.add("depth","float")):s.output!==e.Highlight&&c.varyings.add("vColor","vec3"),c.vertex.code.add(r`
     void main(void) {
       // Move clipped points outside of clipspace
-      if (position.x < uClipMin.x || position.y < uClipMin.y || position.z < uClipMin.z ||
-        position.x > uClipMax.x || position.y > uClipMax.y || position.z > uClipMax.z) {
+      if (position.x < clipMin.x || position.y < clipMin.y || position.z < clipMin.z ||
+        position.x > clipMax.x || position.y > clipMax.y || position.z > clipMax.z) {
         gl_Position = vec4(0.0,0.0,0.0,2.0);
         gl_PointSize = 0.0;
         return;
@@ -19,33 +19,33 @@ import{ShaderOutput as e}from"../views/3d/webgl-engine/core/shaderLibrary/Shader
       }
 
       // Position in camera space
-      vec4 camera = uModelViewMatrix * vec4(position, 1.0);
+      vec4 camera = modelView * vec4(position, 1.0);
 
-      float pointSize = uPointScale.x;
-      vec4 position = uProjectionMatrix * camera;
+      float pointSize = pointScale.x;
+      vec4 position = proj * camera;
      ${s.drawScreenSize?r`
       float clampedScreenSize = pointSize;`:r`
       float pointRadius = 0.5 * pointSize;
       vec4 cameraOffset = camera + vec4(0.0, pointRadius, 0.0, 0.0);
-      vec4 positionOffset = uProjectionMatrix * cameraOffset;
+      vec4 positionOffset = proj * cameraOffset;
       float radius = abs(positionOffset.y - position.y);
-      float viewHeight = uPointScale.y;
+      float viewHeight = pointScale.y;
       // screen diameter = (2 * r / w) * (h / 2)
       float screenPointSize = (radius / position.w) * viewHeight;
-      float clampedScreenSize = clamp(screenPointSize, uScreenMinMaxSize.x, uScreenMinMaxSize.y);
+      float clampedScreenSize = clamp(screenPointSize, screenMinMaxSize.x, screenMinMaxSize.y);
       // Shift towards camera, to move rendered point out of terrain i.e. to
       // the camera-facing end of the virtual point when considering it as a
       // 3D sphere.
       camera.xyz -= normalize(camera.xyz) * pointRadius * clampedScreenSize / screenPointSize;
-      position = uProjectionMatrix * camera;`}
+      position = proj * camera;`}
 
      gl_PointSize = clampedScreenSize;
      gl_Position = position;
 
      ${l?r`depth = (-camera.z - nearFar[0]) / (nearFar[1] - nearFar[0]);`:""}
-     ${c?r`vColor = color;`:""}
+     ${d?r`vColor = color;`:""}
     }
-  `),d.fragment.include(t,s),p&&d.include(o),d.fragment.code.add(r`
+  `),c.fragment.include(t,s),p&&c.include(o),c.fragment.code.add(r`
     void main(void) {
       vec2 vOffset = gl_PointCoord - vec2(0.5, 0.5);
       float r2 = dot(vOffset, vOffset);
@@ -55,6 +55,6 @@ import{ShaderOutput as e}from"../views/3d/webgl-engine/core/shaderLibrary/Shader
       }
       ${l?r`gl_FragColor = float2rgba(depth);`:""}
       ${p?r`outputHighlight();`:""}
-      ${c?r`gl_FragColor = vec4(vColor, 1.0);`:""}
+      ${d?r`gl_FragColor = vec4(vColor, 1.0);`:""}
     }
-  `),d}const d=Object.freeze({__proto__:null,build:s});export{d as P,s as b};
+  `),c}const c=Object.freeze({__proto__:null,build:s});export{c as P,s as b};

package/chunks/Precipitation.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{glsl as t}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 o}from"../views/3d/webgl-engine/lib/basicInterfaces.js";var a;function i(i){const r=new e;return r.attributes.add(o.POSITION,"vec3"),r.attributes.add(o.INSTANCEFEATUREATTRIBUTE,"float"),r.vertex.uniforms.add("cameraPos","vec3").add("offset","vec3").add("width","float").add("proj","mat4").add("view","mat4").add("time","float"),r.varyings.add("vUv","vec2"),r.vertex.code.add(t`
+import{glsl as t}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 o}from"../views/3d/webgl-engine/lib/VertexAttribute.js";var a;function i(i){const r=new e;return r.attributes.add(o.POSITION,"vec3"),r.attributes.add(o.INSTANCEFEATUREATTRIBUTE,"float"),r.vertex.uniforms.add("cameraPosition","vec3").add("offset","vec3").add("width","float").add("proj","mat4").add("view","mat4").add("time","float"),r.varyings.add("vUv","vec2"),r.vertex.code.add(t`
     //https://www.shadertoy.com/view/4djSRW
     vec3 hash31(float p){
       vec3 p3 = fract(vec3(p) * vec3(0.1031, 0.1030, 0.0973));
@@ -40,7 +40,7 @@ import{glsl as t}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js"
       vec3 up = vec3(0, 0, 1);
 
       // Gravity and wind direction
-      vec3 direction = normalize(cameraPos);
+      vec3 direction = normalize(cameraPosition);
 
       vec3 tangent = normalize(cross(direction, up));
 

package/chunks/RealisticTree.glsl.js

@@ -2,11 +2,11 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/esri/copyright.txt for details.
 */
-import{ViewingMode as e}from"../views/ViewingMode.js";import{ForwardLinearDepth as o}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 a}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 l}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{InstancedDoublePrecision as t}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/InstancedDoublePrecision.glsl.js";import{NormalAttribute as d}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 c}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/TextureCoordinateAttribute.glsl.js";import{VertexColor as g}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexColor.glsl.js";import{VerticalOffset as m}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VerticalOffset.glsl.js";import{DefaultMaterialAuxiliaryPasses as v}from"../views/3d/webgl-engine/core/shaderLibrary/default/DefaultMaterialAuxiliaryPasses.glsl.js";import{ReadLinearDepth as p}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{EvaluateAmbientOcclusion as b}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientOcclusion.glsl.js";import{EvaluateSceneLighting as u}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{multipassTerrainTest as f}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{PhysicallyBasedRendering as h}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRendering.glsl.js";import{PhysicallyBasedRenderingParameters as w,PBRMode as x}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{ReadShadowMap as y}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{VisualVariables as C}from"../views/3d/webgl-engine/core/shaderLibrary/shading/VisualVariables.glsl.js";import{symbolAlphaCutoff as L,DiscardOrAdjustAlpha as M}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{MixExternalColor as j}from"../views/3d/webgl-engine/core/shaderLibrary/util/MixExternalColor.glsl.js";import{glsl as O}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 _}from"../views/3d/webgl-engine/lib/basicInterfaces.js";function A(A){const P=new E,S=P.vertex.code,F=P.fragment.code;return P.vertex.uniforms.add("proj","mat4").add("view","mat4").add("camPos","vec3").add("localOrigin","vec3"),P.include(s),P.varyings.add("vpos","vec3"),P.include(C,A),P.include(t,A),P.include(m,A),A.output!==a.Color&&A.output!==a.Alpha||(P.include(d,A),P.include(l,{linearDepth:!1}),A.offsetBackfaces&&P.include(r),A.instancedColor&&P.attributes.add(_.INSTANCECOLOR,"vec4"),P.varyings.add("vNormalWorld","vec3"),P.varyings.add("localvpos","vec3"),A.multipassTerrainEnabled&&P.varyings.add("depth","float"),P.include(c,A),P.include(o,A),P.include(n,A),P.include(g,A),P.vertex.uniforms.add("externalColor","vec4"),P.varyings.add("vcolorExt","vec4"),S.add(O`
+import{ViewingMode as e}from"../views/ViewingMode.js";import{ForwardLinearDepth as o}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 a}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 l}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{InstancedDoublePrecision as t}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/InstancedDoublePrecision.glsl.js";import{NormalAttribute as d}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/NormalAttribute.glsl.js";import{PositionAttribute as n}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/PositionAttribute.glsl.js";import{SymbolColor as s}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/SymbolColor.glsl.js";import{TextureCoordinateAttribute as c}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/TextureCoordinateAttribute.glsl.js";import{VertexColor as g}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexColor.glsl.js";import{VerticalOffset as m}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VerticalOffset.glsl.js";import{DefaultMaterialAuxiliaryPasses as v}from"../views/3d/webgl-engine/core/shaderLibrary/default/DefaultMaterialAuxiliaryPasses.glsl.js";import{ReadLinearDepth as p}from"../views/3d/webgl-engine/core/shaderLibrary/output/ReadLinearDepth.glsl.js";import{EvaluateAmbientOcclusion as b}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientOcclusion.glsl.js";import{EvaluateSceneLighting as u}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{multipassTerrainTest as f}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MultipassTerrainTest.glsl.js";import{PhysicallyBasedRendering as h}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRendering.glsl.js";import{PhysicallyBasedRenderingParameters as w,PBRMode as x}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{ReadShadowMap as y}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{VisualVariables as C}from"../views/3d/webgl-engine/core/shaderLibrary/shading/VisualVariables.glsl.js";import{symbolAlphaCutoff as L,DiscardOrAdjustAlpha as M}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{MixExternalColor as j}from"../views/3d/webgl-engine/core/shaderLibrary/util/MixExternalColor.glsl.js";import{glsl as O}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 A}from"../views/3d/webgl-engine/lib/VertexAttribute.js";function _(_){const P=new E,S=P.vertex.code,F=P.fragment.code;return P.vertex.uniforms.add("proj","mat4").add("view","mat4").add("cameraPosition","vec3").add("localOrigin","vec3"),P.include(n),P.varyings.add("vpos","vec3"),P.include(C,_),P.include(t,_),P.include(m,_),_.output!==a.Color&&_.output!==a.Alpha||(P.include(d,_),P.include(l,{linearDepth:!1}),_.offsetBackfaces&&P.include(r),_.instancedColor&&P.attributes.add(A.INSTANCECOLOR,"vec4"),P.varyings.add("vNormalWorld","vec3"),P.varyings.add("localvpos","vec3"),_.multipassTerrainEnabled&&P.varyings.add("depth","float"),P.include(c,_),P.include(o,_),P.include(s,_),P.include(g,_),P.vertex.uniforms.add("externalColor","vec4"),P.varyings.add("vcolorExt","vec4"),S.add(O`
         void main(void) {
           forwardNormalizedVertexColor();
           vcolorExt = externalColor;
-          ${A.instancedColor?"vcolorExt *= instanceColor;":""}
+          ${_.instancedColor?"vcolorExt *= instanceColor;":""}
           vcolorExt *= vvColor();
           vcolorExt *= getSymbolColor();
           forwardColorMixMode();
@@ -21,45 +21,45 @@ import{ViewingMode as e}from"../views/ViewingMode.js";import{ForwardLinearDepth
             vNormalWorld = dpNormal(vvLocalNormal(normalModel()));
             vpos = addVerticalOffset(vpos, localOrigin);
             gl_Position = transformPosition(proj, view, vpos);
-            ${A.offsetBackfaces?"gl_Position = offsetBackfacingClipPosition(gl_Position, vpos, vNormalWorld, camPos);":""}
+            ${_.offsetBackfaces?"gl_Position = offsetBackfacingClipPosition(gl_Position, vpos, vNormalWorld, cameraPosition);":""}
           }
-          ${A.multipassTerrainEnabled?O`depth = (view * vec4(vpos, 1.0)).z;`:""}
+          ${_.multipassTerrainEnabled?O`depth = (view * vec4(vpos, 1.0)).z;`:""}
           forwardLinearDepth();
           forwardTextureCoordinates();
         }
-      `)),A.output===a.Alpha&&(P.include(i,A),P.include(M,A),A.multipassTerrainEnabled&&(P.fragment.include(p),P.include(f,A)),P.fragment.uniforms.add("camPos","vec3").add("localOrigin","vec3").add("opacity","float").add("layerOpacity","float"),P.fragment.uniforms.add("view","mat4"),A.hasColorTexture&&P.fragment.uniforms.add("tex","sampler2D"),P.fragment.include(j),F.add(O`
+      `)),_.output===a.Alpha&&(P.include(i,_),P.include(M,_),_.multipassTerrainEnabled&&(P.fragment.include(p),P.include(f,_)),P.fragment.uniforms.add("cameraPosition","vec3").add("localOrigin","vec3").add("opacity","float").add("layerOpacity","float"),P.fragment.uniforms.add("view","mat4"),_.hasColorTexture&&P.fragment.uniforms.add("tex","sampler2D"),P.fragment.include(j),F.add(O`
       void main() {
         discardBySlice(vpos);
-        ${A.multipassTerrainEnabled?O`terrainDepthTest(gl_FragCoord, depth);`:""}
-        ${A.hasColorTexture?O`
+        ${_.multipassTerrainEnabled?O`terrainDepthTest(gl_FragCoord, depth);`:""}
+        ${_.hasColorTexture?O`
         vec4 texColor = texture2D(tex, vuv0);
-        ${A.textureAlphaPremultiplied?"texColor.rgb /= texColor.a;":""}
+        ${_.textureAlphaPremultiplied?"texColor.rgb /= texColor.a;":""}
         discardOrAdjustAlpha(texColor);`:O`vec4 texColor = vec4(1.0);`}
-        ${A.attributeColor?O`
+        ${_.attributeColor?O`
         float opacity_ = layerOpacity * mixExternalOpacity(vColor.a * opacity, texColor.a, vcolorExt.a, int(colorMixMode));`:O`
         float opacity_ = layerOpacity * mixExternalOpacity(opacity, texColor.a, vcolorExt.a, int(colorMixMode));
         `}
 
         gl_FragColor = vec4(opacity_);
       }
-    `)),A.output===a.Color&&(P.include(i,A),P.include(u,A),P.include(b,A),P.include(M,A),A.receiveShadows&&P.include(y,A),A.multipassTerrainEnabled&&(P.fragment.include(p),P.include(f,A)),P.fragment.uniforms.add("camPos","vec3").add("localOrigin","vec3").add("ambient","vec3").add("diffuse","vec3").add("opacity","float").add("layerOpacity","float"),P.fragment.uniforms.add("view","mat4"),A.hasColorTexture&&P.fragment.uniforms.add("tex","sampler2D"),P.include(w,A),P.include(h,A),P.fragment.include(j),F.add(O`
+    `)),_.output===a.Color&&(P.include(i,_),P.include(u,_),P.include(b,_),P.include(M,_),_.receiveShadows&&P.include(y,_),_.multipassTerrainEnabled&&(P.fragment.include(p),P.include(f,_)),P.fragment.uniforms.add("cameraPosition","vec3").add("localOrigin","vec3").add("ambient","vec3").add("diffuse","vec3").add("opacity","float").add("layerOpacity","float"),P.fragment.uniforms.add("view","mat4"),_.hasColorTexture&&P.fragment.uniforms.add("tex","sampler2D"),P.include(w,_),P.include(h,_),P.fragment.include(j),F.add(O`
       void main() {
         discardBySlice(vpos);
-        ${A.multipassTerrainEnabled?O`terrainDepthTest(gl_FragCoord, depth);`:""}
-        ${A.hasColorTexture?O`
+        ${_.multipassTerrainEnabled?O`terrainDepthTest(gl_FragCoord, depth);`:""}
+        ${_.hasColorTexture?O`
         vec4 texColor = texture2D(tex, vuv0);
-        ${A.textureAlphaPremultiplied?"texColor.rgb /= texColor.a;":""}
+        ${_.textureAlphaPremultiplied?"texColor.rgb /= texColor.a;":""}
         discardOrAdjustAlpha(texColor);`:O`vec4 texColor = vec4(1.0);`}
-        vec3 viewDirection = normalize(vpos - camPos);
-        ${A.pbrMode===x.Normal?"applyPBRFactors();":""}
+        vec3 viewDirection = normalize(vpos - cameraPosition);
+        ${_.pbrMode===x.Normal?"applyPBRFactors();":""}
         float ssao = evaluateAmbientOcclusionInverse();
         ssao *= getBakedOcclusion();
 
         float additionalAmbientScale = additionalDirectedAmbientLight(vpos + localOrigin);
         vec3 additionalLight = ssao * lightingMainIntensity * additionalAmbientScale * ambientBoostFactor * lightingGlobalFactor;
-        ${A.receiveShadows?"float shadow = readShadowMap(vpos, linearDepth);":A.viewingMode===e.Global?"float shadow = lightingGlobalFactor * (1.0 - additionalAmbientScale);":"float shadow = 0.0;"}
+        ${_.receiveShadows?"float shadow = readShadowMap(vpos, linearDepth);":_.viewingMode===e.Global?"float shadow = lightingGlobalFactor * (1.0 - additionalAmbientScale);":"float shadow = 0.0;"}
         vec3 matColor = max(ambient, diffuse);
-        ${A.attributeColor?O`
+        ${_.attributeColor?O`
         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));`:O`
         vec3 albedo_ = mixExternalColor(matColor, texColor.rgb, vcolorExt.rgb, int(colorMixMode));
@@ -74,11 +74,11 @@ import{ViewingMode as e}from"../views/ViewingMode.js";import{ForwardLinearDepth
         float treeRadialFalloff = vColor.r;
         float backLightFactor = 0.5 * treeRadialFalloff * alignmentLightView * transmittance * (1.0 - shadow);
         additionalLight += backLightFactor * lightingMainIntensity;`}
-        ${A.pbrMode===x.Normal||A.pbrMode===x.Schematic?A.viewingMode===e.Global?O`vec3 normalGround = normalize(vpos + localOrigin);`:O`vec3 normalGround = vec3(0.0, 0.0, 1.0);`:O``}
-        ${A.pbrMode===x.Normal||A.pbrMode===x.Schematic?O`
+        ${_.pbrMode===x.Normal||_.pbrMode===x.Schematic?_.viewingMode===e.Global?O`vec3 normalGround = normalize(vpos + localOrigin);`:O`vec3 normalGround = vec3(0.0, 0.0, 1.0);`:O``}
+        ${_.pbrMode===x.Normal||_.pbrMode===x.Schematic?O`
             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);
-        ${A.OITEnabled?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}
+        ${_.oitEnabled?"gl_FragColor = premultiplyAlpha(gl_FragColor);":""}
       }
-    `)),P.include(v,A),P}const P=Object.freeze({__proto__:null,build:A});export{P as R,A as b};
+    `)),P.include(v,_),P}const P=Object.freeze({__proto__:null,build:_});export{P as R,_ as b};