@arcgis/core 4.23.0-next.20220126 → 4.23.0-next.20220130

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

@@ -0,0 +1,91 @@
+/*
+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/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));
+      p3 += dot(p3, p3.yzx + 33.33);
+      return fract((p3.xxy + p3.yzz) * p3.zyx);
+    }
+
+    float hash11(float p){
+      p = fract(p * 0.1031);
+      p *= p + 33.33;
+      p *= p + p;
+      return fract(p);
+    }
+
+    //https://www.geeks3d.com/20141201/how-to-rotate-a-vertex-by-a-quaternion-in-glsl/
+    vec3 rotateVectorByQuaternion(vec3 v, vec4 q){
+      return 2.0 * cross(q.xyz, v * q.w + cross(q.xyz, v)) + v;
+    }
+
+    void main(void) {
+
+      vUv = position.xz;
+
+      vec3 rand = hash31(instanceFeatureAttribute);
+
+      // Set random position for all particles
+      // The hash function space is not high resolution so offset particles by an additional random value
+      // This creates grids of 1000 particles which are shifted by random hundreths of the tile width
+      // overlaying multiple identical but offset grids
+      vec3 randomPosition = 2.0 * (rand + (0.01 + 0.01 * rand) * floor(0.001 * instanceFeatureAttribute)) - 1.0;
+
+      // Random orientation of rain drops
+      float angle = 3.1415 * hash11(instanceFeatureAttribute);
+
+      vec3 up = vec3(0, 0, 1);
+
+      // Gravity and wind direction
+      vec3 direction = normalize(cameraPosition);
+
+      vec3 tangent = normalize(cross(direction, up));
+
+      // Gravity
+      vec3 animatedPos = randomPosition + direction * -time;
+
+      // Rain particles fall straight down and are randomly oriented
+      // Snow particles have random sinusoid trajectories and are rotated to face the camera
+      ${i.type===a.RAIN?t`
+
+            // Random rotation for particle
+            vec3 rotationAxis = up;
+            vec4 quat = vec4(rotationAxis * sin(angle), cos(angle));
+            vec3 transformedPos = rotateVectorByQuaternion(vec3(0.2, 0.2, 4.0) * (position - vec3(0.5, 0.0, 0.5)), quat);
+
+            // Rotate particle to planetary position
+            rotationAxis = tangent;
+            angle = 0.5 * -acos(dot(direction, up));
+            quat = vec4(rotationAxis * sin(angle), cos(angle));
+            transformedPos = rotateVectorByQuaternion(transformedPos, quat);
+
+            vec4 pos = mat4(mat3(view)) * vec4(transformedPos + (mod(width * animatedPos - offset, width) - 0.5 * width), 1.0);
+            gl_Position = proj * pos;
+      `:t`
+            vec3 rotationAxis = direction;
+            vec4 quat = vec4(rotationAxis * sin(angle), cos(angle));
+
+            tangent = rotateVectorByQuaternion(tangent, quat);
+            // Random sinusoid from friction
+            animatedPos += tangent * 0.25 * sin(dot(animatedPos, direction));
+            vec4 pos = mat4(mat3(view)) * vec4((mod(width * animatedPos - offset, width) - 0.5 * width), 1.0);
+            gl_Position = proj * (0.5 * vec4(position.xzy, 0.0) + pos);
+      `}
+    }
+  `),r.fragment.uniforms.add("heightFade","float"),r.fragment.code.add(t`
+    void main() {
+
+      // Cut off corners of the triangle
+      if(vUv.x < 0.0 || vUv.y < 0.0){
+        discard;
+      }
+
+      float d = length(vUv - vec2(0.5));
+
+      ${i.type===a.RAIN?t`d = 0.5 * smoothstep(0.5, 0.0, d);`:t`d = smoothstep(0.5, 0.1, d);`}
+      gl_FragColor = vec4(heightFade * d);
+    }
+  `),r}!function(t){t[t.RAIN=0]="RAIN",t[t.SNOW=1]="SNOW"}(a||(a={}));const r=Object.freeze({__proto__:null,get PrecipitationType(){return a},build:i});export{a as P,r as a,i as b};

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};

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};