@takram/three-clouds 0.5.0 → 0.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takram/three-clouds",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "A Three.js and R3F implementation of geospatial volumetric clouds",
   "keywords": [
     "three",
@@ -22,14 +22,14 @@
   "type": "module",
   "exports": {
     ".": {
+      "types": "./types/index.d.ts",
       "import": "./build/index.js",
-      "require": "./build/index.cjs",
-      "types": "./types/index.d.ts"
+      "require": "./build/index.cjs"
     },
     "./r3f": {
+      "types": "./types/r3f/index.d.ts",
       "import": "./build/r3f.js",
-      "require": "./build/r3f.cjs",
-      "types": "./types/r3f/index.d.ts"
+      "require": "./build/r3f.cjs"
     }
   },
   "main": "./build/index.cjs",
@@ -45,10 +45,10 @@
     "README.md"
   ],
   "dependencies": {
-    "@takram/three-atmosphere": "0.14.0",
-    "@takram/three-geospatial": "0.4.0",
+    "@takram/three-atmosphere": "0.15.0",
+    "@takram/three-geospatial": "0.5.0",
     "tiny-invariant": "^1.3.3",
-    "type-fest": "^4.34.1"
+    "type-fest": "^4.41.0"
   },
   "peerDependencies": {
     "@react-three/fiber": ">=9.0.4",

package/src/CloudsMaterial.ts

@@ -29,12 +29,12 @@ import {
   runtime
 } from '@takram/three-atmosphere/shaders/bruneton'
 import {
-  assertType,
   define,
   defineExpression,
   defineFloat,
   defineInt,
   Geodetic,
+  reinterpretType,
   resolveIncludes,
   unrollLoops
 } from '@takram/three-geospatial'
@@ -63,12 +63,6 @@ import vertexShader from './shaders/clouds.vert?raw'
 import parameters from './shaders/parameters.glsl?raw'
 import types from './shaders/types.glsl?raw'
 
-declare module 'three' {
-  interface Camera {
-    isPerspectiveCamera?: boolean
-  }
-}
-
 const vectorScratch = /*#__PURE__*/ new Vector3()
 const geodeticScratch = /*#__PURE__*/ new Geodetic()
 
@@ -279,14 +273,15 @@ export class CloudsMaterial extends AtmosphereMaterialBase {
     // Disable onBeforeRender in AtmosphereMaterialBase because we're rendering
     // into fullscreen quad with another camera for the scene projection.
 
-    const prevLogarithmicDepthBuffer = this.defines.USE_LOGDEPTHBUF != null
+    const prevLogarithmicDepthBuffer =
+      this.defines.USE_LOGARITHMIC_DEPTH_BUFFER != null
     const nextLogarithmicDepthBuffer =
       renderer.capabilities.logarithmicDepthBuffer
     if (nextLogarithmicDepthBuffer !== prevLogarithmicDepthBuffer) {
       if (nextLogarithmicDepthBuffer) {
-        this.defines.USE_LOGDEPTHBUF = '1'
+        this.defines.USE_LOGARITHMIC_DEPTH_BUFFER = '1'
       } else {
-        delete this.defines.USE_LOGDEPTHBUF
+        delete this.defines.USE_LOGARITHMIC_DEPTH_BUFFER
       }
     }
 
@@ -316,7 +311,7 @@ export class CloudsMaterial extends AtmosphereMaterialBase {
   }
 
   override copyCameraSettings(camera: Camera): void {
-    // Intentionally omit the call of super.
+    // Intentionally omit the call to super.
 
     if (camera.isPerspectiveCamera === true) {
       if (this.defines.PERSPECTIVE_CAMERA !== '1') {
@@ -376,7 +371,7 @@ export class CloudsMaterial extends AtmosphereMaterialBase {
         .multiply(inverseViewMatrix)
     }
 
-    assertType<PerspectiveCamera | OrthographicCamera>(camera)
+    reinterpretType<PerspectiveCamera | OrthographicCamera>(camera)
     uniforms.cameraNear.value = camera.near
     uniforms.cameraFar.value = camera.far
 

package/src/CloudsResolveMaterial.ts

@@ -84,7 +84,7 @@ export class CloudsResolveMaterial extends RawShaderMaterial {
     this.uniforms.texelSize.value.set(1 / width, 1 / height)
   }
 
-  onBeforeRender(
+  override onBeforeRender(
     renderer: WebGLRenderer,
     scene: Scene,
     camera: Camera,

package/src/PassBase.ts

@@ -18,11 +18,11 @@ export abstract class PassBase extends Pass {
     this.shadow = shadow
   }
 
-  get mainCamera(): Camera {
+  override get mainCamera(): Camera {
     return this._mainCamera
   }
 
-  set mainCamera(value: Camera) {
+  override set mainCamera(value: Camera) {
     this._mainCamera = value
   }
 }

package/src/ShadowPass.ts

@@ -139,7 +139,7 @@ export class ShadowPass extends PassBase {
     }
   }
 
-  setSize(
+  override setSize(
     width: number,
     height: number,
     depth = this.shadow.cascadeCount

package/src/helpers/FrustumCorners.ts

@@ -28,12 +28,6 @@
 
 import { Vector3, type Camera, type Matrix4 } from 'three'
 
-declare module 'three' {
-  interface Camera {
-    isOrthographicCamera?: boolean
-  }
-}
-
 export class FrustumCorners {
   readonly near = [new Vector3(), new Vector3(), new Vector3(), new Vector3()]
   readonly far = [new Vector3(), new Vector3(), new Vector3(), new Vector3()]

package/types/CloudsMaterial.d.ts

@@ -1,11 +1,6 @@
 import { Matrix4, Uniform, Vector2, 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;
-    }
-}
 export interface CloudsMaterialParameters {
     parameterUniforms: CloudParameterUniforms;
     layerUniforms: CloudLayerUniforms;

package/types/helpers/FrustumCorners.d.ts

@@ -1,9 +1,4 @@
 import { Vector3, Camera, Matrix4 } from 'three';
-declare module 'three' {
-    interface Camera {
-        isOrthographicCamera?: boolean;
-    }
-}
 export declare class FrustumCorners {
     readonly near: Vector3[];
     readonly far: Vector3[];