@arcgis/core 6.0.0-next.1 → 6.0.0-next.10

package/assets/esri/widgets/BatchAttributeForm/t9n/messages.en.json

@@ -1 +1 @@
-{"attachments":{"addFile":"Add file","attachmentNumberedLabel":"Attachment {index}","attach":"Attach","attachmentEditingDisabled":"Attachment editing is disabled.","attachmentLimitExceeded":"Attachment limit exceeded","attachmentLimitReached":"Attachment limit reached","attachmentMustBeShorterThan":"Attachment must be shorter than {maxDuration}","attachmentsMustBeShorterThan":"Attachments must be shorter than {maxDuration}","attachmentMustBeSmallerThan":"Attachment must be smaller than {maxSize}","attachmentsMustBeSmallerThan":"Attachments must be smaller than {maxSize}","durationInSecond":"{count} second","durationInSeconds":"{count} seconds","capture":"Capture","captureMethodNotSupported":"Capture method is not supported","captureUnsupportedAdd":"Capture is not supported on this device.","captureUnsupportedDetail":"Capture is not supported on this device.","chooseFile":"Choose file","count":"Count: {count}","deleted":"Deleted","download":"Download","dragAndDropFile":"Drag and drop file.","fileExceedsMaximumSize":"File exceeds the maximum size","fileName":"File name","fileSelected":"File selected","fileToBeReplaced":"File to be replaced","imageResizedToMeetRequirements":"Image has been resized to meet requirements","maximumAudioLength":"Max audio length: {maxDuration}","maximumFileSize":"Maximum file size: {maxSize}","maximumNumberOfFiles":"Maximum number of files: {count}","maximumVideoLength":"Max video length: {maxDuration}","maximize":"Maximize","maximumNumberReachedRemoveToContinue":"Maximum number reached. Remove attachments to continue.","maxAttachmentsShort":"Max: {count}","maxAttachments":"Maximum attachments: {count}","minimumNotMet":"Minimum attachment requirement not met","minimumNumberOfFiles":"Minimum number of files: {count}","minAttachmentsShort":"Min: {count}","minAttachments":"Minimum attachments: {count}","noAttachments":"No attachments","noPreviewAvailable":"No preview available","remove":"Remove","replace":"Replace","recordAudio":"Record audio","takePhoto":"Take photo","takeVideo":"Take video","searchAttachments":"Search attachments","replaceFile":"Replace file","selectFile":"Select file","size":"Size","type":"Type","unableToAddAttachment":"Unable to add attachment","unableToAddAttachments":"Unable to add attachments","unsupportedDevice":"Unsupported device","unsupportedDeviceCaptureMessage":"This device does not support the required capture method.","viewAll":"View all","youCanAddUpToOneAttachment":"You can add up to 1 attachment","youCanAddUpToAttachments":"You can add up to {count} attachments"},"addFeature":"Add feature","addRecord":"Add record","unsupportedDomainGroupTitle":"Unsupported values","differentValues":"Different values","differentValuesPlaceholder":"(Different values)","empty":"No value","noDynamicChoices":"No choices are available","noDynamicChoicesWithNoValue":"No other choices are available","otherOptionLabel":"Other","expressionEvaluationFailed":"Form failed to run calculations","failedToCalculateValues":"Failed to calculate values","footerButtons":{"add":"Add","delete":"Delete","discard":"Discard","done":"Done","replace":"Replace","reset":"Reset","update":"Update"},"footerNotices":{"deleteDisabledMinimumAttachments":"Delete disabled. This feature requires a minimum number of attachments."},"formFailedToLoad":"Form failed to load.","formFailedToLoadTooManyComplexFeatures":"This form uses functions that limit attribute editing to {num} features.","formFailedToLoadTooManyFeatures":"Select up to {num} features to edit attributes.","noVisibleFields":{"allElementsHidden":"The selected features have no fields to display","elementsHiddenInSome":"The selected features have shared fields that are not displayed because of visibility expressions","noElements":"The selected feature has no fields to display","noElementsInCommon":"The selected features have no shared fields"},"other":"Other","recommended":"Recommended","relatedRecords":{"noOriginKeyFeature":"A feature cannot be added to '{relatedLayerName}' until the '{originKeyField}' has been entered.","noOriginKeyRecord":"A record cannot be added to '{relatedLayerName}' until the '{originKeyField}' has been entered.","noRecordsFound":"No records were found.","noRelatedRecordsFound":"No related records were found.","relatedRecordsTitle":"Related records","untitledLayer":"Untitled layer"},"requiredFieldBatchMode":"This field is required for one or more features.","requiredFieldLabel":"{name} - required field","deselectAllLabel":"Deselect all","selectAllLabel":"Select all","showAll":"Show all","showAllOptions":"Show all options","titles":{"addAttachments":"Add attachments","attachments":"Attachments","editFeature":"Edit feature","editFeatures":"Edit features","editAttachment":"Edit attachment","replaceAttachment":"Replace attachment"},"totalCount":"Total: {count}","unsupported":"Unsupported","unsupportedContingentValues":"Editing attributes for multiple features is not available for layers with contingent values.","validationErrors":{"cannotBeNull":"Field is required.","invalidCodedValue":"Value should be one of the listed values.","invalidType":"Not a valid value","invalidBatchFormType":"One or more features contain invalid values. Check individual features.","featuresInError":"One or more features have errors. Check individual features.","featuresWithInvalidValues":"One or more features have invalid values","nonVisibleError_changeValues":"The selected feature has hidden fields with invalid values. Change the values so that fields are visible.","nonVisibleError_checkIndividualFeatures":"One or more features have hidden fields with invalid values. Check individual features and correct the issues.","outsideRange":"Value should be between {min} and {max}","outsideRangeMax":"Value should be less than or equal to {max}","outsideRangeMin":"Value should be greater than or equal to {min}","tooFewSelectedChoices":"Select at least {min} of the options","tooManySelectedChoices":"Select no more than {max} of the options","tooShort":"This field requires a minimum of {min} characters","valuesIncompatible":"Value is incompatible with other selected values"},"valueExpressionError":"Failed to calculate value","viewAll":"View all","subtypes":{"changeWarning":"The subtype {newType} may have different default values from {originalType}. Keeping the current values may cause unexpected results.","changeWarningTitle":"Subtype changed","useDefaultValuesOption":"Use default values","keepCurrentValuesOption":"Keep current values","unsupportedDomainGroupTitle":"Unsupported","fieldOutOfSubtypeDomainWarning":"This field's value is out of range for its domain."}}
+{"attachments":{"addFile":"Add file","attachmentNumberedLabel":"Attachment {index}","attach":"Attach","attachmentEditingDisabled":"Attachment editing is disabled.","attachmentLimitExceeded":"Attachment limit exceeded","attachmentLimitReached":"Attachment limit reached","attachmentMustBeShorterThan":"Attachment must be shorter than {maxDuration}","attachmentsMustBeShorterThan":"Attachments must be shorter than {maxDuration}","attachmentMustBeSmallerThan":"Attachment must be smaller than {maxSize}","attachmentsMustBeSmallerThan":"Attachments must be smaller than {maxSize}","durationInSecond":"{count} second","durationInSeconds":"{count} seconds","capture":"Capture","captureMethodNotSupported":"Capture method is not supported","captureUnsupportedAdd":"Capture is not supported on this device.","captureUnsupportedDetail":"Capture is not supported on this device.","chooseFile":"Choose file","count":"Count: {count}","deleted":"Deleted","download":"Download","dragAndDropFile":"Drag and drop file.","fileExceedsMaximumSize":"File exceeds the maximum size","fileName":"File name","fileSelected":"File selected","fileToBeReplaced":"File to be replaced","imageResizedToMeetRequirements":"Image has been resized to meet requirements","maximumAudioLength":"Max audio length: {maxDuration}","maximumFileSize":"Maximum file size: {maxSize}","maximumNumberOfFiles":"Maximum number of files: {count}","maximumVideoLength":"Max video length: {maxDuration}","maximize":"Maximize","maximumNumberReachedRemoveToContinue":"Maximum number reached. Remove attachments to continue.","maxAttachmentsShort":"Max: {count}","maxAttachments":"Maximum attachments: {count}","minimumNotMet":"Minimum attachment requirement not met","minimumNumberOfFiles":"Minimum number of files: {count}","minAttachmentsShort":"Min: {count}","minAttachments":"Minimum attachments: {count}","noAttachments":"No attachments","noPreviewAvailable":"No preview available","remove":"Remove","replace":"Replace","recordAudio":"Record audio","takePhoto":"Take photo","takeVideo":"Take video","searchAttachments":"Search attachments","replaceFile":"Replace file","selectFile":"Select file","size":"Size","type":"Type","unableToAddAttachment":"Unable to add attachment","unableToAddAttachments":"Unable to add attachments","unsupportedDevice":"Unsupported device","unsupportedDeviceCaptureMessage":"This device does not support the required capture method.","viewAll":"View all","youCanAddUpToOneAttachment":"You can add up to 1 attachment","youCanAddUpToAttachments":"You can add up to {count} attachments"},"addFeature":"Add feature","addRecord":"Add record","unsupportedDomainGroupTitle":"Unsupported values","differentValues":"Different values","differentValuesPlaceholder":"(Different values)","empty":"No value","noDynamicChoices":"No choices are available","noDynamicChoicesWithNoValue":"No other choices are available","otherOptionLabel":"Other","expressionEvaluationFailed":"Form failed to run calculations","failedToCalculateValues":"Failed to calculate values","footerButtons":{"add":"Add","delete":"Delete","discard":"Discard","done":"Done","replace":"Replace","reset":"Reset","update":"Update"},"footerNotices":{"deleteDisabledMinimumAttachments":"Delete disabled. This feature requires a minimum number of attachments."},"formFailedToLoad":"Form failed to load.","formFailedToLoadTooManyComplexFeatures":"This form uses functions that limit attribute editing to {num} features.","formFailedToLoadTooManyFeatures":"Select up to {num} features to edit attributes.","noVisibleFields":{"allElementsHidden":"The selected features have no fields to display","elementsHiddenInSome":"The selected features have shared fields that are not displayed because of visibility expressions","noElements":"The selected feature has no fields to display","noElementsInCommon":"The selected features have no shared fields"},"other":"Other","recommended":"Recommended","relatedRecords":{"noOriginKeyFeature":"A feature cannot be added to '{relatedLayerName}' until the '{originKeyField}' has been entered.","noOriginKeyRecord":"A record cannot be added to '{relatedLayerName}' until the '{originKeyField}' has been entered.","noRecordsFound":"No records were found.","noRelatedRecordsFound":"No related records were found.","relatedRecordsTitle":"Related records","untitledLayer":"Untitled layer"},"requiredFieldBatchMode":"This field is required for one or more features.","requiredFieldLabel":"{name} - required field","deselectAllLabel":"Deselect all","selectAllLabel":"Select all","showAll":"Show all","showAllOptions":"Show all options","titles":{"addAttachments":"Add attachments","attachments":"Attachments","editFeature":"Edit feature","editFeatures":"Edit features","editAttachment":"Edit attachment","replaceAttachment":"Replace attachment"},"totalCount":"Total: {count}","unsupported":"Unsupported","unsupportedContingentValues":"Editing attributes for multiple features is not available for layers with contingent values.","validationErrors":{"cannotBeNull":"Field is required.","invalidCodedValue":"Value should be one of the listed values.","invalidType":"Not a valid value","invalidBatchFormType":"One or more features contain invalid values. Check individual features.","featuresInError":"One or more features have errors. Check individual features.","featuresWithInvalidValues":"One or more features have invalid values","nonVisibleError_changeValues":"The selected feature has hidden fields with invalid values. Change the values so that fields are visible.","nonVisibleError_checkIndividualFeatures":"One or more features have hidden fields with invalid values. Check individual features and correct the issues.","outsideRange":"Value should be between {min} and {max}","outsideRangeMax":"Value should be less than or equal to {max}","outsideRangeMin":"Value should be greater than or equal to {min}","tooFewSelectedChoices":"Minimum selections required: {min}","tooManySelectedChoices":"Maximum selections allowed: {max}","tooShort":"This field requires a minimum of {min} characters","valuesIncompatible":"Value is incompatible with other selected values"},"valueExpressionError":"Failed to calculate value","viewAll":"View all","subtypes":{"changeWarning":"The subtype {newType} may have different default values from {originalType}. Keeping the current values may cause unexpected results.","changeWarningTitle":"Subtype changed","useDefaultValuesOption":"Use default values","keepCurrentValuesOption":"Keep current values","unsupportedDomainGroupTitle":"Unsupported","fieldOutOfSubtypeDomainWarning":"This field's value is out of range for its domain."}}

package/{basemaps/BasemapCollection.d.ts → basemapGallery/BasemapGalleryModel.d.ts}

@@ -14,7 +14,7 @@ import type { AbortOptions } from "../core/promiseUtils.js";
 import type { MapViewOrSceneView } from "../views/MapViewOrSceneView.js";
 
 /** @since 5.2 */
-export interface BasemapCollectionProperties extends LoadableMixinProperties, Partial<Pick<BasemapCollection, "view">> {
+export interface BasemapGalleryModelProperties extends LoadableMixinProperties, Partial<Pick<BasemapGalleryModel, "view">> {
   /**
    * The map's [Map.basemap](https://developers.arcgis.com/javascript/latest/references/core/Map/#basemap).
    *
@@ -31,7 +31,7 @@ export interface BasemapCollectionProperties extends LoadableMixinProperties, Pa
   /**
    * The source for basemaps that the gallery will display.
    * This property can be autocast with an array or [Collection](https://developers.arcgis.com/javascript/latest/references/core/core/Collection/) of [Basemap](https://developers.arcgis.com/javascript/latest/references/core/Basemap/)s, or
-   * a [Portal](https://developers.arcgis.com/javascript/latest/references/core/portal/Portal/) instance. The default source is a [PortalBasemapsSource](https://developers.arcgis.com/javascript/latest/references/core/basemaps/PortalBasemapsSource/).
+   * a [Portal](https://developers.arcgis.com/javascript/latest/references/core/portal/Portal/) instance. The default source is a [PortalBasemapsSource](https://developers.arcgis.com/javascript/latest/references/core/basemapGallery/PortalBasemapsSource/).
    *
    * @since 5.2
    */
@@ -42,12 +42,12 @@ export interface BasemapCollectionProperties extends LoadableMixinProperties, Pa
  * Provides the logic for displaying and selecting a collection of basemaps.
  *
  * @since 5.2
- * @see [LocalBasemapsSource](https://developers.arcgis.com/javascript/latest/references/core/basemaps/LocalBasemapsSource/)
- * @see [PortalBasemapsSource](https://developers.arcgis.com/javascript/latest/references/core/basemaps/PortalBasemapsSource/)
+ * @see [LocalBasemapsSource](https://developers.arcgis.com/javascript/latest/references/core/basemapGallery/LocalBasemapsSource/)
+ * @see [PortalBasemapsSource](https://developers.arcgis.com/javascript/latest/references/core/basemapGallery/PortalBasemapsSource/)
  */
-export default class BasemapCollection extends Loadable {
+export default class BasemapGalleryModel extends Loadable {
   /** @since 5.2 */
-  constructor(properties?: BasemapCollectionProperties);
+  constructor(properties?: BasemapGalleryModelProperties);
   /**
    * The map's [Map.basemap](https://developers.arcgis.com/javascript/latest/references/core/Map/#basemap).
    *
@@ -93,7 +93,7 @@ export default class BasemapCollection extends Loadable {
   /**
    * The source for basemaps that the gallery will display.
    * This property can be autocast with an array or [Collection](https://developers.arcgis.com/javascript/latest/references/core/core/Collection/) of [Basemap](https://developers.arcgis.com/javascript/latest/references/core/Basemap/)s, or
-   * a [Portal](https://developers.arcgis.com/javascript/latest/references/core/portal/Portal/) instance. The default source is a [PortalBasemapsSource](https://developers.arcgis.com/javascript/latest/references/core/basemaps/PortalBasemapsSource/).
+   * a [Portal](https://developers.arcgis.com/javascript/latest/references/core/portal/Portal/) instance. The default source is a [PortalBasemapsSource](https://developers.arcgis.com/javascript/latest/references/core/basemapGallery/PortalBasemapsSource/).
    *
    * @since 5.2
    */
@@ -131,7 +131,7 @@ export default class BasemapCollection extends Loadable {
   /**
    * Loads the current basemap source.
    *
-   * Unlike [load()](https://developers.arcgis.com/javascript/latest/references/core/basemaps/BasemapCollection/#load), this method can be called again after the source changes.
+   * Unlike [load()](https://developers.arcgis.com/javascript/latest/references/core/basemapGallery/BasemapGalleryModel/#load), this method can be called again after the source changes.
    *
    * @param options - Options for aborting the load.
    * @returns A promise that resolves with this collection when the source has loaded.

package/{basemaps/BasemapCollection.js → basemapGallery/BasemapGalleryModel.js}

@@ -1,2 +1,2 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{__decorate as e}from"tslib";import t from"./LocalBasemapsSource.js";import n from"./PortalBasemapsSource.js";import{default3DCompatibility as r,default2DCompatibility as i}from"./support/basemapCompatibilityUtils.js";import a from"./support/BasemapItem.js";import o from"../core/Collection.js";import{Loadable as s,isLoadable as c}from"../core/Loadable.js";import{watch as l,on as u,when as d}from"../core/reactiveUtils.js";import{property as f,subclass as p}from"../core/accessorSupport/decorators.js";import{canProjectWithoutEngine as m,isLoaded as h,load as g}from"../geometry/projectionUtils.js";import{equals as _}from"../geometry/support/spatialReferenceUtils.js";import{basemapEnsureType as v}from"../support/basemapEnsureType.js";import{contentEquals as y}from"../support/basemapUtils.js";import{isBasemapsSource as b}from"../support/userTypeGuards/isBasemapsSource.js";const x=o.ofType(a);function S(e){return e&&e.declaredClass===`esri.portal.Portal`}function C(e){return e&&!(e instanceof n)&&(!!e.portal||!!e.query)}let w=class extends s{constructor(e){super(e),this._loadingProjectionEngine=!1,this.items=new x,this.view=null,this.source=new n}initialize(){let e=()=>this._recreateItems();this.addHandles([l(()=>[this.view,this.compatibilityFunction],()=>this._updateItems()),u(()=>this.source?.basemaps,`change`,e,{onListenerAdd:e}),d(()=>this.view,()=>{this.source instanceof n&&(this.source.viewType=this.view?.type)},{once:!0})])}destroy(){let e=this.source.basemaps.indexOf(this.activeBasemap);this.source.basemaps.removeAt(e),this.source?.destroy()}get activeBasemap(){return this.view?.map?.basemap??null}set activeBasemap(e){let t=this.view;if(!t?.map)return;if(e=v(e),!e||!t.ready){t.map.basemap=e,this._clearOverride(`activeBasemap`);return}let n=e.spatialReference||this.items?.find(t=>this.basemapEquals(e,t.basemap))?.spatialReference;if(n&&`spatialReferenceLocked`in t&&!t.spatialReferenceLocked){let r=t.spatialReference;if(n!=null&&!_(r,n)&&!m(t.spatialReference,n)&&!h()){this._override(`activeBasemap`,e),this._loadingProjectionEngine=!0,g().then(()=>{this._get(`activeBasemap`)===e&&(t.map.basemap=e,t.spatialReference=n,this._clearOverride(`activeBasemap`))},()=>{}).finally(()=>{this._loadingProjectionEngine=!1});return}t.map.basemap=e,this._clearOverride(`activeBasemap`),n!=null&&!_(t.spatialReference,n)&&(t.spatialReference=n)}else t.map.basemap=e,this._clearOverride(`activeBasemap`)}get activeBasemapIndex(){return this._findBasemapIndex(this.activeBasemap)}get compatibilityFunction(){return this.view?.type===`3d`?r:i}set compatibilityFunction(e){this._overrideIfSome(`compatibilityFunction`,e)}get source(){return this._get(`source`)}set source(e){(Array.isArray(e)||o.isCollection(e))&&(e=new t({basemaps:Array.isArray(e)?new o(e):e})),S(e)&&(e=new n({portal:e})),C(e)&&(e=new n(e)),b(e)||(e=null),this._set(`source`,e)}get loading(){return this.items.some(e=>e.state===`loading`)}get projectionEngineLoading(){return this._loadingProjectionEngine}basemapEquals(e,t){return y(e,t)}refresh(){this._recreateItems()}load(){return this.loadSource()}loadSource(e){return this.addResolvingPromise(c(this.source)?this.source.load(e):null),Promise.resolve(this)}_findBasemapIndex(e){let{items:t}=this,n=t.findIndex(t=>t.basemap===e);return n===-1?t.findIndex(t=>this.basemapEquals(t.basemap,e)):n}_recreateItems(){let e=this.source?.basemaps??[],{view:t,compatibilityFunction:n}=this,r=new Map(this.items.map(e=>[e.basemap,e])),i=e.map(e=>{let i=r.get(e);return i?(r.delete(e),i):new a({basemap:e,compatibilityFunction:n,view:t})});this.items.removeAll(),this.items.addMany(i),r.forEach(e=>e.destroy())}_updateItems(){for(let e of this.items)e.compatibilityFunction=this.compatibilityFunction,e.view=this.view}};e([f()],w.prototype,`_loadingProjectionEngine`,void 0),e([f()],w.prototype,`activeBasemap`,null),e([f({readOnly:!0})],w.prototype,`activeBasemapIndex`,null),e([f()],w.prototype,`compatibilityFunction`,null),e([f({readOnly:!0,type:x})],w.prototype,`items`,void 0),e([f()],w.prototype,`source`,null),e([f({readOnly:!0})],w.prototype,`loading`,null),e([f({readOnly:!0})],w.prototype,`projectionEngineLoading`,null),e([f()],w.prototype,`view`,void 0),w=e([p(`esri.basemaps.BasemapCollection`)],w);const T=w;export{T as default};
+import{__decorate as e}from"tslib";import t from"./LocalBasemapsSource.js";import n from"./PortalBasemapsSource.js";import{default3DCompatibility as r,default2DCompatibility as i}from"./support/basemapCompatibilityUtils.js";import a from"./support/BasemapItem.js";import o from"../core/Collection.js";import{Loadable as s,isLoadable as c}from"../core/Loadable.js";import{watch as l,on as u,when as d}from"../core/reactiveUtils.js";import{property as f,subclass as p}from"../core/accessorSupport/decorators.js";import{canProjectWithoutEngine as m,isLoaded as h,load as g}from"../geometry/projectionUtils.js";import{equals as _}from"../geometry/support/spatialReferenceUtils.js";import{basemapEnsureType as v}from"../support/basemapEnsureType.js";import{contentEquals as y}from"../support/basemapUtils.js";import{isBasemapsSource as b}from"../support/userTypeGuards/isBasemapsSource.js";const x=o.ofType(a);function S(e){return e&&e.declaredClass===`esri.portal.Portal`}function C(e){return e&&!(e instanceof n)&&(!!e.portal||!!e.query)}let w=class extends s{constructor(e){super(e),this._loadingProjectionEngine=!1,this.items=new x,this.view=null,this.source=new n}initialize(){let e=()=>this._recreateItems();this.addHandles([l(()=>[this.view,this.compatibilityFunction],()=>this._updateItems()),u(()=>this.source?.basemaps,`change`,e,{onListenerAdd:e}),d(()=>this.view,()=>{this.source instanceof n&&(this.source.viewType=this.view?.type)},{once:!0})])}destroy(){let e=this.source.basemaps.indexOf(this.activeBasemap);this.source.basemaps.removeAt(e),this.source?.destroy()}get activeBasemap(){return this.view?.map?.basemap??null}set activeBasemap(e){let t=this.view;if(!t?.map)return;if(e=v(e),!e||!t.ready){t.map.basemap=e,this._clearOverride(`activeBasemap`);return}let n=e.spatialReference||this.items?.find(t=>this.basemapEquals(e,t.basemap))?.spatialReference;if(n&&`spatialReferenceLocked`in t&&!t.spatialReferenceLocked){let r=t.spatialReference;if(n!=null&&!_(r,n)&&!m(t.spatialReference,n)&&!h()){this._override(`activeBasemap`,e),this._loadingProjectionEngine=!0,g().then(()=>{this._get(`activeBasemap`)===e&&(t.map.basemap=e,t.spatialReference=n,this._clearOverride(`activeBasemap`))},()=>{}).finally(()=>{this._loadingProjectionEngine=!1});return}t.map.basemap=e,this._clearOverride(`activeBasemap`),n!=null&&!_(t.spatialReference,n)&&(t.spatialReference=n)}else t.map.basemap=e,this._clearOverride(`activeBasemap`)}get activeBasemapIndex(){return this._findBasemapIndex(this.activeBasemap)}get compatibilityFunction(){return this.view?.type===`3d`?r:i}set compatibilityFunction(e){this._overrideIfSome(`compatibilityFunction`,e)}get source(){return this._get(`source`)}set source(e){(Array.isArray(e)||o.isCollection(e))&&(e=new t({basemaps:Array.isArray(e)?new o(e):e})),S(e)&&(e=new n({portal:e})),C(e)&&(e=new n(e)),b(e)||(e=null),this._set(`source`,e)}get loading(){return this.items.some(e=>e.state===`loading`)}get projectionEngineLoading(){return this._loadingProjectionEngine}basemapEquals(e,t){return y(e,t)}refresh(){this._recreateItems()}load(){return this.loadSource()}loadSource(e){return this.addResolvingPromise(c(this.source)?this.source.load(e):null),Promise.resolve(this)}_findBasemapIndex(e){let{items:t}=this,n=t.findIndex(t=>t.basemap===e);return n===-1?t.findIndex(t=>this.basemapEquals(t.basemap,e)):n}_recreateItems(){let e=this.source?.basemaps??[],{view:t,compatibilityFunction:n}=this,r=new Map(this.items.map(e=>[e.basemap,e])),i=e.map(e=>{let i=r.get(e);return i?(r.delete(e),i):new a({basemap:e,compatibilityFunction:n,view:t})});this.items.removeAll(),this.items.addMany(i),r.forEach(e=>e.destroy())}_updateItems(){for(let e of this.items)e.compatibilityFunction=this.compatibilityFunction,e.view=this.view}};e([f()],w.prototype,`_loadingProjectionEngine`,void 0),e([f()],w.prototype,`activeBasemap`,null),e([f({readOnly:!0})],w.prototype,`activeBasemapIndex`,null),e([f()],w.prototype,`compatibilityFunction`,null),e([f({readOnly:!0,type:x})],w.prototype,`items`,void 0),e([f()],w.prototype,`source`,null),e([f({readOnly:!0})],w.prototype,`loading`,null),e([f({readOnly:!0})],w.prototype,`projectionEngineLoading`,null),e([f()],w.prototype,`view`,void 0),w=e([p(`esri.basemapGallery.BasemapGalleryModel`)],w);const T=w;export{T as default};

package/{basemaps → basemapGallery}/BasemapsSource.d.ts

@@ -4,7 +4,7 @@ import type Collection from "../core/Collection.js";
 import type { BasemapsSourceState } from "./types.js";
 
 /**
- * Properties for constructing a [BasemapsSource](https://developers.arcgis.com/javascript/latest/references/core/basemaps/BasemapsSource/).
+ * Properties for constructing a [BasemapsSource](https://developers.arcgis.com/javascript/latest/references/core/basemapGallery/BasemapsSource/).
  *
  * @since 5.2
  */

package/{basemaps → basemapGallery}/BasemapsSource.js

@@ -1,2 +1,2 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{__decorate as e}from"tslib";import t from"../core/Accessor.js";import{subclass as n}from"../core/accessorSupport/decorators.js";import{BasemapsSourceSymbol as r}from"../support/userTypeGuards/isBasemapsSource.js";var i;let a=class extends t{static{i=r}constructor(e){super(e),this[i]=!0}};a=e([n(`esri.basemaps.BasemapsSource`)],a);const o=a;export{o as default};
+import{__decorate as e}from"tslib";import t from"../core/Accessor.js";import{subclass as n}from"../core/accessorSupport/decorators.js";import{BasemapsSourceSymbol as r}from"../support/userTypeGuards/isBasemapsSource.js";var i;let a=class extends t{static{i=r}constructor(e){super(e),this[i]=!0}};a=e([n(`esri.basemapGallery.BasemapsSource`)],a);const o=a;export{o as default};

package/{basemaps → basemapGallery}/LocalBasemapsSource.d.ts

@@ -17,10 +17,10 @@ export interface LocalBasemapsSourceProperties extends BasemapsSourceProperties
 }
 
 /**
- * A collection-driven source for [Basemap](https://developers.arcgis.com/javascript/latest/references/core/Basemap/)s in a [BasemapCollection](https://developers.arcgis.com/javascript/latest/references/core/basemaps/BasemapCollection/).
+ * A collection-driven source for [Basemap](https://developers.arcgis.com/javascript/latest/references/core/Basemap/)s in a [BasemapGalleryModel](https://developers.arcgis.com/javascript/latest/references/core/basemapGallery/BasemapGalleryModel/).
  *
  * @since 5.2
- * @see [BasemapCollection.source](https://developers.arcgis.com/javascript/latest/references/core/basemaps/BasemapCollection/#source)
+ * @see [BasemapGalleryModel.source](https://developers.arcgis.com/javascript/latest/references/core/basemapGallery/BasemapGalleryModel/#source)
  */
 export default class LocalBasemapsSource extends BasemapsSource {
   /** @since 5.2 */

package/{basemaps → basemapGallery}/LocalBasemapsSource.js

@@ -1,2 +1,2 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{__decorate as e}from"tslib";import t from"../Basemap.js";import n from"./BasemapsSource.js";import r from"../core/Collection.js";import{property as i,subclass as a}from"../core/accessorSupport/decorators.js";const o=r.ofType(t);let s=class extends n{constructor(e){super(e),this.basemaps=new o}destroy(){this.basemaps.forEach(e=>e.destroy())}get state(){return`ready`}refresh(){}};e([i({type:o})],s.prototype,`basemaps`,void 0),e([i({readOnly:!0})],s.prototype,`state`,null),s=e([a(`esri.basemaps.LocalBasemapsSource`)],s);const c=s;export{c as default};
+import{__decorate as e}from"tslib";import t from"../Basemap.js";import n from"./BasemapsSource.js";import r from"../core/Collection.js";import{property as i,subclass as a}from"../core/accessorSupport/decorators.js";const o=r.ofType(t);let s=class extends n{constructor(e){super(e),this.basemaps=new o}destroy(){this.basemaps.forEach(e=>e.destroy())}get state(){return`ready`}refresh(){}};e([i({type:o})],s.prototype,`basemaps`,void 0),e([i({readOnly:!0})],s.prototype,`state`,null),s=e([a(`esri.basemapGallery.LocalBasemapsSource`)],s);const c=s;export{c as default};

package/{basemaps → basemapGallery}/PortalBasemapsSource.d.ts

@@ -20,10 +20,10 @@ export interface PortalBasemapsSourceProperties extends LocalBasemapsSourcePrope
 }
 
 /**
- * A Portal-driven source for [Basemap](https://developers.arcgis.com/javascript/latest/references/core/Basemap/)s in a [BasemapCollection](https://developers.arcgis.com/javascript/latest/references/core/basemaps/BasemapCollection/).
+ * A Portal-driven source for [Basemap](https://developers.arcgis.com/javascript/latest/references/core/Basemap/)s in a [BasemapGalleryModel](https://developers.arcgis.com/javascript/latest/references/core/basemapGallery/BasemapGalleryModel/).
  *
  * @since 5.2
- * @see [BasemapCollection.source](https://developers.arcgis.com/javascript/latest/references/core/basemaps/BasemapCollection/#source)
+ * @see [BasemapGalleryModel.source](https://developers.arcgis.com/javascript/latest/references/core/basemapGallery/BasemapGalleryModel/#source)
  */
 export default class PortalBasemapsSource extends PortalBasemapsSourceSuperclass {
   /** @since 5.2 */

package/{basemaps → basemapGallery}/PortalBasemapsSource.js

@@ -1,2 +1,2 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{__decorate as e}from"tslib";import t from"../Basemap.js";import n from"./LocalBasemapsSource.js";import{createTask as r}from"../core/asyncUtils.js";import i from"../core/Collection.js";import a from"../core/Error.js";import{LoadableMixin as o}from"../core/Loadable.js";import s from"../core/Logger.js";import{EsriPromiseMixin as c}from"../core/Promise.js";import{ignoreAbortErrors as l,throwIfAborted as u,isAbortError as d}from"../core/promiseUtils.js";import{watch as f,initial as p}from"../core/reactiveUtils.js";import{property as m,subclass as h}from"../core/accessorSupport/decorators.js";import g from"../portal/Portal.js";const _=i.ofType(t);let v=class extends o(c(n)){constructor(e){super(e),this._loadTask=null,this.basemaps=new _,this.filterFunction=null,this.portal=g.getDefault(),this.query=null,this.updateBasemapsCallback=null,this.viewType=null}initialize(){this.addHandles(f(()=>[this.filterFunction,this.loadStatus,this.portal?.basemapGalleryGroupQuery,this.portal?.basemapGalleryGroupQuery3D,this.portal?.user,this.query,this.updateBasemapsCallback],()=>l(this.refresh()),p))}destroy(){this._loadTask?.abort(),this.filterFunction=null,this.portal=null,this.basemaps.forEach(e=>e.destroy())}get state(){return this.loadStatus===`not-loaded`?`not-loaded`:this.loadStatus===`loading`||this._loadTask&&!this._loadTask.finished?`loading`:`ready`}load(e){return this.addResolvingPromise(this.portal.load(e)),Promise.resolve(this)}async refresh(){if(this.loadStatus!==`loaded`)return;this._loadTask?.abort();let e=this.portal;return(this._loadTask=r(async t=>{try{let n=await e.fetchBasemaps(this._toQueryString(this.query),{signal:t,include3d:this.viewType===`3d`||void 0});u(t),await this._updateBasemaps(n,t)}catch(e){if(d(e))throw e;u(t),s.getLogger(this).warn(new a(`basemap-source:fetch-basemaps-error`,`Could not fetch basemaps from portal.`,{error:e})),await this._updateBasemaps([],t)}})).promise}_toQueryString(e){return!e||typeof e==`string`?e:Object.keys(e).map(t=>`${t}:${e[t]}`).join(` AND `)}async _updateBasemaps(e,t){let n=await this._filterBasemaps(e);u(t),this.updateBasemapsCallback&&(n=await this.updateBasemapsCallback(n),u(t)),this.basemaps.removeAll(),this.basemaps.addMany(n)}async _filterBasemaps(e){if(!this.filterFunction)return e;let t=e.map(this.filterFunction),n=await Promise.all(t);return e.filter((e,t)=>n[t])}};e([m()],v.prototype,`_loadTask`,void 0),e([m({readOnly:!0,type:_})],v.prototype,`basemaps`,void 0),e([m()],v.prototype,`filterFunction`,void 0),e([m({type:g})],v.prototype,`portal`,void 0),e([m()],v.prototype,`query`,void 0),e([m({readOnly:!0})],v.prototype,`state`,null),e([m()],v.prototype,`updateBasemapsCallback`,void 0),e([m()],v.prototype,`viewType`,void 0),v=e([h(`esri.basemaps.PortalBasemapsSource`)],v);const y=v;export{y as default};
+import{__decorate as e}from"tslib";import t from"../Basemap.js";import n from"./LocalBasemapsSource.js";import{createTask as r}from"../core/asyncUtils.js";import i from"../core/Collection.js";import a from"../core/Error.js";import{LoadableMixin as o}from"../core/Loadable.js";import s from"../core/Logger.js";import{EsriPromiseMixin as c}from"../core/Promise.js";import{ignoreAbortErrors as l,throwIfAborted as u,isAbortError as d}from"../core/promiseUtils.js";import{watch as f,initial as p}from"../core/reactiveUtils.js";import{property as m,subclass as h}from"../core/accessorSupport/decorators.js";import g from"../portal/Portal.js";const _=i.ofType(t);let v=class extends o(c(n)){constructor(e){super(e),this._loadTask=null,this.basemaps=new _,this.filterFunction=null,this.portal=g.getDefault(),this.query=null,this.updateBasemapsCallback=null,this.viewType=null}initialize(){this.addHandles(f(()=>[this.filterFunction,this.loadStatus,this.portal?.basemapGalleryGroupQuery,this.portal?.basemapGalleryGroupQuery3D,this.portal?.user,this.query,this.updateBasemapsCallback],()=>l(this.refresh()),p))}destroy(){this._loadTask?.abort(),this.filterFunction=null,this.portal=null,this.basemaps.forEach(e=>e.destroy())}get state(){return this.loadStatus===`not-loaded`?`not-loaded`:this.loadStatus===`loading`||this._loadTask&&!this._loadTask.finished?`loading`:`ready`}load(e){return this.addResolvingPromise(this.portal.load(e)),Promise.resolve(this)}async refresh(){if(this.loadStatus!==`loaded`)return;this._loadTask?.abort();let e=this.portal;return(this._loadTask=r(async t=>{try{let n=await e.fetchBasemaps(this._toQueryString(this.query),{signal:t,include3d:this.viewType===`3d`||void 0});u(t),await this._updateBasemaps(n,t)}catch(e){if(d(e))throw e;u(t),s.getLogger(this).warn(new a(`basemap-source:fetch-basemaps-error`,`Could not fetch basemaps from portal.`,{error:e})),await this._updateBasemaps([],t)}})).promise}_toQueryString(e){return!e||typeof e==`string`?e:Object.keys(e).map(t=>`${t}:${e[t]}`).join(` AND `)}async _updateBasemaps(e,t){let n=await this._filterBasemaps(e);u(t),this.updateBasemapsCallback&&(n=await this.updateBasemapsCallback(n),u(t)),this.basemaps.removeAll(),this.basemaps.addMany(n)}async _filterBasemaps(e){if(!this.filterFunction)return e;let t=e.map(this.filterFunction),n=await Promise.all(t);return e.filter((e,t)=>n[t])}};e([m()],v.prototype,`_loadTask`,void 0),e([m({readOnly:!0,type:_})],v.prototype,`basemaps`,void 0),e([m()],v.prototype,`filterFunction`,void 0),e([m({type:g})],v.prototype,`portal`,void 0),e([m()],v.prototype,`query`,void 0),e([m({readOnly:!0})],v.prototype,`state`,null),e([m()],v.prototype,`updateBasemapsCallback`,void 0),e([m()],v.prototype,`viewType`,void 0),v=e([h(`esri.basemapGallery.PortalBasemapsSource`)],v);const y=v;export{y as default};

package/{basemaps → basemapGallery}/support/BasemapItem.d.ts

@@ -13,10 +13,10 @@ export interface BasemapItemProperties extends IdentifiableMixinProperties, Part
 export type BasemapItemState = "ready" | "loading" | "error";
 
 /**
- * Represents one of the basemaps in [BasemapCollection.items](https://developers.arcgis.com/javascript/latest/references/core/basemaps/BasemapCollection/#items).
+ * Represents one of the basemaps in [BasemapGalleryModel.items](https://developers.arcgis.com/javascript/latest/references/core/basemapGallery/BasemapGalleryModel/#items).
  *
  * @since 5.2
- * @see [BasemapCollection.items](https://developers.arcgis.com/javascript/latest/references/core/basemaps/BasemapCollection/#items)
+ * @see [BasemapGalleryModel.items](https://developers.arcgis.com/javascript/latest/references/core/basemapGallery/BasemapGalleryModel/#items)
  */
 export default class BasemapItem extends BasemapItemSuperclass {
   /** @since 5.2 */

package/{basemaps → basemapGallery}/support/BasemapItem.js

@@ -1,2 +1,2 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{__decorate as e}from"tslib";import t from"../../core/Accessor.js";import{createTask as n}from"../../core/asyncUtils.js";import{IdentifiableMixin as r}from"../../core/Identifiable.js";import{abortMaybe as i}from"../../core/maybe.js";import{isAbortError as a}from"../../core/promiseUtils.js";import{watch as o,whenOnce as s}from"../../core/reactiveUtils.js";import{property as c,subclass as l}from"../../core/accessorSupport/decorators.js";import{findSpatialReference as u}from"../../support/basemapUtils.js";let d=class extends r(t){constructor(e){super(e),this._refreshTask=null,this.compatibilityFunction=null,this.view=null}initialize(){this.addHandles(o(()=>[this.basemap?.loadStatus,this.compatibilityFunction,this.view&&`basemapTerrain`in this.view&&this.view.basemapTerrain?.tilingScheme,this.view?.ready,this.view?.spatialReference],()=>this.refresh())),this.refresh()}destroy(){this._refreshTask?.abort()}get _spatialReferenceTask(){return u(this.view,this.basemap)}set basemap(e){e?.load().catch(()=>{}),this._set(`basemap`,e)}get error(){if(!this.compatibilityFunction)return this.basemap?.loadStatus===`failed`?this.basemap.loadError:null;let e=this._refreshTask?.error;return a(e)?null:e}get spatialReference(){return this._spatialReferenceTask.spatialReference}get state(){let e=this.basemap?.loadStatus;if(e!==`loaded`&&e!==`failed`)return`loading`;if(!this.compatibilityFunction)return e===`loaded`?`ready`:`error`;let t=this._refreshTask;return!t?.finished||a(t.error)?`loading`:t.error?`error`:`ready`}refresh(){this._refreshTask=i(this._refreshTask);let e=this.basemap?.loadStatus;if(e!==`loaded`&&e!==`failed`)return;let t=this.compatibilityFunction;t&&(this._refreshTask=n(async e=>{await t(this,{signal:e}),await s(()=>!this._spatialReferenceTask.updating,e)}))}};e([c()],d.prototype,`_refreshTask`,void 0),e([c({readOnly:!0})],d.prototype,`_spatialReferenceTask`,null),e([c()],d.prototype,`basemap`,null),e([c()],d.prototype,`compatibilityFunction`,void 0),e([c({readOnly:!0})],d.prototype,`error`,null),e([c({readOnly:!0})],d.prototype,`spatialReference`,null),e([c({readOnly:!0})],d.prototype,`state`,null),e([c()],d.prototype,`view`,void 0),d=e([l(`esri.basemaps.support.BasemapItem`)],d);const f=d;export{f as default};
+import{__decorate as e}from"tslib";import t from"../../core/Accessor.js";import{createTask as n}from"../../core/asyncUtils.js";import{IdentifiableMixin as r}from"../../core/Identifiable.js";import{abortMaybe as i}from"../../core/maybe.js";import{isAbortError as a}from"../../core/promiseUtils.js";import{watch as o,whenOnce as s}from"../../core/reactiveUtils.js";import{property as c,subclass as l}from"../../core/accessorSupport/decorators.js";import{findSpatialReference as u}from"../../support/basemapUtils.js";let d=class extends r(t){constructor(e){super(e),this._refreshTask=null,this.compatibilityFunction=null,this.view=null}initialize(){this.addHandles(o(()=>[this.basemap?.loadStatus,this.compatibilityFunction,this.view&&`basemapTerrain`in this.view&&this.view.basemapTerrain?.tilingScheme,this.view?.ready,this.view?.spatialReference],()=>this.refresh())),this.refresh()}destroy(){this._refreshTask?.abort()}get _spatialReferenceTask(){return u(this.view,this.basemap)}set basemap(e){e?.load().catch(()=>{}),this._set(`basemap`,e)}get error(){if(!this.compatibilityFunction)return this.basemap?.loadStatus===`failed`?this.basemap.loadError:null;let e=this._refreshTask?.error;return a(e)?null:e}get spatialReference(){return this._spatialReferenceTask.spatialReference}get state(){let e=this.basemap?.loadStatus;if(e!==`loaded`&&e!==`failed`)return`loading`;if(!this.compatibilityFunction)return e===`loaded`?`ready`:`error`;let t=this._refreshTask;return!t?.finished||a(t.error)?`loading`:t.error?`error`:`ready`}refresh(){this._refreshTask=i(this._refreshTask);let e=this.basemap?.loadStatus;if(e!==`loaded`&&e!==`failed`)return;let t=this.compatibilityFunction;t&&(this._refreshTask=n(async e=>{await t(this,{signal:e}),await s(()=>!this._spatialReferenceTask.updating,e)}))}};e([c()],d.prototype,`_refreshTask`,void 0),e([c({readOnly:!0})],d.prototype,`_spatialReferenceTask`,null),e([c()],d.prototype,`basemap`,null),e([c()],d.prototype,`compatibilityFunction`,void 0),e([c({readOnly:!0})],d.prototype,`error`,null),e([c({readOnly:!0})],d.prototype,`spatialReference`,null),e([c({readOnly:!0})],d.prototype,`state`,null),e([c()],d.prototype,`view`,void 0),d=e([l(`esri.basemapGallery.support.BasemapItem`)],d);const f=d;export{f as default};

package/{basemaps → basemapGallery}/types.d.ts

@@ -3,7 +3,7 @@ import type BasemapItem from "./support/BasemapItem.js";
 import type { AbortOptions } from "../core/promiseUtils.js";
 
 /**
- * This function is used by the [PortalBasemapsSource.filterFunction](https://developers.arcgis.com/javascript/latest/references/core/basemaps/PortalBasemapsSource/#filterFunction) property to filter
+ * This function is used by the [PortalBasemapsSource.filterFunction](https://developers.arcgis.com/javascript/latest/references/core/basemapGallery/PortalBasemapsSource/#filterFunction) property to filter
  * basemaps after they are fetched from the Portal.
  *
  * _Support for asynchronous filter functions was added at version 4.27._
@@ -17,7 +17,7 @@ import type { AbortOptions } from "../core/promiseUtils.js";
 export type BasemapFilter = (item: Basemap, index: number, array: Basemap[]) => boolean | Promise<boolean>;
 
 /**
- * This function is used by the [PortalBasemapsSource.updateBasemapsCallback](https://developers.arcgis.com/javascript/latest/references/core/basemaps/PortalBasemapsSource/#updateBasemapsCallback) property for
+ * This function is used by the [PortalBasemapsSource.updateBasemapsCallback](https://developers.arcgis.com/javascript/latest/references/core/basemapGallery/PortalBasemapsSource/#updateBasemapsCallback) property for
  * updating basemaps after being fetched and filtered.
  *
  * _Support for asynchronous update functions was added at version 4.29._

package/chunks/AtmosphereCompositing.glsl.js

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{ScreenSpacePass as e}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{glsl as t}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DBindUniform as n}from"../views/3d/webgl-engine/core/shaderModules/Texture2DBindUniform.js";import{Texture2DPassUniform as r}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{NoParameters as i}from"../views/webgl/NoParameters.js";import{ShaderBuilder as a}from"../views/webgl/ShaderBuilder.js";class o extends i{}function s(){let i=new a;return i.include(e),i.fragment.uniforms.add(new r(`colorTexture`,e=>e.color),new n(`depthTexture`,e=>e.mainDepth)),i.fragment.main.add(t`float depthSample = texture(depthTexture, uv).r;
+import{mainDepth as e}from"../views/3d/webgl-engine/core/shaderLibrary/bindUniforms.js";import{ScreenSpacePass as t}from"../views/3d/webgl-engine/core/shaderLibrary/ScreenSpacePass.glsl.js";import{glsl as n}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DPassUniform as r}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{NoParameters as i}from"../views/webgl/NoParameters.js";import{ShaderBuilder as a}from"../views/webgl/ShaderBuilder.js";class o extends i{}function s(){let i=new a;return i.include(t),i.fragment.uniforms.add(new r(`colorTexture`,e=>e.color),e).main.add(n`float depthSample = texture(mainDepth, uv).r;
 if (depthSample != 1.0 ) {
 fragColor = vec4(0);
 return;

package/chunks/ChapmanAtmosphere.glsl.js

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{Gamma as e}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js";import{mainLightDirection as t}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{BooleanPassUniform as n}from"../views/3d/webgl-engine/core/shaderModules/BooleanPassUniform.js";import{Float2PassUniform as r}from"../views/3d/webgl-engine/core/shaderModules/Float2PassUniform.js";import{Float3BindUniform as i}from"../views/3d/webgl-engine/core/shaderModules/Float3BindUniform.js";import{Float3PassUniform as a}from"../views/3d/webgl-engine/core/shaderModules/Float3PassUniform.js";import{Float4PassUniform as o}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatPassUniform as s}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{FloatsPassUniform as c}from"../views/3d/webgl-engine/core/shaderModules/FloatsPassUniform.js";import{glsl as l}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DBindUniform as u}from"../views/3d/webgl-engine/core/shaderModules/Texture2DBindUniform.js";import{getHeightParameters as d}from"../views/3d/webgl-engine/effects/atmosphere/ChapmanApproximation.glsl.js";import{ChapmanRaymarching as f}from"../views/3d/webgl-engine/effects/atmosphere/ChapmanRaymarching.glsl.js";import{ScreenSpacePassAtmosphere as p}from"../views/3d/webgl-engine/shaders/ScreenSpacePassAtmosphere.glsl.js";import{SphereIntersect as m}from"../views/3d/webgl-engine/shaders/SphereIntersect.glsl.js";import{ToneMapping as h}from"../views/3d/webgl-engine/shaders/ToneMapping.glsl.js";import{ShaderBuilder as g}from"../views/webgl/ShaderBuilder.js";function _(){let _=new g;_.include(p);let{fragment:v}=_;return v.include(e),v.include(m),v.include(h),v.include(f,!1),v.uniforms.add(t,new n(`reduced`,({reduced:e})=>e),new c(`heightParameters`,5,(e,t)=>d(t,e)),new r(`radii`,e=>e.radii),new i(`cameraPosition`,e=>e.camera.eye),new s(`innerFadeDistance`,e=>e.innerFadeDistance),new o(`undergroundColor`,e=>e.undergroundColor),new s(`altitudeFade`,e=>e.altitudeFade)).code.add(l`vec4 applyUndergroundAtmosphere(vec3 rayDir, vec3 lightDirection, vec4 fragColor) {
+import{mainDepth as e}from"../views/3d/webgl-engine/core/shaderLibrary/bindUniforms.js";import{Gamma as t}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js";import{mainLightDirection as n}from"../views/3d/webgl-engine/core/shaderLibrary/shading/lightingUniforms.js";import{cameraPosition as r}from"../views/3d/webgl-engine/core/shaderLibrary/util/cameraUniforms.js";import{BooleanPassUniform as i}from"../views/3d/webgl-engine/core/shaderModules/BooleanPassUniform.js";import{Float2PassUniform as a}from"../views/3d/webgl-engine/core/shaderModules/Float2PassUniform.js";import{Float3PassUniform as o}from"../views/3d/webgl-engine/core/shaderModules/Float3PassUniform.js";import{Float4PassUniform as s}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatPassUniform as c}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{FloatsPassUniform as l}from"../views/3d/webgl-engine/core/shaderModules/FloatsPassUniform.js";import{glsl as u}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{getHeightParameters as d}from"../views/3d/webgl-engine/effects/atmosphere/ChapmanApproximation.glsl.js";import{ChapmanRaymarching as f}from"../views/3d/webgl-engine/effects/atmosphere/ChapmanRaymarching.glsl.js";import{ScreenSpacePassAtmosphere as p}from"../views/3d/webgl-engine/shaders/ScreenSpacePassAtmosphere.glsl.js";import{SphereIntersect as m}from"../views/3d/webgl-engine/shaders/SphereIntersect.glsl.js";import{ToneMapping as h}from"../views/3d/webgl-engine/shaders/ToneMapping.glsl.js";import{ShaderBuilder as g}from"../views/webgl/ShaderBuilder.js";function _(){let _=new g;_.include(p);let{fragment:v}=_;return v.include(t),v.include(m),v.include(h),v.include(f,!1),v.uniforms.add(n,new i(`reduced`,({reduced:e})=>e),new l(`heightParameters`,5,(e,t)=>d(t,e)),new a(`radii`,e=>e.radii),r,new c(`innerFadeDistance`,e=>e.innerFadeDistance),new s(`undergroundColor`,e=>e.undergroundColor),new c(`altitudeFade`,e=>e.altitudeFade)).code.add(u`vec4 applyUndergroundAtmosphere(vec3 rayDir, vec3 lightDirection, vec4 fragColor) {
 float rayPlanetDistance = heightParameters[3];
 vec2 rayPlanetIntersect = sphereIntersect(cameraPosition, rayDir, rayPlanetDistance);
 if (!((rayPlanetIntersect.x <= rayPlanetIntersect.y) && rayPlanetIntersect.y > 0.0)) {
@@ -24,8 +24,8 @@ vec3 sunTransmittance = exp(-(mix(betaCombined, betaRayleigh, 0.5)) * max(0.0, s
 float mu = clamp(dot(rayDir, lightDir), 0.0, 1.0);
 float sunDisc = 256.0 * smoothstep(0.0, 128.0, clamp(getGlow(1.0 - mu, 3e-5, 3.0), 0.0, 128.0));
 return normalize(sunTransmittance) * sunDisc;
-}`),v.uniforms.add(new a(`backgroundColor`,e=>e.backgroundColor),new u(`depthTexture`,e=>e.mainDepth)).main.add(l`vec3 rayDir = normalize(worldRay);
-float depthSample = reduced ? 1.0 : texture(depthTexture, uv).r;
+}`),v.uniforms.add(new o(`backgroundColor`,e=>e.backgroundColor),e).main.add(u`vec3 rayDir = normalize(worldRay);
+float depthSample = reduced ? 1.0 : texture(mainDepth, uv).r;
 if (depthSample != 1.0) {
 fragColor = vec4(0.0);
 return;

package/chunks/CloudsComposition.glsl.js

@@ -1,3 +1,3 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{Gamma as e}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js";import{PiUtils as t}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PiUtils.glsl.js";import{CloudsParallaxShading as n}from"../views/3d/webgl-engine/core/shaderLibrary/util/CloudsParallaxShading.glsl.js";import{ColorConversion as r}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{Float3BindUniform as i}from"../views/3d/webgl-engine/core/shaderModules/Float3BindUniform.js";import{FloatBindUniform as a}from"../views/3d/webgl-engine/core/shaderModules/FloatBindUniform.js";import{glsl as o}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{ScreenSpacePassAtmosphere as s}from"../views/3d/webgl-engine/shaders/ScreenSpacePassAtmosphere.glsl.js";import{ShaderBuilder as c}from"../views/webgl/ShaderBuilder.js";function l(l){let u=new c,{fragment:d}=u;return u.include(s,{needUVs:!1,needEyeDirection:!1}),d.include(r),d.include(t),d.include(e),u.include(n,l),d.uniforms.add(new i(`cameraPosition`,e=>e.camera.eye),new a(`cloudsOpacity`,e=>e.clouds.opacity)).main.add(o`vec4 cloudsColor = renderClouds(normalize(worldRay), cameraPosition);
+import{Gamma as e}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Gamma.glsl.js";import{PiUtils as t}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PiUtils.glsl.js";import{cameraPosition as n}from"../views/3d/webgl-engine/core/shaderLibrary/util/cameraUniforms.js";import{CloudsParallaxShading as r,cloudsOpacity as i}from"../views/3d/webgl-engine/core/shaderLibrary/util/CloudsParallaxShading.glsl.js";import{ColorConversion as a}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{glsl as o}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{ScreenSpacePassAtmosphere as s}from"../views/3d/webgl-engine/shaders/ScreenSpacePassAtmosphere.glsl.js";import{ShaderBuilder as c}from"../views/webgl/ShaderBuilder.js";function l(l){let u=new c,{fragment:d}=u;return u.include(s,{needUVs:!1,needEyeDirection:!1}),d.include(a),d.include(t),d.include(e),u.include(r,l),d.uniforms.add(n,i).main.add(o`vec4 cloudsColor = renderClouds(normalize(worldRay), cameraPosition);
 fragColor = vec4(cloudsOpacity * cloudsColor.rgb, cloudsColor.a);`),u}const u=Object.freeze(Object.defineProperty({__proto__:null,build:l},Symbol.toStringTag,{value:`Module`}));export{u as C,l as b};

package/chunks/Component.glsl.js

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{ComponentData as e}from"../views/3d/webgl-engine/collections/Component/Material/ComponentData.glsl.js";import{forwardLinearDepthToWriteShadow as ee}from"../views/3d/webgl-engine/core/shaderLibrary/forwardLinearDepthToWriteShadow.glsl.js";import{isColor as te,isShadow as ne}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutput.js";import{slicePass as t}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{TextureCoordinateAttribute as n}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/TextureCoordinateAttribute.glsl.js";import{VertexColor as r}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexColor.glsl.js";import{VertexNormal as i}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexNormal.glsl.js";import{VertexPosition as a}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexPosition.glsl.js";import{DepthConversion as o}from"../views/3d/webgl-engine/core/shaderLibrary/output/DepthConversion.glsl.js";import{outputDepth as s}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.glsl.js";import{OutputHighlight as c}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{OutputHighlightOverlay as l}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlightOverlay.js";import{computeFragmentNormals as u}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeFragmentNormals.glsl.js";import{ComputeMaterialColor as d}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeMaterialColor.glsl.js";import{ComputeNormalTextureDraw as re}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeNormalTexture.glsl.js";import{EvaluateSceneLighting as f,lightingGlobalFactor as p}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{mainLightIntensity as ie,mainLightDirection as ae}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{NormalUtils as m}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{pbrGlobals as h}from"../views/3d/webgl-engine/core/shaderLibrary/shading/pbrGlobals.glsl.js";import{PhysicallyBasedRenderingParameters as g}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{ReadBaseColorTexture as _}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadBaseColorTexture.glsl.js";import{readShadowPass as v}from"../views/3d/webgl-engine/core/shaderLibrary/shading/readShadow.glsl.js";import{OverlayIM as oe}from"../views/3d/webgl-engine/core/shaderLibrary/terrain/Overlay.glsl.js";import{DiscardOrAdjustAlphaDraw as se}from"../views/3d/webgl-engine/core/shaderLibrary/util/DiscardOrAdjustAlpha.glsl.js";import{BooleanDrawUniform as ce}from"../views/3d/webgl-engine/core/shaderModules/BooleanDrawUniform.js";import{FloatDrawUniform as y}from"../views/3d/webgl-engine/core/shaderModules/FloatDrawUniform.js";import{If as b,glsl as x}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DBindUniform as le}from"../views/3d/webgl-engine/core/shaderModules/Texture2DBindUniform.js";import{SnowCover as ue}from"../views/3d/webgl-engine/effects/snowcover/SnowCover.glsl.js";import{alphaCutoff as S}from"../views/3d/webgl-engine/shaders/alphaCutoff.glsl.js";import{outputColorHighlightOLID as de}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{getPlanetRadius as C,sphereDepthInterpolate as w}from"../views/3d/webgl-engine/shaders/SphereDepthInterpolate.glsl.js";import{ShaderBuilder as T}from"../views/webgl/ShaderBuilder.js";function E(E){let D=new T,{vertex:O,fragment:k}=D;D.include(a,E),D.include(i,E),D.include(r,E),D.include(n,E),D.include(e,E),D.include(se,E),k.include(t,E),D.include(_,E);let{output:A,pbrMode:j,hasNormalTexture:M,snowCover:N,receiveShadows:P,shadeNormals:F,spherical:I,sphericalSR:L,overlayEnabled:R,componentDataType:fe,vertexDiscardMode:z,renderOccluded:B,isGroundSlice:V,groundTransparencyMode:pe}=E,H=te(A),U=j===1||j===2,W=pe===2,G=W&&(A===3||A===4);U&&(D.include(g,E),M&&D.include(re,E));let K=ne(A),q=A===11,me=A===10,J=A===4,he=K&&fe===1,Y=C(E),X=(R||G)&&I,Z=L===1;(H||J)&&(D.include(d,E),k.include(S)),(R||G)&&(k.include(f,E),D.include(oe,E),X?(D.varyings.add(`vPositionForDraping`,`vec3`),k.uniforms.add(new ce(`useENUForGlobalOverlayUV`,e=>e.useENUForGlobalOverlayUV),new y(`overlayMapScaleU`,e=>e.toMapSpace[2]),new y(`overlayReferenceU`,e=>e.toMapSpace[0])),k.constants.add(`overlayWorldWidth`,`float`,Z?2*Math.PI*Y:360),Z?(k.constants.add(`pRadius`,`float`,Y),k.constants.add(`halfSemiMajorAxis`,`float`,.5*Y)):k.constants.add(`rad2deg1`,`float`,180/Math.PI),k.constants.add(`invRadius`,`float`,1/Y).code.add(x`
+import{ComponentData as e}from"../views/3d/webgl-engine/collections/Component/Material/ComponentData.glsl.js";import{waterNormals as t}from"../views/3d/webgl-engine/core/shaderLibrary/bindUniforms.js";import{forwardLinearDepthToWriteShadow as ee}from"../views/3d/webgl-engine/core/shaderLibrary/forwardLinearDepthToWriteShadow.glsl.js";import{isColor as te,isShadow as n}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutput.js";import{slicePass as r}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{TextureCoordinateAttribute as i}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/TextureCoordinateAttribute.glsl.js";import{VertexColor as a}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexColor.glsl.js";import{VertexNormal as o}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexNormal.glsl.js";import{VertexPosition as s}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexPosition.glsl.js";import{DepthConversion as c}from"../views/3d/webgl-engine/core/shaderLibrary/output/DepthConversion.glsl.js";import{outputDepth as l}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputDepth.glsl.js";import{OutputHighlight as u}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{OutputHighlightOverlay as ne}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlightOverlay.js";import{computeFragmentNormals as d}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeFragmentNormals.glsl.js";import{ComputeMaterialColor as re}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeMaterialColor.glsl.js";import{ComputeNormalTextureDraw as ie}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeNormalTexture.glsl.js";import{EvaluateSceneLighting as f}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{lightingGlobalFactor as p,mainLightIntensity as m,mainLightDirection as h}from"../views/3d/webgl-engine/core/shaderLibrary/shading/lightingUniforms.js";import{NormalUtils as ae}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{pbrGlobals as oe}from"../views/3d/webgl-engine/core/shaderLibrary/shading/pbrGlobals.glsl.js";import{PhysicallyBasedRenderingParameters as se}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{ReadBaseColorTexture as g}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadBaseColorTexture.glsl.js";import{readShadowPass as _}from"../views/3d/webgl-engine/core/shaderLibrary/shading/readShadow.glsl.js";import{OverlayIM as ce}from"../views/3d/webgl-engine/core/shaderLibrary/terrain/Overlay.glsl.js";import{DiscardOrAdjustAlphaDraw as v}from"../views/3d/webgl-engine/core/shaderLibrary/util/DiscardOrAdjustAlpha.glsl.js";import{BooleanDrawUniform as y}from"../views/3d/webgl-engine/core/shaderModules/BooleanDrawUniform.js";import{FloatDrawUniform as b}from"../views/3d/webgl-engine/core/shaderModules/FloatDrawUniform.js";import{If as x,glsl as S}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{SnowCover as le}from"../views/3d/webgl-engine/effects/snowcover/SnowCover.glsl.js";import{alphaCutoff as C}from"../views/3d/webgl-engine/shaders/alphaCutoff.glsl.js";import{outputColorHighlightOLID as ue}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{getPlanetRadius as de,sphereDepthInterpolate as w}from"../views/3d/webgl-engine/shaders/SphereDepthInterpolate.glsl.js";import{ShaderBuilder as T}from"../views/webgl/ShaderBuilder.js";function E(E){let D=new T,{vertex:O,fragment:k}=D;D.include(s,E),D.include(o,E),D.include(a,E),D.include(i,E),D.include(e,E),D.include(v,E),k.include(r,E),D.include(g,E);let{output:A,pbrMode:j,hasNormalTexture:M,snowCover:N,receiveShadows:P,shadeNormals:F,spherical:I,sphericalSR:L,overlayEnabled:R,componentDataType:fe,vertexDiscardMode:z,renderOccluded:B,isGroundSlice:V,groundTransparencyMode:pe}=E,H=te(A),U=j===1||j===2,W=pe===2,G=W&&(A===3||A===4);U&&(D.include(se,E),M&&D.include(ie,E));let K=n(A),q=A===11,me=A===10,J=A===4,he=K&&fe===1,Y=de(E),X=(R||G)&&I,Z=L===1;(H||J)&&(D.include(re,E),k.include(C)),(R||G)&&(k.include(f,E),D.include(ce,E),X?(D.varyings.add(`vPositionForDraping`,`vec3`),k.uniforms.add(new y(`useENUForGlobalOverlayUV`,e=>e.useENUForGlobalOverlayUV),new b(`overlayMapScaleU`,e=>e.toMapSpace[2]),new b(`overlayReferenceU`,e=>e.toMapSpace[0])),k.constants.add(`overlayWorldWidth`,`float`,Z?2*Math.PI*Y:360),Z?(k.constants.add(`pRadius`,`float`,Y),k.constants.add(`halfSemiMajorAxis`,`float`,.5*Y)):k.constants.add(`rad2deg1`,`float`,180/Math.PI),k.constants.add(`invRadius`,`float`,1/Y).code.add(S`
           vec2 projectOverlay(vec3 pos) { return pos.xy / (1.0 + invRadius * pos.z); }
 
           vec2 selectOverlayUVNorm(vec2 normUV, float offsetUNorm) {
@@ -31,12 +31,12 @@ import{ComponentData as e}from"../views/3d/webgl-engine/collections/Component/Ma
             float sinLat = wPos.z / oRadius;
             vec2 posMap;
 
-            ${b(Z,x`
+            ${x(Z,S`
                 posMap = vec2(
                   oLonRad * pRadius,
                   halfSemiMajorAxis * log((1.0 + sinLat) / (1.0 - sinLat))
                 );
-              `,x`
+              `,S`
                 float oLatRad = asin(clamp(sinLat,-1.0,1.0));
                 posMap = vec2(rad2deg1 * oLonRad, rad2deg1 * oLatRad);
               `)}
@@ -49,14 +49,14 @@ import{ComponentData as e}from"../views/3d/webgl-engine/collections/Component/Ma
               ? selectLocalOverlayUVs(projectOverlay(vPositionForDraping))
               : selectMapOverlayUVs(overlayMapUVFromWorldPosition());
           }
-        `)):O.code.add(`vec2 projectOverlay(vec3 pos) { return pos.xy; }`));let Q=R&&H&&j===4;Q&&(D.varyings.add(`tbnTangent`,`vec3`),D.varyings.add(`tbnBiTangent`,`vec3`),D.varyings.add(`upNormal`,`vec3`));let ge=z===0,_e=z===2;if(D.include(v,E),D.include(ee,E),O.include(S),O.main.add(x`
+        `)):O.code.add(`vec2 projectOverlay(vec3 pos) { return pos.xy; }`));let Q=R&&H&&j===4;Q&&(D.varyings.add(`tbnTangent`,`vec3`),D.varyings.add(`tbnBiTangent`,`vec3`),D.varyings.add(`upNormal`,`vec3`));let ge=z===0,_e=z===2;if(D.include(_,E),D.include(ee,E),O.include(C),O.main.add(S`
     bool castShadows;
     vec4 externalColor = forwardExternalColor(castShadows);
-    ${b(he,`if(!castShadows) { gl_Position = vec4(vec3(1e38), 1.0); return; }`)}
-    ${b(!ge,`if (externalColor.a ${_e?`>`:`<=`} opacityCutoff) {
+    ${x(he,`if(!castShadows) { gl_Position = vec4(vec3(1e38), 1.0); return; }`)}
+    ${x(!ge,`if (externalColor.a ${_e?`>`:`<=`} opacityCutoff) {
          gl_Position = vec4(vec3(1e38), 1.0); return;
        }`)}
-    ${b(q,`externalColor.a = 1.0;`)}
+    ${x(q,`externalColor.a = 1.0;`)}
 
     forwardPosition(readElevationOffset());
     forwardNormal();
@@ -66,14 +66,14 @@ import{ComponentData as e}from"../views/3d/webgl-engine/collections/Component/Ma
     forwardLinearDepthToWriteShadow();
     forwardEmissiveStrength();
     forwardObjectAndLayerIdColor();
-    ${b(Q,I?x`
+    ${x(Q,I?S`
             upNormal = normalize(positionWorld());
             tbnTangent = normalize(cross(vec3(0.0, 0.0, 1.0), upNormal));
-            tbnBiTangent = normalize(cross(upNormal, tbnTangent));`:x`
+            tbnBiTangent = normalize(cross(upNormal, tbnTangent));`:S`
             upNormal = vec3(0.0, 0.0, 1.0);
             tbnTangent = vec3(1.0, 0.0, 0.0);
             tbnBiTangent = vec3(0.0, 1.0, 0.0);`)}
-    ${b(R||G,b(I,`vPositionForDraping = positionForDraping();
+    ${x(R||G,x(I,`vPositionForDraping = positionForDraping();
          vtcOverlay = vec4(0.0);`,`setOverlayVTC(projectOverlay(positionForDraping()));`))}
 
     if (externalColor.a < alphaCutoff) {
@@ -81,12 +81,12 @@ import{ComponentData as e}from"../views/3d/webgl-engine/collections/Component/Ma
       gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
       return;
     }
-  `),H)return D.include(u,E),D.include(de,E),k.include(f,E),k.include(ue,E),k.include(m,E),k.code.add(x`
+  `),H)return D.include(d,E),D.include(ue,E),k.include(f,E),k.include(le,E),k.include(ae,E),k.code.add(S`
       float evaluateShadow() {
         return ${P?`readShadowMap(vPositionWorldCameraRelative)`:`0.0`};
       }
-    `).main.add(x`
-      ${b(!V,`discardBySlice(vPositionWorldCameraRelative);`)}
+    `).main.add(S`
+      ${x(!V,`discardBySlice(vPositionWorldCameraRelative);`)}
 
       vec4 textureColor = readBaseColorTexture();
       discardOrAdjustAlpha(textureColor);
@@ -94,15 +94,15 @@ import{ComponentData as e}from"../views/3d/webgl-engine/collections/Component/Ma
       // When rendering the occluded overlay, we still need to read the base color texture because we need to use the
       // same discard logic. However after that to render only the draped overlay, we simply set the base texture color
       // to zero.
-      ${b(B,x`textureColor = vec4(0);`)}
+      ${x(B,S`textureColor = vec4(0);`)}
 
-      ${b(R,x`
+      ${x(R,S`
         vec4 overlayUVs = ${X?`componentOverlayUVs()`:`vtcOverlay`};
 
         vec4 overlayColor = getCombinedOverlayColor(overlayUVs);
 
         /* Early discard to only emit when we have overlay */
-        ${b(B,x`if (overlayColor.a < alphaCutoff) { discard; }`)}
+        ${x(B,S`if (overlayColor.a < alphaCutoff) { discard; }`)}
         `)}
 
       vec4 externalColor;
@@ -110,36 +110,36 @@ import{ComponentData as e}from"../views/3d/webgl-engine/collections/Component/Ma
       readExternalColor(externalColor, externalColorMixMode);
 
       vec4 materialColor = computeMaterialColor(textureColor, externalColor, externalColorMixMode);
-      ${b(W,`materialColor = vec4(0.0);`)}
-    `),U?(I&&k.uniforms.add(p),k.include(h),k.uniforms.add(ie).main.add(x`
+      ${x(W,`materialColor = vec4(0.0);`)}
+    `),U?(I&&k.uniforms.add(p),k.include(oe),k.uniforms.add(m).main.add(S`
         applyPBRFactors();
-        ${b(j===1,`if (externalColorMixMode == 3) mrr = vec3(0.0, 0.6, 0.2);`)}
-        ${b(M,`mat3 tangentSpace = computeTangentSpace(fragmentFaceNormal, vPositionWorldCameraRelative, vuv0);`)}
+        ${x(j===1,`if (externalColorMixMode == 3) mrr = vec3(0.0, 0.6, 0.2);`)}
+        ${x(M,`mat3 tangentSpace = computeTangentSpace(fragmentFaceNormal, vPositionWorldCameraRelative, vuv0);`)}
 
         vec3 viewDirection = normalize(vPositionWorldCameraRelative);
         vec3 upNormal = getLocalUp(positionWorld());
         vec3 shadingNormal = ${M?`computeTextureNormal(tangentSpace, vuv0)`:`fragmentShadingNormal`};
 
         float ssao = 1.0 - occlusion * evaluateAmbientOcclusionInverse();
-        ${b(N,x`float snow = getSnow(fragmentFaceNormal, normalize(positionWorld()));
+        ${x(N,S`float snow = getSnow(fragmentFaceNormal, normalize(positionWorld()));
                  materialColor.rgb = mix(materialColor.rgb, vec3(1.1), snow);
                  ssao = mix(ssao, 0.5 * ssao, snow);
                  shadingNormal = mix(shadingNormal, fragmentFaceNormal, snow);`)}
-        ${b(R,`materialColor = compositeOverlayUnpremultiplied(materialColor, overlayColor);`)}
+        ${x(R,`materialColor = compositeOverlayUnpremultiplied(materialColor, overlayColor);`)}
 
         vec3 additionalLight = evaluateAdditionalLighting(ssao, positionWorld());
-        ${b(I,`float additionalAmbientScale = additionalDirectedAmbientLight(positionWorld());`)}
-        ${b(I,`float shadow = max(lightingGlobalFactor * (1.0 - additionalAmbientScale), evaluateShadow());`,`float shadow = evaluateShadow();`)}
+        ${x(I,`float additionalAmbientScale = additionalDirectedAmbientLight(positionWorld());`)}
+        ${x(I,`float shadow = max(lightingGlobalFactor * (1.0 - additionalAmbientScale), evaluateShadow());`,`float shadow = evaluateShadow();`)}
         vec4 shadedColor = vec4(evaluateSceneLighting(shadingNormal, materialColor.rgb, shadow, ssao, additionalLight, viewDirection, upNormal), materialColor.a);
-      `)):(I&&k.uniforms.add(p),Q&&k.uniforms.add(new le(`ovNormalTex`,e=>e.overlay?.getTexture(3))),k.uniforms.add(ae).main.add(x`
-        ${b(I,`float additionalAmbientScale = additionalDirectedAmbientLight(positionWorld());`)}
+      `)):(I&&k.uniforms.add(p),Q&&k.uniforms.add(t),k.uniforms.add(h).main.add(S`
+        ${x(I,`float additionalAmbientScale = additionalDirectedAmbientLight(positionWorld());`)}
         float shadow = ${P?I?`max(lightingGlobalFactor * (1.0 - additionalAmbientScale), evaluateShadow())`:`evaluateShadow()`:I?`lightingGlobalFactor * (1.0 - additionalAmbientScale)`:`0.0`};
 
-        ${b(P&&F!==1,x`
+        ${x(P&&F!==1,S`
             float dotFL = dot(fragmentFaceNormal, mainLightDirection);
             if( dotFL <= 0.0) shadow = 1.0;
         `)}
-        ${b(N,x`float snow = getSnow(fragmentFaceNormal, normalize(positionWorld()));
+        ${x(N,S`float snow = getSnow(fragmentFaceNormal, normalize(positionWorld()));
                materialColor.rgb = mix(materialColor.rgb, vec3(1), snow);`)}
 
         vec3 viewDirection = normalize(vPositionWorldCameraRelative);
@@ -149,10 +149,10 @@ import{ComponentData as e}from"../views/3d/webgl-engine/collections/Component/Ma
         float ssao = evaluateAmbientOcclusion();
         vec3 additionalLight = evaluateAdditionalLighting(ssao, positionWorld());
 
-        ${b(R,`materialColor = compositeOverlayUnpremultiplied(materialColor, overlayColor);`)}
+        ${x(R,`materialColor = compositeOverlayUnpremultiplied(materialColor, overlayColor);`)}
 
         vec4 shadedColor = vec4(evaluateSceneLighting(fragmentShadingNormal, materialColor.rgb, shadow, ssao, additionalLight, viewDirection, upNormal), materialColor.a);
-        ${b(Q,x`vec4 overlayWaterMask = getOverlayColor(ovNormalTex, overlayUVs);
+        ${x(Q,S`vec4 overlayWaterMask = getOverlayColor(waterNormals, overlayUVs);
                  float waterNormalLength = length(overlayWaterMask);
                  if (waterNormalLength > 0.95) {
                    mat3 tbnMatrix = mat3(tbnTangent, tbnBiTangent, upNormal);
@@ -162,32 +162,32 @@ import{ComponentData as e}from"../views/3d/webgl-engine/collections/Component/Ma
                    shadedColor = mix(shadedColor, waterColorNonLinear, waterColorLinear.w);
                  }`)}
       `)),k.main.add(`
-      ${b(V,`if(rejectBySlice(vPositionWorldCameraRelative)) shadedColor.a *= groundSliceOpacity;`)}
+      ${x(V,`if(rejectBySlice(vPositionWorldCameraRelative)) shadedColor.a *= groundSliceOpacity;`)}
 
-      outputColorHighlightOLID(applySlice(shadedColor, vPositionWorldCameraRelative), materialColor.rgb ${b(N,`, snow`)});
-    `),E.sphereDepthInterpolate&&(D.include(w,E),D.fragment.include(o),k.main.add(x`vec3 worldRay = normalize(vPositionWorldCameraRelative);
+      outputColorHighlightOLID(applySlice(shadedColor, vPositionWorldCameraRelative), materialColor.rgb ${x(N,`, snow`)});
+    `),E.sphereDepthInterpolate&&(D.include(w,E),D.fragment.include(c),k.main.add(S`vec3 worldRay = normalize(vPositionWorldCameraRelative);
 vec3 viewRay = normalize(vPosition_view);
-gl_FragDepth = delinearizeDepth(sphereDepthInterpolate(worldRay, viewRay, linearizeDepth(gl_FragCoord.z)));`)),D;let $=K||A===8;return $&&D.include(s,E),J&&D.include(u,E),R&&D.include(l,E),D.include(c,E),k.main.add(x`
-    ${b(!V,`discardBySlice(vPositionWorldCameraRelative);`)}
+gl_FragDepth = delinearizeDepth(sphereDepthInterpolate(worldRay, viewRay, linearizeDepth(gl_FragCoord.z)));`)),D;let $=K||A===8;return $&&D.include(l,E),J&&D.include(d,E),R&&D.include(ne,E),D.include(u,E),k.main.add(S`
+    ${x(!V,`discardBySlice(vPositionWorldCameraRelative);`)}
 
     vec4 textureColor = readBaseColorTexture();
     discardOrAdjustAlpha(textureColor);
 
-    ${b(G,x`
+    ${x(G,S`
       vec4 overlayUVs = ${X?`componentOverlayUVs()`:`vtcOverlay`};
       if (getCombinedOverlayColor(overlayUVs).a < alphaCutoff) {
         discard;
       }
       `)}
 
-    ${b($,`outputDepth(linearDepth);`)}
-    ${b(J,x`
+    ${x($,`outputDepth(linearDepth);`)}
+    ${x(J,S`
         vec4 externalColor;
         int externalColorMixMode;
         readExternalColor(externalColor, externalColorMixMode);
 
         vec4 materialColor = computeMaterialColor(textureColor, externalColor, externalColorMixMode);
-        ${b(V,x`
+        ${x(V,S`
             if (rejectBySlice(vPositionWorldCameraRelative)) {
               materialColor.a *= groundSliceOpacity;
             }
@@ -195,5 +195,5 @@ gl_FragDepth = delinearizeDepth(sphereDepthInterpolate(worldRay, viewRay, linear
 
         fragColor = vec4(vec3(0.5) + 0.5 * fragmentFaceNormalView, materialColor.a);
       `)}
-    ${b(q,R?X?`fragColor = getOverlayColorTexel(componentOverlayUVs());`:`fragColor = getOverlayColorTexel();`:`outputObjectAndLayerIdColor();`)}
-    ${b(me,b(R,X?x`calculateOcclusionAndOutputHighlight(getAllOverlayHighlightValuesEncoded(componentOverlayUVs()));`:x`calculateOcclusionAndOutputHighlight(getAllOverlayHighlightValuesEncoded());`,x`calculateOcclusionAndOutputHighlight();`))}`),D}const D=Object.freeze(Object.defineProperty({__proto__:null,build:E},Symbol.toStringTag,{value:`Module`}));export{D as C,E as b};
+    ${x(q,R?X?`fragColor = getOverlayColorTexel(componentOverlayUVs());`:`fragColor = getOverlayColorTexel();`:`outputObjectAndLayerIdColor();`)}
+    ${x(me,x(R,X?S`calculateOcclusionAndOutputHighlight(getAllOverlayHighlightValuesEncoded(componentOverlayUVs()));`:S`calculateOcclusionAndOutputHighlight(getAllOverlayHighlightValuesEncoded());`,S`calculateOcclusionAndOutputHighlight();`))}`),D}const D=Object.freeze(Object.defineProperty({__proto__:null,build:E},Symbol.toStringTag,{value:`Module`}));export{D as C,E as b};

package/chunks/DefaultMaterial.glsl.js

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/6.0/LICENSE.txt */
-import{Offset as e}from"../views/3d/webgl-engine/core/shaderLibrary/Offset.glsl.js";import{isColor as t}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutput.js";import{sliceDraw as n}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{Transform as r}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{InstancedDoublePrecision as i}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/InstancedDoublePrecision.glsl.js";import{NormalAttribute as a}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/NormalAttribute.glsl.js";import{TextureCoordinateAttribute as o}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/TextureCoordinateAttribute.glsl.js";import{VertexNormal as s}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexNormal.glsl.js";import{VerticalOffset as c}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VerticalOffset.glsl.js";import{DefaultMaterialAuxiliaryPasses as l}from"../views/3d/webgl-engine/core/shaderLibrary/default/DefaultMaterialAuxiliaryPasses.glsl.js";import{DefaultMaterialExternalColor as u}from"../views/3d/webgl-engine/core/shaderLibrary/default/DefaultMaterialExternalColor.glsl.js";import{ComputeNormalTexturePass as ee}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeNormalTexture.glsl.js";import{EvaluateAmbientOcclusion as d}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientOcclusion.glsl.js";import{EvaluateSceneLighting as f,addAmbientBoostFactor as p,lightingGlobalFactor as m}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{mainLightIntensity as h}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{Normals as g}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Normals.glsl.js";import{NormalUtils as _}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{PhysicallyBasedRendering as v}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRendering.glsl.js";import{PhysicallyBasedRenderingParameters as y}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{readShadowPass as b,readShadowDraw as x}from"../views/3d/webgl-engine/core/shaderLibrary/shading/readShadow.glsl.js";import{colorTextureUV as S,normalTextureUV as C,emissiveTextureUV as w,occlusionTextureUV as T,metallicRoughnessTextureUV as E}from"../views/3d/webgl-engine/core/shaderLibrary/shading/TextureTransformUV.glsl.js";import{VisualVariables as D}from"../views/3d/webgl-engine/core/shaderLibrary/shading/VisualVariables.glsl.js";import{DiscardOrAdjustAlphaPass as O}from"../views/3d/webgl-engine/core/shaderLibrary/util/DiscardOrAdjustAlpha.glsl.js";import{addProjViewLocalOrigin as k,addCameraPosition as A}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float3PassUniform as j}from"../views/3d/webgl-engine/core/shaderModules/Float3PassUniform.js";import{If as M,glsl as N}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DPassUniform as P}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{SnowCover as F}from"../views/3d/webgl-engine/effects/snowcover/SnowCover.glsl.js";import{outputColorHighlightOLID as I}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{ShaderBuilder as te}from"../views/webgl/ShaderBuilder.js";function L(L){let R=new te,{attributes:z,vertex:B,fragment:V,varyings:H}=R,{output:U,normalType:W,offsetBackfaces:G,snowCover:K,pbrMode:q,textureAlphaPremultiplied:J,instancedDoublePrecision:Y,hasVertexColors:X,hasVertexTangents:Z,hasColorTexture:Q,hasNormalTexture:ne,hasNormalTextureTransform:re,hasColorTextureTransform:ie}=L;if(k(B,L),z.add(`position`,`vec3`),B.inputs.add(`position`,()=>`position`),H.add(`vpos`,`vec3`,{invariant:!0}),R.include(D,L),R.include(i,L),R.include(c,L),R.include(S,L),!t(U))return R.include(l,L),R;R.include(C,L),R.include(w,L),R.include(T,L),R.include(E,L),A(B,L),R.include(a,L),R.include(r);let $=W===0||W===1;return $&&G&&R.include(e),R.include(ee,L),R.include(s,L),H.add(`vPositionLocal`,`vec3`),R.include(o,L),R.include(u,L),R.include(Y?b:x,L),B.main.add(N`
+import{Offset as e}from"../views/3d/webgl-engine/core/shaderLibrary/Offset.glsl.js";import{isColor as t}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutput.js";import{sliceDraw as n}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{Transform as r}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{InstancedDoublePrecision as i}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/InstancedDoublePrecision.glsl.js";import{NormalAttribute as a}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/NormalAttribute.glsl.js";import{TextureCoordinateAttribute as o}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/TextureCoordinateAttribute.glsl.js";import{VertexNormal as s}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VertexNormal.glsl.js";import{VerticalOffset as c}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/VerticalOffset.glsl.js";import{DefaultMaterialAuxiliaryPasses as l}from"../views/3d/webgl-engine/core/shaderLibrary/default/DefaultMaterialAuxiliaryPasses.glsl.js";import{DefaultMaterialExternalColor as u}from"../views/3d/webgl-engine/core/shaderLibrary/default/DefaultMaterialExternalColor.glsl.js";import{ComputeNormalTexturePass as ee}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ComputeNormalTexture.glsl.js";import{EvaluateAmbientOcclusion as d}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateAmbientOcclusion.glsl.js";import{EvaluateSceneLighting as f,addAmbientBoostFactor as p}from"../views/3d/webgl-engine/core/shaderLibrary/shading/EvaluateSceneLighting.glsl.js";import{lightingGlobalFactor as m,mainLightIntensity as h}from"../views/3d/webgl-engine/core/shaderLibrary/shading/lightingUniforms.js";import{Normals as g}from"../views/3d/webgl-engine/core/shaderLibrary/shading/Normals.glsl.js";import{NormalUtils as _}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{PhysicallyBasedRendering as v}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRendering.glsl.js";import{PhysicallyBasedRenderingParameters as y}from"../views/3d/webgl-engine/core/shaderLibrary/shading/PhysicallyBasedRenderingParameters.glsl.js";import{readShadowPass as b,readShadowDraw as x}from"../views/3d/webgl-engine/core/shaderLibrary/shading/readShadow.glsl.js";import{colorTextureUV as S,normalTextureUV as C,emissiveTextureUV as w,occlusionTextureUV as T,metallicRoughnessTextureUV as E}from"../views/3d/webgl-engine/core/shaderLibrary/shading/TextureTransformUV.glsl.js";import{VisualVariables as D}from"../views/3d/webgl-engine/core/shaderLibrary/shading/VisualVariables.glsl.js";import{DiscardOrAdjustAlphaPass as O}from"../views/3d/webgl-engine/core/shaderLibrary/util/DiscardOrAdjustAlpha.glsl.js";import{addProjViewLocalOrigin as k,addCameraPosition as A}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float3PassUniform as j}from"../views/3d/webgl-engine/core/shaderModules/Float3PassUniform.js";import{If as M,glsl as N}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{Texture2DPassUniform as P}from"../views/3d/webgl-engine/core/shaderModules/Texture2DPassUniform.js";import{SnowCover as F}from"../views/3d/webgl-engine/effects/snowcover/SnowCover.glsl.js";import{outputColorHighlightOLID as I}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{ShaderBuilder as te}from"../views/webgl/ShaderBuilder.js";function L(L){let R=new te,{attributes:z,vertex:B,fragment:V,varyings:H}=R,{output:U,normalType:W,offsetBackfaces:G,snowCover:K,pbrMode:q,textureAlphaPremultiplied:J,instancedDoublePrecision:Y,hasVertexColors:X,hasVertexTangents:Z,hasColorTexture:Q,hasNormalTexture:ne,hasNormalTextureTransform:re,hasColorTextureTransform:ie}=L;if(k(B,L),z.add(`position`,`vec3`),B.inputs.add(`position`,()=>`position`),H.add(`vpos`,`vec3`,{invariant:!0}),R.include(D,L),R.include(i,L),R.include(c,L),R.include(S,L),!t(U))return R.include(l,L),R;R.include(C,L),R.include(w,L),R.include(T,L),R.include(E,L),A(B,L),R.include(a,L),R.include(r);let $=W===0||W===1;return $&&G&&R.include(e),R.include(ee,L),R.include(s,L),H.add(`vPositionLocal`,`vec3`),R.include(o,L),R.include(u,L),R.include(Y?b:x,L),B.main.add(N`
     forwardDefaultMaterialExternalColor();
 
     vpos = getVertexInLocalOriginSpace();
@@ -22,7 +22,7 @@ import{Offset as e}from"../views/3d/webgl-engine/core/shaderLibrary/Offset.glsl.
       gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
     }
     forwardLinearDepthToReadShadow();
-  `),V.include(f,L),V.include(d,L),R.include(O,L),V.include(n,L),R.include(I,L),A(V,L),V.uniforms.add(B.uniforms.get(`localOrigin`),new j(`ambient`,e=>e.ambient),new j(`diffuse`,e=>e.diffuse)),Q&&V.uniforms.add(new P(`tex`,e=>e.texture)),R.include(y,L),V.include(v,L),R.include(g,L),V.include(F,L),V.include(_,L),p(V),V.uniforms.add(m),V.uniforms.add(h).main.add(N`
+  `),V.include(f,L),V.include(d,L),R.include(O,L),V.include(n,L),R.include(I,L),A(V,L),V.uniforms.add(B.uniforms.get(`localOrigin`),new j(`ambient`,e=>e.ambient),new j(`diffuse`,e=>e.diffuse)),Q&&V.uniforms.add(new P(`tex`,e=>e.texture)),R.include(y,L),V.include(v,L),R.include(g,L),V.include(F,L),V.include(_,L),p(V),V.uniforms.add(m,h).main.add(N`
     discardBySlice(vpos);
     ${Q?N`
             vec4 texColor = texture(tex, ${ie?`colorUV`:`vuv0`});