Merge branch 'master' of https://github.com/DefinitelyTyped/DefinitelyTyped into threeConstructorVsNotConstructor

This commit is contained in:
Erik Krogh Kristensen
2016-01-29 15:54:28 +01:00
106 changed files with 7350 additions and 2092 deletions

View File

@@ -8,7 +8,7 @@ interface DetectorStatic {
webgl: boolean;
workers: boolean;
fileapi: boolean;
getWebGLErrorMessage(): HTMLElement;
addGetWebGLMessage(parameters?: {id?: string; parent?: HTMLElement}): void;
}

View File

@@ -17,7 +17,7 @@ declare module THREE {
readBuffer: WebGLRenderTarget;
passes: any[];
copyPass: ShaderPass;
swapBuffers(): void;
addPass(pass: any): void;
insertPass(pass: any, index: number): void;

View File

@@ -18,7 +18,7 @@ declare module THREE {
render(renderer: WebGLRenderer, writeBuffer: WebGLRenderTarget, readBuffer: WebGLRenderTarget, delta: number): void;
}
export class ClearMaskPass {
constructor();

View File

@@ -51,11 +51,11 @@ declare module THREE {
reset(): void;
getPolarAngle(): number;
getAzimuthalAngle(): number;
// EventDispatcher mixins
addEventListener(type: string, listener: (event: any) => void): void;
hasEventListener(type: string, listener: (event: any) => void): void;
removeEventListener(type: string, listener: (event: any) => void): void;
dispatchEvent(event: { type: string; target: any; }): void;
}
}
}

View File

@@ -72,7 +72,7 @@ declare module THREE {
*/
export class Projector {
constructor();
// deprecated.
projectVector(vector: Vector3, camera: Camera): Vector3;
@@ -88,10 +88,10 @@ declare module THREE {
* @param sort select whether to sort elements using the Painter's algorithm.
*/
projectScene(scene: Scene, camera: Camera, sortObjects: boolean, sortElements?: boolean): {
objects: Object3D[]; // Mesh, Line or other object
sprites: Object3D[]; // Sprite or Particle
objects: Object3D[]; // Mesh, Line or other object
sprites: Object3D[]; // Sprite or Particle
lights: Light[];
elements: Face3[]; // Line, Particle, Face3 or Face4
};
}
}
}