@takram/three-clouds 0.1.2 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takram/three-clouds",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "A Three.js and R3F implementation of geospatial volumetric clouds",
   "keywords": [
     "three",
@@ -45,16 +45,16 @@
     "README.md"
   ],
   "dependencies": {
-    "@takram/three-atmosphere": "0.10.1",
-    "@takram/three-geospatial": "0.1.0",
+    "@takram/three-atmosphere": "0.11.0",
+    "@takram/three-geospatial": "0.2.0",
     "tiny-invariant": "^1.3.3",
     "type-fest": "^4.34.1"
   },
   "peerDependencies": {
-    "@react-three/fiber": ">=8.17.10",
-    "@react-three/postprocessing": ">=2.16.3",
-    "postprocessing": ">=6.36.4",
-    "react": ">=18.0",
+    "@react-three/fiber": ">=9.0.4",
+    "@react-three/postprocessing": ">=3.0.4",
+    "postprocessing": ">=6.36.7",
+    "react": ">=19.0",
     "three": ">=0.170.0"
   },
   "peerDependenciesMeta": {

package/src/CloudsEffect.ts

@@ -776,14 +776,6 @@ export class CloudsEffect extends Effect {
     this.cloudsPass.currentMaterial.transmittanceTexture = value
   }
 
-  /** @deprecated useHalfFloat is now always true */
-  get useHalfFloat(): boolean {
-    return true
-  }
-
-  /** @deprecated useHalfFloat is now always true */
-  set useHalfFloat(value: boolean) {}
-
   get ellipsoid(): Ellipsoid {
     return this.cloudsPass.currentMaterial.ellipsoid
   }

package/src/r3f/Clouds.tsx

@@ -1,4 +1,4 @@
-import { useFrame, useThree } from '@react-three/fiber'
+import { useFrame, useThree, type ElementProps } from '@react-three/fiber'
 import { EffectComposerContext } from '@react-three/postprocessing'
 import {
   forwardRef,
@@ -27,10 +27,7 @@ import {
   parseUint8Array,
   STBNLoader
 } from '@takram/three-geospatial'
-import {
-  type ExpandNestedProps,
-  type PassThoughInstanceProps
-} from '@takram/three-geospatial/r3f'
+import { type ExpandNestedProps } from '@takram/three-geospatial/r3f'
 
 import {
   CloudsEffect,
@@ -137,14 +134,11 @@ function useSTBNTextureState(
 
 export interface CloudsProps
   extends Omit<
-    PassThoughInstanceProps<
-      CloudsEffect,
-      [],
-      Partial<
-        CloudsEffect &
-          ExpandNestedProps<CloudsEffect, 'clouds'> &
-          ExpandNestedProps<CloudsEffect, 'shadow'>
-      >
+    ElementProps<
+      typeof CloudsEffect,
+      CloudsEffect &
+        ExpandNestedProps<CloudsEffect, 'clouds'> &
+        ExpandNestedProps<CloudsEffect, 'shadow'>
     >,
     | 'localWeatherTexture'
     | 'shapeTexture'

package/types/CascadedShadowMaps.d.ts

@@ -1,6 +1,5 @@
-import { FrustumSplitMode } from './helpers/splitFrustum';
 import { Matrix4, Vector2, Vector3, PerspectiveCamera } from 'three';
-
+import { FrustumSplitMode } from './helpers/splitFrustum';
 export interface Cascade {
     readonly interval: Vector2;
     readonly matrix: Matrix4;

package/types/CloudLayer.d.ts

@@ -1,5 +1,4 @@
 import { DensityProfile, DensityProfileLike } from './DensityProfile';
-
 declare const paramKeys: readonly ["channel", "altitude", "height", "densityScale", "shapeAmount", "shapeDetailAmount", "weatherExponent", "shapeAlteringBias", "coverageFilterWidth", "shadow", "densityProfile"];
 export interface CloudLayerLike extends Partial<Pick<CloudLayer, Exclude<(typeof paramKeys)[number], 'densityProfile'>>> {
     densityProfile?: DensityProfileLike;

package/types/CloudLayers.d.ts

@@ -1,7 +1,6 @@
-import { DensityProfileLike } from './DensityProfile';
-import { CloudLayer, CloudLayerLike } from './CloudLayer';
 import { Vector3, Vector4 } from 'three';
-
+import { CloudLayer, CloudLayerLike } from './CloudLayer';
+import { DensityProfileLike } from './DensityProfile';
 type NumericKey = keyof {
     [P in keyof CloudLayer as number extends CloudLayer[P] ? P : never]: any;
 };

package/types/CloudShape.d.ts

@@ -1,5 +1,4 @@
 import { Procedural3DTextureBase } from './Procedural3DTexture';
-
 export declare class CloudShape extends Procedural3DTextureBase {
     constructor();
 }

package/types/CloudShapeDetail.d.ts

@@ -1,5 +1,4 @@
 import { Procedural3DTextureBase } from './Procedural3DTexture';
-
 export declare class CloudShapeDetail extends Procedural3DTextureBase {
     constructor();
 }

package/types/CloudsEffect.d.ts

@@ -1,17 +1,16 @@
-import { ShadowPass } from './ShadowPass';
-import { ShadowMaterial } from './ShadowMaterial';
-import { QualityPreset } from './qualityPresets';
-import { ProceduralTexture } from './ProceduralTexture';
-import { Procedural3DTexture } from './Procedural3DTexture';
-import { CloudsPass } from './CloudsPass';
-import { CloudsMaterial } from './CloudsMaterial';
-import { CloudLayers } from './CloudLayers';
-import { CascadedShadowMaps } from './CascadedShadowMaps';
-import { UniformMap, Ellipsoid, PropertyShorthand, UniformShorthand } from '@takram/three-geospatial';
-import { AtmosphereParameters, AtmosphereOverlay, AtmosphereShadow, AtmosphereShadowLength } from '@takram/three-atmosphere';
-import { Camera, Data3DTexture, EventDispatcher, Matrix4, Texture, Uniform, Vector2, Vector3, DataTexture, DepthPackingStrategies, TextureDataType, WebGLRenderer, WebGLRenderTarget } from 'three';
 import { Effect, Resolution } from 'postprocessing';
-
+import { Camera, Data3DTexture, EventDispatcher, Matrix4, Texture, Uniform, Vector2, Vector3, DataTexture, DepthPackingStrategies, TextureDataType, WebGLRenderer, WebGLRenderTarget } from 'three';
+import { AtmosphereParameters, AtmosphereOverlay, AtmosphereShadow, AtmosphereShadowLength } from '@takram/three-atmosphere';
+import { UniformMap, Ellipsoid, PropertyShorthand, UniformShorthand } from '@takram/three-geospatial';
+import { CascadedShadowMaps } from './CascadedShadowMaps';
+import { CloudLayers } from './CloudLayers';
+import { CloudsMaterial } from './CloudsMaterial';
+import { CloudsPass } from './CloudsPass';
+import { Procedural3DTexture } from './Procedural3DTexture';
+import { ProceduralTexture } from './ProceduralTexture';
+import { QualityPreset } from './qualityPresets';
+import { ShadowMaterial } from './ShadowMaterial';
+import { ShadowPass } from './ShadowPass';
 declare const cloudsUniformKeys: ["maxIterationCount", "minStepSize", "maxStepSize", "maxRayDistance", "perspectiveStepScale", "minDensity", "minExtinction", "minTransmittance", "maxIterationCountToSun", "maxIterationCountToGround", "minSecondaryStepSize", "secondaryStepScale", "maxShadowFilterRadius", "maxShadowLengthIterationCount", "minShadowLengthStepSize", "maxShadowLengthRayDistance", "hazeDensityScale", "hazeExponent"];
 declare const cloudsMaterialParameterKeys: ["multiScatteringOctaves", "accurateSunSkyIrradiance", "accuratePhaseFunction"];
 declare const shadowUniformKeys: ["maxIterationCount", "minStepSize", "maxStepSize", "minDensity", "minExtinction", "minTransmittance", "opticalDepthTailScale"];
@@ -158,10 +157,6 @@ export declare class CloudsEffect extends Effect {
     set scatteringTexture(value: Data3DTexture | null);
     get transmittanceTexture(): DataTexture | null;
     set transmittanceTexture(value: DataTexture | null);
-    /** @deprecated useHalfFloat is now always true */
-    get useHalfFloat(): boolean;
-    /** @deprecated useHalfFloat is now always true */
-    set useHalfFloat(value: boolean);
     get ellipsoid(): Ellipsoid;
     set ellipsoid(value: Ellipsoid);
     get photometric(): boolean;

package/types/CloudsMaterial.d.ts

@@ -1,7 +1,6 @@
-import { AtmosphereUniforms, CloudLayerUniforms, CloudParameterUniforms } from './uniforms';
-import { AtmosphereMaterialBase, AtmosphereParameters, AtmosphereMaterialBaseUniforms } from '@takram/three-atmosphere';
 import { Matrix4, Uniform, Vector2, Vector3, BufferGeometry, Camera, Data3DTexture, DataArrayTexture, Group, Object3D, Scene, Texture, WebGLRenderer } from 'three';
-
+import { AtmosphereMaterialBase, AtmosphereParameters, AtmosphereMaterialBaseUniforms } from '@takram/three-atmosphere';
+import { AtmosphereUniforms, CloudLayerUniforms, CloudParameterUniforms } from './uniforms';
 declare module 'three' {
     interface Camera {
         isPerspectiveCamera?: boolean;

package/types/CloudsPass.d.ts

@@ -1,11 +1,10 @@
-import { AtmosphereUniforms, CloudLayerUniforms, CloudParameterUniforms } from './uniforms';
-import { PassBase, PassBaseOptions } from './PassBase';
-import { CloudsResolveMaterial } from './CloudsResolveMaterial';
-import { CloudsMaterial } from './CloudsMaterial';
-import { AtmosphereParameters } from '@takram/three-atmosphere';
-import { Camera, DataArrayTexture, DepthPackingStrategies, Texture, TextureDataType, WebGLRenderer } from 'three';
 import { ShaderPass } from 'postprocessing';
-
+import { Camera, DataArrayTexture, DepthPackingStrategies, Texture, TextureDataType, WebGLRenderer } from 'three';
+import { AtmosphereParameters } from '@takram/three-atmosphere';
+import { CloudsMaterial } from './CloudsMaterial';
+import { CloudsResolveMaterial } from './CloudsResolveMaterial';
+import { PassBase, PassBaseOptions } from './PassBase';
+import { AtmosphereUniforms, CloudLayerUniforms, CloudParameterUniforms } from './uniforms';
 export interface CloudsPassOptions extends PassBaseOptions {
     parameterUniforms: CloudParameterUniforms;
     layerUniforms: CloudLayerUniforms;

package/types/CloudsResolveMaterial.d.ts

@@ -1,5 +1,4 @@
 import { RawShaderMaterial, Uniform, Vector2, BufferGeometry, Camera, Group, Object3D, Scene, Texture, WebGLRenderer } from 'three';
-
 export interface CloudsResolveMaterialParameters {
     colorBuffer?: Texture | null;
     depthVelocityBuffer?: Texture | null;

package/types/LocalWeather.d.ts

@@ -1,5 +1,4 @@
 import { ProceduralTextureBase } from './ProceduralTexture';
-
 export declare class LocalWeather extends ProceduralTextureBase {
     constructor();
 }

package/types/PassBase.d.ts

@@ -1,7 +1,6 @@
-import { CascadedShadowMaps } from './CascadedShadowMaps';
-import { Camera } from 'three';
 import { Pass } from 'postprocessing';
-
+import { Camera } from 'three';
+import { CascadedShadowMaps } from './CascadedShadowMaps';
 export interface PassBaseOptions {
     shadow: CascadedShadowMaps;
 }

package/types/Procedural3DTexture.d.ts

@@ -1,6 +1,5 @@
-import { ProceduralTexture } from './ProceduralTexture';
 import { Data3DTexture, WebGLRenderer } from 'three';
-
+import { ProceduralTexture } from './ProceduralTexture';
 export type Procedural3DTexture = ProceduralTexture<Data3DTexture>;
 export interface Procedural3DTextureBaseParameters {
     size: number;

package/types/ProceduralTexture.d.ts

@@ -1,5 +1,4 @@
 import { Texture, WebGLRenderer } from 'three';
-
 export interface ProceduralTexture<T extends Texture = Texture> {
     readonly size: number;
     readonly texture: T;

package/types/ShaderArrayPass.d.ts

@@ -1,6 +1,5 @@
-import { WebGLArrayRenderTarget, WebGLRenderer, WebGLRenderTarget } from 'three';
 import { ShaderPass } from 'postprocessing';
-
+import { WebGLArrayRenderTarget, WebGLRenderer, WebGLRenderTarget } from 'three';
 export declare class ShaderArrayPass extends ShaderPass {
     input: string;
     render(renderer: WebGLRenderer, inputBuffer: WebGLRenderTarget | null, outputBuffer: WebGLArrayRenderTarget, deltaTime?: number, stencilTest?: boolean): void;

package/types/ShadowMaterial.d.ts

@@ -1,6 +1,5 @@
-import { AtmosphereUniforms, CloudLayerUniforms, CloudParameterUniforms } from './uniforms';
 import { Matrix4, RawShaderMaterial, Uniform, Vector2, Data3DTexture } from 'three';
-
+import { AtmosphereUniforms, CloudLayerUniforms, CloudParameterUniforms } from './uniforms';
 export interface ShadowMaterialParameters {
     parameterUniforms: CloudParameterUniforms;
     layerUniforms: CloudLayerUniforms;

package/types/ShadowPass.d.ts

@@ -1,10 +1,9 @@
-import { AtmosphereUniforms, CloudLayerUniforms, CloudParameterUniforms } from './uniforms';
-import { ShadowResolveMaterial } from './ShadowResolveMaterial';
-import { ShadowMaterial } from './ShadowMaterial';
-import { ShaderArrayPass } from './ShaderArrayPass';
-import { PassBase, PassBaseOptions } from './PassBase';
 import { DataArrayTexture, TextureDataType, WebGLRenderer } from 'three';
-
+import { PassBase, PassBaseOptions } from './PassBase';
+import { ShaderArrayPass } from './ShaderArrayPass';
+import { ShadowMaterial } from './ShadowMaterial';
+import { ShadowResolveMaterial } from './ShadowResolveMaterial';
+import { AtmosphereUniforms, CloudLayerUniforms, CloudParameterUniforms } from './uniforms';
 export interface ShadowPassOptions extends PassBaseOptions {
     parameterUniforms: CloudParameterUniforms;
     layerUniforms: CloudLayerUniforms;

package/types/ShadowResolveMaterial.d.ts

@@ -1,5 +1,4 @@
 import { RawShaderMaterial, Uniform, Vector2, DataArrayTexture } from 'three';
-
 export interface ShadowResolveMaterialParameters {
     inputBuffer?: DataArrayTexture | null;
     historyBuffer?: DataArrayTexture | null;

package/types/Turbulence.d.ts

@@ -1,5 +1,4 @@
 import { ProceduralTextureBase } from './ProceduralTexture';
-
 export declare class Turbulence extends ProceduralTextureBase {
     constructor();
 }

package/types/bayer.d.ts

@@ -1,4 +1,3 @@
 import { Vector2 } from 'three';
-
 export declare const bayerIndices: number[];
 export declare const bayerOffsets: Vector2[];

package/types/helpers/FrustumCorners.d.ts

@@ -1,5 +1,4 @@
 import { Vector3, Camera, Matrix4 } from 'three';
-
 declare module 'three' {
     interface Camera {
         isOrthographicCamera?: boolean;

package/types/helpers/setArrayRenderTargetLayers.d.ts

@@ -1,3 +1,2 @@
 import { WebGLArrayRenderTarget, WebGLRenderer } from 'three';
-
 export declare function setArrayRenderTargetLayers(renderer: WebGLRenderer, outputBuffer: WebGLArrayRenderTarget): void;

package/types/qualityPresets.d.ts

@@ -1,7 +1,6 @@
-import { CloudsEffect } from './CloudsEffect';
-import { SharedUnionFieldsDeep } from 'type-fest';
 import { Vector2 } from 'three';
-
+import { SharedUnionFieldsDeep } from 'type-fest';
+import { CloudsEffect } from './CloudsEffect';
 export type QualityPreset = 'low' | 'medium' | 'high' | 'ultra';
 declare const values: {
     resolutionScale: number;

package/types/r3f/CloudLayer.d.ts

@@ -1,6 +1,5 @@
-import { CloudLayer as CloudLayerImpl, CloudLayerLike } from '../CloudLayer';
 import { ExpandNestedProps } from '@takram/three-geospatial/r3f';
-
+import { CloudLayer as CloudLayerImpl, CloudLayerLike } from '../CloudLayer';
 export interface CloudLayerProps extends CloudLayerLike, ExpandNestedProps<CloudLayerLike, 'densityProfile'> {
     index?: number;
 }

package/types/r3f/CloudLayers.d.ts

@@ -1,6 +1,5 @@
-import { CloudLayers as CloudLayersImpl } from '../CloudLayers';
 import { FC, ReactNode } from 'react';
-
+import { CloudLayers as CloudLayersImpl } from '../CloudLayers';
 export interface CloudLayersContextValue {
     layers: CloudLayersImpl;
     indexPool: number[];

package/types/r3f/Clouds.d.ts

@@ -1,11 +1,10 @@
-import { ProceduralTexture } from '../ProceduralTexture';
-import { Procedural3DTexture } from '../Procedural3DTexture';
-import { CloudsEffect } from '../CloudsEffect';
-import { ExpandNestedProps, PassThoughInstanceProps } from '@takram/three-geospatial/r3f';
+import { ElementProps } from '@react-three/fiber';
 import { Data3DTexture, Texture } from 'three';
-
-export interface CloudsProps extends Omit<PassThoughInstanceProps<CloudsEffect, [
-], Partial<CloudsEffect & ExpandNestedProps<CloudsEffect, 'clouds'> & ExpandNestedProps<CloudsEffect, 'shadow'>>>, 'localWeatherTexture' | 'shapeTexture' | 'shapeDetailTexture' | 'turbulenceTexture' | 'stbnTexture'> {
+import { ExpandNestedProps } from '@takram/three-geospatial/r3f';
+import { CloudsEffect } from '../CloudsEffect';
+import { Procedural3DTexture } from '../Procedural3DTexture';
+import { ProceduralTexture } from '../ProceduralTexture';
+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/types/uniforms.d.ts

@@ -1,8 +1,7 @@
-import { CloudLayers } from './CloudLayers';
-import { AtmosphereParameters } from '@takram/three-atmosphere';
-import { Primitive } from 'type-fest';
 import { Uniform, Vector3, Vector4, Data3DTexture, Matrix4, Texture, Vector2 } from 'three';
-
+import { Primitive } from 'type-fest';
+import { AtmosphereParameters } from '@takram/three-atmosphere';
+import { CloudLayers } from './CloudLayers';
 export interface CloudParameterUniforms {
     scatteringCoefficient: Uniform<number>;
     absorptionCoefficient: Uniform<number>;