Merge pull request #16914 from FishOrBear/patch-1

Update shaders .d.ts

examples/jsm/shaders/CopyShader.d.ts

@@ -2,11 +2,11 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface CopyShader {
+export const CopyShader: {
   uniforms: {
     tDiffuse: Uniform;
     opacity: Uniform;
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/FXAAShader.d.ts

@@ -2,11 +2,11 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface FXAAShader {
+export const FXAAShader: {
   uniforms: {
     tDiffuse: Uniform;
     resolution: Uniform;
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/FilmShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface FilmShader {
+export const FilmShader: {
   uniforms: {
     tDiffuse: Uniform;
     time: Uniform;
@@ -13,4 +13,4 @@ export interface FilmShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/FocusShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface FocusShader {
+export const FocusShader: {
   uniforms: {
     tDiffuse: Uniform;
     screenWidth: Uniform;
@@ -12,4 +12,4 @@ export interface FocusShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/FreiChenShader.d.ts

@@ -2,11 +2,11 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface FreiChenShader {
+export const FreiChenShader: {
   uniforms: {
     tDiffuse: Uniform;
     aspect: Uniform;
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/FresnelShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface FresnelShader {
+export const FresnelShader: {
   uniforms: {
     mRefractionRatio: Uniform;
     mFresnelBias: Uniform;
@@ -12,4 +12,4 @@ export interface FresnelShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/GodRaysShader.d.ts

@@ -2,15 +2,15 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface GodRaysDepthMaskShader {
+export const GodRaysDepthMaskShader: {
   uniforms: {
     tInput: Uniform;
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};
 
-export interface GodRaysGenerateShader {
+export const GodRaysGenerateShader: {
   uniforms: {
     tInput: Uniform;
     fStepSize: Uniform;
@@ -18,9 +18,9 @@ export interface GodRaysGenerateShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};
 
-export interface GodRaysCombineShader {
+export const GodRaysCombineShader: {
   uniforms: {
     tColors: Uniform;
     tGodRays: Uniform;
@@ -31,7 +31,7 @@ export interface GodRaysCombineShader {
   fragmentShader: string;
 }
 
-export interface GodRaysFakeSunShader {
+export const GodRaysFakeSunShader: {
   uniforms: {
     vSunPositionScreenSpace: Uniform;
     fAspect: Uniform;
@@ -40,4 +40,4 @@ export interface GodRaysFakeSunShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/HalftoneShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface HalftoneShader {
+export const HalftoneShader: {
   uniforms: {
     tDiffuse: Uniform;
     shape: Uniform;
@@ -20,4 +20,4 @@ export interface HalftoneShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/HorizontalBlurShader.d.ts

@@ -2,11 +2,11 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface HorizontalBlurShader {
+export const HorizontalBlurShader: {
   uniforms: {
     tDiffuse: Uniform;
     h: Uniform;
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/HorizontalTiltShiftShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface HorizontalTiltShiftShader {
+export const HorizontalTiltShiftShader: {
   uniforms: {
     tDiffuse: Uniform;
     h: Uniform;
@@ -10,4 +10,4 @@ export interface HorizontalTiltShiftShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/HueSaturationShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface HueSaturationShader {
+export const HueSaturationShader: {
   uniforms: {
     tDiffuse: Uniform;
     hue: Uniform;
@@ -10,4 +10,4 @@ export interface HueSaturationShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/KaleidoShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface KaleidoShader {
+export const KaleidoShader: {
   uniforms: {
     tDiffuse: Uniform;
     sides: Uniform;
@@ -10,4 +10,4 @@ export interface KaleidoShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/LuminosityHighPassShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface LuminosityHighPassShader {
+export const LuminosityHighPassShader: {
   shaderID: string;
   uniforms: {
     tDiffuse: Uniform;
@@ -13,4 +13,4 @@ export interface LuminosityHighPassShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/LuminosityShader.d.ts

@@ -2,10 +2,10 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface LuminosityShader {
+export const LuminosityShader: {
   uniforms: {
     tDiffuse: Uniform;
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/MirrorShader.d.ts

@@ -2,11 +2,11 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface MirrorShader {
+export const MirrorShader: {
   uniforms: {
     tDiffuse: Uniform;
     side: Uniform;
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/NormalMapShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface NormalMapShader {
+export const NormalMapShader: {
   uniforms: {
     heightMap: Uniform;
     resolution: Uniform;
@@ -11,4 +11,4 @@ export interface NormalMapShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/OceanShaders.d.ts

@@ -4,7 +4,7 @@ import {
   Vector2,
 } from '../../../src/Three';
 
-export interface OceanShaders {
+export const OceanShaders: {
 
   ocean_sim_vertex: {
     vertexShader: string;
@@ -72,4 +72,4 @@ export interface OceanShaders {
     fragmentShader: string;
   }
 
-}
+};

examples/jsm/shaders/ParallaxShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface ParallaxShader {
+export const ParallaxShader: {
   modes: {
     none: string;
     basic: string;
@@ -19,4 +19,4 @@ export interface ParallaxShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/PixelShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface PixelShader {
+export const PixelShader: {
   uniforms: {
     tDiffuse: Uniform;
     resolution: Uniform;
@@ -10,4 +10,4 @@ export interface PixelShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/RGBShiftShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface RGBShiftShader {
+export const RGBShiftShader: {
   uniforms: {
     tDiffuse: Uniform;
     amount: Uniform;
@@ -10,4 +10,4 @@ export interface RGBShiftShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/SAOShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface SAOShader {
+export const SAOShader: {
   defines: {
     NUM_SAMPLES: number;
     NUM_RINGS: number;
@@ -29,4 +29,4 @@ export interface SAOShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/SMAAShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface SMAAEdgesShader {
+export const SMAAEdgesShader: {
   defines: {
     SMAA_THRESHOLD: string;
   },
@@ -12,9 +12,9 @@ export interface SMAAEdgesShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};
 
-export interface SMAAWeightsShader {
+export const SMAAWeightsShader: {
   defines: {
     SMAA_MAX_SEARCH_STEPS: string;
     SMAA_AREATEX_MAX_DISTANCE: string;
@@ -29,9 +29,9 @@ export interface SMAAWeightsShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};
 
-export interface SMAABlendShader {
+export const SMAABlendShader: {
   uniforms: {
     tDiffuse: Uniform;
     tColor: Uniform;
@@ -39,4 +39,4 @@ export interface SMAABlendShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/SSAOShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface SSAOShader {
+export const SSAOShader: {
   defines: {
     PERSPECTIVE_CAMERA: number;
     KERNEL_SIZE: number;
@@ -24,9 +24,9 @@ export interface SSAOShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};
 
-export interface SSAODepthShader {
+export const SSAODepthShader: {
   defines: {
     PERSPECTIVE_CAMERA: number;
   };
@@ -37,13 +37,13 @@ export interface SSAODepthShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};
 
-export interface SSAOBlurShader {
+export const SSAOBlurShader: {
   uniforms: {
     tDiffuse: Uniform;
     resolution: Uniform;
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/SepiaShader.d.ts

@@ -2,11 +2,11 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface SepiaShader {
+export const SepiaShader: {
   uniforms: {
     tDiffuse: Uniform;
     amount: Uniform;
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/SkinShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface SkinShaderBasic {
+export const SkinShaderBasic: {
   uniforms: {
     ambientLightColor: Uniform;
     bumpMap: Uniform;
@@ -38,9 +38,9 @@ export interface SkinShaderBasic {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};
 
-export interface SkinShaderAdvanced {
+export const SkinShaderAdvanced: {
   uniforms: {
     ambientLightColor: Uniform;
     diffuse: Uniform;
@@ -76,10 +76,10 @@ export interface SkinShaderAdvanced {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};
 
-export interface SkinShaderBeckmann {
+export const SkinShaderBeckmann: {
   uniforms: {};
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/SobelOperatorShader.d.ts

@@ -2,11 +2,11 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface SobelOperatorShader {
+export const SobelOperatorShader: {
   uniforms: {
     tDiffuse: Uniform;
     resolution: Uniform;
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/TechnicolorShader.d.ts

@@ -2,10 +2,10 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface TechnicolorShader {
+export const TechnicolorShader: {
   uniforms: {
     tDiffuse: Uniform;
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/TerrainShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface TerrainShader {
+export const TerrainShader: {
   uniforms: {
     ambientLightColor: Uniform;
     diffuse: Uniform;
@@ -44,4 +44,4 @@ export interface TerrainShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/ToneMapShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface ToneMapShader {
+export const ToneMapShader: {
   uniforms: {
     tDiffuse: Uniform;
     averageLuminance: Uniform;
@@ -13,4 +13,4 @@ export interface ToneMapShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/ToonShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface ToonShader1 {
+export const ToonShader1: {
   uniforms: {
     uDirLightPos: Uniform;
     uDirLightColor: Uniform;
@@ -11,9 +11,9 @@ export interface ToonShader1 {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};
 
-export interface ToonShader2 {
+export const ToonShader2: {
   uniforms: {
     uDirLightPos: Uniform;
     uDirLightColor: Uniform;
@@ -26,9 +26,9 @@ export interface ToonShader2 {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};
 
-export interface ToonShaderHatching {
+export const ToonShaderHatching: {
   uniforms: {
     uDirLightPos: Uniform;
     uDirLightColor: Uniform;
@@ -41,9 +41,9 @@ export interface ToonShaderHatching {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};
 
-export interface ToonShaderDotted {
+export const ToonShaderDotted: {
   uniforms: {
     uDirLightPos: Uniform;
     uDirLightColor: Uniform;
@@ -53,4 +53,4 @@ export interface ToonShaderDotted {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/TranslucentShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface TranslucentShader {
+export const TranslucentShader: {
   uniforms: {
     alphaMap: Uniform;
     ambientLightColor: Uniform;
@@ -36,4 +36,4 @@ export interface TranslucentShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/TriangleBlurShader.d.ts

@@ -2,11 +2,11 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface TriangleBlurShader {
+export const TriangleBlurShader: {
   uniforms: {
     texture: Uniform;
     delta: Uniform;
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/UnpackDepthRGBAShader.d.ts

@@ -2,11 +2,11 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface UnpackDepthRGBAShader {
+export const UnpackDepthRGBAShader: {
   uniforms: {
     tDiffuse: Uniform;
     opacity: Uniform;
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/VerticalBlurShader.d.ts

@@ -2,11 +2,11 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface VerticalBlurShader {
+export const VerticalBlurShader: {
   uniforms: {
     tDiffuse: Uniform;
     v: Uniform;
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/VerticalTiltShiftShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface VerticalTiltShiftShader {
+export const VerticalTiltShiftShader: {
   uniforms: {
     tDiffuse: Uniform;
     v: Uniform;
@@ -10,4 +10,4 @@ export interface VerticalTiltShiftShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/VignetteShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface VignetteShader {
+export const VignetteShader: {
   uniforms: {
     tDiffuse: Uniform;
     offset: Uniform;
@@ -10,4 +10,4 @@ export interface VignetteShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/VolumeShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface VolumeShader {
+export const VolumeShader: {
   uniforms: {
     u_size: Uniform;
     u_renderstyle: Uniform;
@@ -13,4 +13,4 @@ export interface VolumeShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

examples/jsm/shaders/WaterRefractionShader.d.ts

@@ -2,7 +2,7 @@ import {
   Uniform
 } from '../../../src/Three';
 
-export interface WaterRefractionShader {
+export const WaterRefractionShader: {
   uniforms: {
     color: Uniform;
     time: Uniform;
@@ -12,4 +12,4 @@ export interface WaterRefractionShader {
   };
   vertexShader: string;
   fragmentShader: string;
-}
+};

src/helpers/RectAreaLightHelper.d.ts

@@ -1,13 +1,15 @@
 import { RectAreaLight } from './../lights/RectAreaLight';
 import { Color } from './../math/Color';
-//import { Matrix4 } from './../math/Matrix4';
-//import { Object3D } from './../core/Object3D';
+import { Line } from '../objects/Line';
 
-export class RectAreaLightHelper {
+export class RectAreaLightHelper extends Line {
 
 	constructor( light: RectAreaLight, color?: Color | string | number );
 
 	light: RectAreaLight;
 	color: Color | string | number | undefined;
 
+	update(): void;
+	dispose(): void;
+
 }

src/helpers/SpotLightHelper.d.ts

@@ -2,6 +2,7 @@ import { Light } from './../lights/Light';
 import { Color } from './../math/Color';
 import { Matrix4 } from './../math/Matrix4';
 import { Object3D } from './../core/Object3D';
+import { LineSegments } from '../objects/LineSegments';
 
 export class SpotLightHelper extends Object3D {
 
@@ -11,6 +12,7 @@ export class SpotLightHelper extends Object3D {
 	matrix: Matrix4;
 	matrixAutoUpdate: boolean;
 	color: Color | string | number | undefined;
+	cone: LineSegments;
 
 	dispose(): void;
 	update(): void;