diff --git a/threejs/examples/Detector.d.ts b/threejs/detector.d.ts
similarity index 100%
rename from threejs/examples/Detector.d.ts
rename to threejs/detector.d.ts
diff --git a/threejs/tests/examples/Detector.ts b/threejs/tests/examples/detector.ts
similarity index 100%
rename from threejs/tests/examples/Detector.ts
rename to threejs/tests/examples/detector.ts
diff --git a/threejs/tests/three-tests-setup.ts b/threejs/tests/three-tests-setup.ts
index af594582f8..235dd631db 100644
--- a/threejs/tests/three-tests-setup.ts
+++ b/threejs/tests/three-tests-setup.ts
@@ -3,21 +3,20 @@
//////////////////////////////////////////////////////////////
///
-///
-///
-///
-///
+///
+///
+///
+///
+///
+///
+///
+///
declare module THREE {
var AWDLoader: any;
- var DotScreenShader: any;
var FlyControls: any;
- var RenderPass: any;
- var EffectComposer: any;
- var RGBShiftShader: any;
- var RenderPass: any;
var BloomPass: any;
- var ShaderPass: any;
- var FXAAShader: any;
- var CopyShader: any;
+ var DotScreenShader: Shader;
+ var RGBShiftShader: Shader;
+ var FXAAShader: Shader;
}
diff --git a/threejs/three-copyshader.d.ts b/threejs/three-copyshader.d.ts
new file mode 100644
index 0000000000..5eb92ae2bc
--- /dev/null
+++ b/threejs/three-copyshader.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for CopyShader.js
+// Project: https://github.com/mrdoob/three.js/blob/r68/examples/js/shaders/CopyShader.js
+// Definitions by: Satoru Kimura
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///
+
+declare module THREE {
+ export var CopyShader: Shader;
+}
diff --git a/threejs/examples/CSS3DRenderer.d.ts b/threejs/three-css3drenderer.d.ts
similarity index 95%
rename from threejs/examples/CSS3DRenderer.d.ts
rename to threejs/three-css3drenderer.d.ts
index 1d557b3346..6f8a3679de 100644
--- a/threejs/examples/CSS3DRenderer.d.ts
+++ b/threejs/three-css3drenderer.d.ts
@@ -6,7 +6,7 @@
// This renderer does not work in IE. Can be found here for more information.
// https://github.com/mrdoob/three.js/issues/4783
-///
+///
declare module THREE {
class CSS3DObject extends Object3D {
diff --git a/threejs/three-effectcomposer.d.ts b/threejs/three-effectcomposer.d.ts
new file mode 100644
index 0000000000..2066e6f00a
--- /dev/null
+++ b/threejs/three-effectcomposer.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for EffectComposer.js
+// Project: https://github.com/mrdoob/three.js/blob/r68/examples/js/postprocessing/EffectComposer.js
+// Definitions by: Satoru Kimura
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///
+///
+///
+
+declare module THREE {
+ export class EffectComposer {
+ constructor( renderer: WebGLRenderer, renderTarget?: WebGLRenderTarget);
+
+ renderTarget1: WebGLRenderTarget;
+ renderTarget2: WebGLRenderTarget;
+ writeBuffer: WebGLRenderTarget;
+ readBuffer: WebGLRenderTarget;
+ passes: any[];
+ copyPass: ShaderPass;
+
+ swapBuffers(): void;
+ addPass(pass: any): void;
+ insertPass(pass: any, index: number): void;
+ render(delta: number): void;
+ reset(renderTarget?: WebGLRenderTarget): void;
+ setSize( width: number, height: number ): void;
+ }
+}
diff --git a/threejs/three-maskpass.d.ts b/threejs/three-maskpass.d.ts
new file mode 100644
index 0000000000..9576b35697
--- /dev/null
+++ b/threejs/three-maskpass.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for MaskPass.js
+// Project: https://github.com/mrdoob/three.js/blob/r68/examples/js/postprocessing/MaskPass.js
+// Definitions by: Satoru Kimura
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///
+
+declare module THREE {
+ export class MaskPass {
+ constructor( scene: Scene, camera: Camera);
+
+ scene: Scene;
+ camera: Camera;
+ enabled: boolean;
+ clear: boolean;
+ needsSwap: boolean;
+ inverse: boolean;
+
+ render(renderer: WebGLRenderer, writeBuffer: WebGLRenderTarget, readBuffer: WebGLRenderTarget, delta: number): void;
+ }
+
+ export class ClearMaskPass {
+ constructor();
+
+ enabled: boolean;
+
+ render(renderer: WebGLRenderer, writeBuffer: WebGLRenderTarget, readBuffer: WebGLRenderTarget, delta: number): void;
+ }
+}
diff --git a/threejs/examples/OrbitControls.d.ts b/threejs/three-orbitcontrols.d.ts
similarity index 96%
rename from threejs/examples/OrbitControls.d.ts
rename to threejs/three-orbitcontrols.d.ts
index 7671489aeb..099f68754d 100644
--- a/threejs/examples/OrbitControls.d.ts
+++ b/threejs/three-orbitcontrols.d.ts
@@ -3,7 +3,7 @@
// Definitions by: Satoru Kimura
// Definitions: https://github.com/borisyankov/DefinitelyTyped
-///
+///
declare module THREE {
class OrbitControls {
diff --git a/threejs/three-renderpass.d.ts b/threejs/three-renderpass.d.ts
new file mode 100644
index 0000000000..4d94c575e5
--- /dev/null
+++ b/threejs/three-renderpass.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for RenderPass.js
+// Project: https://github.com/mrdoob/three.js/blob/r68/examples/js/postprocessing/RenderPass.js
+// Definitions by: Satoru Kimura
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///
+
+declare module THREE {
+ export class RenderPass {
+ constructor( scene: Scene, camera: Camera, overrideMaterial?: Material, clearColor?: Color, clearAlpha?: number );
+ constructor( scene: Scene, camera: Camera, overrideMaterial?: Material, clearColor?: string, clearAlpha?: number );
+ constructor( scene: Scene, camera: Camera, overrideMaterial?: Material, clearColor?: number, clearAlpha?: number );
+
+ scene: Scene;
+ camera: Camera;
+ overrideMaterial: Material;
+ clearColor: any; // Color or string or number
+ clearAlpha: number;
+ oldClearColor: Color;
+ oldClearAlpha: number;
+ enabled: boolean;
+ clear: boolean;
+ needsSwap: boolean;
+
+ render(renderer: WebGLRenderer, writeBuffer: WebGLRenderTarget, readBuffer: WebGLRenderTarget, delta: number): void;
+ }
+}
diff --git a/threejs/three-shaderpass.d.ts b/threejs/three-shaderpass.d.ts
new file mode 100644
index 0000000000..470aa46d7c
--- /dev/null
+++ b/threejs/three-shaderpass.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for ShaderPass.js
+// Project: https://github.com/mrdoob/three.js/blob/r68/examples/js/postprocessing/ShaderPass.js
+// Definitions by: Satoru Kimura
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///
+
+declare module THREE {
+ export class ShaderPass {
+ constructor( shader: Shader, textureID?: string );
+
+ textureID: string;
+ uniforms: any;
+ material: ShaderMaterial;
+ renderToScreen: boolean;
+ enabled: boolean;
+ needsSwap: boolean;
+ clear: boolean;
+ camera: Camera;
+ scene: Scene;
+ quad: Mesh;
+
+ render(renderer: WebGLRenderer, writeBuffer: WebGLRenderTarget, readBuffer: WebGLRenderTarget, delta: number): void;
+ }
+}
diff --git a/threejs/three-tests.ts b/threejs/three-tests.ts
index c99f08f23a..0693d40bd1 100644
--- a/threejs/three-tests.ts
+++ b/threejs/three-tests.ts
@@ -58,4 +58,4 @@ THE SOFTWARE.
///
// examples test.
-///
+///
diff --git a/threejs/examples/TrackballControls.d.ts b/threejs/three-trackballcontrols.d.ts
similarity index 95%
rename from threejs/examples/TrackballControls.d.ts
rename to threejs/three-trackballcontrols.d.ts
index 33d69011d1..b4bda75ee9 100644
--- a/threejs/examples/TrackballControls.d.ts
+++ b/threejs/three-trackballcontrols.d.ts
@@ -3,7 +3,7 @@
// Definitions by: Satoru Kimura
// Definitions: https://github.com/borisyankov/DefinitelyTyped
-///
+///
declare module THREE {
class TrackballControls {