@types/three 0.150.2 → 0.152.0

three/src/renderers/shaders/UniformsLib.d.ts

@@ -1,78 +1,92 @@
+import { Color } from '../../math/Color';
+import { Vector2 } from '../../math/Vector2';
+import { Matrix3 } from '../../math/Matrix3';
+
 // tslint:disable-next-line:interface-name
 export interface IUniform<TValue = any> {
     value: TValue;
 }
 
-export let UniformsLib: {
+export const UniformsLib: {
     common: {
-        diffuse: IUniform;
-        opacity: IUniform;
-        map: IUniform;
-        uvTransform: IUniform;
-        uv2Transform: IUniform;
-        alphaMap: IUniform;
+        diffuse: IUniform<Color>;
+        opacity: IUniform<number>;
+        map: IUniform<unknown>;
+        mapTransform: IUniform<Matrix3>;
+        alphaMap: IUniform<unknown>;
+        alphaMapTransform: IUniform<Matrix3>;
+        alphaTest: IUniform<number>;
     };
     specularmap: {
-        specularMap: IUniform;
+        specularMap: IUniform<unknown>;
+        specularMapTransform: IUniform<Matrix3>;
     };
     envmap: {
-        envMap: IUniform;
-        flipEnvMap: IUniform;
-        reflectivity: IUniform;
-        ior: IUniform;
-        refractRatio: IUniform;
-        backgroundBlurriness: IUniform;
+        envMap: IUniform<unknown>;
+        flipEnvMap: IUniform<number>;
+        reflectivity: IUniform<number>;
+        ior: IUniform<number>;
+        refractRatio: IUniform<number>;
     };
     aomap: {
-        aoMap: IUniform;
-        aoMapIntensity: IUniform;
+        aoMap: IUniform<unknown>;
+        aoMapIntensity: IUniform<number>;
+        aoMapTransform: IUniform<Matrix3>;
     };
     lightmap: {
-        lightMap: IUniform;
-        lightMapIntensity: IUniform;
-    };
-    emissivemap: {
-        emissiveMap: IUniform;
+        lightMap: IUniform<number>;
+        lightMapIntensity: IUniform<number>;
+        lightMapTransform: IUniform<Matrix3>;
     };
     bumpmap: {
-        bumpMap: IUniform;
-        bumpScale: IUniform;
+        bumpMap: IUniform<unknown>;
+        bumpMapTransform: IUniform<Matrix3>;
+        bumpScale: IUniform<number>;
     };
     normalmap: {
-        normalMap: IUniform;
-        normalScale: IUniform;
+        normalMap: IUniform<unknown>;
+        normalMapTransform: IUniform<Matrix3>;
+        normalScale: IUniform<Vector2>;
     };
     displacementmap: {
-        displacementMap: IUniform;
-        displacementScale: IUniform;
-        displacementBias: IUniform;
+        displacementMap: IUniform<unknown>;
+        displacementMapTransform: IUniform<Matrix3>;
+        displacementScale: IUniform<number>;
+        displacementBias: IUniform<number>;
     };
-    roughnessmap: {
-        roughnessMap: IUniform;
+    emissivemap: {
+        emissiveMap: IUniform<unknown>;
+        emissiveMapTransform: IUniform<Matrix3>;
     };
     metalnessmap: {
-        metalnessMap: IUniform;
+        metalnessMap: IUniform<unknown>;
+        metalnessMapTransform: IUniform<Matrix3>;
+    };
+    roughnessmap: {
+        roughnessMap: IUniform<unknown>;
+        roughnessMapTransform: IUniform<Matrix3>;
     };
     gradientmap: {
-        gradientMap: IUniform;
+        gradientMap: IUniform<unknown>;
     };
     fog: {
-        fogDensity: IUniform;
-        fogNear: IUniform;
-        fogFar: IUniform;
-        fogColor: IUniform;
+        fogDensity: IUniform<number>;
+        fogNear: IUniform<number>;
+        fogFar: IUniform<number>;
+        fogColor: IUniform<Color>;
     };
     lights: {
-        ambientLightColor: IUniform;
+        ambientLightColor: IUniform<unknown[]>;
+        lightProbe: IUniform<unknown[]>;
         directionalLights: {
-            value: any[];
+            value: unknown[];
             properties: {
                 direction: {};
                 color: {};
             };
         };
         directionalLightShadows: {
-            value: any[];
+            value: unknown[];
             properties: {
                 shadowBias: {};
                 shadowNormalBias: {};
@@ -80,10 +94,10 @@ export let UniformsLib: {
                 shadowMapSize: {};
             };
         };
-        directionalShadowMap: IUniform;
-        directionalShadowMatrix: IUniform;
+        directionalShadowMap: IUniform<unknown[]>;
+        directionalShadowMatrix: IUniform<unknown[]>;
         spotLights: {
-            value: any[];
+            value: unknown[];
             properties: {
                 color: {};
                 position: {};
@@ -95,7 +109,7 @@ export let UniformsLib: {
             };
         };
         spotLightShadows: {
-            value: any[];
+            value: unknown[];
             properties: {
                 shadowBias: {};
                 shadowNormalBias: {};
@@ -103,10 +117,11 @@ export let UniformsLib: {
                 shadowMapSize: {};
             };
         };
-        spotShadowMap: IUniform;
-        spotShadowMatrix: IUniform;
+        spotLightMap: IUniform<unknown[]>;
+        spotShadowMap: IUniform<unknown[]>;
+        spotLightMatrix: IUniform<unknown[]>;
         pointLights: {
-            value: any[];
+            value: unknown[];
             properties: {
                 color: {};
                 position: {};
@@ -115,18 +130,20 @@ export let UniformsLib: {
             };
         };
         pointLightShadows: {
-            value: any[];
+            value: unknown[];
             properties: {
                 shadowBias: {};
                 shadowNormalBias: {};
                 shadowRadius: {};
                 shadowMapSize: {};
+                shadowCameraNear: {};
+                shadowCameraFar: {};
             };
         };
-        pointShadowMap: IUniform;
-        pointShadowMatrix: IUniform;
+        pointShadowMap: IUniform<unknown[]>;
+        pointShadowMatrix: IUniform<unknown[]>;
         hemisphereLights: {
-            value: any[];
+            value: unknown[];
             properties: {
                 direction: {};
                 skycolor: {};
@@ -134,7 +151,7 @@ export let UniformsLib: {
             };
         };
         rectAreaLights: {
-            value: any[];
+            value: unknown[];
             properties: {
                 color: {};
                 position: {};
@@ -142,13 +159,27 @@ export let UniformsLib: {
                 height: {};
             };
         };
+        ltc_1: IUniform<unknown>;
+        ltc_2: IUniform<unknown>;
     };
     points: {
-        diffuse: IUniform;
-        opacity: IUniform;
-        size: IUniform;
-        scale: IUniform;
-        map: IUniform;
-        uvTransform: IUniform;
+        diffuse: IUniform<Color>;
+        opacity: IUniform<number>;
+        size: IUniform<number>;
+        scale: IUniform<number>;
+        map: IUniform<unknown>;
+        alphaMap: IUniform<unknown>;
+        alphaTest: IUniform<number>;
+        uvTransform: IUniform<Matrix3>;
+    };
+    sprite: {
+        diffuse: IUniform<Color>;
+        opacity: IUniform<number>;
+        center: IUniform<Vector2>;
+        rotation: IUniform<number>;
+        map: IUniform<unknown>;
+        mapTransform: IUniform<Matrix3>;
+        alphaMap: IUniform<unknown>;
+        alphaTest: IUniform<number>;
     };
 };

three/src/textures/CanvasTexture.d.ts

@@ -29,7 +29,6 @@ export class CanvasTexture extends Texture {
      * @param format See {@link Texture.format | .format}. Default {@link THREE.RGBAFormat}
      * @param type See {@link Texture.type | .type}. Default {@link THREE.UnsignedByteType}
      * @param anisotropy See {@link Texture.anisotropy | .anisotropy}. Default {@link THREE.Texture.DEFAULT_ANISOTROPY}
-     * @param encoding See {@link Texture.encoding | .encoding}. Default {@link THREE.LinearEncoding}
      */
     constructor(
         canvas: TexImageSource | OffscreenCanvas,

three/src/textures/CompressedTexture.d.ts

@@ -4,9 +4,9 @@ import {
     Wrapping,
     CompressedPixelFormat,
     TextureDataType,
-    TextureEncoding,
     MagnificationTextureFilter,
     MinificationTextureFilter,
+    ColorSpace,
 } from '../constants';
 
 /**
@@ -30,6 +30,7 @@ export class CompressedTexture extends Texture {
      * @param magFilter See {@link Texture.magFilter | .magFilter}. Default {@link THREE.LinearFilter}
      * @param minFilter  See {@link Texture.minFilter | .minFilter}. Default {@link THREE.LinearMipmapLinearFilter}
      * @param anisotropy See {@link Texture.anisotropy | .anisotropy}. Default {@link THREE.Texture.DEFAULT_ANISOTROPY}
+     * @param colorSpace See {@link Texture.colorSpace .colorSpace}. Default {@link NoColorSpace}
      */
     constructor(
         mipmaps: ImageData[],
@@ -43,7 +44,7 @@ export class CompressedTexture extends Texture {
         magFilter?: MagnificationTextureFilter,
         minFilter?: MinificationTextureFilter,
         anisotropy?: number,
-        encoding?: TextureEncoding,
+        colorSpace?: ColorSpace,
     );
 
     /**

three/src/textures/CubeTexture.d.ts

@@ -1,13 +1,12 @@
 import { Texture } from './Texture';
 import {
-    Mapping,
     Wrapping,
     PixelFormat,
     TextureDataType,
-    TextureEncoding,
     MagnificationTextureFilter,
     MinificationTextureFilter,
     CubeTextureMapping,
+    ColorSpace,
 } from '../constants';
 
 /**
@@ -41,7 +40,7 @@ export class CubeTexture extends Texture {
      * @param format See {@link Texture.format | .format}. Default {@link THREE.RGBAFormat}
      * @param type See {@link Texture.type | .type}. Default {@link THREE.UnsignedByteType}
      * @param anisotropy See {@link Texture.anisotropy | .anisotropy}. Default {@link THREE.Texture.DEFAULT_ANISOTROPY}
-     * @param encoding See {@link Texture.encoding | .encoding}. Default {@link THREE.LinearEncoding}
+     * @param colorSpace See {@link Texture.colorSpace | .colorSpace}. Default {@link NoColorSpace}
      */
     constructor(
         images?: any[], // HTMLImageElement or HTMLCanvasElement
@@ -53,7 +52,7 @@ export class CubeTexture extends Texture {
         format?: PixelFormat,
         type?: TextureDataType,
         anisotropy?: number,
-        encoding?: TextureEncoding,
+        colorSpace?: ColorSpace,
     );
 
     /**

three/src/textures/DataTexture.d.ts

@@ -4,9 +4,9 @@ import {
     Wrapping,
     PixelFormat,
     TextureDataType,
-    TextureEncoding,
     MagnificationTextureFilter,
     MinificationTextureFilter,
+    ColorSpace,
 } from '../constants';
 import { TextureImageData } from './types';
 
@@ -50,7 +50,7 @@ export class DataTexture extends Texture {
      * @param magFilter See {@link Texture.magFilter | .magFilter}. Default {@link THREE.NearestFilter}
      * @param minFilter  See {@link Texture.minFilter | .minFilter}. Default {@link THREE.NearestFilter}
      * @param anisotropy See {@link Texture.anisotropy | .anisotropy}. Default {@link THREE.Texture.DEFAULT_ANISOTROPY}
-     * @param encoding See {@link Texture.encoding | .encoding}. Default {@link THREE.LinearEncoding}
+     * @param colorSpace See {@link Texture.colorSpace | .colorSpace}. Default {@link NoColorSpace}
      */
     constructor(
         data?: BufferSource | null,
@@ -64,7 +64,7 @@ export class DataTexture extends Texture {
         magFilter?: MagnificationTextureFilter,
         minFilter?: MinificationTextureFilter,
         anisotropy?: number,
-        encoding?: TextureEncoding,
+        colorSpace?: ColorSpace,
     );
 
     /**

three/src/textures/Texture.d.ts

@@ -13,6 +13,7 @@ import {
     MinificationTextureFilter,
     AnyPixelFormat,
     AnyMapping,
+    ColorSpace,
 } from '../constants';
 
 /** Shim for OffscreenCanvas. */
@@ -49,7 +50,7 @@ export class Texture extends EventDispatcher {
      * @param format See {@link Texture.format | .format}. Default {@link THREE.RGBAFormat}
      * @param type See {@link Texture.type | .type}. Default {@link THREE.UnsignedByteType}
      * @param anisotropy See {@link Texture.anisotropy | .anisotropy}. Default {@link THREE.Texture.DEFAULT_ANISOTROPY}
-     * @param encoding See {@link Texture.encoding | .encoding}. Default {@link THREE.LinearEncoding}
+     * @param colorSpace See {@link Texture.colorSpace | .colorSpace}. Default {@link THREE.NoColorSpace}
      */
     constructor(
         image?: TexImageSource | OffscreenCanvas,
@@ -61,7 +62,23 @@ export class Texture extends EventDispatcher {
         format?: PixelFormat,
         type?: TextureDataType,
         anisotropy?: number,
-        encoding?: TextureEncoding,
+        colorSpace?: ColorSpace,
+    );
+
+    /**
+     * @deprecated
+     */
+    constructor(
+        image: TexImageSource | OffscreenCanvas,
+        mapping: Mapping,
+        wrapS: Wrapping,
+        wrapT: Wrapping,
+        magFilter: MagnificationTextureFilter,
+        minFilter: MinificationTextureFilter,
+        format: PixelFormat,
+        type: TextureDataType,
+        anisotropy: number,
+        encoding: TextureEncoding,
     );
 
     /**
@@ -123,6 +140,12 @@ export class Texture extends EventDispatcher {
      */
     mapping: AnyMapping;
 
+    /**
+     * Lets you select the uv attribute to map the texture to. `0` for `uv`, `1` for `uv1`, `2` for `uv2` and `3` for
+     * `uv3`.
+     */
+    channel: number;
+
     /**
      * This defines how the {@link Texture} is wrapped *horizontally* and corresponds to **U** in UV mapping.
      * @remarks for **WEBGL1** - tiling of images in textures only functions if image dimensions are powers of two
@@ -232,26 +255,6 @@ export class Texture extends EventDispatcher {
     /**
      * How much a single repetition of the texture is offset from the beginning, in each direction **U** and **V**.
      * @remarks Typical range is `0.0` to `1.0`.
-     * @remarks
-     * The below texture types share the `first` uv channel in the engine.
-     * The offset (and repeat) setting is evaluated according to the following priorities and then shared by those textures:
-     *  - color map
-     *  - specular map
-     *  - displacement map
-     *  - normal map
-     *  - bump map
-     *  - roughness map
-     *  - metalness map
-     *  - alpha map
-     *  - emissive map
-     *  - clearcoat map
-     *  - clearcoat normal map
-     *  - clearcoat roughnessMap map
-     * @remarks
-     * The below {@link Texture} types share the `second` uv channel in the engine.
-     * The offset (and repeat) setting is evaluated according to the following priorities and then shared by those textures:
-     *  - ao map
-     *  - light map
      * @defaultValue `new THREE.Vector2(0, 0)`
      */
     offset: Vector2;
@@ -261,8 +264,6 @@ export class Texture extends EventDispatcher {
      * @remarks
      * If repeat is set greater than `1` in either direction, the corresponding *Wrap* parameter should
      * also be set to {@link THREE.RepeatWrapping} or {@link THREE.MirroredRepeatWrapping} to achieve the desired tiling effect.
-     * @remarks
-     * Setting different repeat values for textures is restricted in the same way like {@link .offset | .offset}.
      * @see {@link wrapS}
      * @see {@link wrapT}
      * @defaultValue `new THREE.Vector2( 1, 1 )`
@@ -332,9 +333,21 @@ export class Texture extends EventDispatcher {
      * @see {@link https://threejs.org/docs/index.html#api/en/constants/Textures | Texture Constants}
      * @see {@link THREE.TextureDataType}
      * @defaultValue {@link THREE.LinearEncoding}
+     * @deprecated Use {@link Texture.colorSpace .colorSpace} in three.js r152+.
      */
     encoding: TextureEncoding;
 
+    /**
+     * The {@link Textures | {@link Texture} constants} page for details of other color spaces.
+     * @remarks
+     * Textures containing color data should be annotated with {@link SRGBColorSpace THREE.SRGBColorSpace} or
+     * {@link LinearSRGBColorSpace THREE.LinearSRGBColorSpace}.
+     * @see {@link https://threejs.org/docs/index.html#api/en/constants/Textures | Texture Constants}
+     * @see {@link THREE.TextureDataType}
+     * @defaultValue {@link THREE.NoColorSpace}
+     */
+    colorSpace: ColorSpace;
+
     /**
      * Indicates whether a texture belongs to a render target or not
      * @defaultValue `false`

three/examples/jsm/nodes/functions/light/getDistanceAttenuation.d.ts

@@ -1,5 +0,0 @@
-import { ShaderNode } from '../../shadernode/ShaderNodeBaseElements';
-import Node from '../../core/Node';
-declare const getDistanceAttenuation: ShaderNode<{ lightDistance: Node; cutoffDistance: Node; decayExponent: Node }>;
-
-export default getDistanceAttenuation;

three/examples/jsm/nodes/lighting/PunctualLightNode.d.ts

@@ -1,12 +0,0 @@
-import AnalyticLightNode from './AnalyticLightNode';
-import Node from '../core/Node';
-import { PointLight, SpotLight } from '../../../../src/Three';
-
-export type PunctualLight = PointLight | SpotLight;
-
-export default class PunctualLightNode extends AnalyticLightNode<PunctualLight> {
-    cutoffDistanceNode: Node;
-    decayExponentNode: Node;
-
-    constructor(light?: PunctualLight | null);
-}