@takram/three-geospatial 0.0.1-alpha.6 → 0.0.1-alpha.8

package/types/constants.d.ts

@@ -1,3 +1,4 @@
 export declare const STBN_TEXTURE_WIDTH = 128;
 export declare const STBN_TEXTURE_HEIGHT = 128;
 export declare const STBN_TEXTURE_DEPTH = 64;
+export declare const DEFAULT_STBN_URL = "https://media.githubusercontent.com/media/takram-design-engineering/three-geospatial/9627216cc50057994c98a2118f3c4a23765d43b9/packages/core/assets/stbn.bin";

package/types/decorators.d.ts

@@ -0,0 +1,22 @@
+import { Material } from 'three';
+
+interface EffectLike {
+    defines: Map<string, string>;
+}
+export declare function define(name: string): <T extends Material | EffectLike, K extends keyof T>(target: T[K] extends boolean ? T : never, propertyKey: K) => void;
+export interface DefineIntDecoratorOptions {
+    min?: number;
+    max?: number;
+}
+export declare function defineInt(name: string, { min, max }?: DefineIntDecoratorOptions): <T extends Material | EffectLike, K extends keyof T>(target: T[K] extends number ? T : never, propertyKey: K) => void;
+export interface DefineFloatDecoratorOptions {
+    min?: number;
+    max?: number;
+    precision?: number;
+}
+export declare function defineFloat(name: string, { min, max, precision }?: DefineFloatDecoratorOptions): <T extends Material | EffectLike, K extends keyof T>(target: T[K] extends number ? T : never, propertyKey: K) => void;
+export interface DefineExpressionDecoratorOptions {
+    validate?: (value: string) => boolean;
+}
+export declare function defineExpression(name: string, { validate }?: DefineExpressionDecoratorOptions): <T extends Material | EffectLike, K extends keyof T>(target: T[K] extends string ? T : never, propertyKey: K) => void;
+export {};

package/types/defineShorthand.d.ts

@@ -0,0 +1,16 @@
+import { Uniform } from 'three';
+
+export type PropertyShorthand<Args extends readonly unknown[]> = Args extends readonly [infer T, infer K, ...infer Rest] ? K extends readonly string[] ? K[number] extends keyof T ? Rest extends readonly unknown[] ? {
+    [P in K[number]]: T[P];
+} & PropertyShorthand<Rest> : {
+    [P in K[number]]: T[P];
+} : never : never : {};
+export declare function definePropertyShorthand<T, Args extends readonly unknown[]>(destination: T, ...sourceKeysArgs: [...Args]): T & PropertyShorthand<Args>;
+export type UniformShorthand<T extends {
+    uniforms: Record<K, Uniform>;
+}, K extends keyof T['uniforms']> = {
+    [P in K]: T['uniforms'][P] extends Uniform<infer U> ? U : never;
+};
+export declare function defineUniformShorthand<T, S extends {
+    uniforms: Record<K, Uniform>;
+}, K extends keyof S['uniforms']>(destination: T, source: S, keys: readonly K[]): T & UniformShorthand<S, K>;

package/types/index.d.ts

@@ -3,6 +3,8 @@ export * from './assertions';
 export * from './bufferGeometry';
 export * from './constants';
 export * from './DataLoader';
+export * from './decorators';
+export * from './defineShorthand';
 export * from './Ellipsoid';
 export * from './EllipsoidGeometry';
 export * from './Geodetic';
@@ -10,6 +12,7 @@ export * from './math';
 export * from './PointOfView';
 export * from './Rectangle';
 export * from './resolveIncludes';
+export * from './STBNLoader';
 export * from './TileCoordinate';
 export * from './TilingScheme';
 export * from './typedArray';

package/types/math.d.ts

@@ -8,7 +8,10 @@ export declare const isPowerOfTwo: typeof import('three/src/math/MathUtils.js').
 export declare const ceilPowerOfTwo: typeof import('three/src/math/MathUtils.js').ceilPowerOfTwo;
 export declare const floorPowerOfTwo: typeof import('three/src/math/MathUtils.js').floorPowerOfTwo;
 export declare const normalize: typeof import('three/src/math/MathUtils.js').normalize;
-export declare const remap: typeof import('three/src/math/MathUtils.js').mapLinear;
+export declare function remap(x: number, min1: number, max1: number): number;
+export declare function remap(x: number, min1: number, max1: number, min2: number, max2: number): number;
+export declare function remapClamped(x: number, min1: number, max1: number): number;
+export declare function remapClamped(x: number, min1: number, max1: number, min2: number, max2: number): number;
 export declare function smoothstep(min: number, max: number, x: number): number;
 export declare function saturate(x: number): number;
 export declare function closeTo(a: number, b: number, relativeEpsilon: number, absoluteEpsilon?: number): boolean;

package/types/r3f/types.d.ts

@@ -1,22 +1,21 @@
 import { Callable } from '../types';
 import { WritableKeysOf } from 'type-fest';
-import { Vector2 as Vector2Impl, Vector3 as Vector3Impl, Vector4 as Vector4Impl } from 'three';
-import { Color, ExtendedColors, NodeProps, Overwrite, Vector2, Vector3, Vector4 } from '@react-three/fiber';
+import { Color as ColorImpl, Vector2 as Vector2Impl, Vector3 as Vector3Impl, Vector4 as Vector4Impl } from 'three';
+import { NodeProps, Overwrite, Color as R3FColor, Vector2 as R3FVector2, Vector3 as R3FVector3, Vector4 as R3FVector4 } from '@react-three/fiber';
 
-export type ExtendedVectors<T> = {
-    [K in keyof T]: Vector2Impl extends T[K] ? Vector2 | T[K] : Vector3Impl extends T[K] ? Vector3 | T[K] : Vector4Impl extends T[K] ? Vector4 | T[K] : T[K];
+export type ExtendedProps<T> = {
+    [K in keyof T]: Vector2Impl extends T[K] ? R3FVector2 | T[K] : Vector3Impl extends T[K] ? R3FVector3 | T[K] : Vector4Impl extends T[K] ? R3FVector4 | T[K] : ColorImpl extends T[K] ? R3FColor | T[K] : T[K];
 };
-export type ExtendedProps<T> = ExtendedColors<ExtendedVectors<T>>;
 type NonFunctionKeys<T> = keyof {
     [K in keyof T as Callable extends T[K] ? never : K]: any;
 };
 type WritableNonExtendableKeysOf<T> = WritableKeysOf<T> | keyof {
-    [K in keyof T as Vector2Impl extends T[K] ? K : Vector3Impl extends T[K] ? K : Vector4Impl extends T[K] ? K : Color extends T[K] ? K : never]: any;
+    [K in keyof T as Vector2Impl extends T[K] ? K : Vector3Impl extends T[K] ? K : Vector4Impl extends T[K] ? K : ColorImpl extends T[K] ? K : never]: any;
 };
 export type PassThoughInstanceProps<RefType, Args extends readonly any[], Props> = Overwrite<ExtendedProps<{
     [K in NonFunctionKeys<Props> as K extends WritableNonExtendableKeysOf<Props> ? K : never]: Props[K];
 }>, NodeProps<RefType, Args>>;
 export type ExpandNestedProps<T, Prop extends keyof T & string> = {
-    [K in keyof T[Prop] as K extends string ? `${Prop}-${K}` : never]: T[Prop][K];
+    [K in keyof NonNullable<T[Prop]> as K extends string ? `${Prop}-${K}` : 'never']: NonNullable<T[Prop]>[K];
 };
 export {};

package/types/shaders/index.d.ts

@@ -1,8 +1,10 @@
+export declare const cascadedShadowMaps: string;
 export declare const depth: string;
 export declare const generators: string;
+export declare const interleavedGradientNoise: string;
 export declare const math: string;
 export declare const packing: string;
-export declare const poissonDisk: string;
 export declare const raySphereIntersection: string;
 export declare const transform: string;
 export declare const turbo: string;
+export declare const vogelDisk: string;

package/src/shaders/poissonDisk.glsl

@@ -1,21 +0,0 @@
-// Taken from: https://developer.download.nvidia.com/whitepapers/2008/PCSS_Integration.pdf
-const vec2 poissonDisk[16] = vec2[16](
-  vec2(-0.94201624, -0.39906216),
-  vec2(0.94558609, -0.76890725),
-  vec2(-0.094184101, -0.9293887),
-  vec2(0.34495938, 0.2938776),
-  vec2(-0.91588581, 0.45771432),
-  vec2(-0.81544232, -0.87912464),
-  vec2(-0.38277543, 0.27676845),
-  vec2(0.97484398, 0.75648379),
-  vec2(0.44323325, -0.97511554),
-  vec2(0.53742981, -0.4737342),
-  vec2(-0.26496911, -0.41893023),
-  vec2(0.79197514, 0.19090188),
-  vec2(-0.2418884, 0.99706507),
-  vec2(-0.81409955, 0.9143759),
-  vec2(0.19984126, 0.78641367),
-  vec2(0.14383161, -0.1410079)
-);
-
-#define POISSON_DISK_COUNT (16)