kylefang/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/zhigang1992/DefinitelyTyped.git synced 2026-04-22 20:39:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7200 from paulvanbrenk/master

Browse Source 
Several updates to ThreeJs
This commit is contained in:
Horiuchi_H
2016-01-05 11:44:46 +09:00
parent 4016640d43 d275c4c26a
commit 1153089254
2 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
threejs/three-orbitcontrols.d.ts vendored
View File

@@ -7,10 +7,10 @@
declare module THREE {
class OrbitControls {
constructor(object:Camera, domElement?:HTMLElement);
constructor(object: Camera, domElement?: HTMLElement);
object:Camera;
domElement:HTMLElement;
object: Camera;
domElement: HTMLElement;
// API
enabled: boolean;
@@ -19,13 +19,13 @@ declare module THREE {
// deprecated
center: THREE.Vector3;
noZoom: boolean;
enableZoom: boolean;
zoomSpeed: number;
minDistance: number;
maxDistance: number;
noRotate: boolean;
enableRotate: boolean;
rotateSpeed: number;
noPan: boolean;
enablePan: boolean;
keyPanSpeed: number;
autoRotate: boolean;
autoRotateSpeed: number;
@@ -33,24 +33,27 @@ declare module THREE {
maxPolarAngle: number;
minAzimuthAngle: number;
maxAzimuthAngle: number;
noKeys: boolean;
enableKeys: boolean;
keys: { LEFT: number; UP: number; RIGHT: number; BOTTOM: number; };
mouseButtons: { ORBIT: MOUSE; ZOOM: MOUSE; PAN: MOUSE; };
enableDamping: boolean;
dampingFactor: number;
rotateLeft(angle?: number): void;
rotateUp(angle?: number): void;
panLeft(distance?: number): void;
panUp(distance?: number): void;
pan( deltaX: number, deltaY: number): void;
pan(deltaX: number, deltaY: number): void;
dollyIn(dollyScale: number): void;
dollyOut(dollyScale: number): void;
update(): void;
reset(): void;
getPolarAngle() : number;
getPolarAngle(): number;
getAzimuthalAngle(): number;
// EventDispatcher mixins
addEventListener(type: string, listener: (event: any) => void ): void;
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;

37
threejs/three.d.ts vendored
View File

@@ -1227,7 +1227,7 @@ declare module THREE {
*/
computeBoundingSphere(): void;
merge( geometry: Geometry, matrix: Matrix, materialIndexOffset: number): void;
merge( geometry: Geometry, matrix: Matrix, materialIndexOffset?: number): void;
mergeMesh( mesh: Mesh ): void;
@@ -1677,7 +1677,7 @@ declare module THREE {
* Abstract base class for lights.
*/
export class Light extends Object3D {
constructor(hex?: number);
constructor(hex?: number|string);
color: Color;
receiveShadow: boolean;
@@ -1727,7 +1727,7 @@ declare module THREE {
* This creates a Ambientlight with a color.
* @param hex Numeric value of the RGB component of the color.
*/
constructor(hex?: number);
constructor(hex?: number|string);
clone(recursive?: boolean): AmbientLight;
copy(source: AmbientLight): AmbientLight;
@@ -1746,7 +1746,7 @@ declare module THREE {
*/
export class DirectionalLight extends Light {
constructor(hex?: number, intensity?: number);
constructor(hex?: number|string, intensity?: number);
/**
* Target used for shadow camera orientation.
@@ -1766,7 +1766,7 @@ declare module THREE {
}
export class HemisphereLight extends Light {
constructor(skyColorHex?: number, groundColorHex?: number, intensity?: number);
constructor(skyColorHex?: number|string, groundColorHex?: number|string, intensity?: number);
groundColor: Color;
intensity: number;
@@ -1784,7 +1784,7 @@ declare module THREE {
* scene.add( light );
*/
export class PointLight extends Light {
constructor(hex?: number, intensity?: number, distance?: number, decay?: number);
constructor(hex?: number|string, intensity?: number, distance?: number, decay?: number);
/*
* Light's intensity.
@@ -1810,7 +1810,7 @@ declare module THREE {
* A point light that can cast shadow in one direction.
*/
export class SpotLight extends Light {
constructor(hex?: number, intensity?: number, distance?: number, angle?: number, exponent?: number, decay?: number);
constructor(hex?: number|string, intensity?: number, distance?: number, angle?: number, exponent?: number, decay?: number);
/**
* Spotlight focus points at target.position.
@@ -2244,7 +2244,7 @@ declare module THREE {
}
export interface LineBasicMaterialParameters extends MaterialParameters {
color?: number;
color?: number|string;
linewidth?: number;
linecap?: string;
linejoin?: string;
@@ -2267,7 +2267,7 @@ declare module THREE {
}
export interface LineDashedMaterialParameters extends MaterialParameters {
color?: number;
color?: number|string;
linewidth?: number;
scale?: number;
dashSize?: number;
@@ -2295,7 +2295,7 @@ declare module THREE {
* parameters is an object with one or more properties defining the material's appearance.
*/
export interface MeshBasicMaterialParameters extends MaterialParameters{
color?: number;
color?: number|string;
opacity?: number;
map?: Texture;
aoMap?: Texture;
@@ -2361,7 +2361,7 @@ declare module THREE {
}
export interface MeshLambertMaterialParameters extends MaterialParameters{
color?: number;
color?: number|string;
emissive?: number;
opacity?: number;
map?: Texture;
@@ -2433,7 +2433,7 @@ declare module THREE {
export interface MeshPhongMaterialParameters extends MaterialParameters {
/** geometry color in hexadecimal. Default is 0xffffff. */
color?: number;
color?: number | string;
emissive?: number;
specular?: number;
shininess?: number;
@@ -2461,7 +2461,7 @@ declare module THREE {
blending?: Blending;
depthTest?: boolean;
depthWrite?: boolean;
wireframe?: string;
wireframe?: boolean;
wireframeLinewidth?: number;
vertexColors?: Colors;
skinning?: boolean;
@@ -2528,7 +2528,7 @@ declare module THREE {
}
export interface PointsMaterialParameters extends MaterialParameters{
color?: number;
color?: number|string;
opacity?: number;
map?: Texture;
size?: number;
@@ -2604,7 +2604,7 @@ declare module THREE {
}
export interface SpriteMaterialParameters extends MaterialParameters {
color?: number;
color?: number|string;
opacity?: number;
map?: Texture;
blending?: Blending;
@@ -4470,6 +4470,11 @@ declare module THREE {
clearAlpha?: number;
devicePixelRatio?: number;
/**
* default is false.
*/
logarithmicDepthBuffer?: boolean;
}
@@ -5106,7 +5111,7 @@ declare module THREE {
* This class contains the parameters that define linear fog, i.e., that grows exponentially denser with the distance.
*/
export class FogExp2 implements IFog {
constructor(hex: number, density?: number);
constructor(hex: number|string, density?: number);
name: string;
color: Color;