@arcgis/core 5.0.0-next.70 → 5.0.0-next.72

package/views/3d/types.d.ts

@@ -13,57 +13,109 @@ import type { OGCFeatureLayerView } from "../layers/OGCFeatureLayerView.js";
 import type { PointCloudLayerView } from "../layers/PointCloudLayerView.js";
 import type { StreamLayerView } from "../layers/StreamLayerView.js";
 
+/** @since 5.0 */
 export interface LayerView3DMap {
+  /** @since 5.0 */
   "base-dynamic": never;
+  /** @since 5.0 */
   "base-elevation": never;
+  /** @since 5.0 */
   "base-tile": never;
+  /** @since 5.0 */
   "bing-maps": never;
+  /** @since 5.0 */
   "building-scene": never;
+  /** @since 5.0 */
   catalog: never;
+  /** @since 5.0 */
   "catalog-dynamic-group": never;
+  /** @since 5.0 */
   "catalog-footprint": never;
+  /** @since 5.0 */
   csv: CSVLayerView;
+  /** @since 5.0 */
   dimension: DimensionLayerView;
+  /** @since 5.0 */
   elevation: never;
+  /** @since 5.0 */
   feature: FeatureLayerView;
+  /** @since 5.0 */
   "gaussian-splat": never;
+  /** @since 5.0 */
   "geo-rss": never;
+  /** @since 5.0 */
   geojson: GeoJSONLayerView;
+  /** @since 5.0 */
   graphics: GeoJSONLayerView;
+  /** @since 5.0 */
   group: never;
+  /** @since 5.0 */
   imagery: ImageryLayerView;
+  /** @since 5.0 */
   "imagery-tile": never;
+  /** @since 5.0 */
   "integrated-mesh": never;
+  /** @since 5.0 */
   "integrated-mesh-3dtiles": never;
+  /** @since 5.0 */
   kml: never;
+  /** @since 5.0 */
   "knowledge-graph": never;
+  /** @since 5.0 */
   "knowledge-graph-sublayer": never;
+  /** @since 5.0 */
   "line-of-sight": LineOfSightLayerView;
+  /** @since 5.0 */
   "link-chart": never;
+  /** @since 5.0 */
   "map-image": never;
+  /** @since 5.0 */
   "map-notes": never;
+  /** @since 5.0 */
   media: MediaLayerView;
+  /** @since 5.0 */
   "ogc-feature": OGCFeatureLayerView;
+  /** @since 5.0 */
   "open-street-map": never;
+  /** @since 5.0 */
   "oriented-imagery": never;
+  /** @since 5.0 */
   parquet: never;
+  /** @since 5.0 */
   "point-cloud": PointCloudLayerView;
+  /** @since 5.0 */
   route: never;
+  /** @since 5.0 */
   scene: SceneLayerView;
+  /** @since 5.0 */
   stream: StreamLayerView;
+  /** @since 5.0 */
   "subtype-group": never;
+  /** @since 5.0 */
   tile: never;
+  /** @since 5.0 */
   unknown: never;
+  /** @since 5.0 */
   unsupported: never;
+  /** @since 5.0 */
   "vector-tile": never;
+  /** @since 5.0 */
   video: never;
+  /** @since 5.0 */
   viewshed: ViewshedLayerView;
+  /** @since 5.0 */
   voxel: never;
+  /** @since 5.0 */
   wcs: never;
+  /** @since 5.0 */
   "web-tile": never;
+  /** @since 5.0 */
   wfs: WFSLayerView;
+  /** @since 5.0 */
   wms: never;
+  /** @since 5.0 */
   wmts: never;
 }
 
+/** @since 5.0 */
 export type LayerView3DFor<TLayer extends Layer> = LayerView3DMap[TLayer["type"]];

package/views/3d/webgl/ManagedColorAttachment.d.ts

@@ -3,5 +3,7 @@ import type ManagedFBOAttachment from "./ManagedFBOAttachment.js";
 /**
  * Describes a single attachment of a managed framebuffer. A managed color
  * attachment is also memory managed by the [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+ *
+ * @since 5.0
  */
 export default abstract class ManagedColorAttachment extends ManagedFBOAttachment {}

package/views/3d/webgl/ManagedDepthAttachment.d.ts

@@ -3,5 +3,7 @@ import type ManagedFBOAttachment from "./ManagedFBOAttachment.js";
 /**
  * Describes the depth attachment of a managed framebuffer. The depth attachment is memory managed by
  * the [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+ *
+ * @since 5.0
  */
 export default abstract class ManagedDepthAttachment extends ManagedFBOAttachment {}

package/views/3d/webgl/ManagedFBO.d.ts

@@ -82,12 +82,16 @@ export default abstract class ManagedFBO extends ManagedFBOResource {
    * Release this managed framebuffer.
    *
    * If more than one reference exists this will not have an effect.
+   *
+   * @since 5.0
    */
   release(): boolean;
   /**
    * Increase reference counting on this managed framebuffer.
    *
    * You can use this functionality to hold framebuffer contents for several frames and then release the framebuffer.
+   *
+   * @since 5.0
    */
   retain(): void;
 }

package/views/3d/webgl/ManagedFBOAttachment.d.ts

@@ -1,3 +1,4 @@
 import type ManagedFBOResource from "./ManagedFBOResource.js";
 
+/** @since 5.0 */
 export default abstract class ManagedFBOAttachment extends ManagedFBOResource {}

package/views/3d/webgl/ManagedFBOResource.d.ts

@@ -1,15 +1,20 @@
 
+/** @since 5.0 */
 export default abstract class ManagedFBOResource {
   /**
    * Release this managed framebuffer into cache again.
    *
    * If more than one reference exists this will not have an effect.
+   *
+   * @since 5.0
    */
   release(): boolean;
   /**
    * Increase reference counting on this managed framebuffer.
    *
    * You can use this functionality to hold framebuffer contents for several frames and then release the framebuffer.
+   *
+   * @since 5.0
    */
   retain(): void;
 }

package/views/3d/webgl/types.d.ts

@@ -1,13 +1,25 @@
 
-/** Tuple of an RGB color value and an intensity value. */
+/**
+ * Tuple of an RGB color value and an intensity value.
+ *
+ * @since 5.0
+ */
 export interface ColorAndIntensity {
-  /** RGB color with values between 0 and 1. */
+  /**
+   * RGB color with values between 0 and 1.
+   *
+   * @since 5.0
+   */
   color: [
       number,
       number,
       number
   ];
-  /** Scalar intensity value by which the color should be scaled for compositing. */
+  /**
+   * Scalar intensity value by which the color should be scaled for compositing.
+   *
+   * @since 5.0
+   */
   intensity: number;
 }
 
@@ -16,13 +28,27 @@ export interface ColorAndIntensity {
  * lighting model. It consists of a directional
  * Lambertian (`diffuse`) and a constant (`ambient`) term, which should be treated in the sense of the
  * [Phong Reflection Model](https://en.wikipedia.org/wiki/Phong_reflection_model).
+ *
+ * @since 5.0
  */
 export interface SunLight {
-  /** The ambient light color and intensity. */
+  /**
+   * The ambient light color and intensity.
+   *
+   * @since 5.0
+   */
   ambient: ColorAndIntensity;
-  /** The diffuse light color and intensity. */
+  /**
+   * The diffuse light color and intensity.
+   *
+   * @since 5.0
+   */
   diffuse: ColorAndIntensity;
-  /** The incident light direction in render coordinates. */
+  /**
+   * The incident light direction in render coordinates.
+   *
+   * @since 5.0
+   */
   direction: [
       number,
       number,

package/views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js

@@ -2,31 +2,29 @@
 All material copyright Esri, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/5.0/esri/copyright.txt for details.
 */
-import{colorGamma as i}from"../../../../../../colorUtils.js";import{EvaluateAmbientLighting as n}from"./EvaluateAmbientLighting.glsl.js";import{EvaluateAmbientOcclusion as o}from"./EvaluateAmbientOcclusion.glsl.js";import{addMainLightDirection as e,addMainLightIntensity as t,applyShading as a}from"./MainLighting.glsl.js";import{PhysicallyBasedRendering as r}from"./PhysicallyBasedRendering.glsl.js";import{PiUtils as l}from"./PiUtils.glsl.js";import{BooleanBindUniform as c}from"../../shaderModules/BooleanBindUniform.js";import{FloatBindUniform as d}from"../../shaderModules/FloatBindUniform.js";import{glsl as m,If as s}from"../../shaderModules/glsl.js";import{ambientBoost as g}from"../../../lighting/SceneLighting.js";import{BlackLevelLightSoftCompression as h}from"../../../shaders/BlackLevelLightSoftCompression.glsl.js";import{ToneMapping as u}from"../../../shaders/ToneMapping.glsl.js";function p(i){i.constants.add("ambientBoostFactor","float",g)}function v(i){i.uniforms.add(new d("lightingGlobalFactor",i=>i.lighting.globalFactor))}function f(g,f){const{pbrMode:L,spherical:b,hasColorTexture:C}=f;g.include(o,f),0!==L&&g.include(r,f),g.include(n,f),g.include(l),g.include(u,f);const N=!(2===L&&!C);switch(N&&g.include(h),g.code.add(m`
-    const float GAMMA_SRGB = ${m.float(i)};
-    const float INV_GAMMA_SRGB = 0.4761904;
-    ${s(0!==L,"const float GROUND_REFLECTANCE = 0.2;")}
-  `),p(g),v(g),e(g),g.code.add(m`
+import{EvaluateAmbientLighting as i}from"./EvaluateAmbientLighting.glsl.js";import{EvaluateAmbientOcclusion as n}from"./EvaluateAmbientOcclusion.glsl.js";import{Gamma as e}from"./Gamma.glsl.js";import{addMainLightDirection as o,addMainLightIntensity as t,applyShading as a}from"./MainLighting.glsl.js";import{PhysicallyBasedRendering as r}from"./PhysicallyBasedRendering.glsl.js";import{PiUtils as l}from"./PiUtils.glsl.js";import{BooleanBindUniform as c}from"../../shaderModules/BooleanBindUniform.js";import{FloatBindUniform as d}from"../../shaderModules/FloatBindUniform.js";import{If as m,glsl as s}from"../../shaderModules/glsl.js";import{ambientBoost as g}from"../../../lighting/SceneLighting.js";import{BlackLevelLightSoftCompression as h}from"../../../shaders/BlackLevelLightSoftCompression.glsl.js";import{ToneMapping as u}from"../../../shaders/ToneMapping.glsl.js";function p(i){i.constants.add("ambientBoostFactor","float",g)}function f(i){i.uniforms.add(new d("lightingGlobalFactor",i=>i.lighting.globalFactor))}function v(g,v){const{pbrMode:L,spherical:b,hasColorTexture:C}=v;g.include(n,v),0!==L&&g.include(r,v),g.include(i,v),g.include(l),g.include(u,v),g.include(e);const N=!(2===L&&!C);switch(N&&g.include(h),g.code.add(s`
+    ${m(0!==L,"const float GROUND_REFLECTANCE = 0.2;")}
+  `),p(g),f(g),o(g),g.code.add(s`
     float additionalDirectedAmbientLight(float lightAlignment) {
       return smoothstep(0.0, 1.0, clamp(lightAlignment * 2.5, 0.0, 1.0));
     }
 
     float additionalDirectedAmbientLight(vec3 vPosWorld) {
-      float lightAlignment = dot(${b?m`normalize(vPosWorld)`:m`vec3(0.0, 0.0, 1.0)`}, mainLightDirection);
+      float lightAlignment = dot(${b?s`normalize(vPosWorld)`:s`vec3(0.0, 0.0, 1.0)`}, mainLightDirection);
       return smoothstep(0.0, 1.0, clamp(lightAlignment * 2.5, 0.0, 1.0));
     }
-  `),t(g),g.code.add(m`vec3 evaluateAdditionalLighting(float ambientOcclusion, vec3 vPosWorld) {
+  `),t(g),g.code.add(s`vec3 evaluateAdditionalLighting(float ambientOcclusion, vec3 vPosWorld) {
 float additionalAmbientScale = additionalDirectedAmbientLight(vPosWorld);
 return (1.0 - ambientOcclusion) * additionalAmbientScale * ambientBoostFactor * lightingGlobalFactor * mainLightIntensity;
-}`),L){case 0:case 4:case 3:g.include(a),g.code.add(m`vec3 evaluateSceneLighting(vec3 normalWorld, vec3 albedo, float shadow, float ssao, vec3 additionalLight) {
+}`),L){case 0:case 4:case 3:g.include(a),g.code.add(s`vec3 evaluateSceneLighting(vec3 normalWorld, vec3 albedo, float shadow, float ssao, vec3 additionalLight) {
 vec3 mainLighting = applyShading(normalWorld, shadow);
 vec3 ambientLighting = calculateAmbientIrradiance(normalWorld, ssao);
-vec3 albedoLinear = pow(albedo, vec3(GAMMA_SRGB));
+vec3 albedoLinear = linearizeGamma(albedo);
 vec3 totalLight = mainLighting + ambientLighting + additionalLight;
 totalLight = min(totalLight, vec3(PI));
 vec3 outColor = vec3((albedoLinear / PI) * totalLight);
-return pow(outColor, vec3(INV_GAMMA_SRGB));
-}`);break;case 1:case 2:g.code.add(m`const float fillLightIntensity = 0.25;
+return delinearizeGamma(outColor);
+}`);break;case 1:case 2:g.code.add(s`const float fillLightIntensity = 0.25;
 const float horizonLightDiffusion = 0.4;
 const float additionalAmbientIrradianceFactor = 0.02;
 vec3 evaluateSceneLightingPBR(vec3 normal, vec3 albedo, float shadow, float ssao, vec3 additionalLight,
@@ -38,12 +36,12 @@ inputs.NdotV = clamp(abs(dot(normal, viewDirection)), 0.001, 1.0);
 inputs.NdotNG = clamp(dot(normal, groundNormal), -1.0, 1.0);
 vec3 reflectedView = normalize(reflect(viewDirection, normal));
 inputs.RdotNG = clamp(dot(reflectedView, groundNormal), -1.0, 1.0);
-inputs.albedoLinear = pow(albedo, vec3(GAMMA_SRGB));
+inputs.albedoLinear = linearizeGamma(albedo);
 inputs.ssao = ssao;
 inputs.metalness = mrr[0];
-inputs.roughness = clamp(mrr[1] * mrr[1], 0.001, 0.99);`),g.code.add(m`inputs.f0 = (0.16 * mrr[2] * mrr[2]) * (1.0 - inputs.metalness) + inputs.albedoLinear * inputs.metalness;
+inputs.roughness = clamp(mrr[1] * mrr[1], 0.001, 0.99);`),g.code.add(s`inputs.f0 = (0.16 * mrr[2] * mrr[2]) * (1.0 - inputs.metalness) + inputs.albedoLinear * inputs.metalness;
 inputs.f90 = vec3(clamp(dot(inputs.f0, vec3(50.0 * 0.33)), 0.0, 1.0));
-inputs.diffuseColor = inputs.albedoLinear * (vec3(1.0) - inputs.f0) * (1.0 - inputs.metalness);`),f.useFillLights?g.uniforms.add(new c("hasFillLights",i=>i.enableFillLights)):g.constants.add("hasFillLights","bool",!1),g.code.add(m`vec3 ambientDir = vec3(5.0 * groundNormal[1] - groundNormal[0] * groundNormal[2], - 5.0 * groundNormal[0] - groundNormal[2] * groundNormal[1], groundNormal[1] * groundNormal[1] + groundNormal[0] * groundNormal[0]);
+inputs.diffuseColor = inputs.albedoLinear * (vec3(1.0) - inputs.f0) * (1.0 - inputs.metalness);`),v.useFillLights?g.uniforms.add(new c("hasFillLights",i=>i.enableFillLights)):g.constants.add("hasFillLights","bool",!1),g.code.add(s`vec3 ambientDir = vec3(5.0 * groundNormal[1] - groundNormal[0] * groundNormal[2], - 5.0 * groundNormal[0] - groundNormal[2] * groundNormal[1], groundNormal[1] * groundNormal[1] + groundNormal[0] * groundNormal[0]);
 ambientDir = ambientDir != vec3(0.0) ? normalize(ambientDir) : normalize(vec3(5.0, -1.0, 0.0));
 inputs.NdotAmbDir = hasFillLights ? abs(dot(normal, ambientDir)) : 1.0;
 float NdotL = clamp(dot(normal, mainLightDirection), 0.001, 1.0);
@@ -51,7 +49,7 @@ vec3 mainLightIrradianceComponent = NdotL * (1.0 - shadow) * mainLightIntensity;
 vec3 fillLightsIrradianceComponent = inputs.NdotAmbDir * mainLightIntensity * fillLightIntensity;
 vec3 ambientLightIrradianceComponent = calculateAmbientIrradiance(normal, ssao) + additionalLight;
 inputs.skyIrradianceToSurface = ambientLightIrradianceComponent + mainLightIrradianceComponent + fillLightsIrradianceComponent ;
-inputs.groundIrradianceToSurface = GROUND_REFLECTANCE * ambientLightIrradianceComponent + mainLightIrradianceComponent + fillLightsIrradianceComponent ;`),g.uniforms.add(new d("lightingSpecularStrength",i=>i.lighting.mainLight.specularStrength),new d("lightingEnvironmentStrength",i=>i.lighting.mainLight.environmentStrength)).code.add(m`vec3 horizonRingDir = inputs.RdotNG * groundNormal - reflectedView;
+inputs.groundIrradianceToSurface = GROUND_REFLECTANCE * ambientLightIrradianceComponent + mainLightIrradianceComponent + fillLightsIrradianceComponent ;`),g.uniforms.add(new d("lightingSpecularStrength",i=>i.lighting.mainLight.specularStrength),new d("lightingEnvironmentStrength",i=>i.lighting.mainLight.environmentStrength)).code.add(s`vec3 horizonRingDir = inputs.RdotNG * groundNormal - reflectedView;
 vec3 horizonRingH = normalize(viewDirection + horizonRingDir);
 inputs.NdotH_Horizon = dot(normal, horizonRingH);
 float NdotH = clamp(dot(normal, h), 0.0, 1.0);
@@ -61,14 +59,14 @@ vec3 ambientLightRadianceComponent = lightingEnvironmentStrength * calculateAmbi
 float normalDirectionModifier = mix(1., min(mix(0.1, 2.0, (inputs.NdotNG + 1.) * 0.5), 1.0), clamp(inputs.roughness * 5.0, 0.0 , 1.0));
 inputs.skyRadianceToSurface = (ambientLightRadianceComponent + horizonLightRadianceComponent) * normalDirectionModifier + mainLightRadianceComponent;
 inputs.groundRadianceToSurface = 0.5 * GROUND_REFLECTANCE * (ambientLightRadianceComponent + horizonLightRadianceComponent) * normalDirectionModifier + mainLightRadianceComponent;
-inputs.averageAmbientRadiance = ambientLightIrradianceComponent[1] * (1.0 + GROUND_REFLECTANCE);`),g.code.add(m`
+inputs.averageAmbientRadiance = ambientLightIrradianceComponent[1] * (1.0 + GROUND_REFLECTANCE);`),g.code.add(s`
         vec3 reflectedColorComponent = evaluateEnvironmentIllumination(inputs);
         vec3 additionalMaterialReflectanceComponent = inputs.albedoLinear * additionalAmbientIrradiance;
         vec3 outColorLinear = reflectedColorComponent + additionalMaterialReflectanceComponent;
-        ${N?m`vec3 outColor = pow(blackLevelSoftCompression(outColorLinear, inputs.averageAmbientRadiance), vec3(INV_GAMMA_SRGB));`:m`vec3 outColor = pow(max(vec3(0.0), outColorLinear - 0.005 * inputs.averageAmbientRadiance), vec3(INV_GAMMA_SRGB));`}
-        return outColor;
+        ${N?s`vec3 outColor = blackLevelSoftCompression(outColorLinear, inputs.averageAmbientRadiance);`:s`vec3 outColor = max(vec3(0.0), outColorLinear - 0.005 * inputs.averageAmbientRadiance);`}
+        return delinearizeGamma(outColor);
       }
-    `);break;case 5:case 6:e(g),t(g),g.code.add(m`const float roughnessTerrain = 0.5;
+    `);break;case 5:case 6:o(g),t(g),g.code.add(s`const float roughnessTerrain = 0.5;
 const float specularityTerrain = 0.5;
 const vec3 fresnelReflectionTerrain = vec3(0.04);
 vec3 evaluatePBRSimplifiedLighting(vec3 n, vec3 c, float shadow, float ssao, vec3 al, vec3 vd, vec3 nup) {
@@ -78,7 +76,7 @@ float NdotL = clamp(dot(n, mainLightDirection), 0.001, 1.0);
 float NdotV = clamp(abs(dot(n, viewDirection)), 0.001, 1.0);
 float NdotH = clamp(dot(n, h), 0.0, 1.0);
 float NdotNG = clamp(dot(n, nup), -1.0, 1.0);
-vec3 albedoLinear = pow(c, vec3(GAMMA_SRGB));
+vec3 albedoLinear = linearizeGamma(c);
 float lightness = 0.3 * albedoLinear[0] + 0.5 * albedoLinear[1] + 0.2 * albedoLinear[2];
 vec3 f0 = (0.85 * lightness + 0.15) * fresnelReflectionTerrain;
 vec3 f90 =  vec3(clamp(dot(f0, vec3(50.0 * 0.33)), 0.0, 1.0));
@@ -92,6 +90,6 @@ vec2 dfg = prefilteredDFGAnalytical(roughnessTerrain, NdotV);
 vec3 specularColor = f0 * dfg.x + f90 * dfg.y;
 vec3 specularComponent = specularityTerrain * specularColor * mainLightRadianceComponent;
 vec3 outColorLinear = outDiffColor + specularComponent;
-vec3 outColor = pow(outColorLinear, vec3(INV_GAMMA_SRGB));
+vec3 outColor = delinearizeGamma(outColorLinear);
 return outColor;
-}`)}}export{f as EvaluateSceneLighting,p as addAmbientBoostFactor,v as addLightingGlobalFactor};
+}`)}}export{v as EvaluateSceneLighting,p as addAmbientBoostFactor,f as addLightingGlobalFactor};

package/views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js

@@ -2,15 +2,19 @@
 All material copyright Esri, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/5.0/esri/copyright.txt for details.
 */
-import{colorGamma as o}from"../../../../../../colorUtils.js";import{glsl as r}from"../../shaderModules/glsl.js";function e(e){e.code.add(r`
-    const float GAMMA = ${r.float(o)};
-    const float INV_GAMMA = ${r.float(1/o)};
+import{colorGamma as o}from"../../../../../../colorUtils.js";import{glsl as e}from"../../shaderModules/glsl.js";function r(r){r.code.add(e`
+    const float GAMMA = ${e.float(o)};
+    const float INV_GAMMA = ${e.float(1/o)};
+
+    vec3 delinearizeGamma(vec3 color) {
+       return pow(color, vec3(INV_GAMMA));
+    }
 
     vec4 delinearizeGamma(vec4 color) {
-      return vec4(pow(color.rgb, vec3(INV_GAMMA)), color.a);
+      return vec4(delinearizeGamma(color.rgb), color.a);
     }
 
     vec3 linearizeGamma(vec3 color) {
       return pow(color, vec3(GAMMA));
     }
-  `)}export{e as Gamma};
+  `)}export{r as Gamma};

package/views/3d/webgl-engine/core/shaderLibrary/terrain/TerrainTexture.glsl.js

@@ -8,12 +8,14 @@ import{ReadShadowMapPassParameters as e}from"../shading/ReadShadowMap.glsl.js";i
     ${o(p,"nvtc = nextTexOffsetAndScale.xy + uv * nextTexOffsetAndScale.zw;")}
   }`),s.code.add(r`
     vec4 getColor(vec4 color, vec2 uv, vec3 opacities) {
-      ${o(m||g,r`if (opacities.y <= 0.0) {
-           return color * opacities.z * opacities.x;
-         }
-         vec4 bg = vec4(${g?r`backgroundColor`:r`gridColor(uv)`} * opacities.y, opacities.y);
-         vec4 layer = color * opacities.z;
-         return (bg * (1.0 - layer.a) + layer) * opacities.x;`,"return color;")}
+      ${o(m||g,r`
+          if (opacities.y <= 0.0) {
+            return color * opacities.z * opacities.x;
+          }
+          vec4 bg = vec4(${g?r`backgroundColor`:r`gridColor(uv)`} * opacities.y, opacities.y);
+          vec4 layer = color * opacities.z;
+          return (bg * (1.0 - layer.a) + layer) * opacities.x;
+        `,"return color;")}
     }`),p?s.code.add(r`vec4 getTileColor() {
 vec4 color = getColor(texture(tex, vtc), vtc, textureOpacities);
 if (fadeFactor >= 1.0) {

package/views/3d/webgl-engine/effects/RenderPlugin.js

@@ -2,4 +2,4 @@
 All material copyright Esri, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/5.0/esri/copyright.txt for details.
 */
-import e from"../../../../core/Accessor.js";const r={required:[]},t={required:[1]};class s extends e{precompile(e){return!!this.acquireTechniques(e)}consumes(){return r}get usedMemory(){return 0}get renderOccludedFlags(){return 1}get isDecoration(){return!1}get readyToRun(){return!1}get numGeometries(){return 0}get hasOccludees(){return!1}get hasEmitters(){return!1}forEachGeometry(e){}}class n extends s{}class u extends s{}export{u as AsyncRenderPlugin,t as ConsumesDepth,r as ConsumesNone,n as SyncRenderPlugin};
+import e from"../../../../core/Accessor.js";const r={required:[]},t={required:[1]};class s extends e{precompile(e){return!!this.acquireTechniques(e)}consumes(){return r}get usedMemory(){return 0}get renderOccludedFlags(){return 1}get testsTransparentRenderOrder(){return 0}get isDecoration(){return!1}get readyToRun(){return!1}get numGeometries(){return 0}get hasOccludees(){return!1}get hasEmitters(){return!1}forEachGeometry(e){}}class n extends s{}class u extends s{}export{u as AsyncRenderPlugin,t as ConsumesDepth,r as ConsumesNone,n as SyncRenderPlugin};

package/views/3d/webgl-engine/effects/RenderPluginManager.js

@@ -2,4 +2,4 @@
 All material copyright Esri, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/5.0/esri/copyright.txt for details.
 */
-import{removeUnordered as e}from"../../../../core/arrayUtils.js";import"../../../../core/has.js";import{isPromiseLike as t,createAbortError as r}from"../../../../core/promiseUtils.js";import{signal as s}from"../../../../core/signal.js";import{DepthRange as n}from"../lib/DepthRange.js";class i{constructor(e){this.context=e,this._renderPlugins=new Array,this._slots=new Array,this._version=s(0);for(let t=0;t<22;++t)this._slots[t]=[]}destroy(){this._renderPlugins.forEach(e=>e.destroy()),this._renderPlugins.length=0}get plugins(){return this._renderPlugins}add(e,s){const n=()=>{if(s?.aborted)throw e.uninitializeRenderContext(),r();this._renderPlugins.push(e),e.produces.forEach((t,r)=>this._slots[r].push(e)),this.context.requestRender(),this._version.value++},i=e.initializeRenderContext(this.context,s);if(t(i))return i.then(n);n()}remove(t){e(this._renderPlugins,t),t.uninitializeRenderContext();for(let e=0;e<this._slots.length;++e)this._slots[e]=this._slots[e].filter(e=>e!==t);this.context.requestRender(),this._version.value++}prepareRender(){this._renderPlugins.forEach(e=>{e.prepareRender&&e.prepareRender(this.context.renderContext)})}updateAnimation(e){let t=!1;return this._renderPlugins.forEach(r=>t=r.updateAnimation?.(e)||t),t}precompile(...e){++this.context.techniques.precompiling;const t=this.context.renderContext.bind.slot;for(const r of e)this.context.renderContext.bind.slot=r,this._forEachRender(()=>{});this.context.renderContext.bind.slot=t,--this.context.techniques.precompiling}render(...e){for(const t of e)this.context.renderContext.bind.slot=t,this._forEachRender((e,t)=>e.render(this.context.renderContext,t))}_forEachRender(e){const t=this.context.renderContext.bind.slot,r=this.context.renderContext.output;this._slots[t].forEach(s=>{const n=s.produces.get(t);if(!n?.(r)||s.isDecoration&&!this.context.renderContext.bind.decorations)return;const i=s.acquireTechniques(this.context.renderContext);i&&e(s,i)})}queryDepthRange(e){return this._renderPlugins.reduce((t,r)=>t.union(r.queryDepthRange?.(e)),new n)}get updating(){return this._version.value>=0&&this._renderPlugins.some(e=>e.readyToRun)}produces(e,...t){return t.some(t=>this._slots[t].some(r=>{const s=r.produces.get(t);return!!s&&s(e)}))}consumes(e){return this._renderPlugins.some(t=>t.consumes().required.includes(e))}hasHighlight(e){return o.some(t=>this._slots[t].some(t=>t.hasHighlight(e)))}get hasDecorations(){return this._renderPlugins.some(e=>e.isDecoration)}get hasOccludees(){return this._renderPlugins.some(e=>e.hasOccludees)}get hasEmitters(){return this._renderPlugins.some(e=>e.hasEmitters)}get renderOccludedFlags(){return this._renderPlugins.reduce((e,t)=>e|(t.renderOccludedFlags??0),0)}get usedMemory(){return this._renderPlugins.reduce((e,t)=>t.material?e:e+(t.usedMemory??0),0)}get test(){}}const o=[2,4,19,14,15];export{i as RenderPluginManager};
+import{removeUnordered as e}from"../../../../core/arrayUtils.js";import"../../../../core/has.js";import{isPromiseLike as t,createAbortError as r}from"../../../../core/promiseUtils.js";import{signal as s}from"../../../../core/signal.js";import{DepthRange as n}from"../lib/DepthRange.js";class i{constructor(e){this.context=e,this._renderPlugins=new Array,this._slots=new Array,this._version=s(0);for(let t=0;t<22;++t)this._slots[t]=[]}destroy(){this._renderPlugins.forEach(e=>e.destroy()),this._renderPlugins.length=0}get plugins(){return this._renderPlugins}add(e,s){const n=()=>{if(s?.aborted)throw e.uninitializeRenderContext(),r();this._renderPlugins.push(e),e.produces.forEach((t,r)=>this._slots[r].push(e)),this.context.requestRender(),this._version.value++},i=e.initializeRenderContext(this.context,s);if(t(i))return i.then(n);n()}remove(t){e(this._renderPlugins,t),t.uninitializeRenderContext();for(let e=0;e<this._slots.length;++e)this._slots[e]=this._slots[e].filter(e=>e!==t);this.context.requestRender(),this._version.value++}sortTestsTransparentOrderedSlots(e){}prepareRender(){this._renderPlugins.forEach(e=>{e.prepareRender&&e.prepareRender(this.context.renderContext)})}updateAnimation(e){let t=!1;return this._renderPlugins.forEach(r=>t=r.updateAnimation?.(e)||t),t}precompile(...e){++this.context.techniques.precompiling;const t=this.context.renderContext.bind.slot;for(const r of e)this.context.renderContext.bind.slot=r,this._forEachRender(()=>{});this.context.renderContext.bind.slot=t,--this.context.techniques.precompiling}render(...e){for(const t of e)this.context.renderContext.bind.slot=t,this._forEachRender((e,t)=>e.render(this.context.renderContext,t))}_forEachRender(e){const t=this.context.renderContext.bind.slot,r=this.context.renderContext.output;this._slots[t].forEach(s=>{const n=s.produces.get(t);if(!n?.(r)||s.isDecoration&&!this.context.renderContext.bind.decorations)return;const i=s.acquireTechniques(this.context.renderContext);i&&e(s,i)})}queryDepthRange(e){return this._renderPlugins.reduce((t,r)=>t.union(r.queryDepthRange?.(e)),new n)}get updating(){return this._version.value>=0&&this._renderPlugins.some(e=>e.readyToRun)}produces(e,...t){return t.some(t=>this._slots[t].some(r=>{const s=r.produces.get(t);return!!s&&s(e)}))}consumes(e){return this._renderPlugins.some(t=>t.consumes().required.includes(e))}hasHighlight(e){return o.some(t=>this._slots[t].some(t=>t.hasHighlight(e)))}get hasDecorations(){return this._renderPlugins.some(e=>e.isDecoration)}get hasOccludees(){return this._renderPlugins.some(e=>e.hasOccludees)}get hasEmitters(){return this._renderPlugins.some(e=>e.hasEmitters)}get renderOccludedFlags(){return this._renderPlugins.reduce((e,t)=>e|(t.renderOccludedFlags??0),0)}get usedMemory(){return this._renderPlugins.reduce((e,t)=>t.material?e:e+(t.usedMemory??0),0)}get test(){}}const o=[2,4,19,14,15];export{i as RenderPluginManager};

package/views/3d/webgl-engine/effects/geometry/RenderOccludedRenderNode.js

@@ -2,4 +2,4 @@
 All material copyright Esri, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/5.0/esri/copyright.txt for details.
 */
-import{__decorate as e}from"tslib";import t from"../../../../../core/PooledArray.js";import{property as r,subclass as s}from"../../../../../core/accessorSupport/decorators.js";import{ZEROS as o}from"../../../../../core/libs/gl-matrix-2/factories/vec4f64.js";import{InternalRenderCategory as n}from"../../../webgl.js";import i from"../../../webgl/RenderNode.js";import{Blit as c}from"../blit/Blit.js";import{DepthStencilAttachment as d}from"../../../../webgl/enums.js";let l=class extends i{constructor(e){super(e),this.consumes={required:[n.OCCLUDED]},this.produces=n.OCCLUDED,this._blit=new c(e.view.stage.renderView.techniques,2)}precompile(){const e=this.view.stage.renderer;e.plugins.plugins.forEach(t=>{e.precompileSlots(t,10,12),t.material&&e.precompileOccludedSlots(t,h)})}render(e){const t=e.find(({name:e})=>e===this.produces);return this._renderOccludedAndTransparentStencil(t),this._renderOccludedComposite(t),t}_renderOccludedAndTransparentStencil(e){const t=this.view.stage.renderer,r=a;r.clear();for(const s of t.plugins.plugins)8&s.renderOccludedFlags&&r.push(s);0!==r.length&&(t.renderSlots(r,11),this._renderAndComposite(e,e.getAttachment(d),.5,()=>t.renderSlots(r,12),!1,!1),r.clear())}_renderOccludedComposite(e){const t=this.view.stage.renderer,r=a;r.clear();let s=0;for(const i of t.plugins.plugins){const e=i.renderOccludedFlags&u;s|=e,e&&r.push(i)}if(!s)return void r.clear();const o=this._getDepthStencilAttachment(e);let n=o.clearStencil;for(const i of h)s&i&&(this._renderAndComposite(e,o.depth,16===i?1:.5,()=>t.renderOccludedSlots(r,i),!0,n),n=!1);o.release(),r.clear()}_renderAndComposite(e,t,r,s,n,i){const c=this.renderingContext,{width:d,height:l}=e.fbo,a=this.fboCache.acquire(d,l,"tmp color");a.attachDepth(t),c.bindFramebuffer(a.fbo),c.clearFramebuffer(o,n,i),s(),a.detachDepth(),this._blit.blend(c,a,e,this.bindParameters,r),a.release()}_getDepthStencilAttachment(e){const{width:t,height:r}=e.fbo;if(!this.view.stage.renderer.occludedRequiresIntegratedMeshStencil){const e=this.fboCache.acquireDepth(14,t,r,"retained stencil");return{depth:e,release:()=>e.release(),clearStencil:!0}}const s=this.fboCache.acquire(t,r,"retained stencil",14);return this.renderingContext.blitFramebuffer(e.fbo,s.fbo,1024),{depth:s.getAttachment(d),release:()=>s.release(),clearStencil:!1}}};e([r()],l.prototype,"consumes",void 0),e([r()],l.prototype,"produces",void 0),l=e([s("esri.views.3d.webgl-engine.effects.geometry.RenderOccludedRenderNode")],l);const a=new t;function p(){a.prune()}const h=[4,2,16],u=h.reduce((e,t)=>e|t,0);export{l as RenderOccludedRenderNode,p as cleanupRenderOccluded};
+import{__decorate as e}from"tslib";import r from"../../../../../core/PooledArray.js";import{property as t,subclass as s}from"../../../../../core/accessorSupport/decorators.js";import{ZEROS as n}from"../../../../../core/libs/gl-matrix-2/factories/vec4f64.js";import{InternalRenderCategory as i}from"../../../webgl.js";import o from"../../../webgl/RenderNode.js";import{Blit as c}from"../blit/Blit.js";import{DepthStencilAttachment as d}from"../../../../webgl/enums.js";let l=class extends o{constructor(e){super(e),this.consumes={required:[i.OCCLUDED]},this.produces=i.OCCLUDED,this._blit=new c(e.view.stage.renderView.techniques,2)}precompile(){const e=this.view.stage.renderer;e.plugins.plugins.forEach(r=>{e.precompileSlots(r,10,12),r.material&&e.precompileOccludedSlots(r,p)})}render(e){const r=e.find(({name:e})=>e===this.produces);return this._renderOccludedAndTransparentStencil(r),this._renderOccludedComposite(r),r}_renderOccludedAndTransparentStencil(e){const r=this.view.stage.renderer,t=a;this._acquirePlugins(t,8),0!==t.length&&(r.renderSlots(t,11),this._renderAndComposite(e,e.getAttachment(d),.5,()=>r.renderSlots(t,12),!1,!1),t.clear())}_renderOccludedComposite(e){const r=this.view.stage.renderer,t=a,s=this._acquirePlugins(t,u);if(0===t.length)return;const n=this._getDepthStencilAttachment(e);let i=n.clearStencil;for(const o of p)s&o&&(this._renderAndComposite(e,n.depth,16===o?1:.5,()=>r.renderOccludedSlots(t,o),!0,i),i=!1);n.release(),t.clear()}_acquirePlugins(e,r){const t=this.view.stage.renderer;e.clear();let s=0,n=!1;for(const i of t.plugins.plugins){const t=i.renderOccludedFlags&r;s|=t,t&&(e.push(i),n||=0!==i.testsTransparentRenderOrder)}return n&&e.sort((e,r)=>e.testsTransparentRenderOrder-r.testsTransparentRenderOrder),s}_renderAndComposite(e,r,t,s,i,o){const c=this.renderingContext,{width:d,height:l}=e.fbo,a=this.fboCache.acquire(d,l,"tmp color");a.attachDepth(r),c.bindFramebuffer(a.fbo),c.clearFramebuffer(n,i,o),s(),a.detachDepth(),this._blit.blend(c,a,e,this.bindParameters,t),a.release()}_getDepthStencilAttachment(e){const{width:r,height:t}=e.fbo;if(!this.view.stage.renderer.occludedRequiresIntegratedMeshStencil){const e=this.fboCache.acquireDepth(14,r,t,"retained stencil");return{depth:e,release:()=>e.release(),clearStencil:!0}}const s=this.fboCache.acquire(r,t,"retained stencil",14);return this.renderingContext.blitFramebuffer(e.fbo,s.fbo,1024),{depth:s.getAttachment(d),release:()=>s.release(),clearStencil:!1}}};e([t()],l.prototype,"consumes",void 0),e([t()],l.prototype,"produces",void 0),l=e([s("esri.views.3d.webgl-engine.effects.geometry.RenderOccludedRenderNode")],l);const a=new r;function h(){a.prune()}const p=[4,2,16],u=p.reduce((e,r)=>e|r,0);export{l as RenderOccludedRenderNode,h as cleanupRenderOccluded};

package/views/3d/webgl-engine/lib/Material.js

@@ -2,4 +2,4 @@
 All material copyright Esri, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/5.0/esri/copyright.txt for details.
 */
-import{generateUID as r}from"../../../../core/uid.js";import{isColor as e}from"../core/shaderLibrary/ShaderOutput.js";import{DefaultTechniqueConfiguration as t}from"../materials/DefaultTechniqueConfiguration.js";import{updateParameters as i}from"../materials/internal/MaterialUtil.js";import{NoParameters as s}from"../../../webgl/NoParameters.js";class a{constructor(e,t){this.id=r(),this.supportsEdges=!1,this._renderPriority=0,this._parameters=new t,i(this._parameters,e),this.validateParameters(this._parameters)}get parameters(){return this._parameters}update(r){return!1}setParameters(r,e=!0){i(this._parameters,r)&&(this.validateParameters(this._parameters),e&&this._parametersChanged())}validateParameters(r){}shouldRender(r){return this.visible&&this.isVisibleForOutput(r.output)&&(!this.parameters.isDecoration||r.bind.decorations)&&0!==(this.parameters.renderOccluded&r.renderOccludedMask)}isVisibleForOutput(r){return!0}get renderPriority(){return this._renderPriority}set renderPriority(r){r!==this._renderPriority&&(this._renderPriority=r,this._parametersChanged())}_parametersChanged(){this.repository?.materialChanged(this)}get renderOccludedFlags(){return this.visible?this.parameters.renderOccluded:0}get hasEmissions(){return!1}getConfiguration(r,i,s=new t){return s.output=r,s.hasEmission=i.hasEmission&&e(r),s.hasHighlightMixTexture=8===r&&null!=i.highlightMixTexture,s}}class o extends s{constructor(){super(...arguments),this.renderOccluded=1,this.isDecoration=!1}}export{a as Material,o as MaterialParameters};
+import{generateUID as r}from"../../../../core/uid.js";import{isColor as e}from"../core/shaderLibrary/ShaderOutput.js";import{DefaultTechniqueConfiguration as t}from"../materials/DefaultTechniqueConfiguration.js";import{updateParameters as s}from"../materials/internal/MaterialUtil.js";import{NoParameters as i}from"../../../webgl/NoParameters.js";class a{constructor(e,t){this.id=r(),this.supportsEdges=!1,this._renderPriority=0,this._parameters=new t,s(this._parameters,e),this.validateParameters(this._parameters)}get parameters(){return this._parameters}update(r){return!1}setParameters(r,e=!0){s(this._parameters,r)&&(this.validateParameters(this._parameters),e&&this._parametersChanged())}validateParameters(r){}shouldRender(r){return this.visible&&this.isVisibleForOutput(r.output)&&(!this.parameters.isDecoration||r.bind.decorations)&&0!==(this.parameters.renderOccluded&r.renderOccludedMask)}isVisibleForOutput(r){return!0}get renderPriority(){return this._renderPriority}set renderPriority(r){r!==this._renderPriority&&(this._renderPriority=r,this._parametersChanged())}_parametersChanged(){this.repository?.materialChanged(this)}get renderOccludedFlags(){return this.visible?this.parameters.renderOccluded:0}get testsTransparentRenderOrder(){return this.parameters.testsTransparentRenderOrder}get hasEmissions(){return!1}getConfiguration(r,s,i=new t){return i.output=r,i.hasEmission=s.hasEmission&&e(r),i.hasHighlightMixTexture=8===r&&null!=s.highlightMixTexture,i}}class n extends i{constructor(){super(...arguments),this.renderOccluded=1,this.testsTransparentRenderOrder=0,this.isDecoration=!1}}export{a as Material,n as MaterialParameters};