@arcgis/core 5.2.0-next.63 → 5.2.0-next.65

package/views/3d/terrain/OverlayRenderer.js

@@ -1,2 +1,2 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import{__decorate as e}from"tslib";import{unique as r}from"../../../core/arrayUtils.js";import{EventEmitter as t}from"../../../core/Evented.js";import"../../../core/has.js";import{someMap as s,everyMap as i}from"../../../core/MapUtils.js";import{disposeMaybe as n}from"../../../core/maybe.js";import o from"../../../core/PooledArray.js";import{watch as a,syncAndInitial as h,on as d,initial as l}from"../../../core/reactiveUtils.js";import{someSet as c}from"../../../core/SetUtils.js";import{property as u,subclass as p}from"../../../core/accessorSupport/decorators.js";import{ortho as _,fromTranslation as g}from"../../../core/libs/gl-matrix-2/math/mat4.js";import{set as m}from"../../../core/libs/gl-matrix-2/math/vec3.js";import{ones as y}from"../../../core/libs/gl-matrix-2/factories/vec3f64.js";import{debugFlags as f}from"../support/debugFlags.js";import{Overlay as R}from"./Overlay.js";import{OverlayRenderTargets as v}from"./OverlayRenderTargets.js";import w from"../webgl/RenderCamera.js";import{SyncRenderPlugin as x}from"../webgl-engine/effects/RenderPlugin.js";import{trackHighlightOptions as T,renderHighlightBuffer as S}from"../webgl-engine/effects/highlight/Highlight.js";import{GLMaterialRepository as b}from"../webgl-engine/lib/GLMaterialRepository.js";import{GridLocalOriginFactory as O}from"../webgl-engine/lib/GridLocalOriginFactory.js";import{RenderContext as D,defaultRenderOccludedMask as C}from"../webgl-engine/lib/RenderContext.js";import{ShadowMap as P}from"../webgl-engine/lib/ShadowMap.js";import{T as j}from"../../../chunks/Texture.glsl.js";import{TextureTechnique as E}from"../webgl-engine/lib/TextureTechnique.js";import{TextureTechniqueConfiguration as F}from"../webgl-engine/lib/TextureTechniqueConfiguration.js";import{AmbientLight as M}from"../webgl-engine/lighting/Lightsources.js";import{O as W}from"../../../chunks/OverlayCompositing.glsl.js";import{OverlayCompositingTechnique as V}from"../webgl-engine/shaders/OverlayCompositingTechnique.js";import{TaskPriority as q}from"../../support/Scheduler.js";import A from"../../webgl/Texture.js";import{TextureDescriptor as G}from"../../webgl/TextureDescriptor.js";let k=class extends x{constructor(e){super(e),this._overlays=null,this._renderTargets=null,this._overlayParameters=new W,this.hasHighlights=!1,this.renderOccludedFlags=1,this._hasWater=!1,this._renderers=new Map,this._sortedDrapeSourceRenderersDirty=!1,this._sortedRenderers=new o,this._passParameters=new j,this._screenToWorldRatio=1,this._localOriginFactory=null,this.unloadedMemory=0,this.ignoresMemoryFactor=!1,this._camera=new w,this.events=new t,this.longitudeCyclical=null,this.produces=new Map([[18,e=>10!==e||this.hasHighlights],[19,()=>this._hasWater]]),this._hasTargetWithoutRasterImage=!1,this._hasDrapedFeatureSource=!1,this._hasDrapedRasterSource=!1,this._hasDrapedFlowSource=!1;const{state:r,stage:s}=e.parent.view,i=s.renderer.fboCache,n=s.renderView.renderingContext,a=s.renderView.techniques;this._renderContext=new D(n,new P(i,r.viewingMode),a)}initialize(){const e=this._view,r=e.stage.renderView.waterTextures;this.addHandles([a(()=>r.updating,()=>this.events.emit("content-changed"),h),a(()=>this._spatialReference,e=>this._localOriginFactory=new O(e),h),d(()=>e.allLayerViews,"after-changes",()=>this._sortedDrapeSourceRenderersDirty=!0),a(()=>T(e.state.highlights),()=>this._sortedDrapeSourceRenderersDirty=!0,l),a(()=>e.state.highlights,e=>{this._bindParameters.highlights=e},l),e.resourceController.scheduler.registerTask(q.OVERLAY_RENDERER,this)]);const t=this._camera;t.near=1,t.far=1e4,t.relativeElevation=null,this._bindParameters.slot=18,this._bindParameters.camera=t,this._bindParameters.updateLighting(new M(y()),0,0,0)}destroy(){this._renderers.forEach(e=>e.destroy()),this._renderers.clear(),this._passParameters.texture=n(this._passParameters.texture),this.disposeOverlays(),this._renderContext.destroy(),this._sortedRenderers.prune()}get _bindParameters(){return this._renderContext.bind}get _rctx(){return this._stage.renderView.renderingContext}get _view(){return this.parent.view}get _stage(){return this.parent.view.stage}get _spatialReference(){return this.parent.spatialReference}get _techniques(){return this._stage.renderView.techniques}get rctx(){return this._rctx}get materials(){return this._pluginContext.materials}get screenToWorldRatio(){return this._screenToWorldRatio}get localOriginFactory(){return this._localOriginFactory}set time(e){this._renderContext.time=e}get pluginContext(){return this._pluginContext}initializeRenderContext(e){const r=new b(this._view.stage.renderView.textures,this._techniques,()=>{this._onMaterialOrContentChanged(),this.events.emit("content-changed"),this.notifyChange("updating"),this.notifyChange("isEmpty")},()=>this.events.emit("content-changed"));this._pluginContext={...e,materials:r},this._techniques.precompile(V)}uninitializeRenderContext(){}acquireTechniques(){return[]}render(){}get updating(){return this._sortedDrapeSourceRenderersDirty||s(this._renderers,e=>e.updating||e.canCompact)}get hasOverlays(){return null!=this._overlays&&null!=this._renderTargets}getMaterialRenderer(e){for(const r of this._renderers.values()){const t=r.getMaterialRenderer(e);if(t)return t}return null}get layers(){return this._sortedDrapeSourceRenderersDirty&&this._updateSortedDrapeSourceRenderers(),r(this._sortedRenderers.map(e=>e.drapeSource.layer).filter(e=>!!e))}registerDrapeSource(e,r){const t=this._renderers.get(e);null!=t&&t.destroy(),this._renderers.set(e,r),this._sortedDrapeSourceRenderersDirty=!0,"fullOpacity"in e&&this.addHandles(a(()=>e.fullOpacity,()=>this.events.emit("content-changed")),e)}removeDrapeSourceRenderer(e){if(null==e)return;const r=this._renderers.get(e);null!=r&&(this._sortedDrapeSourceRenderersDirty=!0,this._renderers.delete(e),this.removeHandles(e),r.destroy())}computeValidity(){return this._renderTargets?.computeValidity()??0}releaseRenderTargets(e){this._renderTargets?.dispose(e)}get overlays(){return this._overlays??[]}ensureDrapeTargets(e){this._hasTargetWithoutRasterImage=!!this._overlays&&c(e,e=>1===e.drapeTargetType)}ensureDrapeSources(e){this._overlays?(this._hasDrapedFeatureSource=c(e,e=>1===e.drapeSourceType),this._hasDrapedRasterSource=c(e,e=>0===e.drapeSourceType),this._hasDrapedFlowSource=c(e,e=>2===e.drapeSourceType)):this._hasDrapedFeatureSource=this._hasDrapedRasterSource=this._hasDrapedFlowSource=!1}get _needsColorWithoutRasterImage(){return this._hasDrapedRasterSource&&this._hasDrapedFeatureSource&&this._hasTargetWithoutRasterImage}ensureOverlays(e,r,t=this._bindParameters.overlayStretch){null==this._overlays&&(this._renderTargets=new v(this._stage.renderer.fboCache),this._overlays=[new R,new R]),this.ensureDrapeTargets(e),this.ensureDrapeSources(r),this._bindParameters.overlayStretch=t}disposeOverlays(){this._overlays=null,this._renderTargets?.dispose(1),this._renderTargets=null,this.events.emit("textures-disposed")}_useOverlayColorInsteadOfColorNoRasterImage(e){return 1===e&&!this._needsColorWithoutRasterImage&&this._hasDrapedFeatureSource}getTexture(e){const r=this._useOverlayColorInsteadOfColorNoRasterImage(e);return this._renderTargets?.getTexture(r?0:e)}get readyToRun(){return this.updating}runTask(e){this._processDrapeSources(()=>!0,e)}_onMaterialOrContentChanged(){this.renderOccludedFlags=s(this._renderers,e=>e.hasOccluders)?H:1}_processDrapeSources(e,r){let t=!1;for(const[s,i]of this._renderers){if(r?.done)break;(s.destroyed||e(s))&&(i.commitChanges()&&(t=!0,r?.madeProgress()))}this._sortedDrapeSourceRenderersDirty&&(this._sortedDrapeSourceRenderersDirty=!1,t=!0,this._updateSortedDrapeSourceRenderers(),r?.madeProgress()),r&&this.compact(r),t&&(null!=this._overlays&&0===this._renderers.size&&this.disposeOverlays(),this.notifyChange("updating"),this.notifyChange("isEmpty"),this._onMaterialOrContentChanged(),this.hasHighlights=s(this._renderers,e=>e.hasHighlights),this.events.emit("content-changed"))}compact(e){let r=!1;for(const t of this._renderers.values()){if(e.done)break;r=t.compact(e)||r}return r&&this.notifyChange("updating"),r}hasHighlight(e){return s(this._renderers,r=>r.hasHighlight(e))}processSyncDrapeSources(){this._processDrapeSources(e=>1===e.updatePolicy)}get isEmpty(){return!f.OVERLAY_DRAW_DEBUG_TEXTURE&&i(this._renderers,e=>e.isEmpty)}get hasWater(){const e=s(this._renderers,({hasWater:e})=>e);return e!==this._hasWater&&(this._hasWater=e,this.events.emit("has-water")),this._hasWater}renders(e){if(f.OVERLAY_DRAW_DEBUG_TEXTURE&&4!==e&&2!==e)return!0;if(!this._overlays)return!1;const r=this._overlays[0];for(const i of this._overlays)i.setupGeometryViews(this.longitudeCyclical);if(!r.hasSomeSizedView())return!1;const t=this._setOutput(this._renderTargets?.targets.find(r=>r.content===e)?.output??0);++this._techniques.precompiling;const s=this._sortedRenderers.some(({renderer:e})=>e.precompile(this._renderContext));return--this._techniques.precompiling,this._setOutput(t),s}_setOutput(e){const r=this._bindParameters.output;return this._bindParameters.output=e,this._bindParameters.slot=4===e?19:18,r}get mode(){return this.isEmpty?0:this.hasWater&&this.renders(3)?2:this._renderTargets?.getTexture(0)?1:0}updateAnimation(e){let r=!1;return this._renderers.forEach(t=>r=t.updateAnimation(e)||r),r&&this.parent.requestRender(0),r}updateDrapeSourceOrder(){this._sortedDrapeSourceRenderersDirty=!0}precompileShaders(e){if(!this._overlays||!this._renderTargets)return!1;const r=this._bindParameters;r.alignPixelEnabled=e.alignPixelEnabled,++this._techniques.precompiling;for(const t of this._renderTargets.targets){if(1===t.content&&!this._needsColorWithoutRasterImage)continue;const{output:e}=t;this._setOutput(e),10===e&&(r.highlightMixTexture=r.highlights.length>1?this._rctx.emptyTexture:null);const s=this._renderContext.renderOccludedMask;4===t.content&&(this._renderContext.renderOccludedMask=H),this._sortedRenderers.forAll(({drapeSource:e,renderer:r})=>{1===t.content&&0===e.drapeSourceType||4===t.content&&r.hasOnlyOccluders||r.precompile(this._renderContext)}),this._renderContext.renderOccludedMask=s,r.highlightMixTexture=null}return--this._techniques.precompiling,!0}drawOverlays(e,r){if(!this._overlays||!this._renderTargets)return;for(const s of this._overlays)s.setupGeometryViews(this.longitudeCyclical);this._bindParameters.alignPixelEnabled=e.alignPixelEnabled;const t=this.allSourcesOccluders;for(const s of this._renderTargets.targets){if(!(0===s.content&&this._hasDrapedFlowSource)&&!s.handleRenderRequest(r)||1===s.content&&!this._needsColorWithoutRasterImage||4===s.content&&t)continue;const e=this._drawTarget(0,s),i=this._drawTarget(1,s);(e||i)&&s.fbo.generateMipMap()}}_drawTarget(e,r){const t=this._overlays[e],s=t.canvasGeometries;if(0===s.numViews)return!1;const i=this._view.state.contentPixelRatio;this._screenToWorldRatio=i*t.mapUnitsPerPixel/this._bindParameters.overlayStretch;const{output:n,content:o}=r;if(this.isEmpty||4===n&&!this.hasWater||!t.hasSomeSizedView())return!1;const{_rctx:a,_camera:h,_renderContext:d,_bindParameters:l}=this;if(h.pixelRatio=t.pixelRatio*i,this._setOutput(n),l.screenToWorldRatio=this._screenToWorldRatio,l.screenToPCSRatio=this._screenToWorldRatio*this.parent.worldToPCSRatio,4===o&&(d.renderOccludedMask=H),!this.renders(o))return d.renderOccludedMask=C,!1;const{resolution:c}=t,u=0===e,p=u?0:c;a.setViewport(p,0,c,c),this._bindTargetFBO(r),u&&(10===n?a.gl.clearBufferuiv(a.gl.COLOR,0,[0,0,0,0]):(a.setClearColor(0,0,0,0),a.clear(16384)));if(f.OVERLAY_DRAW_DEBUG_TEXTURE&&4!==o&&2!==o){this._techniques.precompile(E,L);const r=this._techniques.get(E,L);for(let i=0;i<s.numViews;i++)this._setViewParameters(s.extents[i],t),this._ensureDebugPatternResources(t.resolution,U[e]),a.bindTechnique(r,l,this._passParameters),a.screen.draw()}if(10===n){const{fboCache:t}=this._stage.renderer,s=this._resolution;this._bindTargetFBO(r),S(a,t,s,s,l,()=>this._renderAllGeometry(e,r),p)}else this._renderAllGeometry(e,r);return a.bindFramebuffer(null),d.renderOccludedMask=C,!0}get allSourcesOccluders(){return i(this._renderers,e=>e.hasOnlyOccluders)}_renderAllGeometry(e,r){const t=this._overlays[e],s=t.canvasGeometries;this._sortedRenderers.forAll(({drapeSource:i,renderer:n})=>{if(1===r.content&&0===i.drapeSourceType)return;const{fullOpacity:o}=i,a=null!=o&&o<1&&0===r.output&&this._bindTemporaryFBO();for(let e=0;e<s.numViews;e++)this._setViewParameters(s.extents[e],t),n.render(this._renderContext);if(a){this._bindTargetFBO(r),this._overlayParameters.texture=a.getTexture(),this._overlayParameters.opacity=o,this._overlayParameters.overlayIndex=e;const t=this._techniques.get(V);this._rctx.bindTechnique(t,this._bindParameters,this._overlayParameters),this._rctx.screen.draw(),a.release()}})}_bindTargetFBO(e){const r=this._resolution,t=2*r;e.fbo.ensureFramebuffer(t,r),e.fbo.bind(this._rctx)}_bindTemporaryFBO(){const e=this._resolution,r=2*e,t=this._stage.renderer.fboCache,s=t.acquire(r,e,"overlay tmp");return t.rctx.bindFramebuffer(s.fbo),t.rctx.clear(16384),s}get _resolution(){return this._overlays?.[0].resolution??0}notifyContentChanged(){this.events.emit("content-changed")}intersectRay(e,r,t,s){this._sortedDrapeSourceRenderersDirty&&this._updateSortedDrapeSourceRenderers();let i=0;for(const{renderer:n}of this._sortedRenderers)i=n.intersectRay?.(e,r,t,s,i)??i}*intersectScreenPolygon(e,r,t){this._sortedDrapeSourceRenderersDirty&&this._updateSortedDrapeSourceRenderers();let s=0;for(const{renderer:i}of this._sortedRenderers)s=yield*i.intersectScreenPolygon(e,r,t,s)}_updateSortedDrapeSourceRenderers(){if(this._sortedRenderers.clear(),0===this._renderers.size)return;const e=this._view.map.allLayers.map(e=>e.uid),r=e.length;this._renderers.forEach((t,s)=>{const i=e.indexOf(s.layer?.uid),n=i>=0,o=s.renderGroup??(n?0:1),a=s.drapeSourcePriorityOffset??0,h=r*o+(n?i:0)+a;this._sortedRenderers.push(new I(s,t,h))}),this._sortedRenderers.sort((e,r)=>e.index-r.index)}_setViewParameters(e,r){const t=this._camera;t.viewport=[0,0,r.resolution,r.resolution],_(t.projectionMatrix,0,e[2]-e[0],0,e[3]-e[1],t.near,t.far),g(t.viewMatrix,[-e[0],-e[1],0])}_ensureDebugPatternResources(e,r){if(m(this._passParameters.color,r[0],r[1],r[2]),this._passParameters.texture)return;const t=new Uint8Array(e*e*4);let s=0;for(let n=0;n<e;n++)for(let r=0;r<e;r++){const i=Math.floor(r/10),o=Math.floor(n/10);i<2||o<2||10*i>e-20||10*o>e-20?(t[s++]=255,t[s++]=255,t[s++]=255,t[s++]=255):(t[s++]=255,t[s++]=255,t[s++]=255,t[s++]=1&i&&1&o?1&r^1&n?0:255:1&i^1&o?0:128)}const i=new G(e);i.samplingMode=9728,this._passParameters.texture=new A(this._rctx,i,t)}get test(){}};e([u()],k.prototype,"hasHighlights",void 0),e([u()],k.prototype,"renderOccludedFlags",void 0),e([u()],k.prototype,"_sortedDrapeSourceRenderersDirty",void 0),e([u({constructOnly:!0})],k.prototype,"parent",void 0),e([u({readOnly:!0})],k.prototype,"_techniques",null),e([u({type:Boolean,readOnly:!0})],k.prototype,"updating",null),e([u()],k.prototype,"isEmpty",null),k=e([p("esri.views.3d.terrain.OverlayRenderer")],k);class I{constructor(e,r,t){this.drapeSource=e,this.renderer=r,this.index=t}}const U=[[1,.5,.5],[.5,.5,1]],B=-2,H=4,L=new F;L.hasAlpha=!0;export{k as OverlayRenderer,B as drapedZ,H as overlayRenderOccludedFlag};
+import{__decorate as e}from"tslib";import{unique as r}from"../../../core/arrayUtils.js";import{EventEmitter as t}from"../../../core/Evented.js";import"../../../core/has.js";import{someMap as s,everyMap as i}from"../../../core/MapUtils.js";import{disposeMaybe as n}from"../../../core/maybe.js";import o from"../../../core/PooledArray.js";import{watch as a,syncAndInitial as h,on as d,initial as l}from"../../../core/reactiveUtils.js";import{someSet as c}from"../../../core/SetUtils.js";import{property as u,subclass as p}from"../../../core/accessorSupport/decorators.js";import{ortho as _,fromTranslation as g}from"../../../core/libs/gl-matrix-2/math/mat4.js";import{set as m}from"../../../core/libs/gl-matrix-2/math/vec3.js";import{ones as y}from"../../../core/libs/gl-matrix-2/factories/vec3f64.js";import{debugFlags as f}from"../support/debugFlags.js";import{Overlay as R}from"./Overlay.js";import{OverlayRenderTargets as v}from"./OverlayRenderTargets.js";import w from"../webgl/RenderCamera.js";import{SyncRenderPlugin as x}from"../webgl-engine/effects/RenderPlugin.js";import{trackHighlightOptions as S,renderHighlightBuffer as T}from"../webgl-engine/effects/highlight/Highlight.js";import{GLMaterialRepository as b}from"../webgl-engine/lib/GLMaterialRepository.js";import{GridLocalOriginFactory as D}from"../webgl-engine/lib/GridLocalOriginFactory.js";import{RenderContext as O,defaultRenderOccludedMask as C}from"../webgl-engine/lib/RenderContext.js";import{ShadowMap as P}from"../webgl-engine/lib/ShadowMap.js";import{T as j}from"../../../chunks/Texture.glsl.js";import{TextureTechnique as E}from"../webgl-engine/lib/TextureTechnique.js";import{TextureTechniqueConfiguration as F}from"../webgl-engine/lib/TextureTechniqueConfiguration.js";import{AmbientLight as M}from"../webgl-engine/lighting/Lightsources.js";import{O as W}from"../../../chunks/OverlayCompositing.glsl.js";import{OverlayCompositingTechnique as V}from"../webgl-engine/shaders/OverlayCompositingTechnique.js";import{TaskPriority as q}from"../../support/Scheduler.js";import A from"../../webgl/Texture.js";import{TextureDescriptor as G}from"../../webgl/TextureDescriptor.js";let k=class extends x{constructor(e){super(e),this._overlays=null,this._renderTargets=null,this._overlayParameters=new W,this.hasHighlights=!1,this.renderOccludedFlags=1,this._hasWater=!1,this._renderers=new Map,this._sortedDrapeSourceRenderersDirty=!1,this._sortedRenderers=new o,this._passParameters=new j,this._screenToWorldRatio=1,this._localOriginFactory=null,this.unloadedMemory=0,this.ignoresMemoryFactor=!1,this._camera=new w,this.events=new t,this.longitudeCyclical=null,this.produces=new Map([[18,e=>10!==e||this.hasHighlights],[19,()=>this._hasWater]]),this._hasTargetWithoutRasterImage=!1,this._hasDrapedFeatureSource=!1,this._hasDrapedRasterSource=!1,this._hasDrapedFlowSource=!1;const{state:r,stage:s}=e.parent.view,i=s.renderer.fboCache,n=s.renderView.renderingContext,a=s.renderView.techniques;this._renderContext=new O(n,new P(i,r.viewingMode),a)}initialize(){const e=this._view,r=e.stage.renderView.waterTextures;this.addHandles([a(()=>r.updating,()=>this.events.emit("content-changed"),h),a(()=>this._spatialReference,e=>this._localOriginFactory=new D(e),h),d(()=>e.allLayerViews,"after-changes",()=>this._sortedDrapeSourceRenderersDirty=!0),a(()=>S(e.state.highlights),()=>this._sortedDrapeSourceRenderersDirty=!0,l),a(()=>e.state.highlights,e=>{this._bindParameters.highlights=e},l),e.resourceController.scheduler.registerTask(q.OVERLAY_RENDERER,this)]);const t=this._camera;t.near=1,t.far=1e4,t.relativeElevation=null,this._bindParameters.slot=18,this._bindParameters.camera=t,this._bindParameters.updateLighting(new M(y()),0,0,0)}destroy(){this._renderers.forEach(e=>e.destroy()),this._renderers.clear(),this._passParameters.texture=n(this._passParameters.texture),this.disposeOverlays(),this._renderContext.destroy(),this._sortedRenderers.prune()}get _bindParameters(){return this._renderContext.bind}get _rctx(){return this._stage.renderView.renderingContext}get _view(){return this.parent.view}get _stage(){return this.parent.view.stage}get _spatialReference(){return this.parent.spatialReference}get _techniques(){return this._stage.renderView.techniques}get rctx(){return this._rctx}get materials(){return this._pluginContext.materials}get screenToWorldRatio(){return this._screenToWorldRatio}get localOriginFactory(){return this._localOriginFactory}set time(e){this._renderContext.time=e}get pluginContext(){return this._pluginContext}initializeRenderContext(e){const r=new b(this._view.stage.renderView.textures,this._techniques,()=>{this._onMaterialOrContentChanged(),this.events.emit("content-changed"),this.notifyChange("updating"),this.notifyChange("isEmpty")},()=>this.events.emit("content-changed"));this._pluginContext={...e,materials:r},this._techniques.precompile(V)}uninitializeRenderContext(){}acquireTechniques(){return[]}render(){}get updating(){return this._sortedDrapeSourceRenderersDirty||s(this._renderers,e=>e.updating||e.canCompact)}get hasOverlays(){return null!=this._overlays&&null!=this._renderTargets}getMaterialRenderer(e){for(const r of this._renderers.values()){const t=r.getMaterialRenderer(e);if(t)return t}return null}get layers(){return this._sortedDrapeSourceRenderersDirty&&this._updateSortedDrapeSourceRenderers(),r(this._sortedRenderers.map(e=>e.drapeSource.layer).filter(e=>!!e))}registerDrapeSource(e,r){const t=this._renderers.get(e);null!=t&&t.destroy(),this._renderers.set(e,r),this._sortedDrapeSourceRenderersDirty=!0,"fullOpacity"in e&&this.addHandles(a(()=>e.fullOpacity,()=>this.events.emit("content-changed")),e)}removeDrapeSourceRenderer(e){if(null==e)return;const r=this._renderers.get(e);null!=r&&(this._sortedDrapeSourceRenderersDirty=!0,this._renderers.delete(e),this.removeHandles(e),r.destroy())}computeValidity(){return this._renderTargets?.computeValidity()??0}releaseRenderTargets(e){this._renderTargets?.dispose(e)}get overlays(){return this._overlays??[]}ensureDrapeTargets(e){this._hasTargetWithoutRasterImage=!!this._overlays&&c(e,e=>1===e.drapeTargetType)}ensureDrapeSources(e){this._overlays?(this._hasDrapedFeatureSource=c(e,e=>1===e.drapeSourceType),this._hasDrapedRasterSource=c(e,e=>0===e.drapeSourceType),this._hasDrapedFlowSource=c(e,e=>2===e.drapeSourceType)):this._hasDrapedFeatureSource=this._hasDrapedRasterSource=this._hasDrapedFlowSource=!1}get _needsColorWithoutRasterImage(){return this._hasDrapedRasterSource&&this._hasDrapedFeatureSource&&this._hasTargetWithoutRasterImage}ensureOverlays(e,r,t=this._bindParameters.overlayStretch){null==this._overlays&&(this._renderTargets=new v(this._stage.renderer.fboCache),this._overlays=[new R,new R]),this.ensureDrapeTargets(e),this.ensureDrapeSources(r),this._bindParameters.overlayStretch=t}disposeOverlays(){this._overlays=null,this._renderTargets?.dispose(1),this._renderTargets=null,this.events.emit("textures-disposed")}_useOverlayColorInsteadOfColorNoRasterImage(e){return 1===e&&!this._needsColorWithoutRasterImage&&(this._hasDrapedFeatureSource||this._hasDrapedRasterSource)}getTexture(e){const r=this._useOverlayColorInsteadOfColorNoRasterImage(e);return this._renderTargets?.getTexture(r?0:e)}get readyToRun(){return this.updating}runTask(e){this._processDrapeSources(()=>!0,e)}_onMaterialOrContentChanged(){this.renderOccludedFlags=s(this._renderers,e=>e.hasOccluders)?H:1}_processDrapeSources(e,r){let t=!1;for(const[s,i]of this._renderers){if(r?.done)break;(s.destroyed||e(s))&&(i.commitChanges()&&(t=!0,r?.madeProgress()))}this._sortedDrapeSourceRenderersDirty&&(this._sortedDrapeSourceRenderersDirty=!1,t=!0,this._updateSortedDrapeSourceRenderers(),r?.madeProgress()),r&&this.compact(r),t&&(null!=this._overlays&&0===this._renderers.size&&this.disposeOverlays(),this.notifyChange("updating"),this.notifyChange("isEmpty"),this._onMaterialOrContentChanged(),this.hasHighlights=s(this._renderers,e=>e.hasHighlights),this.events.emit("content-changed"))}compact(e){let r=!1;for(const t of this._renderers.values()){if(e.done)break;r=t.compact(e)||r}return r&&this.notifyChange("updating"),r}hasHighlight(e){return s(this._renderers,r=>r.hasHighlight(e))}processSyncDrapeSources(){this._processDrapeSources(e=>1===e.updatePolicy)}get isEmpty(){return!f.OVERLAY_DRAW_DEBUG_TEXTURE&&i(this._renderers,e=>e.isEmpty)}get hasWater(){const e=s(this._renderers,({hasWater:e})=>e);return e!==this._hasWater&&(this._hasWater=e,this.events.emit("has-water")),this._hasWater}renders(e){if(f.OVERLAY_DRAW_DEBUG_TEXTURE&&4!==e&&2!==e)return!0;if(!this._overlays)return!1;const r=this._overlays[0];for(const i of this._overlays)i.setupGeometryViews(this.longitudeCyclical);if(!r.hasSomeSizedView())return!1;const t=this._setOutput(this._renderTargets?.targets.find(r=>r.content===e)?.output??0);++this._techniques.precompiling;const s=this._sortedRenderers.some(({renderer:e})=>e.precompile(this._renderContext));return--this._techniques.precompiling,this._setOutput(t),s}_setOutput(e){const r=this._bindParameters.output;return this._bindParameters.output=e,this._bindParameters.slot=4===e?19:18,r}get mode(){return this.isEmpty?0:this.hasWater&&this.renders(3)?2:this._renderTargets?.getTexture(0)?1:0}updateAnimation(e){let r=!1;return this._renderers.forEach(t=>r=t.updateAnimation(e)||r),r&&this.parent.requestRender(0),r}updateDrapeSourceOrder(){this._sortedDrapeSourceRenderersDirty=!0}precompileShaders(e){if(!this._overlays||!this._renderTargets)return!1;const r=this._bindParameters;r.alignPixelEnabled=e.alignPixelEnabled,++this._techniques.precompiling;for(const t of this._renderTargets.targets){if(1===t.content&&!this._needsColorWithoutRasterImage)continue;const{output:e}=t;this._setOutput(e),10===e&&(r.highlightMixTexture=r.highlights.length>1?this._rctx.emptyTexture:null);const s=this._renderContext.renderOccludedMask;4===t.content&&(this._renderContext.renderOccludedMask=H),this._sortedRenderers.forAll(({drapeSource:e,renderer:r})=>{1===t.content&&0===e.drapeSourceType||4===t.content&&r.hasOnlyOccluders||r.precompile(this._renderContext)}),this._renderContext.renderOccludedMask=s,r.highlightMixTexture=null}return--this._techniques.precompiling,!0}drawOverlays(e,r){if(!this._overlays||!this._renderTargets)return;for(const s of this._overlays)s.setupGeometryViews(this.longitudeCyclical);this._bindParameters.alignPixelEnabled=e.alignPixelEnabled;const t=this.allSourcesOccluders;for(const s of this._renderTargets.targets){if(!(0===s.content&&this._hasDrapedFlowSource)&&!s.handleRenderRequest(r)||1===s.content&&!this._needsColorWithoutRasterImage||4===s.content&&t)continue;const e=this._drawTarget(0,s),i=this._drawTarget(1,s);(e||i)&&s.fbo.generateMipMap()}}_drawTarget(e,r){const t=this._overlays[e],s=t.canvasGeometries;if(0===s.numViews)return!1;const i=this._view.state.contentPixelRatio;this._screenToWorldRatio=i*t.mapUnitsPerPixel/this._bindParameters.overlayStretch;const{output:n,content:o}=r;if(this.isEmpty||4===n&&!this.hasWater||!t.hasSomeSizedView())return!1;const{_rctx:a,_camera:h,_renderContext:d,_bindParameters:l}=this;if(h.pixelRatio=t.pixelRatio*i,this._setOutput(n),l.screenToWorldRatio=this._screenToWorldRatio,l.screenToPCSRatio=this._screenToWorldRatio*this.parent.worldToPCSRatio,4===o&&(d.renderOccludedMask=H),!this.renders(o))return d.renderOccludedMask=C,!1;const{resolution:c}=t,u=0===e,p=u?0:c;a.setViewport(p,0,c,c),this._bindTargetFBO(r),u&&(10===n?a.gl.clearBufferuiv(a.gl.COLOR,0,[0,0,0,0]):(a.setClearColor(0,0,0,0),a.clear(16384)));if(f.OVERLAY_DRAW_DEBUG_TEXTURE&&4!==o&&2!==o){this._techniques.precompile(E,L);const r=this._techniques.get(E,L);for(let i=0;i<s.numViews;i++)this._setViewParameters(s.extents[i],t),this._ensureDebugPatternResources(t.resolution,U[e]),a.bindTechnique(r,l,this._passParameters),a.screen.draw()}if(10===n){const{fboCache:t}=this._stage.renderer,s=this._resolution;this._bindTargetFBO(r),T(a,t,s,s,l,()=>this._renderAllGeometry(e,r),p)}else this._renderAllGeometry(e,r);return a.bindFramebuffer(null),d.renderOccludedMask=C,!0}get allSourcesOccluders(){return i(this._renderers,e=>e.hasOnlyOccluders)}_renderAllGeometry(e,r){const t=this._overlays[e],s=t.canvasGeometries;this._sortedRenderers.forAll(({drapeSource:i,renderer:n})=>{if(1===r.content&&0===i.drapeSourceType)return;const{fullOpacity:o}=i,a=null!=o&&o<1&&0===r.output&&this._bindTemporaryFBO();for(let e=0;e<s.numViews;e++)this._setViewParameters(s.extents[e],t),n.render(this._renderContext);if(a){this._bindTargetFBO(r),this._overlayParameters.texture=a.getTexture(),this._overlayParameters.opacity=o,this._overlayParameters.overlayIndex=e;const t=this._techniques.get(V);this._rctx.bindTechnique(t,this._bindParameters,this._overlayParameters),this._rctx.screen.draw(),a.release()}})}_bindTargetFBO(e){const r=this._resolution,t=2*r;e.fbo.ensureFramebuffer(t,r),e.fbo.bind(this._rctx)}_bindTemporaryFBO(){const e=this._resolution,r=2*e,t=this._stage.renderer.fboCache,s=t.acquire(r,e,"overlay tmp");return t.rctx.bindFramebuffer(s.fbo),t.rctx.clear(16384),s}get _resolution(){return this._overlays?.[0].resolution??0}notifyContentChanged(){this.events.emit("content-changed")}intersectRay(e,r,t,s){this._sortedDrapeSourceRenderersDirty&&this._updateSortedDrapeSourceRenderers();let i=0;for(const{renderer:n}of this._sortedRenderers)i=n.intersectRay?.(e,r,t,s,i)??i}*intersectScreenPolygon(e,r,t){this._sortedDrapeSourceRenderersDirty&&this._updateSortedDrapeSourceRenderers();let s=0;for(const{renderer:i}of this._sortedRenderers)s=yield*i.intersectScreenPolygon(e,r,t,s)}_updateSortedDrapeSourceRenderers(){if(this._sortedRenderers.clear(),0===this._renderers.size)return;const e=this._view.map.allLayers.map(e=>e.uid),r=e.length;this._renderers.forEach((t,s)=>{const i=e.indexOf(s.layer?.uid),n=i>=0,o=s.renderGroup??(n?0:1),a=s.drapeSourcePriorityOffset??0,h=r*o+(n?i:0)+a;this._sortedRenderers.push(new I(s,t,h))}),this._sortedRenderers.sort((e,r)=>e.index-r.index)}_setViewParameters(e,r){const t=this._camera;t.viewport=[0,0,r.resolution,r.resolution],_(t.projectionMatrix,0,e[2]-e[0],0,e[3]-e[1],t.near,t.far),g(t.viewMatrix,[-e[0],-e[1],0])}_ensureDebugPatternResources(e,r){if(m(this._passParameters.color,r[0],r[1],r[2]),this._passParameters.texture)return;const t=new Uint8Array(e*e*4);let s=0;for(let n=0;n<e;n++)for(let r=0;r<e;r++){const i=Math.floor(r/10),o=Math.floor(n/10);i<2||o<2||10*i>e-20||10*o>e-20?(t[s++]=255,t[s++]=255,t[s++]=255,t[s++]=255):(t[s++]=255,t[s++]=255,t[s++]=255,t[s++]=1&i&&1&o?1&r^1&n?0:255:1&i^1&o?0:128)}const i=new G(e);i.samplingMode=9728,this._passParameters.texture=new A(this._rctx,i,t)}get test(){}};e([u()],k.prototype,"hasHighlights",void 0),e([u()],k.prototype,"renderOccludedFlags",void 0),e([u()],k.prototype,"_sortedDrapeSourceRenderersDirty",void 0),e([u({constructOnly:!0})],k.prototype,"parent",void 0),e([u({readOnly:!0})],k.prototype,"_techniques",null),e([u({type:Boolean,readOnly:!0})],k.prototype,"updating",null),e([u()],k.prototype,"isEmpty",null),k=e([p("esri.views.3d.terrain.OverlayRenderer")],k);class I{constructor(e,r,t){this.drapeSource=e,this.renderer=r,this.index=t}}const U=[[1,.5,.5],[.5,.5,1]],B=-2,H=4,L=new F;L.hasAlpha=!0;export{k as OverlayRenderer,B as drapedZ,H as overlayRenderOccludedFlag};

package/views/3d/webgl-engine/core/shaderLibrary/attributes/PathEvaluate.glsl.js

@@ -1,8 +1,8 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import{freeze as e}from"../../../../../../core/libs/gl-matrix-2/factories/vec2f64.js";import{pathNumRoundCapExtrusionSubdivisions as t}from"../../../../layers/graphics/Graphics3DPathSymbolLayerConstants.js";import{PathVertexInfo as r}from"./PathVertexInfo.glsl.js";import{PiUtils as o}from"../shading/PiUtils.glsl.js";import{Float2sPassUniform as a}from"../../shaderModules/Float2sPassUniform.js";import{Float4sPassUniform as i}from"../../shaderModules/Float4sPassUniform.js";import{FloatPassUniform as l}from"../../shaderModules/FloatPassUniform.js";import{glsl as n,If as s}from"../../shaderModules/glsl.js";import{IntegerPassUniform as f}from"../../shaderModules/IntegerPassUniform.js";import{IntegersPassUniform as p}from"../../shaderModules/IntegersPassUniform.js";import{pathProfileUniformLayout as c}from"../../../lib/PathProfile.js";function d(e,d){const{vertex:m}=e;e.include(r,d);const u=1===d.upVectorAlignment;m.uniforms.add(new l("angleCutoff",e=>e.cutoffAngle)),m.code.add(n`float reciprocalClamped(float value) {
+import{freeze as e}from"../../../../../../core/libs/gl-matrix-2/factories/vec2f64.js";import{pathNumJoinSubdivisions as t,pathNumRoundCapExtrusionSubdivisions as r}from"../../../../layers/graphics/Graphics3DPathSymbolLayerConstants.js";import{PathVertexInfo as o}from"./PathVertexInfo.glsl.js";import{PiUtils as a}from"../shading/PiUtils.glsl.js";import{Float2sPassUniform as i}from"../../shaderModules/Float2sPassUniform.js";import{Float4sPassUniform as s}from"../../shaderModules/Float4sPassUniform.js";import{FloatPassUniform as n}from"../../shaderModules/FloatPassUniform.js";import{glsl as l,If as p}from"../../shaderModules/glsl.js";import{IntegersPassUniform as f}from"../../shaderModules/IntegersPassUniform.js";import{pathProfileUniformLayout as c}from"../../../lib/PathProfile.js";function d(e,d){const{vertex:x}=e;e.include(o,d);const u=1===d.upVectorAlignment;x.uniforms.add(new n("angleCutoff",e=>e.cutoffAngle)),x.code.add(l`float reciprocalClamped(float value) {
 float signValue = value < 0.0 ? -1.0 : 1.0;
 return signValue / max(abs(value), 1e-6);
-}`),u?m.code.add(n`vec2 applyMiterStretch(vec2 vertex, float rotationAngle, vec2 rotationRight) {
+}`),u?x.code.add(l`vec2 applyMiterStretch(vec2 vertex, float rotationAngle, vec2 rotationRight) {
 if (rotationAngle == 0.0) {
 return vertex;
 }
@@ -14,13 +14,13 @@ mat2 miterStretch = mat2(
 1. + (k - 1.) * rotationRight.y * rotationRight.y
 );
 return miterStretch * vertex;
-}`):m.code.add(n`vec2 applyMiterStretch(vec2 vertex, float rotationAngle) {
+}`):x.code.add(l`vec2 applyMiterStretch(vec2 vertex, float rotationAngle) {
 if (rotationAngle == 0.0) {
 return vertex;
 }
 float k = reciprocalClamped(cos(0.5 * rotationAngle));
 return vec2(k, 1.) * vertex;
-}`);const{vertexCount:v,indexCount:h,poleCount:g}=c[d.pathProfileType];switch(m.uniforms.add(new a("pathProfileVertices",v,e=>e.profile.vertices.flat()),new a("pathProfileNormals",v,e=>e.profile.normals.flat())),m.code.add(n`mat3 mat3FromRotation(float angle, vec3 axis) {
+}`);const{vertexCount:v,indexCount:h,poleCount:g}=c[d.pathProfileType];switch(x.uniforms.add(new i("pathProfileVertices",v,e=>e.profile.vertices.flat()),new i("pathProfileNormals",v,e=>e.profile.normals.flat())),x.code.add(l`mat3 mat3FromRotation(float angle, vec3 axis) {
 float x = axis.x;
 float y = axis.y;
 float z = axis.z;
@@ -32,12 +32,13 @@ x * x * t + c,      y * x * t + z * s,  z * x * t - y * s,
 x * y * t - z * s,  y * y * t + c,      z * y * t + x * s,
 x * z * t + y * s,  y * z * t - x * s,  z * z * t + c
 );
-}`),m.code.add(n`struct ExtrusionFrame {
+}`),x.code.add(l`struct ExtrusionFrame {
 vec3 up;
 vec3 right;
 };
 struct ExtrudedVertex {
-ExtrusionFrame frame;
+ExtrusionFrame positionFrame;
+ExtrusionFrame normalFrame;
 vec2 profileVertex;
 vec2 profileNormal;
 vec2 rotationRight;
@@ -45,20 +46,22 @@ float maxDistance;
 float capPositionOffset;
 float capNormalOffset;
 bool isCap;
-};`),u?m.code.add(n`vec2 getPathRotationRight(ExtrusionFrame frame) {
+};`),u?x.code.add(l`vec2 getPathRotationRight(ExtrusionFrame frame) {
 vec3 rotationUp = getFrameRotationUp();
 float a = dot(rotationUp, frame.up);
 float b = dot(rotationUp, frame.right);
 vec3 vertex = normalize(frame.up * -b + frame.right * a);
 return vec2(dot(vertex, frame.right), dot(vertex, frame.up));
-}`):m.code.add(n`vec2 getPathRotationRight() {
+}`):x.code.add(l`vec2 getPathRotationRight() {
 return vec2(1., 0.);
-}`),m.uniforms.add(new f("numJoinSubdivisions",e=>e.numJoinSubdivisions)),m.code.add(n`
+}`),2===d.pathJoinType&&x.constants.add("numJoinSubdivisions","float",t),x.code.add(l`
       ExtrudedVertex evaluateJoinVertex(PathVertexDescriptor vertexDescriptor, ExtrusionFrame frame) {
+        ExtrusionFrame positionFrame = frame;
+        ExtrusionFrame subdivisionFrame = frame;
         vec2 profileVertex = pathProfileVertices[vertexDescriptor.sourceIndex];
         vec2 profileNormal = pathProfileNormals[vertexDescriptor.sourceIndex];
         float profileRotation = getProfileRotation();
-        vec2 rotationRight = getPathRotationRight(${s(u,n`frame`)});
+        vec2 rotationRight = getPathRotationRight(${p(u,l`frame`)});
         bool isBevel = abs(profileRotation) >= angleCutoff;
 
         // determine if the current profile vertex is on the inside or outside of the rotationAxis
@@ -68,32 +71,41 @@ return vec2(1., 0.);
 
         bool isBevelBend = isBevel && isBend;
 
+        float subdivisionRotation = ${p(2===d.pathJoinType,l`(-0.5 + float(vertexDescriptor.subdivision) / numJoinSubdivisions) * profileRotation`,l`(-0.5 + float(vertexDescriptor.subdivision / 2u)) * profileRotation`)};
+        if (subdivisionRotation != 0.) {
+          mat3 subdivisionTransform = mat3FromRotation(subdivisionRotation, getFrameRotationUp());
+          ${p(u,l`subdivisionFrame.up = normalize(subdivisionTransform * subdivisionFrame.up);`)}
+          subdivisionFrame.right = normalize(subdivisionTransform * subdivisionFrame.right);
+        }
+
         if (isBevelBend) {
-          float k = vertexDescriptor.subdivision;
-          // rotate half rotation angle backwards to where the rotation starts
-          // and then rotate a couple of times depending on the current subdivision segment
-          float bendRotation = -profileRotation * 0.5 + (k * profileRotation) / float(numJoinSubdivisions);
-          if (bendRotation != 0.) {
-            vec3 rotationUp = getFrameRotationUp();
-            mat3 transform  = mat3FromRotation(bendRotation, rotationUp);
-            ${s(u,n`frame.up = normalize(transform * frame.up);`)}
-            frame.right = normalize(transform * frame.right);
-          }
+          positionFrame = subdivisionFrame;
         } else {
           profileVertex = applyMiterStretch(
             profileVertex,
-            profileRotation${s(u,n`,
+            profileRotation${p(u,l`,
               rotationRight`)}
           );
         }
 
+       ${p(2===d.pathJoinType,l`
+          ExtrusionFrame normalFrame = subdivisionFrame;
+          `,l`
+           ExtrusionFrame normalFrame;
+           if (isBevelBend && (vertexDescriptor.subdivision == 1u || vertexDescriptor.subdivision == 2u)) {
+            normalFrame = frame;
+           } else {
+            normalFrame = subdivisionFrame;
+           }`)};
+
         rotationRight = isBend ? vec2(0.) : rotationRight;
         float maxDistance = isBend
         ? 0.
         : getMaxStretchDistance();
 
         return ExtrudedVertex(
-          frame,
+          positionFrame,
+          normalFrame,
           profileVertex,
           profileNormal,
           rotationRight,
@@ -103,14 +115,15 @@ return vec2(1., 0.);
           false
         );
       }
-    `),m.code.add(n`
+    `),x.code.add(l`
         ExtrudedVertex evaluateConnectingVertex(PathVertexDescriptor vertexDescriptor, ExtrusionFrame frame) {
           vec2 profileVertex = pathProfileVertices[vertexDescriptor.sourceIndex];
           vec2 profileNormal = pathProfileNormals[vertexDescriptor.sourceIndex];
 
-          float profilePlaneVertexOffset = ${s(2===d.pathCapType,n`vertexDescriptor.isEnd ? 0.5 : -0.5`,n`0.`)};
+          float profilePlaneVertexOffset = ${p(2===d.pathCapType,l`vertexDescriptor.isEnd ? 0.5 : -0.5`,l`0.`)};
 
           return ExtrudedVertex(
+            frame,
             frame,
             profileVertex,
             profileNormal,
@@ -121,15 +134,16 @@ return vec2(1., 0.);
             true
           );
         }
-    `),d.pathCapType){case 1:case 2:m.code.add(n`
+    `),d.pathCapType){case 1:case 2:x.code.add(l`
           ExtrudedVertex evaluateFlatCapVertex(PathVertexDescriptor vertexDescriptor, ExtrusionFrame frame) {
             vec2 profileVertex = pathProfileVertices[vertexDescriptor.sourceIndex];
             bool isEnd = vertexDescriptor.isEnd;
             float normalOffset = isEnd ? 1. : -1.;
-            float profilePlaneOffset = ${s(2===d.pathCapType,n`isEnd ? 0.5 : -0.5`,n`0.0`)};
+            float profilePlaneOffset = ${p(2===d.pathCapType,l`isEnd ? 0.5 : -0.5`,l`0.0`)};
             vec2 normal = vec2(0.);
 
             return ExtrudedVertex(
+              frame,
               frame,
               profileVertex,
               normal,
@@ -140,7 +154,7 @@ return vec2(1., 0.);
               true
             );
           }
-        `);break;case 3:m.uniforms.add(new i("pathProfilePoles",g,e=>e.profile.poles.flatMap(({position:e,normal:t})=>[...e,...t??x]),{supportsNaN:!0}),new p("pathProfilePoleIndices",h,e=>e.profile.poleIndices)),m.include(o),m.constants.add("pathNumRoundCapExtrusionSubdivisions","float",t),m.code.add(n`ExtrudedVertex evaluateRoundCapPoleVertex(PathVertexDescriptor vertexDescriptor, ExtrusionFrame frame) {
+        `);break;case 3:x.uniforms.add(new s("pathProfilePoles",g,e=>e.profile.poles.flatMap(({position:e,normal:t})=>[...e,...t??m]),{supportsNaN:!0}),new f("pathProfilePoleIndices",h,e=>e.profile.poleIndices)),x.include(a),x.constants.add("pathNumRoundCapExtrusionSubdivisions","float",r),x.code.add(l`ExtrudedVertex evaluateRoundCapPoleVertex(PathVertexDescriptor vertexDescriptor, ExtrusionFrame frame) {
 bool isEnd = vertexDescriptor.isEnd;
 float capSign = isEnd ? 1. : -1.;
 float offsetScale = capSign * 0.5;
@@ -151,6 +165,7 @@ vec2 poleNormal = hasPoleNormal ? pole.zw : vec2(0.);
 float normalOffset = hasPoleNormal ? 0. : capSign;
 return ExtrudedVertex(
 frame,
+frame,
 polePosition,
 poleNormal,
 vec2(0.),
@@ -164,7 +179,7 @@ ExtrudedVertex evaluateRoundCapInnerVertex(PathVertexDescriptor vertexDescriptor
 bool isEnd = vertexDescriptor.isEnd;
 float capSign = isEnd ? 1. : -1.;
 float offsetScale = capSign * 0.5;
-float subdivision = vertexDescriptor.subdivision;
+float subdivision = float(vertexDescriptor.subdivision);
 float t = 1. - (subdivision + 1.) / pathNumRoundCapExtrusionSubdivisions;
 float theta = t * HALF_PI;
 float t1 = sin(theta);
@@ -182,6 +197,7 @@ vec2 profileNormal = hasPoleNormal
 float normalOffset = hasPoleNormal ? 0. : capSign * t2;
 return ExtrudedVertex(
 frame,
+frame,
 poleVertex,
 profileNormal,
 vec2(0.),
@@ -190,7 +206,7 @@ offsetScale * t2,
 normalOffset,
 true
 );
-}`)}m.code.add(n`
+}`)}x.code.add(l`
       ExtrudedVertex evaluateVertex() {
         PathVertexDescriptor vertexDescriptor = getDescriptor();
         ExtrusionFrame frame = ExtrusionFrame(
@@ -205,12 +221,12 @@ true
           case pathVertexTypeCapConnectingProfile:
             return evaluateConnectingVertex(vertexDescriptor, frame);
 
-          ${s(1===d.pathCapType||2===d.pathCapType,n`
+          ${p(1===d.pathCapType||2===d.pathCapType,l`
           case pathVertexTypeCapProfile:
             return evaluateFlatCapVertex(vertexDescriptor, frame);
           `)}
 
-          ${s(3===d.pathCapType,n`
+          ${p(3===d.pathCapType,l`
           case pathVertexTypeCapProfile:
             return evaluateRoundCapPoleVertex(vertexDescriptor, frame);
           case pathVertexTypeRoundCapInnerProfile:
@@ -219,6 +235,7 @@ true
 
           default:
             return ExtrudedVertex(
+              frame,
               frame,
               vec2(0.),
               vec2(0.),
@@ -230,4 +247,4 @@ true
             );
         }
       }
-    `)}const x=e(NaN,NaN);export{d as PathEvaluate};
+    `)}const m=e(NaN,NaN);export{d as PathEvaluate};

package/views/3d/webgl-engine/core/shaderLibrary/attributes/PathVertexInfo.glsl.js

@@ -1,8 +1,8 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import{If as t,glsl as e}from"../../shaderModules/glsl.js";import{sourceIndexMask as a,descriptorDataShift as r,descriptorDataMask as i,descriptorTypeShift as n,descriptorCapSideShift as p,descriptorCapSubdivisionMask as s,descriptorShift as o,frameIndexMask as d}from"../../../lib/PathVertexInfo.js";function c(c,h){const{attributes:x,vertex:u}=c;x.add("pathVertexInfo","uint"),u.constants.add("pathVertexDescriptorSourceIndexMask","uint",a),u.constants.add("pathVertexDescriptorDataShift","uint",r),u.constants.add("pathVertexDescriptorDataMask","uint",i),u.constants.add("pathVertexDescriptorTypeShift","uint",n),u.constants.add("pathVertexDescriptorCapSideShift","uint",p),u.constants.add("pathVertexDescriptorCapSubdivisionMask","uint",s),u.constants.add("pathVertexInfoDescriptorShift","uint",o),u.constants.add("pathVertexInfoFrameIndexMask","uint",d),u.constants.add("pathVertexCapSideEnd","uint",1),u.constants.add("pathVertexTypeJoin","uint",0),u.constants.add("pathVertexTypeCapConnectingProfile","uint",1),u.constants.add("pathVertexTypeCapProfile","uint",2),3===h.pathCapType&&u.constants.add("pathVertexTypeRoundCapInnerProfile","uint",3),u.code.add(e`
+import{If as t,glsl as e}from"../../shaderModules/glsl.js";import{sourceIndexMask as r,descriptorDataShift as a,descriptorDataMask as i,descriptorTypeShift as n,descriptorCapSideShift as p,descriptorCapSubdivisionMask as s,descriptorShift as o,frameIndexMask as d}from"../../../lib/PathVertexInfo.js";function c(c,h){const{attributes:u,vertex:x}=c;u.add("pathVertexInfo","uint"),x.constants.add("pathVertexDescriptorSourceIndexMask","uint",r),x.constants.add("pathVertexDescriptorDataShift","uint",a),x.constants.add("pathVertexDescriptorDataMask","uint",i),x.constants.add("pathVertexDescriptorTypeShift","uint",n),x.constants.add("pathVertexDescriptorCapSideShift","uint",p),x.constants.add("pathVertexDescriptorCapSubdivisionMask","uint",s),x.constants.add("pathVertexInfoDescriptorShift","uint",o),x.constants.add("pathVertexInfoFrameIndexMask","uint",d),x.constants.add("pathVertexCapSideEnd","uint",1),x.constants.add("pathVertexTypeJoin","uint",0),x.constants.add("pathVertexTypeCapConnectingProfile","uint",1),x.constants.add("pathVertexTypeCapProfile","uint",2),3===h.pathCapType&&x.constants.add("pathVertexTypeRoundCapInnerProfile","uint",3),x.code.add(e`
     struct PathVertexDescriptor {
       uint sourceIndex;
-      float subdivision;
+      uint subdivision;
       uint type;
       bool isEnd;
     };
@@ -16,17 +16,17 @@ import{If as t,glsl as e}from"../../shaderModules/glsl.js";import{sourceIndexMas
       uint sourceIndex = descriptor & pathVertexDescriptorSourceIndexMask;
       uint descriptorData = (descriptor >> pathVertexDescriptorDataShift) & pathVertexDescriptorDataMask;
       uint type = descriptor >> pathVertexDescriptorTypeShift;
-      float subdivision = 0.;
+      uint subdivision = 0u;
       bool isEnd = false;
 
       switch (type) {
         case pathVertexTypeJoin:
-          subdivision = float(descriptorData);
+          subdivision = descriptorData;
           break;
 
         ${t(3===h.pathCapType,e`
         case pathVertexTypeRoundCapInnerProfile:
-          subdivision = float(descriptorData & pathVertexDescriptorCapSubdivisionMask);
+          subdivision = descriptorData & pathVertexDescriptorCapSubdivisionMask;
         `)}
         case pathVertexTypeCapConnectingProfile:
         ${t(0!==h.pathCapType,e`

package/views/3d/webgl-engine/core/shaderLibrary/attributes/PathVertexPosition.glsl.js

@@ -1,5 +1,5 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import{fromValues as e}from"../../../../../../core/libs/gl-matrix-2/factories/vec2f64.js";import{TextureBackedBufferModule as t}from"../TextureBackedBuffer.glsl.js";import{PathEvaluate as r}from"./PathEvaluate.glsl.js";import{PiUtils as o}from"../shading/PiUtils.glsl.js";import{Float2PassUniform as i}from"../../shaderModules/Float2PassUniform.js";import{Float3PassUniform as a}from"../../shaderModules/Float3PassUniform.js";import{Float4PassUniform as l}from"../../shaderModules/Float4PassUniform.js";import{Float4sPassUniform as s}from"../../shaderModules/Float4sPassUniform.js";import{FloatPassUniform as c}from"../../shaderModules/FloatPassUniform.js";import{FloatsPassUniform as v}from"../../shaderModules/FloatsPassUniform.js";import{glsl as u,If as n}from"../../shaderModules/glsl.js";import{Texture2DUintDrawUniform as d}from"../../shaderModules/Texture2DUintDrawUniform.js";import{circleProfiles as f}from"../../../lib/PathProfile.js";import{getTextureLayout as p}from"../../../materials/PathLayouts.js";import{VisualVariablePassParameters as x,vvColorNumber as m}from"../../../materials/VisualVariablePassParameters.js";const g=8;function h(e,f){const{vertex:x}=e,h=new d("componentTextureBuffer",e=>e.textureBuffer),y=new t({layout:p(f),itemIndexExpression:"getFrameIndex()",bufferUniform:h}).createBuilder(e,f);x.uniforms.add(new i("size",e=>e.size));const{hasVVSize:b,hasVVColor:V,hasVVOpacity:z,hasPathSize:O,hasPathColor:C,hasPathOpacity:S}=f;b?(x.uniforms.add(new a("vvSizeMinSize",e=>e.vvSize.minSize),new a("vvSizeMaxSize",e=>e.vvSize.maxSize),new a("vvSizeOffset",e=>e.vvSize.offset),new a("vvSizeFactor",e=>e.vvSize.factor),new a("vvSizeFallback",e=>e.vvSize.fallback)),x.code.add(u`
+import{fromValues as e}from"../../../../../../core/libs/gl-matrix-2/factories/vec2f64.js";import{TextureBackedBufferModule as t}from"../TextureBackedBuffer.glsl.js";import{PathEvaluate as r}from"./PathEvaluate.glsl.js";import{PiUtils as o}from"../shading/PiUtils.glsl.js";import{Float2PassUniform as i}from"../../shaderModules/Float2PassUniform.js";import{Float3PassUniform as a}from"../../shaderModules/Float3PassUniform.js";import{Float4PassUniform as l}from"../../shaderModules/Float4PassUniform.js";import{Float4sPassUniform as s}from"../../shaderModules/Float4sPassUniform.js";import{FloatPassUniform as c}from"../../shaderModules/FloatPassUniform.js";import{FloatsPassUniform as v}from"../../shaderModules/FloatsPassUniform.js";import{glsl as u,If as n}from"../../shaderModules/glsl.js";import{Texture2DUintDrawUniform as d}from"../../shaderModules/Texture2DUintDrawUniform.js";import{circleProfiles as p}from"../../../lib/PathProfile.js";import{getTextureLayout as f}from"../../../materials/PathLayouts.js";import{VisualVariablePassParameters as m,vvColorNumber as x}from"../../../materials/VisualVariablePassParameters.js";const g=8;function h(e,p){const{vertex:m}=e,h=new d("componentTextureBuffer",e=>e.textureBuffer),y=new t({layout:f(p),itemIndexExpression:"getFrameIndex()",bufferUniform:h}).createBuilder(e,p);m.uniforms.add(new i("size",e=>e.size));const{hasVVSize:V,hasVVColor:b,hasVVOpacity:z,hasPathSize:O,hasPathColor:C,hasPathOpacity:S}=p;V?(m.uniforms.add(new a("vvSizeMinSize",e=>e.vvSize.minSize),new a("vvSizeMaxSize",e=>e.vvSize.maxSize),new a("vvSizeOffset",e=>e.vvSize.offset),new a("vvSizeFactor",e=>e.vvSize.factor),new a("vvSizeFallback",e=>e.vvSize.fallback)),m.code.add(u`
     vec2 getSize() {
       float value = ${y.getTextureAttribute("sizeFeatureAttribute")};
       if (isnan(value)) {
@@ -7,13 +7,13 @@ import{fromValues as e}from"../../../../../../core/libs/gl-matrix-2/factories/ve
       }
       return size * clamp(vvSizeOffset + value * vvSizeFactor, vvSizeMinSize, vvSizeMaxSize).xz;
     }
-    `)):O?x.code.add(u`
+    `)):O?m.code.add(u`
     vec2 getSize(){
       return ${y.getTextureAttribute("size")};
     }
-    `):x.code.add(u`vec2 getSize(){
+    `):m.code.add(u`vec2 getSize(){
 return size;
-}`),z?(x.constants.add("vvOpacityNumber","int",g),x.uniforms.add(new v("vvOpacityValues",g,e=>e.vvOpacity.values),new v("vvOpacityOpacities",g,e=>e.vvOpacity.opacityValues),new c("vvOpacityFallback",e=>e.vvOpacity.fallback,{supportsNaN:!0})),x.code.add(u`
+}`),z?(m.constants.add("vvOpacityNumber","int",g),m.uniforms.add(new v("vvOpacityValues",g,e=>e.vvOpacity.values),new v("vvOpacityOpacities",g,e=>e.vvOpacity.opacityValues),new c("vvOpacityFallback",e=>e.vvOpacity.fallback,{supportsNaN:!0})),m.code.add(u`
     vec4 applyOpacity(vec4 color) {
       // if we encounter NaN in the color it means the color is in the fallback case where the symbol color
       // is not defined and there is no valid color visual variable override. In this case just return a fully
@@ -26,7 +26,7 @@ return size;
 
       if (isnan(value)) {
         // If there is a color vv then it will already have taken care of applying the fallback
-        return ${n(V,"color","vec4(color.rgb, vvOpacityFallback)")};
+        return ${n(b,"color","vec4(color.rgb, vvOpacityFallback)")};
       }
 
       if (value <= vvOpacityValues[0]) {
@@ -42,13 +42,13 @@ return size;
 
       return vec4(color.rgb, vvOpacityOpacities[vvOpacityNumber - 1]);
     }
-    `)):S?x.code.add(u`
+    `)):S?m.code.add(u`
     vec4 applyOpacity(vec4 color){
       return vec4(color.rgb, ${y.getTextureAttribute("opacity")});
     }
-    `):x.code.add(u`vec4 applyOpacity(vec4 color){
+    `):m.code.add(u`vec4 applyOpacity(vec4 color){
 return color;
-}`),V?(x.constants.add("vvColorNumber","int",m),x.uniforms.add(new v("vvColorValues",m,e=>e.vvColor.values),new s("vvColorColors",m,e=>e.vvColor.colors),new l("vvColorFallback",e=>e.vvColor.fallback)),x.code.add(u`
+}`),b?(m.constants.add("vvColorNumber","int",x),m.uniforms.add(new v("vvColorValues",x,e=>e.vvColor.values),new s("vvColorColors",x,e=>e.vvColor.colors),new l("vvColorFallback",e=>e.vvColor.fallback)),m.code.add(u`
     vec4 getColor() {
       float value = ${y.getTextureAttribute("colorFeatureAttribute")};
       if (isnan(value)) {
@@ -68,13 +68,13 @@ return color;
 
       return applyOpacity(vvColorColors[vvColorNumber - 1]);
     }
-    `)):C?x.code.add(u`
+    `)):C?m.code.add(u`
     vec4 getColor(){
       return applyOpacity(${y.getTextureAttribute("color")});
     }
-    `):x.code.add(u`vec4 getColor(){
+    `):m.code.add(u`vec4 getColor(){
 return applyOpacity(vec4(1, 1, 1, 1));
-}`),x.include(o),x.code.add(u`
+}`),m.include(o),m.code.add(u`
     vec3 decompressAxis(vec2 axis) {
       float z = 1.0 - abs(axis.x) - abs(axis.y);
       return normalize(vec3(axis + sign(axis) * min(z, 0.0), z));
@@ -95,29 +95,29 @@ return applyOpacity(vec4(1, 1, 1, 1));
     vec3 getFrameRight() {
       return decompressAxis(${y.getTextureAttribute("profileRight")});
     }
-  `),11===f.output&&x.code.add(u`
+  `),11===p.output&&m.code.add(u`
     vec4 getOlidColor() {
       return ${y.getTextureAttribute("olidColor")};
     }
-  `),x.code.add(u`
+  `),m.code.add(u`
     vec3 getFrameRotationUp() {
-      return ${1===f.upVectorAlignment?u`decompressAxis(${y.getTextureAttribute("pathRotationUp")})`:u`getFrameUp()`};
+      return ${1===p.upVectorAlignment?u`decompressAxis(${y.getTextureAttribute("pathRotationUp")})`:u`getFrameUp()`};
     }
-  `),e.include(r,f),x.code.add(u`
+  `),e.include(r,p),m.code.add(u`
   vec3 calculateVPos(ExtrudedVertex extrudedVertex) {
     vec2 size = getSize();
     vec3 origin = ${y.getTextureAttribute("position")};
-    vec3 right = extrudedVertex.frame.right;
-    vec3 up = extrudedVertex.frame.up;
+    vec3 right = extrudedVertex.positionFrame.right;
+    vec3 up = extrudedVertex.positionFrame.up;
     vec2 profileVertex = extrudedVertex.profileVertex * size;
-    `),x.code.add(u`if(extrudedVertex.isCap) {
+    `),m.code.add(u`if(extrudedVertex.isCap) {
 float positionOffsetAlongProfilePlaneNormal = extrudedVertex.capPositionOffset * size[0];
 vec3 forward = cross(up, right);
 vec3 offset = right * profileVertex.x + up * profileVertex.y + forward * positionOffsetAlongProfilePlaneNormal;
 return origin + offset;
 }
 vec2 rotationRight = extrudedVertex.rotationRight;
-float maxDistance = extrudedVertex.maxDistance;`),x.code.add(u`rotationRight *= size;
+float maxDistance = extrudedVertex.maxDistance;`),m.code.add(u`rotationRight *= size;
 rotationRight = length(rotationRight) > 0.0 ? normalize(rotationRight) : vec2(0, 0);
 float rx = dot(profileVertex, rotationRight);
 if (abs(rx) > maxDistance) {
@@ -127,9 +127,9 @@ profileVertex = rotationRight * maxDistance * sign(rx) + rotationUp * ry;
 }
 vec3 offset = right * profileVertex.x + up * profileVertex.y;
 return origin + offset;
-}`),x.code.add(u`vec3 localNormal(ExtrudedVertex extrudedVertex) {
-vec3 right = extrudedVertex.frame.right;
-vec3 up = extrudedVertex.frame.up;
+}`),m.code.add(u`vec3 localNormal(ExtrudedVertex extrudedVertex) {
+vec3 right = extrudedVertex.normalFrame.right;
+vec3 up = extrudedVertex.normalFrame.up;
 vec2 profileNormal = extrudedVertex.profileNormal;
 vec3 normal = right * profileNormal.x + up * profileNormal.y;
 if(extrudedVertex.isCap) {
@@ -137,4 +137,4 @@ vec3 forward = cross(up, right);
 normal += forward * extrudedVertex.capNormalOffset;
 }
 return normal;
-}`)}class y extends x{constructor(){super(...arguments),this.numJoinSubdivisions=1,this.size=e(1,1),this.cutoffAngle=0,this.profile=f.center,this.hasPathSize=!1,this.hasPathColor=!1,this.hasPathOpacity=!1}}export{h as PathVertexPosition,y as PathVertexPositionPassParameters};
+}`)}class y extends m{constructor(){super(...arguments),this.size=e(1,1),this.cutoffAngle=0,this.profile=p.center,this.hasPathSize=!1,this.hasPathColor=!1,this.hasPathOpacity=!1}}export{h as PathVertexPosition,y as PathVertexPositionPassParameters};

package/views/3d/webgl-engine/core/shaderLibrary/default/DefaultMaterialAuxiliaryPasses.glsl.js

@@ -1,41 +1,49 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import{addNearFar as o}from"../ForwardLinearDepthToWriteShadowMap.glsl.js";import{SliceDraw as r}from"../Slice.glsl.js";import{Transform as e}from"../Transform.glsl.js";import{NormalAttribute as t}from"../attributes/NormalAttribute.glsl.js";import{ObjectAndLayerIdColor as i}from"../attributes/ObjectAndLayerIdColor.glsl.js";import{TextureCoordinateAttribute as a}from"../attributes/TextureCoordinateAttribute.glsl.js";import{VertexNormal as s}from"../attributes/VertexNormal.glsl.js";import{outputDepth as l}from"../output/OutputDepth.glsl.js";import{OutputHighlight as d}from"../output/OutputHighlight.glsl.js";import{VisualVariables as n}from"../shading/VisualVariables.glsl.js";import{DiscardOrAdjustAlphaPass as c}from"../util/DiscardOrAdjustAlpha.glsl.js";import{addProjViewLocalOrigin as u}from"../util/View.glsl.js";import{glsl as p,If as v}from"../../shaderModules/glsl.js";import{Texture2DPassUniform as m}from"../../shaderModules/Texture2DPassUniform.js";function f(f,g){const{vertex:x,fragment:O,varyings:j}=f,{hasColorTexture:h,alphaDiscardMode:w}=g,V=h&&1!==w,{output:C,normalType:b,hasColorTextureTransform:A}=g;switch(C){case 3:u(x,g),f.include(e),O.include(r,g),f.include(a,g),V&&O.uniforms.add(new m("tex",o=>o.texture)),x.main.add(p`vpos = getVertexInLocalOriginSpace();
+import{addNearFar as o}from"../ForwardLinearDepthToWriteShadowMap.glsl.js";import{SliceDraw as e}from"../Slice.glsl.js";import{Transform as r}from"../Transform.glsl.js";import{NormalAttribute as t}from"../attributes/NormalAttribute.glsl.js";import{ObjectAndLayerIdColor as i}from"../attributes/ObjectAndLayerIdColor.glsl.js";import{TextureCoordinateAttribute as a}from"../attributes/TextureCoordinateAttribute.glsl.js";import{VertexNormal as l}from"../attributes/VertexNormal.glsl.js";import{DefaultMaterialExternalColor as s}from"./DefaultMaterialExternalColor.glsl.js";import{outputDepth as d}from"../output/OutputDepth.glsl.js";import{OutputHighlight as n}from"../output/OutputHighlight.glsl.js";import{VisualVariables as c}from"../shading/VisualVariables.glsl.js";import{DiscardOrAdjustAlphaPass as u}from"../util/DiscardOrAdjustAlpha.glsl.js";import{addProjViewLocalOrigin as p}from"../util/View.glsl.js";import{glsl as v,If as m}from"../../shaderModules/glsl.js";import{Texture2DPassUniform as f}from"../../shaderModules/Texture2DPassUniform.js";function g(g,x){const{vertex:O,fragment:j,varyings:h}=g,{hasColorTexture:C,alphaDiscardMode:w}=x,V=C&&1!==w,{output:b,normalType:A,hasColorTextureTransform:y}=x;switch(b){case 3:p(O,x),g.include(r),j.include(e,x),g.include(a,x),V&&j.uniforms.add(new f("tex",o=>o.texture)),O.main.add(v`vpos = getVertexInLocalOriginSpace();
 vpos = subtractOrigin(vpos);
 vpos = addVerticalOffset(vpos, localOrigin);
 gl_Position = transformPosition(proj, view, vpos);
-forwardTextureCoordinates();`),f.include(c,g),O.main.add(p`
+forwardTextureCoordinates();`),g.include(u,x),j.main.add(v`
         discardBySlice(vpos);
-        ${v(V,p`vec4 texColor = texture(tex, ${A?"colorUV":"vuv0"});
-                discardOrAdjustAlpha(texColor);`)}`);break;case 5:case 6:case 7:case 8:case 11:u(x,g),f.include(e),f.include(a,g),f.include(n,g),f.include(l,g),O.include(r,g),f.include(i,g),o(f),j.add("depth","float",{invariant:!0}),V&&O.uniforms.add(new m("tex",o=>o.texture)),x.main.add(p`vpos = getVertexInLocalOriginSpace();
+        ${m(V,v`vec4 texColor = texture(tex, ${y?"colorUV":"vuv0"});
+                discardOrAdjustAlpha(texColor);`)}`);break;case 5:case 6:case 7:case 8:case 11:p(O,x),g.include(r),g.include(a,x),g.include(c,x),g.include(d,x),j.include(e,x),g.include(i,x),o(g),h.add("depth","float",{invariant:!0}),V&&j.uniforms.add(new f("tex",o=>o.texture)),O.main.add(v`vpos = getVertexInLocalOriginSpace();
 vpos = subtractOrigin(vpos);
 vpos = addVerticalOffset(vpos, localOrigin);
 gl_Position = transformPositionWithDepth(proj, view, vpos, nearFar, depth);
 forwardTextureCoordinates();
-forwardObjectAndLayerIdColor();`),f.include(c,g),O.main.add(p`
+forwardObjectAndLayerIdColor();`),g.include(u,x),j.main.add(v`
         discardBySlice(vpos);
-        ${v(V,p`vec4 texColor = texture(tex, ${A?"colorUV":"vuv0"});
+        ${m(V,v`vec4 texColor = texture(tex, ${y?"colorUV":"vuv0"});
                discardOrAdjustAlpha(texColor);`)}
-        ${11===C?p`outputObjectAndLayerIdColor();`:p`outputDepth(depth);`}`);break;case 4:{u(x,g),f.include(e),f.include(t,g),f.include(s,g),f.include(a,g),f.include(n,g),V&&O.uniforms.add(new m("tex",o=>o.texture)),2===b&&j.add("vPositionView","vec3",{invariant:!0});const o=0===b||1===b;x.main.add(p`
+        ${11===b?v`outputObjectAndLayerIdColor();`:v`outputDepth(depth);`}`);break;case 4:{p(O,x),g.include(r),g.include(t,x),g.include(l,x),g.include(a,x),g.include(c,x),g.include(s,x),V&&j.uniforms.add(new f("tex",o=>o.texture)),2===A&&h.add("vPositionView","vec3",{invariant:!0});const o=0===A||1===A;O.main.add(v`
+        forwardDefaultMaterialExternalColor();
+
+        if (shouldCullByOpacity()) {
+          gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
+          return;
+        }
+
         vpos = getVertexInLocalOriginSpace();
-        ${o?p`vNormalWorld = dpNormalView(vvLocalNormal(normalModel()));`:p`vPositionView = (view * vec4(vpos, 1.0)).xyz;`}
+        ${o?v`vNormalWorld = dpNormalView(vvLocalNormal(normalModel()));`:v`vPositionView = (view * vec4(vpos, 1.0)).xyz;`}
         vpos = subtractOrigin(vpos);
         vpos = addVerticalOffset(vpos, localOrigin);
         gl_Position = transformPosition(proj, view, vpos);
-        forwardTextureCoordinates();`),O.include(r,g),f.include(c,g),O.main.add(p`
+        forwardTextureCoordinates();`),j.include(e,x),g.include(u,x),j.main.add(v`
         discardBySlice(vpos);
-        ${v(V,p`vec4 texColor = texture(tex, ${A?"colorUV":"vuv0"});
-               discardOrAdjustAlpha(texColor);`)}
+        ${m(V,v`vec4 texColor = texture(tex, ${y?"colorUV":"vuv0"});
+               discardOrAdjustAlpha(texColor);`,v`vec4 texColor = vec4(1.0);`)}
+        float opacity = getDefaultMaterialOpacity(texColor.a);
 
-        ${2===b?p`vec3 normal = screenDerivativeNormal(vPositionView);`:p`vec3 normal = normalize(vNormalWorld);
+        ${2===A?v`vec3 normal = screenDerivativeNormal(vPositionView);`:v`vec3 normal = normalize(vNormalWorld);
                     if (gl_FrontFacing == false){
                       normal = -normal;
                     }`}
-        fragColor = vec4(0.5 + 0.5 * normal, 1.0);`);break}case 10:u(x,g),f.include(e),f.include(a,g),f.include(n,g),V&&O.uniforms.add(new m("tex",o=>o.texture)),x.main.add(p`vpos = getVertexInLocalOriginSpace();
+        fragColor = vec4(0.5 + 0.5 * normal, opacity);`);break}case 10:p(O,x),g.include(r),g.include(a,x),g.include(c,x),V&&j.uniforms.add(new f("tex",o=>o.texture)),O.main.add(v`vpos = getVertexInLocalOriginSpace();
 vpos = subtractOrigin(vpos);
 vpos = addVerticalOffset(vpos, localOrigin);
 gl_Position = transformPosition(proj, view, vpos);
-forwardTextureCoordinates();`),O.include(r,g),f.include(c,g),f.include(d,g),O.main.add(p`
+forwardTextureCoordinates();`),j.include(e,x),g.include(u,x),g.include(n,x),j.main.add(v`
         discardBySlice(vpos);
-        ${v(V,p`vec4 texColor = texture(tex, ${A?"colorUV":"vuv0"});
+        ${m(V,v`vec4 texColor = texture(tex, ${y?"colorUV":"vuv0"});
                 discardOrAdjustAlpha(texColor);`)}
-        calculateOcclusionAndOutputHighlight();`)}}export{f as DefaultMaterialAuxiliaryPasses};
+        calculateOcclusionAndOutputHighlight();`)}}export{g as DefaultMaterialAuxiliaryPasses};

package/views/3d/webgl-engine/core/shaderLibrary/default/DefaultMaterialExternalColor.glsl.js

@@ -0,0 +1,25 @@
+/* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
+import{InstanceColor as o}from"../attributes/InstanceColor.glsl.js";import{MaskedColorDefinition as r,CreateMaskedFromNaNColor as l}from"../attributes/MaskedColor.glsl.js";import{SymbolColor as a}from"../attributes/SymbolColor.glsl.js";import{VertexColor as t}from"../attributes/VertexColor.glsl.js";import{MixExternalColor as e}from"../util/MixExternalColor.glsl.js";import{Float4PassUniform as i}from"../../shaderModules/Float4PassUniform.js";import{FloatPassUniform as s}from"../../shaderModules/FloatPassUniform.js";import{glsl as d,If as n}from"../../shaderModules/glsl.js";import{colorMixModes as m}from"../../../materials/internal/MaterialUtil.js";import{alphaCutoff as p}from"../../../shaders/alphaCutoff.glsl.js";function c(c,u){const{vertex:C,fragment:f,varyings:y}=c;c.include(o,u),c.include(a,u),c.include(t,u),C.include(r),C.include(l),C.include(p),C.uniforms.add(new i("externalColor",o=>o.externalColor,{supportsNaN:!0})),y.add("vExternalColor","vec4"),C.code.add(d`
+    void forwardDefaultMaterialExternalColor() {
+      forwardVertexColor();
+
+      MaskedColor maskedColor =
+        applySymbolColor(applyVVColor(applyInstanceColor(createMaskedFromNaNColor(externalColor))));
+
+      vExternalColor = maskedColor.color;
+      forwardColorMixMode(maskedColor.mask);
+    }
+
+    bool shouldCullByOpacity() {
+      return opacityMixMode != ${d.int(m.ignore)} && vExternalColor.a < alphaCutoff;
+    }
+  `),f.include(e),f.uniforms.add(new s("opacity",o=>o.opacity),new s("layerOpacity",o=>o.layerOpacity)),f.code.add(d`
+    float getDefaultMaterialOpacity(float textureOpacity) {
+      return layerOpacity * mixExternalOpacity(
+        ${n(u.hasVertexColors,"vColor.a * ")} opacity,
+        textureOpacity,
+        vExternalColor.a,
+        opacityMixMode
+      );
+    }
+  `)}export{c as DefaultMaterialExternalColor};

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

@@ -0,0 +1,2 @@
+/* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
+import{set as t}from"../../../../core/libs/gl-matrix-2/math/vec2.js";import{copy as e,scale as a,floor as i,subtract as l,set as r}from"../../../../core/libs/gl-matrix-2/math/vec3.js";import{positiveInfinity as n}from"../../../../geometry/support/aaBoundingBox.js";function o(t){return t.visibleGaussians>0&&null!=t.orderTexture.texture&&null!=t.textureAtlas.texture&&null!=t.headerTexture.texture}function s(a,i,l){u(a,i,l,l.eye),a.splatFading=i.data.fadingTexture.texture;const{fullHeight:r,fullWidth:n}=l,o=Math.tan(.5*l.fovY),s=o/r*n;t(a.tanFov,s,o),a.focalLength=r/(2*o),e(a.origin,l.eye)}function u(t,e,o,s){const u=e.data;t.splatOrder=u.orderTexture.texture,t.splatAtlas=u.textureAtlas.texture,t.splatHeader=u.headerTexture.texture;const{fullHeight:x,fullWidth:c}=o,d=e.view.qualitySettings.gaussianSplat,p=2===e.view.state.mode?d.idleMinimumSplatPixelRadius:d.nonIdleMinimumSplatPixelRadius;t.minSplatRadius=p*Math.sqrt(c*x)/Math.sqrt(2073600),a(t.tileCameraPosition,s,1/m),i(t.tileCameraPosition,t.tileCameraPosition),a(t.cameraDelta,t.tileCameraPosition,m),l(t.cameraDelta,s,t.cameraDelta),t.slicePlaneLocalOrigin=s;const g=e.clippingBox||n,[f,h,v,M,P,C]=g,[R,S,T]=s;r(t.clipMinCameraRelative,f-R,h-S,v-T),r(t.clipMaxCameraRelative,M-R,P-S,C-T)}const m=2.048;export{o as canRenderGaussianSplats,m as gaussianSplatTileSize,s as prepareGaussianSplatPerspectiveParameters,u as prepareGaussianSplatRenderParameters};