kylefang/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/zhigang1992/DefinitelyTyped.git synced 2026-04-28 09:25:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Partial merge remote-tracking branch 'upstream/master' into merge_7_25

Browse Source
This commit is contained in:
Ryan Cavanaugh
2016-07-25 14:26:20 -07:00
parent 1a21fac318 311d63427a
commit 347311a5f0
90 changed files with 124469 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
three/index.d.ts vendored
View File

@@ -2495,8 +2495,9 @@ declare namespace THREE {
export interface MeshStandardMaterialParameters extends MaterialParameters {
color?: number|string;
roughtness?: number;
roughness?: number;
metalness?: number;
map?: Texture;
lighhtMap?: Texture;
lightMapIntensity?: number;
aoMap?: Texture;
@@ -2511,7 +2512,7 @@ declare namespace THREE {
displacementMap?: Texture;
displacementScale?: number;
displacementBias?: number;
roughtnessMap?: Texture;
roughnessMap?: Texture;
metalMap?: Texture;
alphaMap?: Texture;
envMap?: Texture;
@@ -2532,7 +2533,7 @@ declare namespace THREE {
constructor(parameters?: MeshStandardMaterialParameters);
color: Color;
roughtness: number;
roughness: number;
metalness: number;
map: Texture;
lighhtMap: Texture;
@@ -2549,7 +2550,7 @@ declare namespace THREE {
displacementMap: Texture;
displacementScale: number;
displacementBias: number;
roughtnessMap: Texture;
roughnessMap: Texture;
metalMap: Texture;
alphaMap: Texture;
envMap: Texture;
@@ -5100,8 +5101,8 @@ declare namespace THREE {
points_vert: string;
premultiplied_alpha_fragment: string;
project_vertex: string;
roughtnessmap_fragment: string;
roughtnessmap_pars_fragment: string;
roughnessmap_fragment: string;
roughnessmap_pars_fragment: string;
shadowmap_pars_fragment: string;
shadowmap_pars_vertex: string;
shadowmap_vertex: string;
@@ -5185,7 +5186,7 @@ declare namespace THREE {
displacementScale: IUniform;
displacementBias: IUniform;
};
roughtnessmap: { roughtnessMap: IUniform };
roughnessmap: { roughnessMap: IUniform };
metalnessmap: { metalnessMap: IUniform };
fog: {
fogDensity: IUniform;

2
three/tests/webgl/webgl_lines_colors.ts
View File

@@ -95,8 +95,6 @@
//
stats = new Stats();
stats.domElement.style.position = 'absolute';
stats.domElement.style.top = '0px';
//container.appendChild( stats.domElement );
//