@arcgis/core 4.23.0-next.20220106 → 4.23.0-next.20220124

package/chunks/HUDMaterial.glsl.js

@@ -2,7 +2,7 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/esri/copyright.txt for details.
 */
-import{c as e}from"./vec2.js";import{a as o}from"./vec2f64.js";import{Z as i}from"./vec4f64.js";import{ShaderOutput as r}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutputOptions.js";import{Slice as l}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{AlignPixel as t}from"../views/3d/webgl-engine/core/shaderLibrary/hud/AlignPixel.glsl.js";import{HUD as a}from"../views/3d/webgl-engine/core/shaderLibrary/hud/HUD.glsl.js";import{HUDOcclusionPass as s}from"../views/3d/webgl-engine/core/shaderLibrary/hud/HUDOcclusionPass.glsl.js";import{OutputHighlight as n}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{VisualVariables as c}from"../views/3d/webgl-engine/core/shaderLibrary/shading/VisualVariables.glsl.js";import{symbolAlphaCutoff as d,defaultMaskAlphaCutoff as u}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{ColorConversion as v}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{RgbaFloatEncoding as f}from"../views/3d/webgl-engine/core/shaderLibrary/util/RgbaFloatEncoding.glsl.js";import{ScreenSizePerspective as g}from"../views/3d/webgl-engine/core/shaderLibrary/util/ScreenSizePerspective.glsl.js";import{glsl as p}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as m}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as b}from"../views/3d/webgl-engine/lib/basicInterfaces.js";function h(e){const o=new m,i=e.signedDistanceFieldEnabled;if(o.include(t),o.include(a,e),o.include(l,e),e.output===r.Occlusion)return o.include(s,e),o;o.include(g),o.fragment.include(f),o.fragment.include(v),o.include(c,e),o.varyings.add("vcolor","vec4"),o.varyings.add("vtc","vec2"),o.varyings.add("vsize","vec2"),e.binaryHighlightOcclusionEnabled&&o.varyings.add("voccluded","float"),o.vertex.uniforms.add("screenOffset","vec2").add("anchorPos","vec2").add("textureCoordinateScaleFactor","vec2").add("materialColor","vec4"),i&&o.vertex.uniforms.add("outlineColor","vec4"),e.screenSizePerspectiveEnabled&&o.vertex.uniforms.add("screenSizePerspective","vec4"),(e.debugDrawBorder||e.binaryHighlightOcclusionEnabled)&&o.varyings.add("debugBorderCoords","vec4"),o.attributes.add(b.UV0,"vec2"),o.attributes.add(b.COLOR,"vec4"),o.attributes.add(b.SIZE,"vec2"),o.attributes.add(b.AUXPOS2,"vec4"),o.vertex.code.add(p`
+import{c as e}from"./vec2.js";import{a as o}from"./vec2f64.js";import{Z as i}from"./vec4f64.js";import{ShaderOutput as r}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutputOptions.js";import{Slice as l}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{AlignPixel as t}from"../views/3d/webgl-engine/core/shaderLibrary/hud/AlignPixel.glsl.js";import{HUD as a}from"../views/3d/webgl-engine/core/shaderLibrary/hud/HUD.glsl.js";import{HUDOcclusionPass as s}from"../views/3d/webgl-engine/core/shaderLibrary/hud/HUDOcclusionPass.glsl.js";import{OutputHighlight as n}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{VisualVariables as c}from"../views/3d/webgl-engine/core/shaderLibrary/shading/VisualVariables.glsl.js";import{symbolAlphaCutoff as d,defaultMaskAlphaCutoff as u}from"../views/3d/webgl-engine/core/shaderLibrary/util/AlphaDiscard.glsl.js";import{ColorConversion as v}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{RgbaFloatEncoding as g}from"../views/3d/webgl-engine/core/shaderLibrary/util/RgbaFloatEncoding.glsl.js";import{ScreenSizePerspective as p}from"../views/3d/webgl-engine/core/shaderLibrary/util/ScreenSizePerspective.glsl.js";import{glsl as f}from"../views/3d/webgl-engine/core/shaderModules/interfaces.js";import{ShaderBuilder as m}from"../views/3d/webgl-engine/core/shaderModules/ShaderBuilder.js";import{VertexAttribute as b}from"../views/3d/webgl-engine/lib/basicInterfaces.js";function h(e){const o=new m,i=e.signedDistanceFieldEnabled;if(o.include(t),o.include(a,e),o.include(l,e),e.output===r.Occlusion)return o.include(s,e),o;o.include(p),o.fragment.include(g),o.fragment.include(v),o.include(c,e),o.varyings.add("vcolor","vec4"),o.varyings.add("vtc","vec2"),o.varyings.add("vsize","vec2"),e.binaryHighlightOcclusionEnabled&&o.varyings.add("voccluded","float"),o.vertex.uniforms.add("screenOffset","vec2").add("anchorPos","vec2").add("textureCoordinateScaleFactor","vec2").add("materialColor","vec4"),i&&o.vertex.uniforms.add("outlineColor","vec4"),e.screenSizePerspectiveEnabled&&o.vertex.uniforms.add("screenSizePerspective","vec4"),(e.debugDrawLabelBorder||e.binaryHighlightOcclusionEnabled)&&o.varyings.add("debugBorderCoords","vec4"),o.attributes.add(b.UV0,"vec2"),o.attributes.add(b.COLOR,"vec4"),o.attributes.add(b.SIZE,"vec2"),o.attributes.add(b.AUXPOS2,"vec4"),o.vertex.code.add(f`
     void main(void) {
       ProjectHUDAux projectAux;
       vec4 posProj = projectPositionHUD(projectAux);
@@ -13,10 +13,10 @@ import{c as e}from"./vec2.js";import{a as o}from"./vec2f64.js";import{Z as i}fro
         return;
       }
       vec2 inputSize;
-      ${e.screenSizePerspectiveEnabled?p`
+      ${e.screenSizePerspectiveEnabled?f`
       inputSize = screenSizePerspectiveScaleVec2(size, projectAux.absCosAngle, projectAux.distanceToCamera, screenSizePerspective);
       vec2 screenOffsetScaled = screenSizePerspectiveScaleVec2(screenOffset, projectAux.absCosAngle, projectAux.distanceToCamera, screenSizePerspectiveAlignment);
-         `:p`
+         `:f`
       inputSize = size;
       vec2 screenOffsetScaled = screenOffset;`}
 
@@ -28,18 +28,18 @@ import{c as e}from"./vec2.js";import{a as o}from"./vec2f64.js";import{Z as i}fro
       ${e.occlusionTestEnabled||e.binaryHighlightOcclusionEnabled?"bool visible = testVisibilityHUD(posProj);":""}
 
       ${e.binaryHighlightOcclusionEnabled?"voccluded = visible ? 0.0 : 1.0;":""}
-    `);const h=p`vec2 uv01 = floor(uv0);
+    `);const h=f`vec2 uv01 = floor(uv0);
 vec2 uv = uv0 - uv01;
-quadOffset.xy = ((uv01 - anchorPos) * 2.0 * combinedSize + screenOffsetScaled) / viewport.zw * posProj.w;`,x=e.pixelSnappingEnabled?i?p`posProj = alignToPixelOrigin(posProj, viewport.zw) + quadOffset;`:p`posProj += quadOffset;
+quadOffset.xy = ((uv01 - anchorPos) * 2.0 * combinedSize + screenOffsetScaled) / viewport.zw * posProj.w;`,x=e.pixelSnappingEnabled?i?f`posProj = alignToPixelOrigin(posProj, viewport.zw) + quadOffset;`:f`posProj += quadOffset;
 if (inputSize.x == size.x) {
 posProj = alignToPixelOrigin(posProj, viewport.zw);
-}`:p`posProj += quadOffset;`;o.vertex.code.add(p`
+}`:f`posProj += quadOffset;`;o.vertex.code.add(f`
       ${e.occlusionTestEnabled?"if (visible) {":""}
       ${h}
       ${e.vvColor?"vcolor = vvGetColor(auxpos2, vvColorValues, vvColorColors) * materialColor;":"vcolor = color / 255.0 * materialColor;"}
 
-      bool alphaDiscard = vcolor.a < ${p.float(d)};
-      ${i?`alphaDiscard = alphaDiscard && outlineColor.a < ${p.float(d)};`:""}
+      bool alphaDiscard = vcolor.a < ${f.float(d)};
+      ${i?`alphaDiscard = alphaDiscard && outlineColor.a < ${f.float(d)};`:""}
       if (alphaDiscard) {
         // "early discard" if both symbol color (= fill) and outline color (if applicable) are transparent
         gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
@@ -51,16 +51,16 @@ posProj = alignToPixelOrigin(posProj, viewport.zw);
 
       vtc = uv * textureCoordinateScaleFactor;
 
-      ${e.debugDrawBorder?"debugBorderCoords = vec4(uv01, 1.5 / combinedSize);":""}
+      ${e.debugDrawLabelBorder?"debugBorderCoords = vec4(uv01, 1.5 / combinedSize);":""}
       vsize = inputSize;
-      ${e.occlusionTestEnabled?p`} else { vtc = vec2(0.0);
-        ${e.debugDrawBorder?"debugBorderCoords = vec4(0.5, 0.5, 1.5 / combinedSize);}":"}"}`:""}
+      ${e.occlusionTestEnabled?f`} else { vtc = vec2(0.0);
+        ${e.debugDrawLabelBorder?"debugBorderCoords = vec4(0.5, 0.5, 1.5 / combinedSize);}":"}"}`:""}
     }
-    `),o.fragment.uniforms.add("tex","sampler2D"),i&&(o.fragment.uniforms.add("outlineColor","vec4"),o.fragment.uniforms.add("outlineSize","float"));const C=e.debugDrawBorder?p`(isBorder > 0.0 ? 0.0 : ${p.float(u)})`:p.float(u),S=p`
-    ${e.debugDrawBorder?p`
+    `),o.fragment.uniforms.add("tex","sampler2D"),i&&(o.fragment.uniforms.add("outlineColor","vec4"),o.fragment.uniforms.add("outlineSize","float"));const C=e.debugDrawLabelBorder?f`(isBorder > 0.0 ? 0.0 : ${f.float(u)})`:f.float(u),S=f`
+    ${e.debugDrawLabelBorder?f`
       float isBorder = float(any(lessThan(debugBorderCoords.xy, debugBorderCoords.zw)) || any(greaterThan(debugBorderCoords.xy, 1.0 - debugBorderCoords.zw)));`:""}
 
-    ${i?p`
+    ${i?f`
       vec4 fillPixelColor = vcolor;
 
       // Attempt to sample texel centers to avoid that thin cross outlines
@@ -92,7 +92,7 @@ posProj = alignToPixelOrigin(posProj, viewport.zw);
 
         if (
           outlineAlphaFactor + fillAlphaFactor < ${C} ||
-          fillPixelColor.a + outlinePixelColor.a < ${p.float(d)}
+          fillPixelColor.a + outlinePixelColor.a < ${f.float(d)}
         ) {
           discard;
         }
@@ -113,7 +113,7 @@ posProj = alignToPixelOrigin(posProj, viewport.zw);
 
       // visualize SDF:
       // gl_FragColor = vec4(clamp(-dist/vsize.x*2.0, 0.0, 1.0), clamp(dist/vsize.x*2.0, 0.0, 1.0), 0.0, 1.0);
-      `:p`
+      `:f`
           vec4 texColor = texture2D(tex, vtc, -0.5);
           if (texColor.a < ${C}) {
             discard;
@@ -121,21 +121,22 @@ posProj = alignToPixelOrigin(posProj, viewport.zw);
           gl_FragColor = texColor * premultiplyAlpha(vcolor);
           `}
 
-    ${e.debugDrawBorder?p`gl_FragColor = mix(gl_FragColor, vec4(1.0, 0.0, 1.0, 1.0), isBorder);`:""}
-  `;return e.output===r.Alpha&&o.fragment.code.add(p`
+    // Draw debug border with transparency, so that original texels along border are still partially visible
+    ${e.debugDrawLabelBorder?f`gl_FragColor = mix(gl_FragColor, vec4(1.0, 0.0, 1.0, 1.0), isBorder * 0.5);`:""}
+  `;return e.output===r.Alpha&&o.fragment.code.add(f`
       void main() {
         ${S}
         gl_FragColor = vec4(gl_FragColor.a);
       }
-      `),e.output===r.Color&&o.fragment.code.add(p`
+      `),e.output===r.Color&&o.fragment.code.add(f`
     void main() {
       ${S}
       ${e.FrontFacePass?"gl_FragColor.rgb /= gl_FragColor.a;":""}
     }
-    `),e.output===r.Highlight&&(o.include(n),o.fragment.code.add(p`
+    `),e.output===r.Highlight&&(o.include(n),o.fragment.code.add(f`
     void main() {
       ${S}
-      ${e.binaryHighlightOcclusionEnabled?p`
+      ${e.binaryHighlightOcclusionEnabled?f`
           if (voccluded == 1.0) {
             gl_FragColor = vec4(1.0, 1.0, 0.0, 1.0);
           } else {

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,u=f.capType!==v.BUTT,D=f.capType===v.ROUND,x=f.stippleEnabled&&D,S=f.falloffEnabled||x,b=f.innerColorEnabled||D,L=f.stippleEnabled&&f.stippleScaleWithLineWidth||D,y=f.stippleEnabled&&f.stippleScaleWithLineWidth,C=f.stippleEnabled||D;return h.extensions.add("GL_OES_standard_derivatives"),h.include(s),h.include(i,f),h.include(o,{...f,stippleRequiresStretchMeasure:x}),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")),D&&h.varyings.add("vSegmentSDF","float"),x&&h.varyings.add("vStipplePatternStretch","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 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);
 float interp(float ncp, vec4 a, vec4 b) {
 return (-ncp - a.z) / (b.z - a.z);
 }
@@ -108,7 +108,7 @@ return posNdc;
       float isEndVertex = float(!isStartVertex);
       vec2 segmentOrigin = mix(pos.xy, prev.xy, isEndVertex);
       vec2 segment = mix(right, left, isEndVertex);
-      ${D?d`vec2 segmentEnd = mix(next.xy, pos.xy, isEndVertex);`:""}
+      ${u?d`vec2 segmentEnd = mix(next.xy, pos.xy, isEndVertex);`:""}
     `),h.vertex.code.add(d`left = (leftLen > 0.001) ? left/leftLen : vec2(0.0, 0.0);
 right = (rightLen > 0.001) ? right/rightLen : vec2(0.0, 0.0);
 vec2 capDisplacementDir = vec2(0, 0);
@@ -179,7 +179,7 @@ joinDisplacementDir = PERPENDICULAR(joinDisplacementDir);`),h.vertex.code.add(d`
       joinDisplacementDir = PERPENDICULAR(joinDisplacementDir);
       displacementLen = lineWidth;
 
-      ${u?d`capDisplacementDir = isStartVertex ? -right : left;`:""}
+      ${D?d`capDisplacementDir = isStartVertex ? -right : left;`:""}
     }
   `),h.vertex.code.add(d`
     // Displacement (in pixels) caused by join/or cap
@@ -191,7 +191,7 @@ joinDisplacementDir = PERPENDICULAR(joinDisplacementDir);`),h.vertex.code.add(d`
     ${S?d`vLineDistanceNorm = lineDistNorm;`:""}
 
     pos.xy += dpos;
-  `),D&&h.vertex.code.add(d`vec2 segmentDir = normalize(segment);
+  `),u&&h.vertex.code.add(d`vec2 segmentDir = normalize(segment);
 mat2 segmentRotation = mat2(segmentDir * vec2(1.0, -1.0), segmentDir.yx);
 vec2 segmentSpacePosition = segmentRotation * (pos.xy - segmentOrigin);
 vec2 revSegmentSpacePosition = -segmentRotation * (pos.xy - segmentEnd);
@@ -199,18 +199,14 @@ vSegmentSDF = (isJoin == isStartVertex ? revSegmentSpacePosition.x : segmentSpac
 float worldToScreenRatio = computeWorldToScreenRatio(segmentCenter);`),h.vertex.code.add(d`float segmentLengthScreenDouble = length(segment);
 float segmentLengthScreen = segmentLengthScreenDouble * 0.5;
 float discreteWorldToScreenRatio = discretizeWorldToScreenRatio(worldToScreenRatio);
-float segmentLengthRender = length(mix(auxpos2 - position, position - auxpos1, isEndVertex));`),f.draped?h.vertex.code.add(d`float segmentLengthPseudoScreen = segmentLengthScreen / pixelRatio * discreteWorldToScreenRatio / worldToScreenRatio;
+float segmentLengthRender = length(mix(auxpos2 - position, position - auxpos1, isEndVertex));
+vStipplePatternStretch = worldToScreenRatio / discreteWorldToScreenRatio;`),f.draped?h.vertex.code.add(d`float segmentLengthPseudoScreen = segmentLengthScreen / pixelRatio * discreteWorldToScreenRatio / worldToScreenRatio;
 float startPseudoScreen = uv0.x * discreteWorldToScreenRatio - mix(0.0, segmentLengthPseudoScreen, isEndVertex);`):h.vertex.code.add(d`float startPseudoScreen = mix(uv0.x, uv0.x - segmentLengthRender, isEndVertex) * discreteWorldToScreenRatio;
 float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRatio;`),h.vertex.code.add(d`
       float patternLength = ${f.stippleScaleWithLineWidth?"lineSize * ":""} stipplePatternPixelSize;
 
       // Compute the coordinates at both start and end of the line segment, because we need both to clamp to in the fragment shader
-      // The 0.5 factor on the screen length is to correct for pixel ratio (it is calculated at double resolution)
-      ${x?d`
-            vec3 stippleSegmentInfo = computeStippleDistanceLimits(startPseudoScreen, segmentLengthPseudoScreen, segmentLengthScreen, patternLength);
-            vStippleDistanceLimits = stippleSegmentInfo.xy;
-            vStipplePatternStretch = stippleSegmentInfo.z;`:d`
-            vStippleDistanceLimits = computeStippleDistanceLimits(startPseudoScreen, segmentLengthPseudoScreen, segmentLengthScreen, patternLength);`}
+      vStippleDistanceLimits = computeStippleDistanceLimits(startPseudoScreen, segmentLengthPseudoScreen, segmentLengthScreen, patternLength);
 
       vStippleDistance = mix(vStippleDistanceLimits.x, vStippleDistanceLimits.y, isEndVertex);
 
@@ -251,9 +247,9 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRat
   void main() {
     discardBySlice(vpos);
     ${f.multipassTerrainEnabled?"terrainDepthTest(gl_FragCoord, depth);":""}
-  `),f.wireframe?h.fragment.code.add(d`vec4 finalColor = vec4(1.0, 0.0, 1.0, 1.0);`):(D&&h.fragment.code.add(d`
+  `),f.wireframe?h.fragment.code.add(d`vec4 finalColor = vec4(1.0, 0.0, 1.0, 1.0);`):(u&&h.fragment.code.add(d`
       vec2 fragmentPosition = vec2(
-        max(-vSegmentSDF, 0.0),
+        min(vSegmentSDF, 0.0),
         vLineDistance
       ) * gl_FragCoord.w;
 
@@ -266,7 +262,7 @@ float segmentLengthPseudoScreen = segmentLengthRender * discreteWorldToScreenRat
       }
     `),x?h.fragment.code.add(d`
       vec2 stipplePosition = vec2(
-        max(1.0 - getStippleSDF() * 2.0 * vStipplePatternStretch, 0.0),
+        min(getStippleSDF() * 2.0 - 1.0, 0.0),
         vLineDistanceNorm * gl_FragCoord.w
       );
       float stippleRadius = length(stipplePosition * vLineWidth);

package/chunks/persistableUrlUtils.js

@@ -2,4 +2,4 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/esri/copyright.txt for details.
 */
-import{isSome as r}from"../core/maybe.js";import{makeAbsolute as e,makeRelative as t,isAbsolute as o,normalize as s,isDataProtocol as l,changeDomain as a,hasSameOrigin as u,appUrl as n}from"../core/urlUtils.js";function c(r,o){const s=o&&o.url&&o.url.path;if(r&&s&&(r=e(r,s,{preserveProtocolRelative:!0}),o.portalItem&&o.readResourcePaths)){const e=t(r,o.portalItem.itemUrl);h.test(e)&&o.readResourcePaths.push(o.portalItem.resourceFromPath(e).path)}return I(r,o&&o.portal)}function i(r,a,u=R.YES){if(!r)return r;!o(r)&&a&&a.blockedRelativeUrls&&a.blockedRelativeUrls.push(r);let n=e(r);if(a){const e=a.verifyItemRelativeUrls&&a.verifyItemRelativeUrls.rootPath||a.url&&a.url.path;if(e){const o=I(e,a.portal);n=t(I(n,a.portal),o,o),n!==r&&a.verifyItemRelativeUrls&&a.verifyItemRelativeUrls.writtenUrls.push(n)}}return n=U(n,a&&a.portal),o(n)&&(n=s(n)),null!=a&&a.resources&&null!=a&&a.portalItem&&!o(n)&&!l(n)&&u===R.YES&&a.resources.toKeep.push({resource:a.portalItem.resourceFromPath(n)}),n}function m(r,e,t){return c(r,t)}function p(r,e,t,o){const s=i(r,o);void 0!==s&&(e[t]=s)}const f=/\/items\/([^\/]+)\/resources\//,h=/^\.\/resources\//;function v(e){const t=r(e)?e.match(f):null;return r(t)?t[1]:null}function U(r,e){return e&&!e.isPortal&&e.urlKey&&e.customBaseUrl?a(r,`${e.urlKey}.${e.customBaseUrl}`,e.portalHostname):r}function I(r,e){if(!e||e.isPortal||!e.urlKey||!e.customBaseUrl)return r;const t=`${e.urlKey}.${e.customBaseUrl}`;return u(n,`${n.scheme}://${t}`)?a(r,e.portalHostname,t):a(r,t,e.portalHostname)}var R;!function(r){r[r.YES=0]="YES",r[r.NO=1]="NO"}(R||(R={}));const y=Object.freeze({__proto__:null,fromJSON:c,toJSON:i,read:m,write:p,itemIdFromResourceUrl:v,get MarkKeep(){return R}});export{R as M,c as f,v as i,y as p,m as r,i as t,p as w};
+import{isSome as r}from"../core/maybe.js";import{makeAbsolute as e,makeRelative as t,isAbsolute as o,normalize as s,isDataProtocol as l,changeDomain as a,hasSameOrigin as u,getAppUrl as n}from"../core/urlUtils.js";function c(r,o){const s=o&&o.url&&o.url.path;if(r&&s&&(r=e(r,s,{preserveProtocolRelative:!0}),o.portalItem&&o.readResourcePaths)){const e=t(r,o.portalItem.itemUrl);h.test(e)&&o.readResourcePaths.push(o.portalItem.resourceFromPath(e).path)}return I(r,o&&o.portal)}function i(r,a,u=R.YES){if(!r)return r;!o(r)&&a&&a.blockedRelativeUrls&&a.blockedRelativeUrls.push(r);let n=e(r);if(a){const e=a.verifyItemRelativeUrls&&a.verifyItemRelativeUrls.rootPath||a.url&&a.url.path;if(e){const o=I(e,a.portal);n=t(I(n,a.portal),o,o),n!==r&&a.verifyItemRelativeUrls&&a.verifyItemRelativeUrls.writtenUrls.push(n)}}return n=U(n,a&&a.portal),o(n)&&(n=s(n)),null!=a&&a.resources&&null!=a&&a.portalItem&&!o(n)&&!l(n)&&u===R.YES&&a.resources.toKeep.push({resource:a.portalItem.resourceFromPath(n)}),n}function m(r,e,t){return c(r,t)}function p(r,e,t,o){const s=i(r,o);void 0!==s&&(e[t]=s)}const f=/\/items\/([^\/]+)\/resources\//,h=/^\.\/resources\//;function v(e){const t=r(e)?e.match(f):null;return r(t)?t[1]:null}function U(r,e){return e&&!e.isPortal&&e.urlKey&&e.customBaseUrl?a(r,`${e.urlKey}.${e.customBaseUrl}`,e.portalHostname):r}function I(r,e){if(!e||e.isPortal||!e.urlKey||!e.customBaseUrl)return r;const t=`${e.urlKey}.${e.customBaseUrl}`,o=n();return u(o,`${o.scheme}://${t}`)?a(r,e.portalHostname,t):a(r,t,e.portalHostname)}var R;!function(r){r[r.YES=0]="YES",r[r.NO=1]="NO"}(R||(R={}));const y=Object.freeze({__proto__:null,fromJSON:c,toJSON:i,read:m,write:p,itemIdFromResourceUrl:v,get MarkKeep(){return R}});export{R as M,c as f,v as i,y as p,m as r,i as t,p as w};

package/chunks/vec32.js

@@ -2,4 +2,4 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/esri/copyright.txt for details.
 */
-import{logger as t}from"../geometry/support/buffer/math/common.js";function e(e,f,r){if(e.count!==f.count)return void t.error("source and destination buffers need to have the same number of elements");const o=e.count,n=r[0],u=r[1],d=r[2],s=r[4],c=r[5],i=r[6],a=r[8],p=r[9],y=r[10],B=r[12],m=r[13],h=r[14],l=e.typedBuffer,S=e.typedBufferStride,b=f.typedBuffer,M=f.typedBufferStride;for(let t=0;t<o;t++){const e=t*S,f=t*M,r=b[f],o=b[f+1],v=b[f+2];l[e]=n*r+s*o+a*v+B,l[e+1]=u*r+c*o+p*v+m,l[e+2]=d*r+i*o+y*v+h}}function f(e,f,r){if(e.count!==f.count)return void t.error("source and destination buffers need to have the same number of elements");const o=e.count,n=r[0],u=r[1],d=r[2],s=r[3],c=r[4],i=r[5],a=r[6],p=r[7],y=r[8],B=e.typedBuffer,m=e.typedBufferStride,h=f.typedBuffer,l=f.typedBufferStride;for(let t=0;t<o;t++){const e=t*m,f=t*l,r=h[f],o=h[f+1],S=h[f+2];B[e]=n*r+s*o+a*S,B[e+1]=u*r+c*o+p*S,B[e+2]=d*r+i*o+y*S}}function r(t,e,f){const r=Math.min(t.count,e.count),o=t.typedBuffer,n=t.typedBufferStride,u=e.typedBuffer,d=e.typedBufferStride;for(let s=0;s<r;s++){const t=s*n,e=s*d;o[t]=f*u[e],o[t+1]=f*u[e+1],o[t+2]=f*u[e+2]}}function o(t,e){const f=Math.min(t.count,e.count),r=t.typedBuffer,o=t.typedBufferStride,n=e.typedBuffer,u=e.typedBufferStride;for(let d=0;d<f;d++){const t=d*o,e=d*u,f=n[e],s=n[e+1],c=n[e+2],i=Math.sqrt(f*f+s*s+c*c);if(i>0){const e=1/i;r[t]=e*f,r[t+1]=e*s,r[t+2]=e*c}}}function n(t,e,f){const r=Math.min(t.count,e.count),o=t.typedBuffer,n=t.typedBufferStride,u=e.typedBuffer,d=e.typedBufferStride;for(let s=0;s<r;s++){const t=s*n,e=s*d;o[t]=u[e]>>f,o[t+1]=u[e+1]>>f,o[t+2]=u[e+2]>>f}}const u=Object.freeze({__proto__:null,transformMat4:e,transformMat3:f,scale:r,normalize:o,shiftRight:n});export{f as a,n as b,o as n,r as s,e as t,u as v};
+import{mathLogger as t}from"../geometry/support/buffer/math/common.js";function e(e,f,r){if(e.count!==f.count)return void t.error("source and destination buffers need to have the same number of elements");const o=e.count,n=r[0],u=r[1],d=r[2],s=r[4],c=r[5],i=r[6],a=r[8],p=r[9],y=r[10],B=r[12],m=r[13],h=r[14],l=e.typedBuffer,S=e.typedBufferStride,b=f.typedBuffer,M=f.typedBufferStride;for(let t=0;t<o;t++){const e=t*S,f=t*M,r=b[f],o=b[f+1],v=b[f+2];l[e]=n*r+s*o+a*v+B,l[e+1]=u*r+c*o+p*v+m,l[e+2]=d*r+i*o+y*v+h}}function f(e,f,r){if(e.count!==f.count)return void t.error("source and destination buffers need to have the same number of elements");const o=e.count,n=r[0],u=r[1],d=r[2],s=r[3],c=r[4],i=r[5],a=r[6],p=r[7],y=r[8],B=e.typedBuffer,m=e.typedBufferStride,h=f.typedBuffer,l=f.typedBufferStride;for(let t=0;t<o;t++){const e=t*m,f=t*l,r=h[f],o=h[f+1],S=h[f+2];B[e]=n*r+s*o+a*S,B[e+1]=u*r+c*o+p*S,B[e+2]=d*r+i*o+y*S}}function r(t,e,f){const r=Math.min(t.count,e.count),o=t.typedBuffer,n=t.typedBufferStride,u=e.typedBuffer,d=e.typedBufferStride;for(let s=0;s<r;s++){const t=s*n,e=s*d;o[t]=f*u[e],o[t+1]=f*u[e+1],o[t+2]=f*u[e+2]}}function o(t,e){const f=Math.min(t.count,e.count),r=t.typedBuffer,o=t.typedBufferStride,n=e.typedBuffer,u=e.typedBufferStride;for(let d=0;d<f;d++){const t=d*o,e=d*u,f=n[e],s=n[e+1],c=n[e+2],i=Math.sqrt(f*f+s*s+c*c);if(i>0){const e=1/i;r[t]=e*f,r[t+1]=e*s,r[t+2]=e*c}}}function n(t,e,f){const r=Math.min(t.count,e.count),o=t.typedBuffer,n=t.typedBufferStride,u=e.typedBuffer,d=e.typedBufferStride;for(let s=0;s<r;s++){const t=s*n,e=s*d;o[t]=u[e]>>f,o[t+1]=u[e+1]>>f,o[t+2]=u[e+2]>>f}}const u=Object.freeze({__proto__:null,transformMat4:e,transformMat3:f,scale:r,normalize:o,shiftRight:n});export{f as a,n as b,o as n,r as s,e as t,u as v};

package/chunks/vec42.js

@@ -2,4 +2,4 @@
 All material copyright ESRI, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/4.23/esri/copyright.txt for details.
 */
-import{logger as e}from"../geometry/support/buffer/math/common.js";function t(t,r,f){if(t.count!==r.count)return void e.error("source and destination buffers need to have the same number of elements");const o=t.count,n=f[0],u=f[1],d=f[2],s=f[3],c=f[4],i=f[5],a=f[6],p=f[7],y=f[8],m=f[9],B=f[10],h=f[11],l=f[12],S=f[13],b=f[14],v=f[15],M=t.typedBuffer,_=t.typedBufferStride,g=r.typedBuffer,j=r.typedBufferStride;for(let e=0;e<o;e++){const t=e*_,r=e*j,f=g[r],o=g[r+1],x=g[r+2],z=g[r+3];M[t]=n*f+c*o+y*x+l*z,M[t+1]=u*f+i*o+m*x+S*z,M[t+2]=d*f+a*o+B*x+b*z,M[t+3]=s*f+p*o+h*x+v*z}}function r(t,r,f){if(t.count!==r.count)return void e.error("source and destination buffers need to have the same number of elements");const o=t.count,n=f[0],u=f[1],d=f[2],s=f[3],c=f[4],i=f[5],a=f[6],p=f[7],y=f[8],m=t.typedBuffer,B=t.typedBufferStride,h=r.typedBuffer,l=r.typedBufferStride;for(let e=0;e<o;e++){const t=e*B,r=e*l,f=h[r],o=h[r+1],S=h[r+2],b=h[r+3];m[t]=n*f+s*o+a*S,m[t+1]=u*f+c*o+p*S,m[t+2]=d*f+i*o+y*S,m[t+3]=b}}function f(e,t,r){const f=Math.min(e.count,t.count),o=e.typedBuffer,n=e.typedBufferStride,u=t.typedBuffer,d=t.typedBufferStride;for(let s=0;s<f;s++){const e=s*n,t=s*d;o[e]=r*u[t],o[e+1]=r*u[t+1],o[e+2]=r*u[t+2],o[e+3]=r*u[t+3]}}function o(e,t,r){const f=Math.min(e.count,t.count),o=e.typedBuffer,n=e.typedBufferStride,u=t.typedBuffer,d=t.typedBufferStride;for(let s=0;s<f;s++){const e=s*n,t=s*d;o[e]=u[t]>>r,o[e+1]=u[t+1]>>r,o[e+2]=u[t+2]>>r,o[e+3]=u[t+3]>>r}}const n=Object.freeze({__proto__:null,transformMat4:t,transformMat3:r,scale:f,shiftRight:o});export{o as a,t as b,f as s,r as t,n as v};
+import{mathLogger as e}from"../geometry/support/buffer/math/common.js";function t(t,r,f){if(t.count!==r.count)return void e.error("source and destination buffers need to have the same number of elements");const o=t.count,n=f[0],u=f[1],d=f[2],s=f[3],c=f[4],i=f[5],a=f[6],p=f[7],y=f[8],m=f[9],B=f[10],h=f[11],l=f[12],S=f[13],b=f[14],v=f[15],M=t.typedBuffer,_=t.typedBufferStride,g=r.typedBuffer,j=r.typedBufferStride;for(let e=0;e<o;e++){const t=e*_,r=e*j,f=g[r],o=g[r+1],x=g[r+2],z=g[r+3];M[t]=n*f+c*o+y*x+l*z,M[t+1]=u*f+i*o+m*x+S*z,M[t+2]=d*f+a*o+B*x+b*z,M[t+3]=s*f+p*o+h*x+v*z}}function r(t,r,f){if(t.count!==r.count)return void e.error("source and destination buffers need to have the same number of elements");const o=t.count,n=f[0],u=f[1],d=f[2],s=f[3],c=f[4],i=f[5],a=f[6],p=f[7],y=f[8],m=t.typedBuffer,B=t.typedBufferStride,h=r.typedBuffer,l=r.typedBufferStride;for(let e=0;e<o;e++){const t=e*B,r=e*l,f=h[r],o=h[r+1],S=h[r+2],b=h[r+3];m[t]=n*f+s*o+a*S,m[t+1]=u*f+c*o+p*S,m[t+2]=d*f+i*o+y*S,m[t+3]=b}}function f(e,t,r){const f=Math.min(e.count,t.count),o=e.typedBuffer,n=e.typedBufferStride,u=t.typedBuffer,d=t.typedBufferStride;for(let s=0;s<f;s++){const e=s*n,t=s*d;o[e]=r*u[t],o[e+1]=r*u[t+1],o[e+2]=r*u[t+2],o[e+3]=r*u[t+3]}}function o(e,t,r){const f=Math.min(e.count,t.count),o=e.typedBuffer,n=e.typedBufferStride,u=t.typedBuffer,d=t.typedBufferStride;for(let s=0;s<f;s++){const e=s*n,t=s*d;o[e]=u[t]>>r,o[e+1]=u[t+1]>>r,o[e+2]=u[t+2]>>r,o[e+3]=u[t+3]>>r}}const n=Object.freeze({__proto__:null,transformMat4:t,transformMat3:r,scale:f,shiftRight:o});export{o as a,t as b,f as s,r as t,n as v};