소스 검색

Fix uniforms to support fog

Fixed uniforms of conditionalEdgeMaterial to support fog.
I think this is a bug, because its VertShader and FragShader is already support fog.
lk-lkaz 4 년 전
부모
커밋
d9fa714202
1개의 변경된 파일11개의 추가작업 그리고 7개의 파일을 삭제
  1. 11 7
      examples/js/loaders/LDrawLoader.js

+ 11 - 7
examples/js/loaders/LDrawLoader.js

@@ -998,14 +998,18 @@ THREE.LDrawLoader = ( function () {
 				edgeMaterial.userData.conditionalEdgeMaterial = new THREE.ShaderMaterial( {
 					vertexShader: conditionalLineVertShader,
 					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,
 					depthWrite: ! isTransparent
 				} );