|
@@ -52,6 +52,7 @@ UniformsLib.line = {
|
|
|
depthTexture:{ value: null },
|
|
|
nearPlane:{value: 0.1},
|
|
|
farPlane:{value: 100000},
|
|
|
+ //uUseOrthographicCamera:{ type: "b", value: false },
|
|
|
|
|
|
};
|
|
|
|
|
@@ -301,7 +302,7 @@ ShaderLib[ 'line' ] = {
|
|
|
uniform vec3 diffuse;
|
|
|
uniform float opacity;
|
|
|
uniform float lineWidth;
|
|
|
-
|
|
|
+ uniform bool uUseOrthographicCamera;
|
|
|
#ifdef USE_DASH
|
|
|
|
|
|
uniform float dashOffset;
|
|
@@ -355,8 +356,12 @@ ShaderLib[ 'line' ] = {
|
|
|
#if defined(GL_EXT_frag_depth) && defined(useDepth)
|
|
|
float convertToLinear(float zValue)
|
|
|
{
|
|
|
- float z = zValue * 2.0 - 1.0;
|
|
|
- return (2.0 * nearPlane * farPlane) / (farPlane + nearPlane - z * (farPlane - nearPlane));
|
|
|
+ //if(uUseOrthographicCamera){
|
|
|
+ // return zValue*(farPlane-nearPlane)+nearPlane;
|
|
|
+ //}else{
|
|
|
+ float z = zValue * 2.0 - 1.0;
|
|
|
+ return (2.0 * nearPlane * farPlane) / (farPlane + nearPlane - z * (farPlane - nearPlane));
|
|
|
+ //}
|
|
|
}
|
|
|
#endif
|
|
|
|
|
@@ -937,7 +942,7 @@ class LineMaterial extends ShaderMaterial {
|
|
|
this.uniforms.nearPlane.value = camera.near;
|
|
|
this.uniforms.farPlane.value = camera.far;
|
|
|
}
|
|
|
-
|
|
|
+ //this.uniforms.uUseOrthographicCamera.value = !camera.isPerspectiveCamera
|
|
|
}
|
|
|
|
|
|
}
|