@arcgis/core 5.2.0-next.118 → 5.2.0-next.119

package/chunks/Water.glsl.js

@@ -1,29 +1,29 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import e from"../core/Error.js";import{isColor as o}from"../views/3d/webgl-engine/core/shaderLibrary/ShaderOutput.js";import{SliceDraw as r}from"../views/3d/webgl-engine/core/shaderLibrary/Slice.glsl.js";import{Transform as i}from"../views/3d/webgl-engine/core/shaderLibrary/Transform.glsl.js";import{ObjectAndLayerIdColor as a}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/ObjectAndLayerIdColor.glsl.js";import{OutputHighlight as t}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{mainLightDirection as n,mainLightIntensity as s}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{NormalUtils as l}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{ReadShadowMapDrawFragment as d}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{WaterColor as m}from"../views/3d/webgl-engine/core/shaderLibrary/shading/WaterColor.glsl.js";import{WaterDistortion as c}from"../views/3d/webgl-engine/core/shaderLibrary/shading/WaterDistortion.glsl.js";import{ColorConversion as v}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{addProjViewLocalOrigin as g,addCameraPosition as p}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float4PassUniform as u}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatPassUniform as w}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as f}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{outputColorHighlightOLID as h}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{ShaderBuilder as b}from"../views/webgl/ShaderBuilder.js";import{alphaCutoff as y}from"../webscene/support/AlphaCutoff.js";function j(j){const C=new b,{vertex:P,fragment:L,varyings:x}=C,{output:S,draped:_,receiveShadows:O}=j;g(P,j),C.include(i),C.attributes.add("position","vec3"),C.attributes.add("uv0","vec2");const D=new u("waterColor",e=>e.color);if(x.add("vpos","vec3",{invariant:!0}),P.uniforms.add(D),o(S)){if(_)return P.main.add(f`
-      if (waterColor.a < ${f.float(y)}) {
-        // Discard this vertex
-        gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
-        return;
-      }
+import e from"../core/Error.js";import{SliceDraw as o}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{ObjectAndLayerIdColor as i}from"../views/3d/webgl-engine/core/shaderLibrary/attributes/ObjectAndLayerIdColor.glsl.js";import{OutputHighlight as a}from"../views/3d/webgl-engine/core/shaderLibrary/output/OutputHighlight.glsl.js";import{mainLightDirection as t,mainLightIntensity as n}from"../views/3d/webgl-engine/core/shaderLibrary/shading/MainLighting.glsl.js";import{NormalUtils as s}from"../views/3d/webgl-engine/core/shaderLibrary/shading/NormalUtils.glsl.js";import{ReadShadowMapDrawFragment as l}from"../views/3d/webgl-engine/core/shaderLibrary/shading/ReadShadowMap.glsl.js";import{WaterColor as d}from"../views/3d/webgl-engine/core/shaderLibrary/shading/WaterColor.glsl.js";import{WaterDistortion as m}from"../views/3d/webgl-engine/core/shaderLibrary/shading/WaterDistortion.glsl.js";import{viewNormal as v}from"../views/3d/webgl-engine/core/shaderLibrary/util/cameraUniforms.js";import{ColorConversion as c}from"../views/3d/webgl-engine/core/shaderLibrary/util/ColorConversion.glsl.js";import{addProjViewLocalOrigin as g,addCameraPosition as p}from"../views/3d/webgl-engine/core/shaderLibrary/util/View.glsl.js";import{Float4PassUniform as u}from"../views/3d/webgl-engine/core/shaderModules/Float4PassUniform.js";import{FloatPassUniform as w}from"../views/3d/webgl-engine/core/shaderModules/FloatPassUniform.js";import{glsl as f}from"../views/3d/webgl-engine/core/shaderModules/glsl.js";import{outputColorHighlightOLID as h}from"../views/3d/webgl-engine/shaders/OutputColorHighlightOLID.glsl.js";import{ShaderBuilder as b}from"../views/webgl/ShaderBuilder.js";import{alphaCutoff as j}from"../webscene/support/AlphaCutoff.js";function y(y){const C=new b,{vertex:P,fragment:L,varyings:x}=C,{output:S,draped:_,receiveShadows:O}=y;g(P,y),C.include(r),C.attributes.add("position","vec3"),C.attributes.add("uv0","vec2");const N=new u("waterColor",e=>e.color);switch(x.add("vpos","vec3",{invariant:!0}),P.uniforms.add(N),C.include(l,y),S){case 0:case 1:case 2:if(C.include(m),C.include(d,y),C.include(h,y),_)return P.main.add(f`
+          if (waterColor.a < ${f.float(j)}) {
+            // Discard this vertex
+            gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
+            return;
+          }
 
-      vpos = position;
-      gl_Position = transformPosition(proj, view, vpos);`),L.uniforms.add(D),L.main.add(f`fragColor = waterColor;`),C;P.include(l,j),x.add("vuv","vec2"),x.add("vnormal","vec3"),x.add("vtbnMatrix","mat3"),P.main.add(f`
-      if (waterColor.a < ${f.float(y)}) {
-        // Discard this vertex
-        gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
-        return;
-      }
-
-      vuv = uv0;
-      vpos = position;
+          vpos = position;
+          gl_Position = transformPosition(proj, view, vpos);
+        `),L.uniforms.add(N),L.main.add(f`fragColor = waterColor;`),C;P.include(s,y),x.add("vuv","vec2"),x.add("vnormal","vec3"),x.add("vtbnMatrix","mat3"),P.main.add(f`
+        if (waterColor.a < ${f.float(j)}) {
+          // Discard this vertex
+          gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
+          return;
+        }
 
-      vnormal = getLocalUp(vpos, localOrigin);
-      vtbnMatrix = getTBNMatrix(vnormal);
+        vuv = uv0;
+        vpos = position;
+        vnormal = getLocalUp(vpos, localOrigin);
+        vtbnMatrix = getTBNMatrix(vnormal);
 
-      gl_Position = transformPosition(proj, view, vpos);
-      forwardLinearDepthToReadShadowMap();`)}switch(C.include(d,j),S){case 0:case 1:case 2:C.include(c),C.include(m,j),C.include(h,j),L.include(r,j),L.include(v),p(L,j),L.uniforms.add(n,s,D,new w("timeElapsed",({timeElapsed:e})=>e),P.uniforms.get("view"),P.uniforms.get("localOrigin")).main.add(f`
+        gl_Position = transformPosition(proj, view, vpos);
+        forwardLinearDepthToReadShadowMap();
+      `),L.include(o,y),L.include(c),p(L,y),L.uniforms.add(t,n,N,new w("timeElapsed",({timeElapsed:e})=>e),P.uniforms.get("view"),P.uniforms.get("localOrigin")).main.add(f`
         discardBySlice(vpos);
-        vec3 localUp = vnormal;
         // the created normal is in tangent space
         vec4 tangentNormalFoam = getSurfaceNormalAndFoam(vuv, timeElapsed);
 
@@ -32,33 +32,22 @@ import e from"../core/Error.js";import{isColor as o}from"../views/3d/webgl-engin
         vec3 v = -normalize(vpos - cameraPosition);
         float shadow = ${O?f`1.0 - readShadowMap(vpos, linearDepth)`:"1.0"};
         vec4 vPosView = view * vec4(vpos, 1.0);
-        vec4 final = vec4(getWaterColor(n, v, mainLightDirection, waterColor.rgb, mainLightIntensity, localUp, shadow, tangentNormalFoam.w, vPosView.xyz, vpos + localOrigin), waterColor.w);
+        vec4 final = vec4(getWaterColor(n, v, mainLightDirection, waterColor.rgb, mainLightIntensity, vnormal, shadow, tangentNormalFoam.w, vPosView.xyz, vpos + localOrigin), waterColor.w);
 
         fragColor = delinearizeGamma(final);
-        outputColorHighlightOLID(applySlice(fragColor, vpos), final.rgb);`);break;case 4:P.include(l,j),C.include(c,j),L.include(r,j),x.add("vuv","vec2"),P.main.add(f`
-        if (waterColor.a < ${f.float(y)}) {
+        outputColorHighlightOLID(applySlice(fragColor, vpos), final.rgb);`);break;case 4:C.include(m,y),P.include(s,y),P.main.add(f`
+        if (waterColor.a < ${f.float(j)}) {
           // Discard this vertex
           gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
           return;
         }
 
-        vuv = uv0;
         vpos = position;
-
-        gl_Position = transformPosition(proj, view, vpos);`),L.uniforms.add(new w("timeElapsed",({timeElapsed:e})=>e)).main.add(f`
-        discardBySlice(vpos);
-
-        // the created normal is in tangent space and foam
-        vec4 tangentNormalFoam = getSurfaceNormalAndFoam(vuv, timeElapsed);
-        tangentNormalFoam.xyz = normalize(tangentNormalFoam.xyz);
-
-        // Draped water is only rendered for overlay, writes foam and is not rendered for ambient illumination.
-        // Non-draped water opts out of ambient illumination by writing 0.0.
-        fragColor = vec4(
-          (tangentNormalFoam.xyz + vec3(1.0)) * 0.5,
-          ${_?f`tangentNormalFoam.w`:f`0.0`}
-        );`);break;case 3:P.main.add(f`
-        if (waterColor.a < ${f.float(y)}) {
+        gl_Position = transformPosition(proj, view, vpos);
+      `),L.include(o,y),L.main.add(f`discardBySlice(vpos);`),y.drapedNormals?(x.add("vuv","vec2"),P.main.add("vuv = uv0;"),L.uniforms.add(new w("timeElapsed",({timeElapsed:e})=>e)).main.add(f`vec4 tangentNormalFoam = getSurfaceNormalAndFoam(vuv, timeElapsed);
+tangentNormalFoam.xyz = normalize(tangentNormalFoam.xyz);
+fragColor = vec4((tangentNormalFoam.xyz + vec3(1.0)) * 0.5, tangentNormalFoam.a);`)):(x.add("vnormal","vec3"),P.uniforms.add(v).main.add("vnormal = normalize4(viewNormal * vec4(getLocalUp(vpos, localOrigin), 1.0));"),L.main.add("fragColor = vec4(vec3(0.5) + 0.5 * vnormal, 1.0);"));break;case 3:P.main.add(f`
+        if (waterColor.a < ${f.float(j)}) {
           // Discard this vertex
           gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
           return;
@@ -66,17 +55,17 @@ import e from"../core/Error.js";import{isColor as o}from"../views/3d/webgl-engin
 
         vpos = position;
         gl_Position = transformPosition(proj, view, vpos);
-      `),L.include(r,j),L.main.add("discardBySlice(vpos);");break;case 10:C.include(t,j),P.main.add(f`
-        if (waterColor.a < ${f.float(y)}) {
+      `),L.include(o,y),L.main.add("discardBySlice(vpos);");break;case 10:C.include(a,y),P.main.add(f`
+        if (waterColor.a < ${f.float(j)}) {
           // Discard this vertex
           gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
           return;
         }
 
         vpos = position;
-        gl_Position = transformPosition(proj, view, vpos);`),L.include(r,j),L.main.add(f`discardBySlice(vpos);
-calculateOcclusionAndOutputHighlight();`);break;case 11:C.include(a,j),P.main.add(f`
-        if (waterColor.a < ${f.float(y)}) {
+        gl_Position = transformPosition(proj, view, vpos);`),L.include(o,y),L.main.add(f`discardBySlice(vpos);
+calculateOcclusionAndOutputHighlight();`);break;case 11:C.include(i,y),P.main.add(f`
+        if (waterColor.a < ${f.float(j)}) {
           // Discard this vertex
           gl_Position = vec4(1e38, 1e38, 1e38, 1.0);
           return;
@@ -84,5 +73,5 @@ calculateOcclusionAndOutputHighlight();`);break;case 11:C.include(a,j),P.main.ad
 
         vpos = position;
         gl_Position = transformPosition(proj, view, vpos);
-        forwardObjectAndLayerIdColor();`),L.include(r,j),L.main.add(f`discardBySlice(vpos);
-outputObjectAndLayerIdColor();`);break;default:throw new e("shaderbuilder:missing-output",`Unimplemented shader output ${S} for WaterTechnique`)}return C}const C=Object.freeze(Object.defineProperty({__proto__:null,build:j},Symbol.toStringTag,{value:"Module"}));export{C as W,j as b};
+        forwardObjectAndLayerIdColor();`),L.include(o,y),L.main.add(f`discardBySlice(vpos);
+outputObjectAndLayerIdColor();`);break;default:throw new e("shaderbuilder:missing-output",`Unimplemented shader output ${S} for WaterTechnique`)}return C}const C=Object.freeze(Object.defineProperty({__proto__:null,build:y},Symbol.toStringTag,{value:"Module"}));export{C as W,y as b};

package/config.js

@@ -1,2 +1,2 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import"./core/has.js";import{deepMerge as e}from"./core/object.js";const s={apiKey:void 0,apiKeys:{scopes:[]},applicationName:"",applicationUrl:globalThis.location?.href,assetsPath:"",fontsUrl:"https://static.arcgis.com/fonts",geometryServiceUrl:"https://utility.arcgisonline.com/arcgis/rest/services/Geometry/GeometryServer",geoRSSServiceUrl:"https://utility.arcgis.com/sharing/rss",kmlServiceUrl:"https://utility.arcgis.com/sharing/kml",userPrivilegesApplied:!0,portalUrl:"https://www.arcgis.com",respectPrefersReducedMotion:!0,routeServiceUrl:"https://route-api.arcgis.com/arcgis/rest/services/World/Route/NAServer/Route_World",workers:{loaderConfig:{has:{},paths:{},map:{},packages:[]}},request:{crossOriginNoCorsDomains:null,httpsDomains:["arcgis.com","arcgisonline.com","esrikr.com","premiumservices.blackbridge.com","esripremium.accuweather.com","gbm.digitalglobe.com","firstlook.digitalglobe.com","msi.digitalglobe.com"],interceptors:[],internalInterceptors:[],maxUrlLength:2e3,priority:"high",proxyRules:[],proxyUrl:null,timeout:62e3,trustedServers:[],useIdentity:!0},log:{interceptors:[],level:null}};if(globalThis.esriConfig&&(e(s,globalThis.esriConfig,!0),delete s.has),!s.assetsPath){{const e="5.2.0-next.118";s.assetsPath=`https://cdn.jsdelivr.net/npm/@arcgis/core@${e}/assets`}s.defaultAssetsPath=s.assetsPath}export{s as default};
+import"./core/has.js";import{deepMerge as e}from"./core/object.js";const s={apiKey:void 0,apiKeys:{scopes:[]},applicationName:"",applicationUrl:globalThis.location?.href,assetsPath:"",fontsUrl:"https://static.arcgis.com/fonts",geometryServiceUrl:"https://utility.arcgisonline.com/arcgis/rest/services/Geometry/GeometryServer",geoRSSServiceUrl:"https://utility.arcgis.com/sharing/rss",kmlServiceUrl:"https://utility.arcgis.com/sharing/kml",userPrivilegesApplied:!0,portalUrl:"https://www.arcgis.com",respectPrefersReducedMotion:!0,routeServiceUrl:"https://route-api.arcgis.com/arcgis/rest/services/World/Route/NAServer/Route_World",workers:{loaderConfig:{has:{},paths:{},map:{},packages:[]}},request:{crossOriginNoCorsDomains:null,httpsDomains:["arcgis.com","arcgisonline.com","esrikr.com","premiumservices.blackbridge.com","esripremium.accuweather.com","gbm.digitalglobe.com","firstlook.digitalglobe.com","msi.digitalglobe.com"],interceptors:[],internalInterceptors:[],maxUrlLength:2e3,priority:"high",proxyRules:[],proxyUrl:null,timeout:62e3,trustedServers:[],useIdentity:!0},log:{interceptors:[],level:null}};if(globalThis.esriConfig&&(e(s,globalThis.esriConfig,!0),delete s.has),!s.assetsPath){{const e="5.2.0-next.119";s.assetsPath=`https://cdn.jsdelivr.net/npm/@arcgis/core@${e}/assets`}s.defaultAssetsPath=s.assetsPath}export{s as default};

package/kernel.js

@@ -1,2 +1,2 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import has from"./core/has.js";import{addQueryParameter as o}from"./core/urlUtils.js";export{buildDate,revision}from"./support/revision.js";Symbol.dispose??=Symbol("Symbol.dispose"),Symbol.asyncDispose??=Symbol("Symbol.asyncDispose");const e="5.2";let r,s=e;function i(o){r=o}function t(e){const s=r?.findCredential(e);return s?.token?o(e,"token",s.token):e}s="5.2.0-next.118",has("host-webworker")||globalThis.$arcgis||Object.defineProperty(globalThis,"$arcgis",{configurable:!1,enumerable:!0,writable:!1,value:{}}),has("host-webworker");export{t as addTokenParameter,s as fullVersion,r as id,i as setId,e as version};
+import has from"./core/has.js";import{addQueryParameter as o}from"./core/urlUtils.js";export{buildDate,revision}from"./support/revision.js";Symbol.dispose??=Symbol("Symbol.dispose"),Symbol.asyncDispose??=Symbol("Symbol.asyncDispose");const e="5.2";let r,s=e;function i(o){r=o}function t(e){const s=r?.findCredential(e);return s?.token?o(e,"token",s.token):e}s="5.2.0-next.119",has("host-webworker")||globalThis.$arcgis||Object.defineProperty(globalThis,"$arcgis",{configurable:!1,enumerable:!0,writable:!1,value:{}}),has("host-webworker");export{t as addTokenParameter,s as fullVersion,r as id,i as setId,e as version};