|
@@ -998,14 +998,18 @@ THREE.LDrawLoader = ( function () {
|
|
edgeMaterial.userData.conditionalEdgeMaterial = new THREE.ShaderMaterial( {
|
|
edgeMaterial.userData.conditionalEdgeMaterial = new THREE.ShaderMaterial( {
|
|
vertexShader: conditionalLineVertShader,
|
|
vertexShader: conditionalLineVertShader,
|
|
fragmentShader: conditionalLineFragShader,
|
|
fragmentShader: conditionalLineFragShader,
|
|
- uniforms: {
|
|
|
|
- diffuse: {
|
|
|
|
- value: new THREE.Color( edgeColour )
|
|
|
|
- },
|
|
|
|
- opacity: {
|
|
|
|
- value: alpha
|
|
|
|
|
|
+ uniforms: THREE.UniformsUtils.merge( [
|
|
|
|
+ THREE.UniformsLib.fog,
|
|
|
|
+ {
|
|
|
|
+ diffuse: {
|
|
|
|
+ value: new THREE.Color( edgeColour )
|
|
|
|
+ },
|
|
|
|
+ opacity: {
|
|
|
|
+ value: alpha
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- },
|
|
|
|
|
|
+ ] ),
|
|
|
|
+ fog: true,
|
|
transparent: isTransparent,
|
|
transparent: isTransparent,
|
|
depthWrite: ! isTransparent
|
|
depthWrite: ! isTransparent
|
|
} );
|
|
} );
|