@takram/three-clouds 0.6.0 → 0.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takram/three-clouds",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "description": "A Three.js and R3F implementation of geospatial volumetric clouds",
   "keywords": [
     "three",
@@ -45,15 +45,15 @@
     "README.md"
   ],
   "dependencies": {
-    "@takram/three-atmosphere": "0.16.0",
-    "@takram/three-geospatial": "0.6.0",
+    "@takram/three-atmosphere": "0.17.0",
+    "@takram/three-geospatial": "0.7.0",
     "tiny-invariant": "^1.3.3",
-    "type-fest": "^4.41.0"
+    "type-fest": "^5.4.4"
   },
   "peerDependencies": {
     "@react-three/fiber": ">=9.0.4",
     "@react-three/postprocessing": ">=3.0.4",
-    "postprocessing": ">=6.36.7",
+    "postprocessing": ">=6.38.0",
     "react": ">=19.0",
     "three": ">=0.170.0"
   },

package/src/CascadedShadowMaps.ts

@@ -14,8 +14,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

package/src/CloudLayer.ts

@@ -14,10 +14,9 @@ const paramKeys = [
   'densityProfile'
 ] as const
 
-export interface CloudLayerLike
-  extends Partial<
-    Pick<CloudLayer, Exclude<(typeof paramKeys)[number], 'densityProfile'>>
-  > {
+export interface CloudLayerLike extends Partial<
+  Pick<CloudLayer, Exclude<(typeof paramKeys)[number], 'densityProfile'>>
+> {
   densityProfile?: DensityProfileLike
 }
 

package/src/CloudsEffect.ts

@@ -119,11 +119,13 @@ const shadowMapsParameterKeys = [
 ] as const satisfies Array<keyof CascadedShadowMaps>
 
 interface CloudsShorthand
-  extends UniformShorthand<CloudsMaterial, (typeof cloudsUniformKeys)[number]>,
+  extends
+    UniformShorthand<CloudsMaterial, (typeof cloudsUniformKeys)[number]>,
     PropertyShorthand<[CloudsMaterial, typeof cloudsMaterialParameterKeys]> {}
 
 interface ShadowShorthand
-  extends UniformShorthand<ShadowMaterial, (typeof shadowUniformKeys)[number]>,
+  extends
+    UniformShorthand<ShadowMaterial, (typeof shadowUniformKeys)[number]>,
     PropertyShorthand<
       [
         ShadowMaterial,
@@ -699,16 +701,6 @@ export class CloudsEffect extends Effect {
     this.cloudsPass.currentMaterial.scatterAnisotropyMix = value
   }
 
-  /** @deprecated Use skyLightScale instead. */
-  get skyIrradianceScale(): number {
-    return this.skyLightScale
-  }
-
-  /** @deprecated Use skyLightScale instead. */
-  set skyIrradianceScale(value: number) {
-    this.skyLightScale = value
-  }
-
   get skyLightScale(): number {
     return this.cloudsPass.currentMaterial.uniforms.skyLightScale.value
   }
@@ -717,16 +709,6 @@ export class CloudsEffect extends Effect {
     this.cloudsPass.currentMaterial.uniforms.skyLightScale.value = value
   }
 
-  /** @deprecated Use groundBounceScale instead. */
-  get groundIrradianceScale(): number {
-    return this.groundBounceScale
-  }
-
-  /** @deprecated Use groundBounceScale instead. */
-  set groundIrradianceScale(value: number) {
-    this.groundBounceScale = value
-  }
-
   get groundBounceScale(): number {
     return this.cloudsPass.currentMaterial.uniforms.groundBounceScale.value
   }

package/src/CloudsMaterial.ts

@@ -73,9 +73,7 @@ export interface CloudsMaterialParameters {
 }
 
 export interface CloudsMaterialUniforms
-  extends CloudParameterUniforms,
-    CloudLayerUniforms,
-    AtmosphereUniforms {
+  extends CloudParameterUniforms, CloudLayerUniforms, AtmosphereUniforms {
   depthBuffer: Uniform<Texture | null>
   viewMatrix: Uniform<Matrix4>
   inverseProjectionMatrix: Uniform<Matrix4>
@@ -458,16 +456,6 @@ export class CloudsMaterial extends AtmosphereMaterialBase {
   @defineInt('MULTI_SCATTERING_OCTAVES', { min: 1, max: 12 })
   multiScatteringOctaves: number = defaults.clouds.multiScatteringOctaves
 
-  /** @deprecated Use accurateSunSkyLight instead. */
-  get accurateSunSkyIrradiance(): boolean {
-    return this.accurateSunSkyLight
-  }
-
-  /** @deprecated Use accurateSunSkyLight instead. */
-  set accurateSunSkyIrradiance(value: boolean) {
-    this.accurateSunSkyLight = value
-  }
-
   @define('ACCURATE_SUN_SKY_LIGHT')
   accurateSunSkyLight: boolean = defaults.clouds.accurateSunSkyLight
 

package/src/DensityProfile.ts

@@ -1,7 +1,6 @@
-export interface DensityProfileLike
-  extends Partial<
-    Pick<DensityProfile, 'expTerm' | 'exponent' | 'linearTerm' | 'constantTerm'>
-  > {}
+export interface DensityProfileLike extends Partial<
+  Pick<DensityProfile, 'expTerm' | 'exponent' | 'linearTerm' | 'constantTerm'>
+> {}
 
 export class DensityProfile {
   constructor(

package/src/ShadowMaterial.ts

@@ -37,9 +37,7 @@ export interface ShadowMaterialParameters {
 }
 
 export interface ShadowMaterialUniforms
-  extends CloudParameterUniforms,
-    CloudLayerUniforms,
-    AtmosphereUniforms {
+  extends CloudParameterUniforms, CloudLayerUniforms, AtmosphereUniforms {
   [key: string]: Uniform<unknown>
   inverseShadowMatrices: Uniform<Matrix4[]>
   reprojectionMatrices: Uniform<Matrix4[]>

package/src/helpers/FrustumCorners.ts

@@ -14,8 +14,8 @@
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

package/src/r3f/CloudLayer.tsx

@@ -17,8 +17,7 @@ import { CloudLayers } from '../CloudLayers'
 import { CloudLayersContext } from './CloudLayers'
 
 export interface CloudLayerProps
-  extends CloudLayerLike,
-    ExpandNestedProps<CloudLayerLike, 'densityProfile'> {
+  extends CloudLayerLike, ExpandNestedProps<CloudLayerLike, 'densityProfile'> {
   ref?: Ref<CloudLayerImpl>
   index?: number
 }

package/src/r3f/Clouds.tsx

@@ -117,20 +117,19 @@ function useLoadSTBNTexture(
   return (typeof input === 'string' ? loadedTexture : input) ?? null
 }
 
-export interface CloudsProps
-  extends Omit<
-    ElementProps<
-      typeof CloudsEffect,
-      CloudsEffect &
-        ExpandNestedProps<CloudsEffect, 'clouds'> &
-        ExpandNestedProps<CloudsEffect, 'shadow'>
-    >,
-    | 'localWeatherTexture'
-    | 'shapeTexture'
-    | 'shapeDetailTexture'
-    | 'turbulenceTexture'
-    | 'stbnTexture'
-  > {
+export interface CloudsProps extends Omit<
+  ElementProps<
+    typeof CloudsEffect,
+    CloudsEffect &
+      ExpandNestedProps<CloudsEffect, 'clouds'> &
+      ExpandNestedProps<CloudsEffect, 'shadow'>
+  >,
+  | 'localWeatherTexture'
+  | 'shapeTexture'
+  | 'shapeDetailTexture'
+  | 'turbulenceTexture'
+  | 'stbnTexture'
+> {
   disableDefaultLayers?: boolean
   localWeatherTexture?: Texture | ProceduralTexture | string
   shapeTexture?: Data3DTexture | Procedural3DTexture | string

package/src/shaders/clouds.frag

@@ -819,8 +819,8 @@ vec2 getHazeRayNearFar(const IntersectionResult intersections) {
 
 float getRayDistanceToScene(const vec3 rayDirection, out float viewZ) {
   float depth = readDepth(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);
   }

package/types/CloudsEffect.d.ts

@@ -139,16 +139,8 @@ export declare class CloudsEffect extends Effect {
     set scatterAnisotropy2(value: number);
     get scatterAnisotropyMix(): number;
     set scatterAnisotropyMix(value: number);
-    /** @deprecated Use skyLightScale instead. */
-    get skyIrradianceScale(): number;
-    /** @deprecated Use skyLightScale instead. */
-    set skyIrradianceScale(value: number);
     get skyLightScale(): number;
     set skyLightScale(value: number);
-    /** @deprecated Use groundBounceScale instead. */
-    get groundIrradianceScale(): number;
-    /** @deprecated Use groundBounceScale instead. */
-    set groundIrradianceScale(value: number);
     get groundBounceScale(): number;
     set groundBounceScale(value: number);
     get powderScale(): number;

package/types/CloudsMaterial.d.ts

@@ -72,10 +72,6 @@ export declare class CloudsMaterial extends AtmosphereMaterialBase {
     shadowLength: boolean;
     haze: boolean;
     multiScatteringOctaves: number;
-    /** @deprecated Use accurateSunSkyLight instead. */
-    get accurateSunSkyIrradiance(): boolean;
-    /** @deprecated Use accurateSunSkyLight instead. */
-    set accurateSunSkyIrradiance(value: boolean);
     accurateSunSkyLight: boolean;
     accuratePhaseFunction: boolean;
     shadowCascadeCount: number;