@arcgis/core 5.2.0-next.111 → 5.2.0-next.113

package/chunks/Path.glsl.js

@@ -1,57 +1,54 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import{addNearFar as e}from"../views/3d/webgl-engine/core/shaderLibrary/ForwardLinearDepthToWriteShadowMap.glsl.js";import{Offset as o}from"../views/3d/webgl-engine/core/shaderLibrary/Offset.glsl.js";import{isColor as r}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutput.js";import{SliceDraw as a}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{Transform as i}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{PathVertexPosition as d}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/PathVertexPosition.glsl.js";import{outputDepth as n}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.glsl.js";import{OutputHighlight as l}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{EvaluateAmbientOcclusion as t}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientOcclusion.glsl.js";import{EvaluateSceneLighting as s,addAmbientBoostFactor as c,addLightingGlobalFactor as m}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{addMainLightIntensity as g}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{Normals as v}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Normals.glsl.js";import{NormalUtils as u}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{PhysicallyBasedRenderingParameters as p}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{ReadShadowMapDrawFragment as b}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{ColorConversion as w}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{addProjViewLocalOrigin as f,addCameraPosition as h,addViewNormal as y}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float3PassUniform as x}from"../views/3d/webgl-engine/core/shaderModules/Float3PassUniform.js";import{FloatPassUniform as L}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as j,If as P}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{SnowCover as V}from"../views/3d/webgl-engine/effects/snowcover/SnowCover.glsl.js";import{outputColorHighlightOLID as C}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{ShaderBuilder as S}from"../views/webgl/ShaderBuilder.js";function O(O){const A=new S,{vertex:I,fragment:B,varyings:_}=A;f(I,O),_.add("vpos","vec3",{invariant:!0}),A.include(d,O);const{output:D,spherical:M,pbrMode:F,snowCover:k,offsetBackfaces:z}=O,E=11===D;switch((r(D)||E)&&(E?(A.varyings.add("objectAndLayerIdColorVarying","vec4"),A.vertex.code.add(j`void forwardObjectAndLayerIdColor() {
+import{addNearFar as e}from"../views/3d/webgl-engine/core/shaderLibrary/ForwardLinearDepthToWriteShadowMap.glsl.js";import{Offset as o}from"../views/3d/webgl-engine/core/shaderLibrary/Offset.glsl.js";import{isColor as r}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutput.js";import{SliceDraw as i}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{Transform as a}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{PathVertexPosition as d}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/PathVertexPosition.glsl.js";import{outputDepth as l}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.glsl.js";import{OutputHighlight as t}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{EvaluateAmbientOcclusion as n}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientOcclusion.glsl.js";import{EvaluateSceneLighting as s,addAmbientBoostFactor as c,addLightingGlobalFactor as g}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{mainLightIntensity as m}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{Normals as v}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Normals.glsl.js";import{NormalUtils as u}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{PhysicallyBasedRenderingParameters as p}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{ReadShadowMapDrawFragment as w}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{ColorConversion as b}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{addProjViewLocalOrigin as f,addCameraPosition as h,addViewNormal as y}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float3PassUniform as x}from"../views/3d/webgl-engine/core/shaderModules/Float3PassUniform.js";import{FloatPassUniform as j}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as L,If as V}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{SnowCover as P}from"../views/3d/webgl-engine/effects/snowcover/SnowCover.glsl.js";import{outputColorHighlightOLID as C}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{ShaderBuilder as O}from"../views/webgl/ShaderBuilder.js";function S(S){const A=new O,{vertex:I,fragment:_,varyings:B}=A;f(I,S),B.add("vpos","vec3",{invariant:!0}),A.include(d,S);const{output:D,pbrMode:M,snowCover:N,offsetBackfaces:F}=S,k=11===D;switch((r(D)||k)&&(k?(A.varyings.add("objectAndLayerIdColorVarying","vec4"),A.vertex.code.add(L`void forwardObjectAndLayerIdColor() {
 objectAndLayerIdColorVarying = getOlidColor();
-}`),A.fragment.code.add(j`void outputObjectAndLayerIdColor() {
+}`),A.fragment.code.add(L`void outputObjectAndLayerIdColor() {
 fragColor = objectAndLayerIdColorVarying;
-}`)):(A.vertex.code.add(j`void forwardObjectAndLayerIdColor() {}`),A.fragment.code.add(j`void outputObjectAndLayerIdColor() {}`)),A.include(i),A.include(b,O),z&&(h(I,O),A.include(o)),_.add("vnormal","vec3"),_.add("vcolor","vec4"),I.main.add(j`
+}`)):(A.vertex.code.add(L`void forwardObjectAndLayerIdColor() {}`),A.fragment.code.add(L`void outputObjectAndLayerIdColor() {}`)),A.include(a),A.include(w,S),F&&(h(I,S),A.include(o)),B.add("vnormal","vec3"),B.add("vcolor","vec4"),I.main.add(L`
       ExtrudedVertex extrudedVertex = evaluateVertex();
       vpos = calculateVPos(extrudedVertex);
       vnormal = normalize(localNormal(extrudedVertex));
       gl_Position = transformPosition(proj, view, vpos);
-      ${P(z,"gl_Position = offsetBackfacingClipPosition(gl_Position, vpos, vnormal, cameraPosition);")}
+      ${V(F,"gl_Position = offsetBackfacingClipPosition(gl_Position, vpos, vnormal, cameraPosition);")}
 
       forwardObjectAndLayerIdColor();
       vcolor = getColor();
-      forwardLinearDepthToReadShadowMap();`)),D){case 0:case 1:case 2:A.include(p,O),B.include(s,O),B.include(t,O),A.include(v,O),B.include(a,O),A.include(C,O),h(B,O),c(B),m(B),B.uniforms.add(I.uniforms.get("localOrigin"),new x("ambient",e=>e.ambient),new x("diffuse",e=>e.diffuse),new L("opacity",e=>e.opacity)),B.include(w),B.include(V,O),g(B),B.main.add(j`
+      forwardLinearDepthToReadShadowMap();`)),D){case 0:case 1:case 2:A.include(p,S),_.include(s,S),_.include(n,S),A.include(v,S),_.include(u,S),_.include(i,S),A.include(C,S),h(_,S),c(_),g(_),_.uniforms.add(I.uniforms.get("localOrigin"),new x("ambient",e=>e.ambient),new x("diffuse",e=>e.diffuse),new j("opacity",e=>e.opacity)),_.include(b),_.include(P,S),_.uniforms.add(m).main.add(L`
         discardBySlice(vpos);
 
-        shadingParams.viewDirection = normalize(vpos - cameraPosition);
-        shadingParams.normalView = vnormal;
-        vec3 normal = shadingNormal(shadingParams);
+        vec3 viewDirection = normalize(vpos - cameraPosition);
+        vec3 normal = shadingNormal(vnormal, viewDirection);
         float ssao = evaluateAmbientOcclusionInverse();
-
-        vec3 posWorld = vpos + localOrigin;
-        vec3 normalGround = ${M?"normalize(posWorld);":"vec3(0.0, 0.0, 1.0);"}
+        vec3 upNormal = getLocalUp(vpos, localOrigin);
 
         vec3 albedo = vcolor.rgb * max(ambient, diffuse); // combine the old material parameters into a single one
         float combinedOpacity = vcolor.a * opacity;
 
-        ${P(k,j`float snow = getSnow(normal, normalGround);
+        ${V(N,L`float snow = getSnow(normal, upNormal);
                  albedo = mix(albedo, vec3(1), snow);
                  ssao = mix(ssao, 1.0, snow);`)}
 
+        vec3 posWorld = vpos + localOrigin;
         float additionalAmbientScale = additionalDirectedAmbientLight(posWorld);
         vec3 additionalLight = ssao * mainLightIntensity * additionalAmbientScale * ambientBoostFactor * lightingGlobalFactor;
         float shadow = readShadow(additionalAmbientScale, vpos);
 
-        ${P(2===F,`float additionalAmbientIrradiance = additionalAmbientIrradianceFactor * mainLightIntensity[2];\n           ${P(k,"mrr = applySnowToMRR(mrr, snow);")}`)}
-
-        vec3 shadedColor = ${2===F?"evaluateSceneLightingPBR(normal, albedo, shadow, 1.0 - ssao, additionalLight, shadingParams.viewDirection, normalGround, mrr, additionalAmbientIrradiance);":"evaluateSceneLighting(normal, albedo, shadow, 1.0 - ssao, additionalLight);"}
+        ${V(2===M&&N,"applySnowToMRR(snow);")}
+        vec3 shadedColor = evaluateSceneLighting(normal, albedo, shadow, 1.0 - ssao, additionalLight, viewDirection, upNormal);
         vec4 finalColor = vec4(shadedColor, combinedOpacity);
-        outputColorHighlightOLID(applySlice(finalColor, vpos), albedo ${P(k,", snow")});`);break;case 3:A.include(i),I.main.add(j`ExtrudedVertex extrudedVertex = evaluateVertex();
+        outputColorHighlightOLID(applySlice(finalColor, vpos), albedo ${V(N,", snow")});`);break;case 3:A.include(a),I.main.add(L`ExtrudedVertex extrudedVertex = evaluateVertex();
 vpos = calculateVPos(extrudedVertex);
-gl_Position = transformPosition(proj, view, vpos);`),A.fragment.include(a,O),B.main.add(j`discardBySlice(vpos);`);break;case 5:case 6:case 7:case 8:A.include(i),e(A),_.add("depth","float"),I.main.add(j`ExtrudedVertex extrudedVertex = evaluateVertex();
+gl_Position = transformPosition(proj, view, vpos);`),A.fragment.include(i,S),_.main.add(L`discardBySlice(vpos);`);break;case 5:case 6:case 7:case 8:A.include(a),e(A),B.add("depth","float"),I.main.add(L`ExtrudedVertex extrudedVertex = evaluateVertex();
 vpos = calculateVPos(extrudedVertex);
-gl_Position = transformPositionWithDepth(proj, view, vpos, nearFar, depth);`),B.include(a,O),A.include(n,O),B.main.add(j`discardBySlice(vpos);
-outputDepth(depth);`);break;case 11:A.fragment.include(a,O),B.main.add(j`discardBySlice(vpos);
-outputObjectAndLayerIdColor();`);break;case 4:A.include(i),A.include(u,O),y(I),_.add("vnormal","vec3"),_.add("vcolor","vec4"),I.main.add(j`ExtrudedVertex extrudedVertex = evaluateVertex();
+gl_Position = transformPositionWithDepth(proj, view, vpos, nearFar, depth);`),_.include(i,S),A.include(l,S),_.main.add(L`discardBySlice(vpos);
+outputDepth(depth);`);break;case 11:A.fragment.include(i,S),_.main.add(L`discardBySlice(vpos);
+outputObjectAndLayerIdColor();`);break;case 4:A.include(a),I.include(u,S),y(I),B.add("vnormal","vec3"),B.add("vcolor","vec4"),I.main.add(L`ExtrudedVertex extrudedVertex = evaluateVertex();
 vpos = calculateVPos(extrudedVertex);
 vnormal = normalize((viewNormal * vec4(localNormal(extrudedVertex), 1.0)).xyz);
 vcolor = getColor();
-gl_Position = transformPosition(proj, view, vpos);`),A.fragment.include(a,O),B.uniforms.add(new L("opacity",e=>e.opacity)),B.main.add(j`discardBySlice(vpos);
+gl_Position = transformPosition(proj, view, vpos);`),A.fragment.include(i,S),_.uniforms.add(new j("opacity",e=>e.opacity)),_.main.add(L`discardBySlice(vpos);
 vec3 normal = normalize(vnormal);
 if (gl_FrontFacing == false) normal = -normal;
-fragColor = vec4(vec3(0.5) + 0.5 * normal, vcolor.a * opacity);`);break;case 10:A.include(i),A.include(u,O),_.add("vnormal","vec3"),I.main.add(j`ExtrudedVertex extrudedVertex = evaluateVertex();
+fragColor = vec4(vec3(0.5) + 0.5 * normal, vcolor.a * opacity);`);break;case 10:A.include(a),I.include(u,S),B.add("vnormal","vec3"),I.main.add(L`ExtrudedVertex extrudedVertex = evaluateVertex();
 vpos = calculateVPos(extrudedVertex);
-gl_Position = transformPosition(proj, view, vpos);`),A.fragment.include(a,O),A.include(l,O),B.main.add(j`discardBySlice(vpos);
-calculateOcclusionAndOutputHighlight();`)}return A}const A=Object.freeze(Object.defineProperty({__proto__:null,build:O},Symbol.toStringTag,{value:"Module"}));export{A as P,O as b};
+gl_Position = transformPosition(proj, view, vpos);`),A.fragment.include(i,S),A.include(t,S),_.main.add(L`discardBySlice(vpos);
+calculateOcclusionAndOutputHighlight();`)}return A}const A=Object.freeze(Object.defineProperty({__proto__:null,build:S},Symbol.toStringTag,{value:"Module"}));export{A as P,S as b};

package/chunks/RealisticTree.glsl.js

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import{Offset as e}from"../views/3d/webgl-engine/core/shaderLibrary/Offset.glsl.js";import{isColor as i}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutput.js";import{SliceDraw as r}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{Transform as o}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{InstancedDoublePrecision as a}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/InstancedDoublePrecision.glsl.js";import{NormalAttribute as l}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/NormalAttribute.glsl.js";import{TextureCoordinateAttribute as t}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/TextureCoordinateAttribute.glsl.js";import{VerticalOffset as s}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VerticalOffset.glsl.js";import{DefaultMaterialAuxiliaryPasses as n}from"../views/3d/webgl-engine/core/shaderLibrary/default/DefaultMaterialAuxiliaryPasses.glsl.js";import{DefaultMaterialExternalColor as d}from"../views/3d/webgl-engine/core/shaderLibrary/default/DefaultMaterialExternalColor.glsl.js";import{EvaluateAmbientOcclusion as c}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientOcclusion.glsl.js";import{EvaluateSceneLighting as g,addAmbientBoostFactor as m,addLightingGlobalFactor as v}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{addMainLightDirection as b,addMainLightIntensity as u}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{PhysicallyBasedRendering as w}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRendering.glsl.js";import{PhysicallyBasedRenderingParameters as f}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{ReadShadowMapPassFragment as h,ReadShadowMapDrawFragment as p}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{colorTextureUV as L,emissiveTextureUV as y}from"../views/3d/webgl-engine/core/shaderLibrary/shading/TextureTransformUV.glsl.js";import{VisualVariables as x}from"../views/3d/webgl-engine/core/shaderLibrary/shading/VisualVariables.glsl.js";import{DiscardOrAdjustAlphaPass as j}from"../views/3d/webgl-engine/core/shaderLibrary/util/DiscardOrAdjustAlpha.glsl.js";import{addProjViewLocalOrigin as C,addCameraPosition as O}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float3PassUniform as P}from"../views/3d/webgl-engine/core/shaderModules/Float3PassUniform.js";import{If as S,glsl as N}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DPassUniform as A}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{SnowCover as D}from"../views/3d/webgl-engine/effects/snowcover/SnowCover.glsl.js";import{outputColorHighlightOLID as M}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{ShaderBuilder as T}from"../views/webgl/ShaderBuilder.js";function V(V){const F=new T,{attributes:R,vertex:$,fragment:B,varyings:I}=F,{output:E,offsetBackfaces:_,pbrMode:U,snowCover:k,spherical:z}=V,W=1===U||2===U;if(C($,V),R.add("position","vec3"),$.inputs.add("position",()=>"position"),I.add("vpos","vec3",{invariant:!0}),F.include(x,V),F.include(a,V),F.include(s,V),F.include(L,V),!i(E))return F.include(n,V),F;F.include(y,V),O(F.vertex,V),F.include(l,V),F.include(o),_&&F.include(e),I.add("vNormalWorld","vec3"),I.add("localvpos","vec3",{invariant:!0}),F.include(t,V),F.include(d,V),F.include(V.instancedDoublePrecision?h:p,V),$.main.add(N`
+import{Offset as e}from"../views/3d/webgl-engine/core/shaderLibrary/Offset.glsl.js";import{isColor as i}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutput.js";import{SliceDraw as r}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{Transform as o}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{InstancedDoublePrecision as a}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/InstancedDoublePrecision.glsl.js";import{NormalAttribute as l}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/NormalAttribute.glsl.js";import{TextureCoordinateAttribute as s}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/TextureCoordinateAttribute.glsl.js";import{VerticalOffset as t}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VerticalOffset.glsl.js";import{DefaultMaterialAuxiliaryPasses as n}from"../views/3d/webgl-engine/core/shaderLibrary/default/DefaultMaterialAuxiliaryPasses.glsl.js";import{DefaultMaterialExternalColor as d}from"../views/3d/webgl-engine/core/shaderLibrary/default/DefaultMaterialExternalColor.glsl.js";import{EvaluateAmbientOcclusion as c}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientOcclusion.glsl.js";import{EvaluateSceneLighting as g,addAmbientBoostFactor as m,addLightingGlobalFactor as v}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{mainLightDirection as u,mainLightIntensity as w}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{NormalUtils as b}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{PhysicallyBasedRendering as f}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRendering.glsl.js";import{PhysicallyBasedRenderingParameters as p}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{ReadShadowMapPassFragment as h,ReadShadowMapDrawFragment as y}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{colorTextureUV as L,emissiveTextureUV as j}from"../views/3d/webgl-engine/core/shaderLibrary/shading/TextureTransformUV.glsl.js";import{VisualVariables as x}from"../views/3d/webgl-engine/core/shaderLibrary/shading/VisualVariables.glsl.js";import{DiscardOrAdjustAlphaPass as C}from"../views/3d/webgl-engine/core/shaderLibrary/util/DiscardOrAdjustAlpha.glsl.js";import{addProjViewLocalOrigin as O,addCameraPosition as P}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float3PassUniform as S}from"../views/3d/webgl-engine/core/shaderModules/Float3PassUniform.js";import{If as N,glsl as D}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DPassUniform as M}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{SnowCover as A}from"../views/3d/webgl-engine/effects/snowcover/SnowCover.glsl.js";import{outputColorHighlightOLID as T}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{ShaderBuilder as V}from"../views/webgl/ShaderBuilder.js";function F(F){const R=new V,{attributes:B,vertex:$,fragment:U,varyings:E}=R,{output:I,offsetBackfaces:_,pbrMode:k,snowCover:z}=F,W=1===k||2===k;if(O($,F),B.add("position","vec3"),$.inputs.add("position",()=>"position"),E.add("vpos","vec3",{invariant:!0}),R.include(x,F),R.include(a,F),R.include(t,F),R.include(L,F),!i(I))return R.include(n,F),R;R.include(j,F),P(R.vertex,F),R.include(l,F),R.include(o),_&&R.include(e),E.add("vNormalWorld","vec3"),E.add("localvpos","vec3",{invariant:!0}),R.include(s,F),R.include(d,F),R.include(F.instancedDoublePrecision?h:y,F),$.main.add(D`
     forwardDefaultMaterialExternalColor();
 
     vpos = getVertexInLocalOriginSpace();
@@ -16,43 +16,44 @@ import{Offset as e}from"../views/3d/webgl-engine/core/shaderLibrary/Offset.glsl.
     forwardLinearDepthToReadShadowMap();
 
     gl_Position = shouldCullByOpacity() ? vec4(1e38, 1e38, 1e38, 1.0) :
-    ${S(_,"offsetBackfacingClipPosition(basePosition, vpos, vNormalWorld, cameraPosition);","basePosition;")}
-  `);const{hasColorTexture:H,hasColorTextureTransform:G}=V;return B.include(g,V),B.include(c,V),F.include(j,V),B.include(r,V),F.include(M,V),O(B,V),b(B),m(B),v(B),B.uniforms.add($.uniforms.get("localOrigin"),$.uniforms.get("view"),new P("ambient",e=>e.ambient),new P("diffuse",e=>e.diffuse)),H&&B.uniforms.add(new A("tex",e=>e.texture)),F.include(f,V),B.include(w,V),B.include(D,V),u(B),B.main.add(N`
-      discardBySlice(vpos);
-      vec4 texColor = ${H?`texture(tex, ${G?"colorUV":"vuv0"})`:" vec4(1.0)"};
-      ${S(H,`${S(V.textureAlphaPremultiplied,"texColor.rgb /= texColor.a;")}\n        discardOrAdjustAlpha(texColor);`)}
-      vec3 viewDirection = normalize(vpos - cameraPosition);
-      applyPBRFactors();
-      float ssao = evaluateAmbientOcclusionInverse();
-      ssao *= getBakedOcclusion();
-
-      float additionalAmbientScale = additionalDirectedAmbientLight(vpos + localOrigin);
-      vec3 additionalLight = ssao * mainLightIntensity * additionalAmbientScale * ambientBoostFactor * lightingGlobalFactor;
-      float shadow = readShadow(additionalAmbientScale, vpos);
-      vec3 matColor = max(ambient, diffuse);
-      vec3 albedo = mixExternalColor(
-        ${S(V.hasVertexColors,"vColor.rgb * ")} matColor,
-        texColor.rgb,
-        vExternalColor.rgb,
-        colorMixMode
-      );
-      float opacity_ = getDefaultMaterialOpacity(texColor.a);
-
-      vec3 shadingNormal = normalize(vNormalWorld);
-      vec3 groundNormal = ${z?"normalize(vpos + localOrigin)":"vec3(0.0, 0.0, 1.0)"};
-
-      ${S(k,"vec3 faceNormal = screenDerivativeNormal(vpos);\n         float snow = getRealisticTreeSnow(faceNormal, shadingNormal, groundNormal);\n         albedo = mix(albedo, vec3(1), snow);")}
-
-      ${N`albedo *= 1.2;
-             vec3 viewForward = vec3(view[0][2], view[1][2], view[2][2]);
-             float alignmentLightView = clamp(dot(viewForward, -mainLightDirection), 0.0, 1.0);
-             float transmittance = 1.0 - clamp(dot(viewForward, shadingNormal), 0.0, 1.0);
-             float treeRadialFalloff = vColor.r;
-             float backLightFactor = 0.5 * treeRadialFalloff * alignmentLightView * transmittance * (1.0 - shadow);
-             additionalLight += backLightFactor * mainLightIntensity;`}
-
-      ${W?N`float additionalAmbientIrradiance = additionalAmbientIrradianceFactor * mainLightIntensity[2];
-            ${S(k,"mrr = applySnowToMRR(mrr, snow);")}
-            vec3 shadedColor = evaluateSceneLightingPBR(shadingNormal, albedo, shadow, 1.0 - ssao, additionalLight, viewDirection, groundNormal, mrr, additionalAmbientIrradiance);`:N`vec3 shadedColor = evaluateSceneLighting(shadingNormal, albedo, shadow, 1.0 - ssao, additionalLight);`}
-      vec4 finalColor = vec4(shadedColor, opacity_);
-      outputColorHighlightOLID(applySlice(finalColor, vpos), albedo ${S(k,", 1.0")});`),F}const F=Object.freeze(Object.defineProperty({__proto__:null,build:V},Symbol.toStringTag,{value:"Module"}));export{F as R,V as b};
+    ${N(_,"offsetBackfacingClipPosition(basePosition, vpos, vNormalWorld, cameraPosition);","basePosition;")}
+  `);const{hasColorTexture:H,hasColorTextureTransform:G}=F;return U.include(g,F),U.include(c,F),R.include(C,F),U.include(r,F),R.include(T,F),P(U,F),m(U),v(U),U.uniforms.add(u,$.uniforms.get("localOrigin"),$.uniforms.get("view"),new S("ambient",e=>e.ambient),new S("diffuse",e=>e.diffuse)),H&&U.uniforms.add(new M("tex",e=>e.texture)),R.include(p,F),U.include(f,F),U.include(A,F),U.include(b,F),U.uniforms.add(w).main.add(D`
+    discardBySlice(vpos);
+    vec4 texColor = ${H?`texture(tex, ${G?"colorUV":"vuv0"})`:" vec4(1.0)"};
+    ${N(H,`${N(F.textureAlphaPremultiplied,"texColor.rgb /= texColor.a;")}\n      discardOrAdjustAlpha(texColor);`)}
+    applyPBRFactors();
+    float ssao = evaluateAmbientOcclusionInverse();
+    ssao *= getBakedOcclusion();
+
+    float additionalAmbientScale = additionalDirectedAmbientLight(vpos + localOrigin);
+    vec3 additionalLight = ssao * mainLightIntensity * additionalAmbientScale * ambientBoostFactor * lightingGlobalFactor;
+    float shadow = readShadow(additionalAmbientScale, vpos);
+    vec3 matColor = max(ambient, diffuse);
+    vec3 albedo = mixExternalColor(
+      ${N(F.hasVertexColors,"vColor.rgb * ")} matColor,
+      texColor.rgb,
+      vExternalColor.rgb,
+      colorMixMode
+    );
+    float opacity_ = getDefaultMaterialOpacity(texColor.a);
+
+    vec3 shadingNormal = normalize(vNormalWorld);
+    vec3 viewDirection = normalize(vpos - cameraPosition);
+    vec3 upNormal = getLocalUp(vpos, localOrigin);
+
+    ${N(z,"vec3 faceNormal = screenDerivativeNormal(vpos);\n        float snow = getRealisticTreeSnow(faceNormal, shadingNormal, upNormal);\n        albedo = mix(albedo, vec3(1), snow);")}
+
+    ${D`albedo *= 1.2;
+            vec3 viewForward = vec3(view[0][2], view[1][2], view[2][2]);
+            float alignmentLightView = clamp(dot(viewForward, -mainLightDirection), 0.0, 1.0);
+            float transmittance = 1.0 - clamp(dot(viewForward, shadingNormal), 0.0, 1.0);
+            float treeRadialFalloff = vColor.r;
+            float backLightFactor = 0.5 * treeRadialFalloff * alignmentLightView * transmittance * (1.0 - shadow);
+            additionalLight += backLightFactor * mainLightIntensity;`}
+
+    ${N(W&&z,"applySnowToMRR(snow);")}
+
+    vec3 shadedColor = evaluateSceneLighting(shadingNormal, albedo, shadow, 1.0 - ssao, additionalLight, viewDirection, upNormal);
+    vec4 finalColor = vec4(shadedColor, opacity_);
+    outputColorHighlightOLID(applySlice(finalColor, vpos), albedo ${N(z,", 1.0")});
+  `),R}const R=Object.freeze(Object.defineProperty({__proto__:null,build:F},Symbol.toStringTag,{value:"Module"}));export{R,F as b};

package/chunks/RibbonLine.glsl.js

@@ -1,15 +1,15 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import{SliceDraw as e}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{RibbonVertexPosition as t}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/RibbonVertexPosition.glsl.js";import{EvaluateSceneLighting as i}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{LineStipple as n,computePixelSize as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/LineStipple.glsl.js";import{MarkerSizing as o}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MarkerSizing.glsl.js";import{NormalUtils as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{PiUtils as s}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PiUtils.glsl.js";import{positionOutsideClipSpace as l}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PositionOutsideClipSpace.js";import{ColorConversion as d}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{NoPerspectiveWrite as c,NoPerspectiveRead as p}from"../views/3d/webgl-engine/core/shaderLibrary/util/NoPerspective.glsl.js";import{addProjViewLocalOrigin as m,addPixelRatio as v}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float2BindUniform as g}from"../views/3d/webgl-engine/core/shaderModules/Float2BindUniform.js";import{Float4BindUniform as f}from"../views/3d/webgl-engine/core/shaderModules/Float4BindUniform.js";import{Float4PassUniform as h}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatBindUniform as S}from"../views/3d/webgl-engine/core/shaderModules/FloatBindUniform.js";import{FloatPassUniform as u}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as x,If as D}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Matrix4BindUniform as L}from"../views/3d/webgl-engine/core/shaderModules/Matrix4BindUniform.js";import{alphaCutoff as b}from"../views/3d/webgl-engine/shaders/alphaCutoff.glsl.js";import{AnimatedLine as w}from"../views/3d/webgl-engine/shaders/AnimatedLine.glsl.js";import{outputColorHighlightOLID as y}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{getTextureBackedBufferModule as C}from"../views/3d/webgl-engine/shaders/RibbonLineTextureBuffer.glsl.js";import{ShaderBuilder as P}from"../views/webgl/ShaderBuilder.js";const F=1;function j(F){const j=new P,{attributes:z,varyings:A,vertex:W,fragment:T}=j,{applyMarkerOffset:I,draped:R,shadingEnabled:V,output:N,capType:E,stippleEnabled:O,falloffEnabled:J,wireframe:_,innerColorEnabled:$,hasAnimation:M,hasScreenSizePerspective:U,worldSizedImagePattern:H}=F,B=2===E,k=O&&B,G=J||k,X=O||B,Y=C(F).createBuilder(j,F);W.inputs.add("position",()=>Y.getTextureAttribute("position")),F.hasVVSize?W.inputs.add("sizeFeatureAttribute",()=>Y.getTextureAttribute("sizeFeatureAttribute")):W.inputs.add("size",()=>Y.getTextureAttribute("size")),F.hasVVOpacity&&W.inputs.add("opacityFeatureAttribute",()=>Y.getTextureAttribute("opacityFeatureAttribute")),F.hasVVColor?W.inputs.add("colorFeatureAttribute",()=>Y.getTextureAttribute("colorFeatureAttribute")):W.inputs.add("color",()=>Y.getTextureAttribute("color")),T.include(s),j.include(t,F),j.include(n,F);const Z={animation:F.animation,hasAnimation:F.hasAnimation,timeStampsExpr:Y.getTextureAttribute("timeStamps")};j.include(w,Z),11===N?(j.varyings.add("objectAndLayerIdColorVarying","vec4"),W.code.add(x`
+import{SliceDraw as e}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{RibbonVertexPosition as t}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/RibbonVertexPosition.glsl.js";import{EvaluateSceneLighting as i}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{LineStipple as n,computePixelSize as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/LineStipple.glsl.js";import{MarkerSizing as o}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MarkerSizing.glsl.js";import{NormalUtils as a}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{PiUtils as s}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PiUtils.glsl.js";import{positionOutsideClipSpace as l}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PositionOutsideClipSpace.js";import{ColorConversion as d}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{NoPerspectiveWrite as c,NoPerspectiveRead as p}from"../views/3d/webgl-engine/core/shaderLibrary/util/NoPerspective.glsl.js";import{addProjViewLocalOrigin as m,addPixelRatio as v,addCameraPosition as g}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float2BindUniform as f}from"../views/3d/webgl-engine/core/shaderModules/Float2BindUniform.js";import{Float4BindUniform as h}from"../views/3d/webgl-engine/core/shaderModules/Float4BindUniform.js";import{Float4PassUniform as S}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatBindUniform as u}from"../views/3d/webgl-engine/core/shaderModules/FloatBindUniform.js";import{FloatPassUniform as x}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as D,If as b}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Matrix4BindUniform as L}from"../views/3d/webgl-engine/core/shaderModules/Matrix4BindUniform.js";import{alphaCutoff as w}from"../views/3d/webgl-engine/shaders/alphaCutoff.glsl.js";import{AnimatedLine as y}from"../views/3d/webgl-engine/shaders/AnimatedLine.glsl.js";import{outputColorHighlightOLID as C}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{getTextureBackedBufferModule as P}from"../views/3d/webgl-engine/shaders/RibbonLineTextureBuffer.glsl.js";import{ShaderBuilder as z}from"../views/webgl/ShaderBuilder.js";const F=1;function j(F){const j=new z,{attributes:A,varyings:W,vertex:T,fragment:R}=j,{applyMarkerOffset:I,draped:V,shadingEnabled:E,output:N,capType:O,stippleEnabled:$,falloffEnabled:J,wireframe:U,innerColorEnabled:_,hasAnimation:M,hasScreenSizePerspective:H,worldSized:B,imagePattern:k}=F,G=2===O,X=$&&G,Y=J||X,Z=$||G,q=P(F).createBuilder(j,F);T.inputs.add("position",()=>q.getTextureAttribute("position")),F.hasVVSize?T.inputs.add("sizeFeatureAttribute",()=>q.getTextureAttribute("sizeFeatureAttribute")):T.inputs.add("size",()=>q.getTextureAttribute("size")),F.hasVVOpacity&&T.inputs.add("opacityFeatureAttribute",()=>q.getTextureAttribute("opacityFeatureAttribute")),F.hasVVColor?T.inputs.add("colorFeatureAttribute",()=>q.getTextureAttribute("colorFeatureAttribute")):T.inputs.add("color",()=>q.getTextureAttribute("color")),R.include(s),j.include(t,F),j.include(n,F);const K={animation:F.animation,hasAnimation:F.hasAnimation,timeStampsExpr:q.getTextureAttribute("timeStamps")};j.include(y,K),11===N?(j.varyings.add("objectAndLayerIdColorVarying","vec4"),T.code.add(D`
       vec4 getOlidColor() {
-        return ${Y.getTextureAttribute("olidColor")};
+        return ${q.getTextureAttribute("olidColor")};
       }
 
       void forwardObjectAndLayerIdColor() {
         objectAndLayerIdColorVarying = getOlidColor();
       }
-    `),T.code.add(x`void outputObjectAndLayerIdColor() {
+    `),R.code.add(D`void outputObjectAndLayerIdColor() {
 fragColor = objectAndLayerIdColorVarying;
-}`)):(W.code.add(x`void forwardObjectAndLayerIdColor() {}`),T.code.add(x`void outputObjectAndLayerIdColor() {}`));const q=I&&!R;return q&&(W.uniforms.add(new u("markerScale",e=>e.markerScale)),j.include(o,{space:2,hasScreenSizePerspective:U})),m(W,F),W.uniforms.add(new L("inverseProjectionMatrix",e=>e.camera.inverseProjectionMatrix),new g("nearFar",e=>e.camera.nearFar),new u("miterLimit",e=>"miter"!==e.join?0:e.miterLimit),new f("viewport",e=>e.camera.fullViewport)),W.constants.add("LARGE_HALF_FLOAT","float",65500),W.constants.add("EPS","float",.001),W.constants.add("NUM_JOIN_SUBDIVISIONS","float",F.numJoinSubdivisions),z.add("textureElementIndex","uint"),z.add("lineParameters","vec2"),A.add("vColor","vec4"),A.add("vpos","vec3",{invariant:!0}),A.add("vLineDistance","float"),A.add("vLineWidth","float"),O||(A.add("vIsInsideJoin","int"),A.add("vStretchFactor","float"),A.add("vJoinCenterLineSDFs","vec2"),A.add("vSubdivisionFactor","float")),O&&A.add("vLineSizeInv","float"),G&&A.add("vLineDistanceNorm","float"),B&&(A.add("vSegmentSDF","float"),A.add("vReverseSegmentSDF","float")),W.code.add(x`vec3 perpendicular(vec3 v) {
+}`)):(T.code.add(D`void forwardObjectAndLayerIdColor() {}`),R.code.add(D`void outputObjectAndLayerIdColor() {}`));const Q=I&&!V;return Q&&(T.uniforms.add(new x("markerScale",e=>e.markerScale)),j.include(o,{space:2,hasScreenSizePerspective:H,worldSized:B})),m(T,F),V&&(B||$)&&T.uniforms.add(new u("worldToScreenRatio",e=>1/e.screenToPCSRatio)),T.uniforms.add(new L("inverseProjectionMatrix",e=>e.camera.inverseProjectionMatrix),new f("nearFar",e=>e.camera.nearFar),new x("miterLimit",e=>"miter"!==e.join?0:e.miterLimit),new h("viewport",e=>e.camera.fullViewport)),T.constants.add("LARGE_HALF_FLOAT","float",65500),T.constants.add("EPS","float",.001),T.constants.add("NUM_JOIN_SUBDIVISIONS","float",F.numJoinSubdivisions),A.add("textureElementIndex","uint"),A.add("lineParameters","vec2"),W.add("vColor","vec4"),W.add("vpos","vec3",{invariant:!0}),W.add("vLineDistance","float"),W.add("vLineWidth","float"),$||(W.add("vIsInsideJoin","int"),W.add("vStretchFactor","float"),W.add("vJoinCenterLineSDFs","vec2"),W.add("vSubdivisionFactor","float")),$&&W.add("vLineSizeInv","float"),Y&&W.add("vLineDistanceNorm","float"),G&&(W.add("vSegmentSDF","float"),W.add("vReverseSegmentSDF","float")),T.code.add(D`vec3 perpendicular(vec3 v) {
 return vec3(v.y, -v.x, 0.0);
 }
 float nearPlaneInterpolationFactor(float nearPlaneDistance, vec4 start, vec4 end) {
@@ -20,12 +20,12 @@ float s = sin(a);
 float c = cos(a);
 mat2 m = mat2(c, -s, s, c);
 return vec3(m * v.xy, v.z);
-}`),W.code.add(x`vec4 projectAndScale(vec4 pos) {
+}`),T.code.add(D`vec4 projectAndScale(vec4 pos) {
 vec4 posNdc = proj * pos;
 posNdc.xy *= viewport.zw / posNdc.w;
 posNdc.z /= posNdc.w;
 return posNdc;
-}`),W.code.add(x`void clip(
+}`),T.code.add(D`void clip(
 inout vec4 pos,
 inout vec4 prev,
 inout vec4 next,
@@ -56,16 +56,20 @@ if (next.z > -nearFar[0]) {
 next = mix(next, pos, nearPlaneInterpolationFactor(adjustedNearPlaneDistance, next, pos));
 }
 }
-}`),v(W),W.constants.add("aaWidth","float",O?0:1),W.main.add(x`
-    vec3 position = ${Y.getTextureAttribute("position")};
-    float u0 = ${Y.getTextureAttribute("u0")};
+}`),v(T),T.constants.add("aaWidth","float",$?0:1),T.main.add(D`
+    vec3 position = ${q.getTextureAttribute("position")};
+    float u0 = ${q.getTextureAttribute("u0")};
+    ${b(B,D`
+        float prevU0 = ${q.getTextureAttribute("u0",-1)};
+        float nextU0 = ${q.getTextureAttribute("u0",1)};
+      `)}
 
     // unpack values from vertex type
     float vertexType = abs(lineParameters.y);
     float lineSide = sign(lineParameters.y);
     bool isStartVertex = vertexType == 2.0 || vertexType == 4.0;
-    vec3 prevPosition = ${Y.getTextureAttribute("position",-1)};
-    vec3 nextPosition = ${Y.getTextureAttribute("position",1)};
+    vec3 prevPosition = ${q.getTextureAttribute("position",-1)};
+    vec3 nextPosition = ${q.getTextureAttribute("position",1)};
 
     float coverage = 1.0;
 
@@ -80,11 +84,11 @@ next = mix(next, pos, nearPlaneInterpolationFactor(adjustedNearPlaneDistance, ne
       vec4 next = view * vec4(nextPosition, 1.0);
 
       bool isJoin = vertexType < 3.0;
-  `),q&&W.main.add(x`vec4 other = isStartVertex ? next : prev;
+  `),Q&&T.main.add(D`vec4 other = isStartVertex ? next : prev;
 bool markersHidden = areWorldMarkersHidden(pos.xyz, other.xyz);
 if (!isJoin && !markersHidden) {
 pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
-}`),j.include(c),W.code.add(x`
+}`),j.include(c),T.code.add(D`
     vec2 computeJoinAndCapDisplacement(
       bool isJoin,
       bool isStartVertex,
@@ -129,7 +133,7 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
           }
         }
 
-        ${D(!O,x`
+        ${b(!$,D`
             // Compute stretch compensation for feathering.
             if (subdivisionFactor > 0.0) {
               vIsInsideJoin = 1;
@@ -164,14 +168,14 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
           `)}
 
         if (isOutside && displacementLen > miterLimit * lineWidth) {
-          ${D(F.roundJoins,x`
+          ${b(F.roundJoins,D`
               vec3 startDir = perpendicular(leftLen < EPS ? right : left);
               vec3 endDir = perpendicular(rightLen < EPS ? left : right);
-              float factor = ${O?x`min(1.0, subdivisionFactor * ((NUM_JOIN_SUBDIVISIONS + 1.0) / NUM_JOIN_SUBDIVISIONS))`:x`subdivisionFactor`};
+              float factor = ${$?D`min(1.0, subdivisionFactor * ((NUM_JOIN_SUBDIVISIONS + 1.0) / NUM_JOIN_SUBDIVISIONS))`:D`subdivisionFactor`};
 
               float rotationAngle = acos(clamp(dot(startDir.xy, endDir.xy), -1.0, 1.0));
               joinDisplacementDir = rotateZ(startDir, -lineSide * factor * rotationAngle);
-            `,x`
+            `,D`
               /**
                * Convert to bevel join if miterLimit is exceeded.
                * Here vertices with a subdivisionFactor > 0 are either START vertices or
@@ -183,18 +187,18 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
               vec3 startDir = perpendicular(leftLen < EPS ? right : left);
               vec3 endDir = perpendicular(rightLen < EPS ? left : right);
 
-              ${D(O,x`joinDisplacementDir = (isStartVertex || subdivisionFactor > 0.0) ? endDir : startDir;`,x`joinDisplacementDir = mix(startDir, endDir, subdivisionFactor);`)}
+              ${b($,D`joinDisplacementDir = (isStartVertex || subdivisionFactor > 0.0) ? endDir : startDir;`,D`joinDisplacementDir = mix(startDir, endDir, subdivisionFactor);`)}
             `)}
           displacementLen = lineWidth;
         }
       } else {
         joinDisplacementDir = perpendicular(isStartVertex ? right : left);
-        ${0!==E?x`capDisplacementDir = vec3((isStartVertex ? -right : left).xy, 0.0);`:""}
+        ${0!==O?D`capDisplacementDir = vec3((isStartVertex ? -right : left).xy, 0.0);`:""}
       }
 
       return (joinDisplacementDir.xy * lineSide + capDisplacementDir.xy) * displacementLen;
     }
-  `),W.main.add(x`
+  `),T.main.add(D`
       clip(pos, prev, next, isStartVertex);
 
       vec3 clippedPos = pos.xyz;
@@ -207,18 +211,20 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
       vec3 left = (pos.xyz - prev.xyz);
       vec3 right = (next.xyz - pos.xyz);
 
-      float lineSize = getSize(${D(U,"clippedPos")});
-      ${D(O&&U,"float patternLineSize = getSize(clippedCenter);")}
-      ${D(O&&!U,"float patternLineSize = lineSize;")}
+      float lineSize = getSize(${b(H,"clippedPos")});
+      ${b($&&H,"float patternLineSize = getSize(clippedCenter);")}
+      ${b($&&!H,"float patternLineSize = lineSize;")}
 
-      ${D(H,x`
-          lineSize += aaWidth;
-          float lineWidth = lineSize * pixelRatio * worldToScreenRatio;
-          if (lineWidth < 1.0) {
-            coverage = lineWidth;
-            lineWidth = 1.0;
+      ${b(B,D`
+          float lineSizeScreen = lineSize * worldToScreenRatio;
+          if (lineSizeScreen < 1.0) {
+            coverage = lineSizeScreen;
+            lineSizeScreen = 1.0;
           }
-        `,x`
+
+          lineSizeScreen += aaWidth;
+          float lineWidth = lineSizeScreen * pixelRatio;
+        `,D`
           if (lineSize < 1.0) {
             coverage = lineSize; // convert sub-pixel coverage to alpha
             lineSize = 1.0;
@@ -229,14 +235,14 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
         `)}
 
       vLineWidth = noPerspectiveWrite(lineWidth, pos.w);
-      ${O?x`vLineSizeInv = noPerspectiveWrite(1.0 / lineSize, pos.w);`:""}
-  `),X&&W.main.add(x`
+      ${$?D`vLineSizeInv = noPerspectiveWrite(1.0 / lineSize, pos.w);`:""}
+  `),Z&&T.main.add(D`
       float isEndVertex = float(!isStartVertex);
       vec3 segmentOrigin = mix(pos.xyz, prev.xyz, isEndVertex);
       vec3 segment = mix(right, left, isEndVertex);
-      ${B?x`vec3 segmentEnd = mix(next.xyz, pos.xyz, isEndVertex);`:""}
-    `),W.main.add(x`
-    ${D(!O,x`
+      ${G?D`vec3 segmentEnd = mix(next.xyz, pos.xyz, isEndVertex);`:""}
+    `),T.main.add(D`
+    ${b(!$,D`
         vIsInsideJoin = 0;
         vStretchFactor = 1.0;
         vSubdivisionFactor = 0.0;
@@ -267,10 +273,10 @@ pos.xyz += normalize(other.xyz - pos.xyz) * getWorldMarkerSize(pos.xyz) * 0.5;
     float lineDistNorm = noPerspectiveWrite(lineSide, pos.w);
 
     vLineDistance = lineWidth * lineDistNorm;
-    ${G?x`vLineDistanceNorm = lineDistNorm;`:""}
+    ${Y?D`vLineDistanceNorm = lineDistNorm;`:""}
 
     pos.xyz += displacement;
-  `),O||W.main.add(x`if (isJoin) {
+  `),$||T.main.add(D`if (isJoin) {
 vec2 joinCenterToVertex = displacementXY;
 vec2 leftCenterlineDir = left.xy;
 vec2 rightCenterlineDir = right.xy;
@@ -285,30 +291,35 @@ dot(vec2(leftCenterlineDir.y, -leftCenterlineDir.x), joinCenterToVertex)
 ),
 pos.w
 );
-}`),B&&W.main.add(x`vec2 segmentDir = normalize(segment.xy);
+}`),G&&T.main.add(D`vec2 segmentDir = normalize(segment.xy);
 vSegmentSDF = noPerspectiveWrite((isJoin && isStartVertex) ? LARGE_HALF_FLOAT : (dot(pos.xy - segmentOrigin.xy, segmentDir)), pos.w);
-vReverseSegmentSDF = noPerspectiveWrite((isJoin && !isStartVertex) ? LARGE_HALF_FLOAT : (dot(pos.xy - segmentEnd.xy, -segmentDir)), pos.w);`),O&&(R?W.uniforms.add(new S("worldToScreenRatio",e=>1/e.screenToPCSRatio)):W.main.add(x`vec3 segmentCenter = mix((nextPosition + position) * 0.5, (position + prevPosition) * 0.5, isEndVertex);
-float worldToScreenRatio = computeWorldToScreenRatio(segmentCenter);`),W.main.add(x`
+vReverseSegmentSDF = noPerspectiveWrite((isJoin && !isStartVertex) ? LARGE_HALF_FLOAT : (dot(pos.xy - segmentEnd.xy, -segmentDir)), pos.w);`),$&&(V||T.main.add(D`vec3 segmentCenter = mix((nextPosition + position) * 0.5, (position + prevPosition) * 0.5, isEndVertex);
+float worldToScreenRatio = computeWorldToScreenRatio(segmentCenter);`),T.main.add(D`
       float segmentLengthScreenDouble = length(segment.xy);
       float segmentLengthScreen = segmentLengthScreenDouble * 0.5;
       float discreteWorldToScreenRatio = discretizeWorldToScreenRatio(worldToScreenRatio);
-      float segmentLengthRender = length(mix(nextPosition - position, position - prevPosition, isEndVertex));
-      ${D(!R||H,x`float segmentStartRender = mix(u0, u0 - segmentLengthRender, isEndVertex);`)}
+      float segmentLengthRender = ${b(B,D`abs(mix(nextU0 - u0, u0 - prevU0, isEndVertex))`,D`length(mix(nextPosition - position, position - prevPosition, isEndVertex))`)};
+
+      ${b(!V||B,D`
+          float segmentStartRender = ${b(B,D`mix(u0, prevU0, isEndVertex)`,D`mix(u0, u0 - segmentLengthRender, isEndVertex)`)};
+        `)}
 
       vStipplePatternStretch = worldToScreenRatio / discreteWorldToScreenRatio;
-    `),R?W.main.add(x`float segmentLengthPseudoScreen = segmentLengthScreen / pixelRatio * discreteWorldToScreenRatio / worldToScreenRatio;
-float startPseudoScreen = u0 * discreteWorldToScreenRatio - mix(0.0, segmentLengthPseudoScreen, isEndVertex);`):W.main.add(x`float startPseudoScreen = segmentStartRender * discreteWorldToScreenRatio;
-float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRatio;`),W.uniforms.add(new u("stipplePatternPixelSize",e=>r(e))),W.main.add(x`
+    `),V?T.main.add(D`float segmentLengthPseudoScreen = segmentLengthScreen / pixelRatio * discreteWorldToScreenRatio / worldToScreenRatio;
+float startPseudoScreen = u0 * discreteWorldToScreenRatio - mix(0.0, segmentLengthPseudoScreen, isEndVertex);`):T.main.add(D`float startPseudoScreen = segmentStartRender * discreteWorldToScreenRatio;
+float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRatio;`),T.uniforms.add(new x("stipplePatternPixelSize",e=>r(e))),T.main.add(D`
       float patternLength = patternLineSize * stipplePatternPixelSize;
 
-      ${D(H,x`
+      ${b(B,D`
           vStippleDistanceLimits = vec2(segmentStartRender, segmentStartRender + segmentLengthRender);
           vStipplePatternStretch = 1.0;
 
-          // The v-coordinate used in case of an image pattern.
-          bool isLeft = lineSide < 0.0;
-          vStippleV = isLeft ? 0.0 : 1.0;
-        `,x`
+          ${b(k,D`
+              // The v-coordinate used in case of an image pattern.
+              bool isLeft = lineSide < 0.0;
+              vStippleV = isLeft ? 0.0 : 1.0;
+            `)}
+        `,D`
           // Compute the coordinates at both start and end of the line segment, because we need both to clamp to in the
           // fragment shader
           vStippleDistanceLimits = computeStippleDistanceLimits(startPseudoScreen, segmentLengthPseudoScreen, segmentLengthScreen, patternLength);
@@ -329,7 +340,7 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRat
       }
 
       // Cancel out perspective correct interpolation because we want this length to really represent the screen
-      // distance
+      // distance.
       vStippleDistanceLimits = noPerspectiveWrite(vStippleDistanceLimits, pos.w);
       vStippleDistance = noPerspectiveWrite(vStippleDistance, pos.w);
 
@@ -339,7 +350,7 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRat
                                  isStartVertex ?
                                   vec2(-1e34, vStippleDistanceLimits.y) :
                                   vec2(vStippleDistanceLimits.x, 1e34);
-    `)),W.main.add(x`
+    `)),T.main.add(D`
       // Convert back into NDC
       pos.xy = (pos.xy / viewport.zw) * pos.w;
       pos.z = pos.z * pos.w;
@@ -347,13 +358,13 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRat
       vColor = getColor();
       vColor.a = noPerspectiveWrite(vColor.a * coverage, pos.w);
 
-      ${_&&!R?"pos.z -= EPS * pos.w;":""}
+      ${U&&!V?"pos.z -= EPS * pos.w;":""}
 
       // transform final position to camera space for slicing
       vpos = (inverseProjectionMatrix * pos).xyz;
       gl_Position = pos;
       forwardObjectAndLayerIdColor();
-    }`),j.fragment.include(e,F),j.include(y,F),T.include(d),T.main.add(x`discardBySlice(vpos);`),j.include(p),T.include(b),O||T.code.add(x`float lineFeatheringFactor(float lineWidth, float lineDistance) {
+    }`),j.fragment.include(e,F),j.include(C,F),R.include(d),R.main.add(D`discardBySlice(vpos);`),j.include(p),R.include(w),$||R.code.add(D`float lineFeatheringFactor(float lineWidth, float lineDistance) {
 float stretchFactor = vIsInsideJoin == 1 ? noPerspectiveRead(vStretchFactor) : 1.0;
 float featherWidth = 2.0;
 float featherStartDistance = max(lineWidth - featherWidth / stretchFactor, 0.0);
@@ -365,26 +376,26 @@ float joinCenterDistance = abs(vSubdivisionFactor > 0.5 ? joinCenterSDFs.x : joi
 float straightFeather = (joinCenterDistance - straightFeatherStartDistance) / (lineWidth - straightFeatherStartDistance);
 feather = vIsInsideJoin == 1 ? max(feather, straightFeather) : feather;
 return 1.0 - clamp(feather, 0.0, 1.0);
-}`),T.main.add(x`
+}`),R.main.add(D`
     float lineWidth = noPerspectiveRead(vLineWidth);
     float lineDistance = noPerspectiveRead(vLineDistance);
-    ${D(G,x`float lineDistanceNorm = noPerspectiveRead(vLineDistanceNorm);`)}
-  `),_?T.main.add(x`vec4 finalColor = vec4(1.0, 0.0, 1.0, 1.0);`):(B&&T.main.add(x`float sdf = noPerspectiveRead(min(vSegmentSDF, vReverseSegmentSDF));
+    ${b(Y,D`float lineDistanceNorm = noPerspectiveRead(vLineDistanceNorm);`)}
+  `),U?R.main.add(D`vec4 finalColor = vec4(1.0, 0.0, 1.0, 1.0);`):(G&&R.main.add(D`float sdf = noPerspectiveRead(min(vSegmentSDF, vReverseSegmentSDF));
 vec2 fragmentPosition = vec2(min(sdf, 0.0), lineDistance);
 float fragmentRadius = length(fragmentPosition);
 float fragmentCapSDF = (fragmentRadius - lineWidth) * 0.5;
 float capCoverage = clamp(0.5 - fragmentCapSDF, 0.0, 1.0);
 if (capCoverage < alphaCutoff) {
 discard;
-}`),k?T.main.add(x`vec2 stipplePosition = vec2(
+}`),X?R.main.add(D`vec2 stipplePosition = vec2(
 min(getStippleSDF() * 2.0 - 1.0, 0.0),
 lineDistanceNorm
 );
 float stippleRadius = length(stipplePosition * lineWidth);
 float stippleCapSDF = (stippleRadius - lineWidth) * 0.5;
 float stippleCoverage = clamp(0.5 - stippleCapSDF, 0.0, 1.0);
-float stippleAlpha = step(alphaCutoff, stippleCoverage);`):T.main.add(x`float stippleAlpha = getStippleAlpha(lineWidth);`),11!==N&&T.main.add(x`discardByStippleAlpha(stippleAlpha, alphaCutoff);`),T.uniforms.add(new h("intrinsicColor",e=>e.color)).main.add(x`vec4 color = intrinsicColor * vColor;
-color.a = noPerspectiveRead(color.a);`),$&&T.uniforms.add(new h("innerColor",e=>e.innerColor??e.color),new u("innerWidth",(e,t)=>e.innerWidth*t.camera.pixelRatio)).main.add(x`float distToInner = abs(lineDistance) - innerWidth;
+float stippleAlpha = step(alphaCutoff, stippleCoverage);`):R.main.add(D`float stippleAlpha = getStippleAlpha(lineWidth);`),11!==N&&R.main.add(D`discardByStippleAlpha(stippleAlpha, alphaCutoff);`),R.uniforms.add(new S("intrinsicColor",e=>e.color)).main.add(D`vec4 color = intrinsicColor * vColor;
+color.a = noPerspectiveRead(color.a);`),_&&R.uniforms.add(new S("innerColor",e=>e.innerColor??e.color),new x("innerWidth",(e,t)=>e.innerWidth*t.camera.pixelRatio)).main.add(D`float distToInner = abs(lineDistance) - innerWidth;
 float innerAA = clamp(0.5 - distToInner, 0.0, 1.0);
 float innerAlpha = innerColor.a + color.a * (1.0 - innerColor.a);
-color = mix(color, vec4(innerColor.rgb, innerAlpha), innerAA);`),T.main.add(x`vec4 finalColor = blendStipple(color, stippleAlpha);`),J&&(T.uniforms.add(new u("falloff",e=>e.falloff)),T.main.add(x`finalColor.a *= pow(max(0.0, 1.0 - abs(lineDistanceNorm)), falloff);`)),O||T.main.add(x`finalColor.a *= lineFeatheringFactor(lineWidth, lineDistance);`),V&&(A.add("vnormal","vec3"),j.include(a,F),W.main.add("vnormal = getLocalUp(vpos, localOrigin);"),T.include(i,F),T.main.add("finalColor = vec4(evaluateSceneLighting(vnormal, finalColor.rgb, 0.0, 0.0, vec3(0.0)), finalColor.a);")),M&&T.main.add("finalColor = animate(finalColor);")),T.main.add(x`outputColorHighlightOLID(applySlice(finalColor, vpos), finalColor.rgb);`),j}const z=Object.freeze(Object.defineProperty({__proto__:null,build:j,numRoundJoinSubdivisions:F},Symbol.toStringTag,{value:"Module"}));export{z as R,j as b,F as n};
+color = mix(color, vec4(innerColor.rgb, innerAlpha), innerAA);`),R.main.add(D`vec4 finalColor = blendStipple(color, stippleAlpha);`),J&&(R.uniforms.add(new x("falloff",e=>e.falloff)),R.main.add(D`finalColor.a *= pow(max(0.0, 1.0 - abs(lineDistanceNorm)), falloff);`)),$||R.main.add(D`finalColor.a *= lineFeatheringFactor(lineWidth, lineDistance);`),E&&(W.add("vnormal","vec3"),T.include(a,F),T.main.add("vnormal = getLocalUp(vpos, localOrigin);"),R.include(i,F),g(R,F),R.main.add("\n        vec3 viewDirection = normalize(vpos - cameraPosition);\n        finalColor = vec4(evaluateSceneLighting(vnormal, finalColor.rgb, 0.0, 0.0, vec3(0.0), viewDirection, vnormal), finalColor.a);")),M&&R.main.add("finalColor = animate(finalColor);")),R.main.add(D`outputColorHighlightOLID(applySlice(finalColor, vpos), finalColor.rgb);`),j}const A=Object.freeze(Object.defineProperty({__proto__:null,build:j,numRoundJoinSubdivisions:F},Symbol.toStringTag,{value:"Module"}));export{A as R,j as b,F as n};

package/chunks/SimpleAtmosphere.glsl.js

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import{create as e}from"../core/libs/gl-matrix-2/factories/vec2f64.js";import{create as o}from"../core/libs/gl-matrix-2/factories/vec3f64.js";import{Transform as i}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{addMainLightDirection as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{Float2PassUniform as t}from"../views/3d/webgl-engine/core/shaderModules/Float2PassUniform.js";import{Float3BindUniform as s}from"../views/3d/webgl-engine/core/shaderModules/Float3BindUniform.js";import{Float3PassUniform as n}from"../views/3d/webgl-engine/core/shaderModules/Float3PassUniform.js";import{FloatPassUniform as a}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as l}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Matrix4BindUniform as d}from"../views/3d/webgl-engine/core/shaderModules/Matrix4BindUniform.js";import{Texture2DPassUniform as c}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{NoParameters as m}from"../views/webgl/NoParameters.js";import{ShaderBuilder as f}from"../views/webgl/ShaderBuilder.js";class g extends m{constructor(){super(...arguments),this.texV=e(),this.altitudeFade=0,this.innerScale=0,this.undergroundFadeAlpha=0,this.silhouette=new p}}class p{constructor(){this.center=o(),this.v1=o(),this.v2=o()}}function h(e){const o=new f,{vertex:m,fragment:g}=o;if(r(m),2===e.geometry)o.attributes.add("position","vec2"),o.varyings.add("color","vec4"),m.uniforms.add(new s("cameraPosition",e=>e.camera.eye),new a("undergroundFadeAlpha",e=>e.undergroundFadeAlpha)),m.main.add(l`float ndotl = dot(normalize(cameraPosition), mainLightDirection);
+import{create as e}from"../core/libs/gl-matrix-2/factories/vec2f64.js";import{create as o}from"../core/libs/gl-matrix-2/factories/vec3f64.js";import{Transform as i}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{mainLightDirection as r}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{Float2PassUniform as t}from"../views/3d/webgl-engine/core/shaderModules/Float2PassUniform.js";import{Float3BindUniform as s}from"../views/3d/webgl-engine/core/shaderModules/Float3BindUniform.js";import{Float3PassUniform as n}from"../views/3d/webgl-engine/core/shaderModules/Float3PassUniform.js";import{FloatPassUniform as a}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as l}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Matrix4BindUniform as d}from"../views/3d/webgl-engine/core/shaderModules/Matrix4BindUniform.js";import{Texture2DPassUniform as c}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{NoParameters as m}from"../views/webgl/NoParameters.js";import{ShaderBuilder as f}from"../views/webgl/ShaderBuilder.js";class g extends m{constructor(){super(...arguments),this.texV=e(),this.altitudeFade=0,this.innerScale=0,this.undergroundFadeAlpha=0,this.silhouette=new p}}class p{constructor(){this.center=o(),this.v1=o(),this.v2=o()}}function h(e){const o=new f,{vertex:m,fragment:g}=o;if(m.uniforms.add(r),2===e.geometry)o.attributes.add("position","vec2"),o.varyings.add("color","vec4"),m.uniforms.add(new s("cameraPosition",e=>e.camera.eye),new a("undergroundFadeAlpha",e=>e.undergroundFadeAlpha)),m.main.add(l`float ndotl = dot(normalize(cameraPosition), mainLightDirection);
 float lighting = max(0.0, smoothstep(-1.0, 0.8, 2.0 * ndotl));
 color = vec4(vec3(lighting), undergroundFadeAlpha);
 gl_Position = vec4(position.xy, 1.0, 1.0);`),g.main.add(l`fragColor = color;`);else{o.include(i),o.attributes.add("position","vec3"),o.varyings.add("vtc","vec2"),o.varyings.add("falloff","float");const r=1===e.geometry;m.uniforms.add(new d("proj",e=>e.camera.projectionMatrix),new d("view",e=>e.camera.viewMatrix)),r||(o.varyings.add("innerFactor","float"),m.uniforms.add(new n("silCircleCenter",e=>e.silhouette.center),new n("silCircleV1",e=>e.silhouette.v1),new n("silCircleV2",e=>e.silhouette.v2),new t("texV",e=>e.texV),new a("innerScale",e=>e.innerScale)));const s=6.2831853,f=1/128;m.main.add(l`