Merge pull request #30259 from Devilsparta/master

Three change 2 place
This commit is contained in:
Daniel Rosenwasser
2018-11-04 22:35:02 -08:00
committed by GitHub
3 changed files with 6 additions and 2 deletions

View File

@@ -21,6 +21,7 @@
// Ethan Kay <https://github.com/elk941>,
// Methuselah96 <https://github.com/Methuselah96>
// Dilip Ramirez <https://github.com/Dukuo>
// Zhang Hao <https://github.com/devilsparta>
// Definitions: https://github.com//DefinitelyTyped
// TypeScript Version: 2.8
@@ -32,7 +33,7 @@ export * from "./three-copyshader";
export * from "./three-css3drenderer";
export * from "./three-ctmloader";
export * from "./three-ddsloader";
export * from './three-dragcontrols';
export * from "./three-dragcontrols";
export * from "./three-editorcontrols";
export * from "./three-effectcomposer";
export * from "./three-examples";

View File

@@ -1127,7 +1127,8 @@ export class EventDispatcher {
export interface Event {
type: string;
target: any;
target?: any;
[attachment: string]: any;
}
/**

View File

@@ -22,6 +22,8 @@ export class UnrealBloomPass extends Pass {
camera: OrthographicCamera;
scene: Scene;
quad: Mesh;
radius: number;
threshold: number;
dispose(): void;
getSeparableBlurMaterial(): ShaderMaterial;
getCompositeMaterial(): ShaderMaterial;