@takram/three-clouds 0.7.0 → 0.7.2

package/build/shared.js

@@ -1,7 +1,7 @@
-import { Pass as Fe, ShaderPass as q, Resolution as $, Effect as ze, EffectAttribute as We } from "postprocessing";
+import { Pass as Fe, ShaderPass as K, Resolution as $, Effect as ze, EffectAttribute as We } from "postprocessing";
 import { Vector3 as p, Vector2 as f, Matrix4 as m, Object3D as se, Box3 as Be, Uniform as r, GLSL3 as G, Vector4 as S, RawShaderMaterial as Q, Camera as we, WebGLRenderTarget as Ge, HalfFloatType as Ce, LinearFilter as B, RedFormat as Ve, WebGLArrayRenderTarget as ke, EventDispatcher as je, Matrix3 as Ye, Texture as ce, Data3DTexture as le } from "three";
-import { AtmosphereMaterialBase as Ze, AtmosphereParameters as Te, getAltitudeCorrectionOffset as Ke } from "@takram/three-atmosphere";
-import { lerp as De, defineInt as L, defineExpression as Ee, define as x, defineFloat as ee, unrollLoops as V, resolveIncludes as H, reinterpretType as qe, Geodetic as $e, definePropertyShorthand as he, defineUniformShorthand as ue } from "@takram/three-geospatial";
+import { AtmosphereMaterialBase as Ze, AtmosphereParameters as Te, getAltitudeCorrectionOffset as qe } from "@takram/three-atmosphere";
+import { lerp as De, defineInt as L, defineExpression as Ee, define as x, defineFloat as ee, unrollLoops as V, resolveIncludes as H, reinterpretType as Ke, Geodetic as $e, definePropertyShorthand as he, defineUniformShorthand as ue } from "@takram/three-geospatial";
 import { runtime as de, definitions as pe, common as fe } from "@takram/three-atmosphere/shaders/bruneton";
 import { vogelDisk as Xe, interleavedGradientNoise as Je, cascadedShadowMaps as Qe, raySphereIntersection as Ae, generators as et, turbo as _e, math as Pe, depth as tt } from "@takram/three-geospatial/shaders";
 class k {
@@ -62,7 +62,7 @@ let w = b;
 const R = /* @__PURE__ */ Array.from(
   { length: 8 },
   () => ({ value: 0, flag: 0 })
-), M = /* @__PURE__ */ Array.from(
+), I = /* @__PURE__ */ Array.from(
   { length: 3 },
   () => ({ min: 0, max: 0 })
 );
@@ -124,17 +124,17 @@ const U = class U extends Array {
     for (let s = 0; s < R.length; ++s) {
       const { value: l, flag: h } = R[s];
       if (a === 0 && s > 0) {
-        const u = M[n++];
+        const u = I[n++];
         u.min = R[s - 1].value, u.max = l;
       }
       a += h === 0 ? 1 : -1;
     }
     for (; n < 3; ++n) {
-      const s = M[n];
+      const s = I[n];
       s.min = 0, s.max = 0;
     }
-    let i = M[0];
-    e.x = i.min, t.x = i.max, i = M[1], e.y = i.min, t.y = i.max, i = M[2], e.z = i.min, t.z = i.max;
+    let i = I[0];
+    e.x = i.min, t.x = i.max, i = I[1], e.y = i.min, t.y = i.max, i = I[2], e.z = i.min, t.z = i.max;
   }
 };
 U.DEFAULT = /* @__PURE__ */ new U([
@@ -535,6 +535,7 @@ precision highp sampler2DArray;
 #include <common>
 #include <packing>
 
+#include "core/depth"
 #include "core/math"
 #include "core/turbo"
 #include "core/generators"
@@ -627,14 +628,6 @@ layout(location = 1) out vec3 outputDepthVelocity;
 layout(location = 2) out float outputShadowLength;
 #endif // SHADOW_LENGTH
 
-float readDepth(const vec2 uv) {
-  #if DEPTH_PACKING == 3201
-  return unpackRGBAToDepth(texture(depthBuffer, uv));
-  #else // DEPTH_PACKING == 3201
-  return texture(depthBuffer, uv).r;
-  #endif // DEPTH_PACKING == 3201
-}
-
 float getViewZ(const float depth) {
   #ifdef PERSPECTIVE_CAMERA
   return perspectiveDepthToViewZ(depth, cameraNear, cameraFar);
@@ -1347,8 +1340,10 @@ vec2 getHazeRayNearFar(const IntersectionResult intersections) {
 #endif // HAZE
 
 float getRayDistanceToScene(const vec3 rayDirection, out float viewZ) {
-  float depth = readDepth(vUv * targetUvScale + temporalJitter);
+  float depth = readDepthValue(depthBuffer, vUv * targetUvScale + temporalJitter);
+  depth = reverseLogDepth(depth, cameraNear, cameraFar);
   if (depth < 1.0 - 1e-7) {
+    depth = reverseLogDepth(depth, cameraNear, cameraFar);
     viewZ = getViewZ(depth);
     return -viewZ / dot(rayDirection, vCameraDirection);
   }
@@ -2029,7 +2024,7 @@ class g extends Ze {
       t.temporalJitter.value.set(P, O), t.mipLevelScale.value = 0.25, i.copy(e.projectionMatrix), i.elements[8] += P * 2, i.elements[9] += O * 2, i.invert(), l.copy(n), l.elements[8] += P * 2, l.elements[9] += O * 2, l.multiply(a), h.copy(l).multiply(s);
     } else
       t.temporalJitter.value.setScalar(0), t.mipLevelScale.value = 1, i.copy(e.projectionMatrixInverse), l.copy(n).multiply(a), h.copy(l).multiply(s);
-    qe(e), t.cameraNear.value = e.near, t.cameraFar.value = e.far;
+    Ke(e), t.cameraNear.value = e.near, t.cameraFar.value = e.far;
     const u = e.getWorldPosition(
       t.cameraPosition.value
     ), d = St.copy(u).applyMatrix4(t.worldToECEFMatrix.value);
@@ -2403,7 +2398,7 @@ void main() {
   vUv = position.xy * 0.5 + 0.5;
   gl_Position = vec4(position.xy, 1.0, 1.0);
 }
-`, Ie = `#ifdef VARIANCE_9_SAMPLES
+`, Me = `#ifdef VARIANCE_9_SAMPLES
 #define VARIANCE_OFFSET_COUNT 8
 const ivec2 varianceOffsets[8] = ivec2[8](
   ivec2(-1, -1),
@@ -2518,7 +2513,7 @@ vec4 varianceClipping(
   return varianceClipping(inputBuffer, coord, current, history, 1.0);
 }
 `;
-var Tt = Object.defineProperty, Me = (o, e, t, n) => {
+var Tt = Object.defineProperty, Ie = (o, e, t, n) => {
   for (var a = void 0, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (a = s(e, t, a) || a);
   return a && Tt(e, t, a), a;
@@ -2539,7 +2534,7 @@ class te extends Q {
         H(wt, {
           core: { turbo: _e },
           catmullRomSampling: xt,
-          varianceClipping: Ie
+          varianceClipping: Me
         })
       ),
       uniforms: {
@@ -2564,10 +2559,10 @@ class te extends Q {
     this.uniforms.jitterOffset.value.set(d, v);
   }
 }
-Me([
+Ie([
   x("TEMPORAL_UPSCALE")
 ], te.prototype, "temporalUpscale");
-Me([
+Ie([
   x("SHADOW_LENGTH")
 ], te.prototype, "shadowLength");
 class Ne extends Fe {
@@ -2611,7 +2606,7 @@ class Dt extends Ne {
         atmosphereUniforms: n
       },
       i
-    ), this.currentPass = new q(this.currentMaterial), this.resolveMaterial = new te(), this.resolvePass = new q(this.resolveMaterial), this.initRenderTargets({
+    ), this.currentPass = new K(this.currentMaterial), this.resolveMaterial = new te(), this.resolvePass = new K(this.resolveMaterial), this.initRenderTargets({
       depthVelocity: !0,
       shadowLength: c.lightShafts
     });
@@ -2717,7 +2712,7 @@ function Et(o, e) {
       ), i.push(a.COLOR_ATTACHMENT0 + s);
   a.drawBuffers(i);
 }
-class xe extends q {
+class xe extends K {
   render(e, t, n, a, i) {
     const s = this.fullscreenMaterial.uniforms;
     t !== null && s?.[this.input] != null && (s[this.input].value = t.texture), Et(e, n), e.render(this.scene, this.camera);
@@ -3028,7 +3023,7 @@ void intersectStructuredPlanes(
   }
 }
 `;
-var Ot = Object.defineProperty, I = (o, e, t, n) => {
+var Ot = Object.defineProperty, M = (o, e, t, n) => {
   for (var a = void 0, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (a = s(e, t, a) || a);
   return a && Ot(e, t, a), a;
@@ -3090,24 +3085,24 @@ class _ extends Q {
     this.uniforms.resolution.value.set(e, t);
   }
 }
-I([
+M([
   Ee("LOCAL_WEATHER_CHANNELS", {
     validate: (o) => /^[rgba]{4}$/.test(o)
   })
 ], _.prototype, "localWeatherChannels");
-I([
+M([
   L("CASCADE_COUNT", { min: 1, max: 4 })
 ], _.prototype, "cascadeCount");
-I([
+M([
   x("TEMPORAL_PASS")
 ], _.prototype, "temporalPass");
-I([
+M([
   x("TEMPORAL_JITTER")
 ], _.prototype, "temporalJitter");
-I([
+M([
   x("SHAPE_DETAIL")
 ], _.prototype, "shapeDetail");
-I([
+M([
   x("TURBULENCE")
 ], _.prototype, "turbulence");
 const Rt = `precision highp float;
@@ -3197,10 +3192,10 @@ void main() {
   gl_Position = vec4(position.xy, 1.0, 1.0);
 }
 `;
-var It = Object.defineProperty, Mt = (o, e, t, n) => {
+var Mt = Object.defineProperty, It = (o, e, t, n) => {
   for (var a = void 0, i = o.length - 1, s; i >= 0; i--)
     (s = o[i]) && (a = s(e, t, a) || a);
-  return a && It(e, t, a), a;
+  return a && Mt(e, t, a), a;
 };
 class be extends Q {
   constructor({
@@ -3213,7 +3208,7 @@ class be extends Q {
       vertexShader: Lt,
       fragmentShader: V(
         H(Rt, {
-          varianceClipping: Ie
+          varianceClipping: Me
         })
       ),
       uniforms: {
@@ -3234,7 +3229,7 @@ class be extends Q {
     this.uniforms.texelSize.value.set(1 / e, 1 / t);
   }
 }
-Mt([
+It([
   L("CASCADE_COUNT", { min: 1, max: 4 })
 ], be.prototype, "cascadeCount");
 function Z(o) {
@@ -3352,7 +3347,7 @@ function Ut() {
     })
   };
 }
-const K = [0, 0, 0, 0];
+const q = [0, 0, 0, 0];
 function Ht(o, e) {
   e.packValues("altitude", o.minLayerHeights.value), e.packSums("altitude", "height", o.maxLayerHeights.value), e.packIntervalHeights(
     o.minIntervalHeights.value,
@@ -3361,12 +3356,12 @@ function Ht(o, e) {
   const t = o.densityProfile.value;
   e.packDensityProfiles("expTerm", t.expTerms), e.packDensityProfiles("exponent", t.exponents), e.packDensityProfiles("linearTerm", t.linearTerms), e.packDensityProfiles("constantTerm", t.constantTerms);
   let n = 1 / 0, a = 0, i = 1 / 0, s = 0;
-  K.fill(0);
+  q.fill(0);
   for (let l = 0; l < e.length; ++l) {
     const { altitude: h, height: u, shadow: d } = e[l], v = h + u;
-    u > 0 && (h < n && (n = h), d && h < i && (i = h), v > a && (a = v), d && v > s && (s = v)), K[l] = d ? 1 : 0;
+    u > 0 && (h < n && (n = h), d && h < i && (i = h), v > a && (a = v), d && v > s && (s = v)), q[l] = d ? 1 : 0;
   }
-  n !== 1 / 0 ? (o.minHeight.value = n, o.maxHeight.value = a) : (A(a === 0), o.minHeight.value = 0), i !== 1 / 0 ? (o.shadowBottomHeight.value = i, o.shadowTopHeight.value = s) : (A(s === 0), o.shadowBottomHeight.value = 0), o.shadowLayerMask.value.fromArray(K);
+  n !== 1 / 0 ? (o.minHeight.value = n, o.maxHeight.value = a) : (A(a === 0), o.minHeight.value = 0), i !== 1 / 0 ? (o.shadowBottomHeight.value = i, o.shadowTopHeight.value = s) : (A(s === 0), o.shadowBottomHeight.value = 0), o.shadowLayerMask.value.fromArray(q);
 }
 function Ft(o, e) {
   return {
@@ -3430,9 +3425,9 @@ const N = /* @__PURE__ */ new p(), Gt = /* @__PURE__ */ new f(), Vt = /* @__PURE
   "opticalDepthTailScale"
 ], Zt = [
   "temporalJitter"
-], Kt = [
-  "temporalPass"
 ], qt = [
+  "temporalPass"
+], Kt = [
   "cascadeCount",
   "mapSize",
   "maxFar",
@@ -3509,9 +3504,9 @@ class Xt extends ze {
       this.shadowPass.currentMaterial,
       Zt,
       this.shadowPass,
-      Kt,
+      qt,
       this.shadowMaps,
-      qt
+      Kt
     ), this.resolution = new $(
       this,
       l,
@@ -3541,7 +3536,7 @@ class Xt extends ze {
     const n = this.worldToECEFMatrix;
     this.ecefToWorldMatrix.copy(n).invert();
     const a = this.camera.getWorldPosition(N).applyMatrix4(this.worldToECEFMatrix), i = this.altitudeCorrection;
-    this.correctAltitude ? Ke(
+    this.correctAltitude ? qe(
       a,
       this.atmosphere.bottomRadius,
       this.ellipsoid,