@types/three 0.182.0 → 0.183.0

three/src/renderers/common/nodes/NodeUniform.d.ts

@@ -16,6 +16,7 @@ import {
     Vector3Uniform,
     Vector4Uniform,
 } from "../Uniform.js";
+
 /**
  * A special form of Number uniform binding type.
  * It's value is managed by a node object.
@@ -23,14 +24,19 @@ import {
  * @private
  * @augments NumberUniform
  */
-declare class NumberNodeUniform extends NumberUniform {
-    nodeUniform: NodeUniform<number>;
+export class NumberNodeUniform<TNodeType> extends NumberUniform {
     /**
      * Constructs a new node-based Number uniform.
      *
      * @param {NodeUniform} nodeUniform - The node uniform.
      */
-    constructor(nodeUniform: NodeUniform<number>);
+    constructor(nodeUniform: NodeUniform<TNodeType, number>);
+    /**
+     * The node uniform.
+     *
+     * @type {NodeUniform}
+     */
+    nodeUniform: NodeUniform<TNodeType, number>;
     /**
      * Overwritten to return the value of the node uniform.
      *
@@ -42,7 +48,7 @@ declare class NumberNodeUniform extends NumberUniform {
      *
      * @return {string} The data type.
      */
-    getType(): string | null;
+    getType(): string;
 }
 /**
  * A special form of Vector2 uniform binding type.
@@ -51,26 +57,25 @@ declare class NumberNodeUniform extends NumberUniform {
  * @private
  * @augments Vector2Uniform
  */
-declare class Vector2NodeUniform extends Vector2Uniform {
-    nodeUniform: NodeUniform<Vector2>;
+export class Vector2NodeUniform<TNodeType> extends Vector2Uniform {
     /**
      * Constructs a new node-based Vector2 uniform.
      *
      * @param {NodeUniform} nodeUniform - The node uniform.
      */
-    constructor(nodeUniform: NodeUniform<Vector2>);
+    constructor(nodeUniform: NodeUniform<TNodeType, Vector2>);
     /**
-     * Overwritten to return the value of the node uniform.
+     * The node uniform.
      *
-     * @return {Vector2} The value.
+     * @type {NodeUniform}
      */
-    getValue(): Vector2;
+    nodeUniform: NodeUniform<TNodeType, Vector2>;
     /**
      * Returns the node uniform data type.
      *
      * @return {string} The data type.
      */
-    getType(): string | null;
+    getType(): string;
 }
 /**
  * A special form of Vector3 uniform binding type.
@@ -79,26 +84,25 @@ declare class Vector2NodeUniform extends Vector2Uniform {
  * @private
  * @augments Vector3Uniform
  */
-declare class Vector3NodeUniform extends Vector3Uniform {
-    nodeUniform: NodeUniform<Vector3>;
+export class Vector3NodeUniform<TNodeType> extends Vector3Uniform {
     /**
      * Constructs a new node-based Vector3 uniform.
      *
      * @param {NodeUniform} nodeUniform - The node uniform.
      */
-    constructor(nodeUniform: NodeUniform<Vector3>);
+    constructor(nodeUniform: NodeUniform<TNodeType, Vector3>);
     /**
-     * Overwritten to return the value of the node uniform.
+     * The node uniform.
      *
-     * @return {Vector3} The value.
+     * @type {NodeUniform}
      */
-    getValue(): Vector3;
+    nodeUniform: NodeUniform<TNodeType, Vector3>;
     /**
      * Returns the node uniform data type.
      *
      * @return {string} The data type.
      */
-    getType(): string | null;
+    getType(): string;
 }
 /**
  * A special form of Vector4 uniform binding type.
@@ -107,26 +111,25 @@ declare class Vector3NodeUniform extends Vector3Uniform {
  * @private
  * @augments Vector4Uniform
  */
-declare class Vector4NodeUniform extends Vector4Uniform {
-    nodeUniform: NodeUniform<Vector4>;
+export class Vector4NodeUniform<TNodeType> extends Vector4Uniform {
     /**
      * Constructs a new node-based Vector4 uniform.
      *
      * @param {NodeUniform} nodeUniform - The node uniform.
      */
-    constructor(nodeUniform: NodeUniform<Vector4>);
+    constructor(nodeUniform: NodeUniform<TNodeType, Vector4>);
     /**
-     * Overwritten to return the value of the node uniform.
+     * The node uniform.
      *
-     * @return {Vector4} The value.
+     * @type {NodeUniform}
      */
-    getValue(): Vector4;
+    nodeUniform: NodeUniform<TNodeType, Vector4>;
     /**
      * Returns the node uniform data type.
      *
      * @return {string} The data type.
      */
-    getType(): string | null;
+    getType(): string;
 }
 /**
  * A special form of Color uniform binding type.
@@ -135,26 +138,25 @@ declare class Vector4NodeUniform extends Vector4Uniform {
  * @private
  * @augments ColorUniform
  */
-declare class ColorNodeUniform extends ColorUniform {
-    nodeUniform: NodeUniform<Color>;
+export class ColorNodeUniform<TNodeType> extends ColorUniform {
     /**
      * Constructs a new node-based Color uniform.
      *
      * @param {NodeUniform} nodeUniform - The node uniform.
      */
-    constructor(nodeUniform: NodeUniform<Color>);
+    constructor(nodeUniform: NodeUniform<TNodeType, Color>);
     /**
-     * Overwritten to return the value of the node uniform.
+     * The node uniform.
      *
-     * @return {Color} The value.
+     * @type {NodeUniform}
      */
-    getValue(): Color;
+    nodeUniform: NodeUniform<TNodeType, Color>;
     /**
      * Returns the node uniform data type.
      *
      * @return {string} The data type.
      */
-    getType(): string | null;
+    getType(): string;
 }
 /**
  * A special form of Matrix2 uniform binding type.
@@ -163,26 +165,25 @@ declare class ColorNodeUniform extends ColorUniform {
  * @private
  * @augments Matrix2Uniform
  */
-declare class Matrix2NodeUniform extends Matrix2Uniform {
-    nodeUniform: NodeUniform<Matrix2>;
+export class Matrix2NodeUniform<TNodeType> extends Matrix2Uniform {
     /**
      * Constructs a new node-based Matrix2 uniform.
      *
      * @param {NodeUniform} nodeUniform - The node uniform.
      */
-    constructor(nodeUniform: NodeUniform<Matrix2>);
+    constructor(nodeUniform: NodeUniform<TNodeType, Matrix2>);
     /**
-     * Overwritten to return the value of the node uniform.
+     * The node uniform.
      *
-     * @return {Matrix2} The value.
+     * @type {NodeUniform}
      */
-    getValue(): Matrix2;
+    nodeUniform: NodeUniform<TNodeType, Matrix2>;
     /**
      * Returns the node uniform data type.
      *
      * @return {string} The data type.
      */
-    getType(): string | null;
+    getType(): string;
 }
 /**
  * A special form of Matrix3 uniform binding type.
@@ -191,26 +192,25 @@ declare class Matrix2NodeUniform extends Matrix2Uniform {
  * @private
  * @augments Matrix3Uniform
  */
-declare class Matrix3NodeUniform extends Matrix3Uniform {
-    nodeUniform: NodeUniform<Matrix3>;
+export class Matrix3NodeUniform<TNodeType> extends Matrix3Uniform {
     /**
      * Constructs a new node-based Matrix3 uniform.
      *
      * @param {NodeUniform} nodeUniform - The node uniform.
      */
-    constructor(nodeUniform: NodeUniform<Matrix3>);
+    constructor(nodeUniform: NodeUniform<TNodeType, Matrix3>);
     /**
-     * Overwritten to return the value of the node uniform.
+     * The node uniform.
      *
-     * @return {Matrix3} The value.
+     * @type {NodeUniform}
      */
-    getValue(): Matrix3;
+    nodeUniform: NodeUniform<TNodeType, Matrix3>;
     /**
      * Returns the node uniform data type.
      *
      * @return {string} The data type.
      */
-    getType(): string | null;
+    getType(): string;
 }
 /**
  * A special form of Matrix4 uniform binding type.
@@ -219,42 +219,32 @@ declare class Matrix3NodeUniform extends Matrix3Uniform {
  * @private
  * @augments Matrix4Uniform
  */
-declare class Matrix4NodeUniform extends Matrix4Uniform {
-    nodeUniform: NodeUniform<Matrix4>;
+export class Matrix4NodeUniform<TNodeType> extends Matrix4Uniform {
     /**
      * Constructs a new node-based Matrix4 uniform.
      *
      * @param {NodeUniform} nodeUniform - The node uniform.
      */
-    constructor(nodeUniform: NodeUniform<Matrix4>);
+    constructor(nodeUniform: NodeUniform<TNodeType, Matrix4>);
     /**
-     * Overwritten to return the value of the node uniform.
+     * The node uniform.
      *
-     * @return {Matrix4} The value.
+     * @type {NodeUniform}
      */
-    getValue(): Matrix4;
+    nodeUniform: NodeUniform<TNodeType, Matrix4>;
     /**
      * Returns the node uniform data type.
      *
      * @return {string} The data type.
      */
-    getType(): string | null;
+    getType(): string;
 }
-export {
-    ColorNodeUniform,
-    Matrix2NodeUniform,
-    Matrix3NodeUniform,
-    Matrix4NodeUniform,
-    NumberNodeUniform,
-    Vector2NodeUniform,
-    Vector3NodeUniform,
-    Vector4NodeUniform,
-};
+
 export type NodeUniformGPU =
-    | NumberNodeUniform
-    | Vector2NodeUniform
-    | Vector3NodeUniform
-    | Vector4NodeUniform
-    | ColorNodeUniform
-    | Matrix3NodeUniform
-    | Matrix4NodeUniform;
+    | NumberNodeUniform<unknown>
+    | Vector2NodeUniform<unknown>
+    | Vector3NodeUniform<unknown>
+    | Vector4NodeUniform<unknown>
+    | ColorNodeUniform<unknown>
+    | Matrix3NodeUniform<unknown>
+    | Matrix4NodeUniform<unknown>;

three/src/renderers/common/nodes/NodeUniformsGroup.d.ts

@@ -1,5 +1,6 @@
-import { UniformGroupNode } from "../../../nodes/Nodes.js";
+import UniformGroupNode from "../../../nodes/core/UniformGroupNode.js";
 import UniformsGroup from "../UniformsGroup.js";
+
 /**
  * A special form of uniforms group that represents
  * the individual uniforms as node-based uniforms.
@@ -8,9 +9,6 @@ import UniformsGroup from "../UniformsGroup.js";
  * @augments UniformsGroup
  */
 declare class NodeUniformsGroup extends UniformsGroup {
-    id: number;
-    groupNode: UniformGroupNode;
-    readonly isNodeUniformsGroup: true;
     /**
      * Constructs a new node-based uniforms group.
      *
@@ -18,5 +16,26 @@ declare class NodeUniformsGroup extends UniformsGroup {
      * @param {UniformGroupNode} groupNode - The uniform group node.
      */
     constructor(name: string, groupNode: UniformGroupNode);
+    /**
+     * The group's ID.
+     *
+     * @type {number}
+     */
+    id: number;
+    /**
+     * The uniform group node.
+     *
+     * @type {UniformGroupNode}
+     */
+    groupNode: UniformGroupNode;
+    /**
+     * This flag can be used for type testing.
+     *
+     * @type {boolean}
+     * @readonly
+     * @default true
+     */
+    readonly isNodeUniformsGroup: boolean;
 }
+
 export default NodeUniformsGroup;

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

@@ -96,7 +96,6 @@ export const UniformsLib: {
                 shadowMapSize: {};
             };
         };
-        directionalShadowMap: IUniform<unknown[]>;
         directionalShadowMatrix: IUniform<unknown[]>;
         spotLights: {
             value: unknown[];
@@ -121,7 +120,6 @@ export const UniformsLib: {
             };
         };
         spotLightMap: IUniform<unknown[]>;
-        spotShadowMap: IUniform<unknown[]>;
         spotLightMatrix: IUniform<unknown[]>;
         pointLights: {
             value: unknown[];
@@ -144,7 +142,6 @@ export const UniformsLib: {
                 shadowCameraFar: {};
             };
         };
-        pointShadowMap: IUniform<unknown[]>;
         pointShadowMatrix: IUniform<unknown[]>;
         hemisphereLights: {
             value: unknown[];

three/src/renderers/webgl/WebGLAttributes.d.ts

@@ -2,17 +2,19 @@ import { BufferAttribute } from "../../core/BufferAttribute.js";
 import { GLBufferAttribute } from "../../core/GLBufferAttribute.js";
 import { InterleavedBufferAttribute } from "../../core/InterleavedBufferAttribute.js";
 
+export interface WebGLAttribute {
+    buffer: WebGLBuffer;
+    type: number;
+    bytesPerElement: number;
+    version: number;
+    size: number;
+}
+
 export class WebGLAttributes {
     constructor(gl: WebGLRenderingContext | WebGL2RenderingContext);
 
     get(attribute: BufferAttribute | InterleavedBufferAttribute | GLBufferAttribute):
-        | {
-            buffer: WebGLBuffer;
-            type: number;
-            bytesPerElement: number;
-            version: number;
-            size: number;
-        }
+        | WebGLAttribute
         | undefined;
 
     remove(attribute: BufferAttribute | InterleavedBufferAttribute | GLBufferAttribute): void;

three/src/renderers/webgl/WebGLEnvironments.d.ts

@@ -0,0 +1,8 @@
+import { Texture } from "../../textures/Texture.js";
+
+declare class WebGLEnvironments {
+    get(texture: Texture): Texture | null;
+    dispose(): void;
+}
+
+export { WebGLEnvironments };

three/src/renderers/webgl/WebGLExtensions.d.ts

@@ -3,5 +3,5 @@ export class WebGLExtensions {
 
     has(name: string): boolean;
     init(): void;
-    get(name: string): any;
+    get(name: string): unknown;
 }

three/src/renderers/webgl/WebGLIndexedBufferRenderer.d.ts

@@ -1,10 +1,14 @@
+import { WebGLAttribute } from "./WebGLAttributes.js";
+import { WebGLExtensions } from "./WebGLExtensions.js";
+import { WebGLInfo } from "./WebGLInfo.js";
+
 export class WebGLIndexedBufferRenderer {
-    constructor(gl: WebGLRenderingContext, extensions: any, info: any);
+    constructor(gl: WebGLRenderingContext, extensions: WebGLExtensions, info: WebGLInfo);
 
-    setMode: (value: any) => void;
-    setIndex: (index: any) => void;
-    render: (start: any, count: number) => void;
-    renderInstances: (start: any, count: number, primcount: number) => void;
+    setMode: (value: number) => void;
+    setIndex: (value: WebGLAttribute) => void;
+    render: (start: number, count: number) => void;
+    renderInstances: (start: number, count: number, primcount: number) => void;
     renderMultiDraw: (starts: Int32Array, counts: Int32Array, drawCount: number) => void;
     renderMultiDrawInstances: (
         starts: Int32Array,

three/src/renderers/webgl/WebGLLights.d.ts

@@ -1,3 +1,5 @@
+import { Camera } from "../../cameras/Camera.js";
+import { Light } from "../../lights/Light.js";
 import { WebGLExtensions } from "./WebGLExtensions.js";
 
 export interface WebGLLightsState {
@@ -19,21 +21,21 @@ export interface WebGLLightsState {
     };
 
     ambient: number[];
-    probe: any[];
-    directional: any[];
-    directionalShadow: any[];
-    directionalShadowMap: any[];
-    directionalShadowMatrix: any[];
-    spot: any[];
-    spotShadow: any[];
-    spotShadowMap: any[];
-    spotShadowMatrix: any[];
-    rectArea: any[];
-    point: any[];
-    pointShadow: any[];
-    pointShadowMap: any[];
-    pointShadowMatrix: any[];
-    hemi: any[];
+    probe: unknown[];
+    directional: unknown[];
+    directionalShadow: unknown[];
+    directionalShadowMap: unknown[];
+    directionalShadowMatrix: unknown[];
+    spot: unknown[];
+    spotShadow: unknown[];
+    spotShadowMap: unknown[];
+    spotShadowMatrix: unknown[];
+    rectArea: unknown[];
+    point: unknown[];
+    pointShadow: unknown[];
+    pointShadowMap: unknown[];
+    pointShadowMatrix: unknown[];
+    hemi: unknown[];
     numSpotLightShadowsWithMaps: number;
     numLightProbes: number;
 }
@@ -43,7 +45,6 @@ export class WebGLLights {
 
     state: WebGLLightsState;
 
-    get(light: any): any;
-    setup(lights: any): void;
-    setupView(lights: any, camera: any): void;
+    setup(lights: Light[]): void;
+    setupView(lights: Light[], camera: Camera): void;
 }

three/src/renderers/webgl/WebGLObjects.d.ts

@@ -1,6 +1,19 @@
+import { BufferGeometry } from "../../core/BufferGeometry.js";
+import { Object3D } from "../../core/Object3D.js";
+import { WebGLAttributes } from "./WebGLAttributes.js";
+import { WebGLBindingStates } from "./WebGLBindingStates.js";
+import { WebGLGeometries } from "./WebGLGeometries.js";
+import { WebGLInfo } from "./WebGLInfo.js";
+
 export class WebGLObjects {
-    constructor(gl: WebGLRenderingContext, geometries: any, attributes: any, info: any);
+    constructor(
+        gl: WebGLRenderingContext,
+        geometries: WebGLGeometries,
+        attributes: WebGLAttributes,
+        bindingStates: WebGLBindingStates,
+        info: WebGLInfo,
+    );
 
-    update(object: any): any;
+    update(object: Object3D): BufferGeometry;
     dispose(): void;
 }

three/src/renderers/webgl/WebGLProgram.d.ts

@@ -12,19 +12,11 @@ export class WebGLProgram {
      * @default 1
      */
     usedTimes: number;
-    program: any;
+    program: unknown; // TODO This should be the WebGLProgram in the DOM types
     vertexShader: WebGLShader;
     fragmentShader: WebGLShader;
-    /**
-     * @deprecated Use {@link WebGLProgram#getUniforms getUniforms()} instead.
-     */
-    uniforms: any;
-    /**
-     * @deprecated Use {@link WebGLProgram#getAttributes getAttributes()} instead.
-     */
-    attributes: any;
 
     getUniforms(): WebGLUniforms;
-    getAttributes(): any;
+    getAttributes(): unknown;
     destroy(): void;
 }

three/src/renderers/webgl/WebGLPrograms.d.ts

@@ -8,7 +8,7 @@ import { WebGLRenderer } from "../WebGLRenderer.js";
 import { WebGLBindingStates } from "./WebGLBindingStates.js";
 import { WebGLCapabilities } from "./WebGLCapabilities.js";
 import { WebGLClipping } from "./WebGLClipping.js";
-import { WebGLCubeMaps } from "./WebGLCubeMaps.js";
+import { WebGLEnvironments } from "./WebGLEnvironments.js";
 import { WebGLExtensions } from "./WebGLExtensions.js";
 import { WebGLLightsState } from "./WebGLLights.js";
 import { WebGLProgram } from "./WebGLProgram.js";
@@ -208,7 +208,7 @@ export interface WebGLProgramParametersWithUniforms extends WebGLProgramParamete
 export class WebGLPrograms {
     constructor(
         renderer: WebGLRenderer,
-        cubemaps: WebGLCubeMaps,
+        environments: WebGLEnvironments,
         extensions: WebGLExtensions,
         capabilities: WebGLCapabilities,
         bindingStates: WebGLBindingStates,

three/src/renderers/webgl/WebGLRenderLists.d.ts

@@ -1,10 +1,8 @@
-import { Camera } from "../../cameras/Camera.js";
 import { BufferGeometry } from "../../core/BufferGeometry.js";
 import { Object3D } from "../../core/Object3D.js";
 import { Material } from "../../materials/Material.js";
 import { Group } from "../../objects/Group.js";
 import { Scene } from "../../scenes/Scene.js";
-import { WebGLProgram } from "./WebGLProgram.js";
 import { WebGLProperties } from "./WebGLProperties.js";
 
 export interface RenderItem {
@@ -12,7 +10,7 @@ export interface RenderItem {
     object: Object3D;
     geometry: BufferGeometry | null;
     material: Material;
-    program: WebGLProgram;
+    materialVariant: number;
     groupOrder: number;
     renderOrder: number;
     z: number;

three/src/renderers/webgl/WebGLShadowMap.d.ts

@@ -30,9 +30,4 @@ export class WebGLShadowMap {
     type: ShadowMapType;
 
     render(shadowsArray: Light[], scene: Scene, camera: Camera): void;
-
-    /**
-     * @deprecated Use {@link Material#shadowSide} instead.
-     */
-    cullFace: any;
 }