Merge pull request #17669 from linbingquan/dev-ts

TS: Clean up WebGLGeometries, WebGLIndexedBufferRenderer, WebGLInfo, WebGLLights, WebGLObjects, WebGLShader, WebGLTextures, WebGLUniforms.

Author: mrdoob

src/renderers/webgl/WebGLGeometries.d.ts

@@ -1,7 +1,9 @@
 export class WebGLGeometries {
 
-	constructor( gl: WebGLRenderingContext, extensions: any, _infoRender: any );
+	constructor( gl: WebGLRenderingContext, attributes: any, info: any );
 
-	get( object: any ): any;
+	get( object: any, geometry: any ): any;
+	update( geometry: any ): any;
+	getWireframeAttribute( geometry: any ): any;
 
 }

src/renderers/webgl/WebGLIndexedBufferRenderer.d.ts

@@ -1,10 +1,19 @@
 export class WebGLIndexedBufferRenderer {
 
-	constructor( gl: WebGLRenderingContext, properties: any, info: any );
+	constructor(
+		gl: WebGLRenderingContext,
+		extensions: any,
+		info: any,
+		capabilities: any
+	);
 
 	setMode( value: any ): void;
 	setIndex( index: any ): void;
 	render( start: any, count: number ): void;
-	renderInstances( geometry: any, start: any, count: number ): void;
-
+	renderInstances(
+		geometry: any,
+		start: any,
+		count: number,
+		primcount: number
+	): void;
 }

src/renderers/webgl/WebGLInfo.d.ts

@@ -5,6 +5,8 @@ import { WebGLProgram } from './WebGLProgram';
  */
 export class WebGLInfo {
 
+	constructor( gl: WebGLRenderingContext );
+
 	autoReset: boolean;
 	memory: {
 		geometries: number;
@@ -18,6 +20,7 @@ export class WebGLInfo {
 		points: number;
 		triangles: number;
 	};
+	update( count: any, mode: any, instanceCount: any ): void;
 	reset(): void;
 
 }

src/renderers/webgl/WebGLLights.d.ts

@@ -2,6 +2,40 @@ export class WebGLLights {
 
 	constructor( gl: WebGLRenderingContext, properties: any, info: any );
 
-	get( light: any ): any;
+	state: {
+		version: number;
+
+		hash: {
+			directionalLength: number;
+			pointLength: number;
+			spotLength: number;
+			rectAreaLength: number;
+			hemiLength: number;
+
+			numDirectionalShadows: number;
+			numPointShadows: number;
+			numSpotShadows: number;
+		};
 
+		ambient: Array<number>;
+		probe: Array<any>;
+		directional: Array<any>;
+		directionalShadowMap: Array<any>;
+		directionalShadowMatrix: Array<any>;
+		spot: Array<any>;
+		spotShadowMap: Array<any>;
+		spotShadowMatrix: Array<any>;
+		rectArea: Array<any>;
+		point: Array<any>;
+		pointShadowMap: Array<any>;
+		pointShadowMatrix: Array<any>;
+		hemi: Array<any>;
+
+		numDirectionalShadows: number;
+		numPointShadows: number;
+		numSpotShadows: number;
+	};
+
+	get( light: any ): any;
+	setup( lights: any, shadows: any, camera: any ): void;
 }

src/renderers/webgl/WebGLObjects.d.ts

@@ -1,9 +1,13 @@
 export class WebGLObjects {
 
-	constructor( gl: WebGLRenderingContext, properties: any, info: any );
+	constructor(
+		gl: WebGLRenderingContext,
+		geometries: any,
+		attributes: any,
+		info: any
+	);
 
-	getAttributeBuffer( attribute: any ): any;
-	getWireframeAttribute( geometry: any ): any;
-	update( object: any ): void;
+	update( object: any ): any;
+	dispose(): void;
 
 }

src/renderers/webgl/WebGLShader.d.ts

@@ -1,5 +1,5 @@
 export class WebGLShader {
 
-	constructor( gl: any, type: string, string: string );
+	constructor( gl: WebGLRenderingContext, type: string, string: string );
 
 }

src/renderers/webgl/WebGLTextures.d.ts

@@ -1,19 +1,33 @@
+import { WebGLExtensions } from './WebGLExtensions.js';
+import { WebGLState } from './WebGLState.js';
+import { WebGLProperties } from './WebGLProperties.js';
+import { WebGLCapabilities } from './WebGLCapabilities.js';
+import { WebGLUtils } from './WebGLUtils.js';
+import { WebGLInfo } from './WebGLInfo.js';
+
 export class WebGLTextures {
 
 	constructor(
-		gl: any,
-		extensions: any,
-		state: any,
-		properties: any,
-		capabilities: any,
-		paramThreeToGL: Function,
-		info: any
+		gl: WebGLRenderingContext,
+		extensions: WebGLExtensions,
+		state: WebGLState,
+		properties: WebGLProperties,
+		capabilities: WebGLCapabilities,
+		utils: WebGLUtils,
+		info: WebGLInfo
 	);
 
+	allocateTextureUnit(): void;
+	resetTextureUnits(): void;
 	setTexture2D( texture: any, slot: number ): void;
+	setTexture2DArray( texture: any, slot: number ): void;
+	setTexture3D( texture: any, slot: number ): void;
 	setTextureCube( texture: any, slot: number ): void;
 	setTextureCubeDynamic( texture: any, slot: number ): void;
 	setupRenderTarget( renderTarget: any ): void;
 	updateRenderTargetMipmap( renderTarget: any ): void;
+	updateMultisampleRenderTarget( renderTarget: any ): void;
+	safeSetTexture2D( texture: any, slot: number ): void;
+	safeSetTextureCube( texture: any, slot: number ): void;
 
 }

src/renderers/webgl/WebGLUniforms.d.ts

@@ -3,14 +3,12 @@ import { WebGLTextures } from './WebGLTextures';
 
 export class WebGLUniforms {
 
-	constructor( gl: any, program: WebGLProgram );
+	constructor( gl: WebGLRenderingContext, program: WebGLProgram );
 
-	setValue( gl: any, name: string, value: any, textures: WebGLTextures ): void;
-	setOptional( gl: any, object: any, name: string ): void;
+	setValue( gl: WebGLRenderingContext, name: string, value: any, textures: WebGLTextures ): void;
+	setOptional( gl: WebGLRenderingContext, object: any, name: string ): void;
 
-	static upload( gl: any, seq: any, values: any[], textures: WebGLTextures ): void;
+	static upload( gl: WebGLRenderingContext, seq: any, values: any[], textures: WebGLTextures ): void;
 	static seqWithValue( seq: any, values: any[] ): any[];
-	static splitDynamic( seq: any, values: any[] ): any[];
-	static evalDynamic( seq: any, values: any[], object: any, camera: any ): any[];
 
 }