Browse Source

TS: Update WebGLProgram and WebGLPrograms.

Mugen87 5 years ago
parent
commit
3b5da4ae63
2 changed files with 10 additions and 11 deletions
  1. 4 7
      src/renderers/webgl/WebGLProgram.d.ts
  2. 6 4
      src/renderers/webgl/WebGLPrograms.d.ts

+ 4 - 7
src/renderers/webgl/WebGLProgram.d.ts

@@ -1,26 +1,23 @@
-import { WebGLRenderer, WebGLRendererParameters } from './../WebGLRenderer';
-import { ShaderMaterial } from './../../materials/ShaderMaterial';
+import { WebGLRenderer } from './../WebGLRenderer';
 import { WebGLShader } from './WebGLShader';
 import { WebGLShader } from './WebGLShader';
-import { WebGLExtensions } from './WebGLExtensions';
 import { WebGLUniforms } from './WebGLUniforms';
 import { WebGLUniforms } from './WebGLUniforms';
 
 
 export class WebGLProgram {
 export class WebGLProgram {
 
 
 	constructor(
 	constructor(
 		renderer: WebGLRenderer,
 		renderer: WebGLRenderer,
-		extensions: WebGLExtensions,
 		cacheKey: string,
 		cacheKey: string,
-		material: ShaderMaterial,
-		shader: WebGLShader,
-		parameters: WebGLRendererParameters
+		parameters: object
 	);
 	);
 
 
+	name: string;
 	id: number;
 	id: number;
 	cacheKey: string; // unique identifier for this program, used for looking up compiled programs from cache.
 	cacheKey: string; // unique identifier for this program, used for looking up compiled programs from cache.
 	usedTimes: number;
 	usedTimes: number;
 	program: any;
 	program: any;
 	vertexShader: WebGLShader;
 	vertexShader: WebGLShader;
 	fragmentShader: WebGLShader;
 	fragmentShader: WebGLShader;
+	numMultiviewViews: number;
 	/**
 	/**
 	 * @deprecated Use {@link WebGLProgram#getUniforms getUniforms()} instead.
 	 * @deprecated Use {@link WebGLProgram#getUniforms getUniforms()} instead.
 	 */
 	 */

+ 6 - 4
src/renderers/webgl/WebGLPrograms.d.ts

@@ -3,6 +3,7 @@ import { WebGLProgram } from './WebGLProgram';
 import { WebGLCapabilities } from './WebGLCapabilities';
 import { WebGLCapabilities } from './WebGLCapabilities';
 import { WebGLExtensions } from './WebGLExtensions';
 import { WebGLExtensions } from './WebGLExtensions';
 import { Material } from './../../materials/Material';
 import { Material } from './../../materials/Material';
+import { Scene } from './../../scenes/Scene';
 
 
 export class WebGLPrograms {
 export class WebGLPrograms {
 
 
@@ -12,14 +13,15 @@ export class WebGLPrograms {
 
 
 	getParameters(
 	getParameters(
 		material: Material,
 		material: Material,
-		lights: any,
-		fog: any,
+		lights: object[],
+		shadows: object[],
+		scene: Scene,
 		nClipPlanes: number,
 		nClipPlanes: number,
+		nClipIntersection: number,
 		object: any
 		object: any
 	): any;
 	): any;
-	getProgramCacheKey( material: Material, parameters: any ): string;
+	getProgramCacheKey( parameters: any ): string;
 	acquireProgram(
 	acquireProgram(
-		material: Material,
 		parameters: any,
 		parameters: any,
 		cacheKey: string
 		cacheKey: string
 	): WebGLProgram;
 	): WebGLProgram;