浏览代码

Merge pull request #19552 from taphos/type-fixes

TypeScript: type fixes
Mr.doob 5 年之前
父节点
当前提交
cff8579cb2
共有 3 个文件被更改,包括 8 次插入5 次删除
  1. 1 0
      src/renderers/webgl/WebGLClipping.d.ts
  2. 2 2
      src/renderers/webgl/WebGLMaterials.d.ts
  3. 5 3
      src/scenes/Scene.d.ts

+ 1 - 0
src/renderers/webgl/WebGLClipping.d.ts

@@ -4,6 +4,7 @@ export class WebGLClipping {
 
 	uniform: { value: any; needsUpdate: boolean };
 	numPlanes: number;
+	numIntersection: number;
 
 	init( planes: any[], enableLocalClipping: boolean, camera: Camera ): boolean;
 	beginShadows(): void;

+ 2 - 2
src/renderers/webgl/WebGLMaterials.d.ts

@@ -7,7 +7,7 @@ export class WebGLMaterials {
 
 	constructor( properties: WebGLProperties );
 
-	refreshUniforms( uniforms: object, material: Material, environment: Texture, pixelRatio: number, height: number ): void;
-	refreshUniformsFog( uniforms: object, fog: IFog ): void;
+	refreshMaterialUniforms( uniforms: object, material: Material, environment: Texture, pixelRatio: number, height: number ): void;
+	refreshFogUniforms( uniforms: object, fog: IFog ): void;
 
 }

+ 5 - 3
src/scenes/Scene.d.ts

@@ -5,7 +5,9 @@ import { Color } from '../math/Color';
 import { Texture } from '../textures/Texture';
 import { WebGLRenderer } from "../renderers/WebGLRenderer";
 import { Camera } from "../cameras/Camera";
-import { RenderTarget } from "../renderers/webgl/WebGLRenderLists";
+import { WebGLRenderTarget } from "../renderers/WebGLRenderTarget";
+import { WebGLCubeRenderTarget } from "../renderers/WebGLCubeRenderTarget";
+
 // Scenes /////////////////////////////////////////////////////////////////////
 
 /**
@@ -27,7 +29,7 @@ export class Scene extends Object3D {
 	 */
 	overrideMaterial: Material | null;
 	autoUpdate: boolean;
-	background: null | Color | Texture;
+	background: null | Color | Texture | WebGLCubeRenderTarget;
 	environment: null | Texture;
 
 	readonly isScene: true;
@@ -39,7 +41,7 @@ export class Scene extends Object3D {
 		renderer: WebGLRenderer,
 		scene: Scene,
 		camera: Camera,
-		renderTarget: RenderTarget
+		renderTarget: WebGLRenderTarget | any // any required for Object3D.onBeforeRender compatibility
 	) => void;
 
 	/**