Merge pull request #33110 from saranshkataria/master

fixed linewidth attribute in three.js
This commit is contained in:
Nathan Shively-Sanders
2019-03-05 09:00:05 -08:00
committed by GitHub
2 changed files with 39 additions and 38 deletions
+38 -37
View File
@@ -24,47 +24,48 @@
// Zhang Hao <https://github.com/devilsparta>
// Konstantin Lukaschenko <https://github.com/KonstantinLukaschenko>
// Daniel Yim <https://github.com/danyim>
// Saransh Kataria <https://github.com/saranshkataria>
// Philippe Suter <https://github.com/psuter>
// Definitions: https://github.com//DefinitelyTyped
// TypeScript Version: 2.8
export * from "./three-core";
export * from './three-core';
export * from "./three-canvasrenderer";
export * from "./three-colladaLoader";
export * from "./three-copyshader";
export * from "./three-css3drenderer";
export * from "./three-ctmloader";
export * from "./three-ddsloader";
export * from "./three-tdsloader";
export * from "./three-dragcontrols";
export * from "./three-editorcontrols";
export * from "./three-effectcomposer";
export * from "./three-examples";
export * from "./three-fbxloader";
export * from "./three-FirstPersonControls";
export * from "./three-gltfexporter";
export * from "./three-gltfloader";
export * from "./three-lensflare";
export * from "./three-mapcontrols";
export * from "./three-maskpass";
export * from "./three-mtlloader";
export * from "./three-objloader";
export * from "./three-octree";
export * from "./three-orbitcontrols";
export * from "./three-orthographictrackballcontrols";
export * from "./three-outlinepass";
export * from "./three-projector";
export * from "./three-renderpass";
export * from "./three-shaderpass";
export * from "./three-smaapass";
export * from "./three-ssaapass";
export * from "./three-filmpass";
export * from "./three-tgaloader";
export * from "./three-trackballcontrols";
export * from "./three-transformcontrols";
export * from "./three-unrealbloompass";
export * from "./three-vrcontrols";
export * from "./three-vreffect";
export * from './three-canvasrenderer';
export * from './three-colladaLoader';
export * from './three-copyshader';
export * from './three-css3drenderer';
export * from './three-ctmloader';
export * from './three-ddsloader';
export * from './three-tdsloader';
export * from './three-dragcontrols';
export * from './three-editorcontrols';
export * from './three-effectcomposer';
export * from './three-examples';
export * from './three-fbxloader';
export * from './three-FirstPersonControls';
export * from './three-gltfexporter';
export * from './three-gltfloader';
export * from './three-lensflare';
export * from './three-mapcontrols';
export * from './three-maskpass';
export * from './three-mtlloader';
export * from './three-objloader';
export * from './three-octree';
export * from './three-orbitcontrols';
export * from './three-orthographictrackballcontrols';
export * from './three-outlinepass';
export * from './three-projector';
export * from './three-renderpass';
export * from './three-shaderpass';
export * from './three-smaapass';
export * from './three-ssaapass';
export * from './three-filmpass';
export * from './three-tgaloader';
export * from './three-trackballcontrols';
export * from './three-transformcontrols';
export * from './three-unrealbloompass';
export * from './three-vrcontrols';
export * from './three-vreffect';
export as namespace THREE;
+1 -1
View File
@@ -3115,7 +3115,7 @@ export interface ShaderMaterialParameters extends MaterialParameters {
uniforms?: any;
vertexShader?: string;
fragmentShader?: string;
lineWidth?: number;
linewidth?: number;
wireframe?: boolean;
wireframeLinewidth?: number;
lights?: boolean;