From 6702fe212ed02f953dcd2fed1d1635ec1dc7f167 Mon Sep 17 00:00:00 2001 From: linbingquan <695601626@qq.com> Date: Thu, 23 Jul 2020 00:51:44 +0800 Subject: [PATCH] Clean up. --- src/renderers/shaders/ShaderChunk/common.glsl.js | 2 +- src/renderers/shaders/ShaderChunk/envmap_vertex.glsl.js | 2 +- src/renderers/shaders/ShaderChunk/fog_vertex.glsl.js | 2 +- .../shaders/ShaderChunk/gradientmap_pars_fragment.glsl.js | 1 - .../ShaderChunk/lights_phong_pars_fragment.glsl.js | 8 ++++---- .../ShaderChunk/lights_physical_pars_fragment.glsl.js | 6 +++--- .../shaders/ShaderChunk/lights_toon_pars_fragment.glsl.js | 2 +- .../shaders/ShaderChunk/morphtarget_pars_vertex.glsl.js | 4 ++-- .../shaders/ShaderChunk/morphtarget_vertex.glsl.js | 8 ++++---- 9 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/renderers/shaders/ShaderChunk/common.glsl.js b/src/renderers/shaders/ShaderChunk/common.glsl.js index b9b38330ff5281..89a69534ef3374 100644 --- a/src/renderers/shaders/ShaderChunk/common.glsl.js +++ b/src/renderers/shaders/ShaderChunk/common.glsl.js @@ -114,7 +114,7 @@ float linearToRelativeLuminance( const in vec3 color ) { bool isPerspectiveMatrix( mat4 m ) { - return m[ 2 ][ 3 ] == - 1.0; + return m[ 2 ][ 3 ] == - 1.0; } diff --git a/src/renderers/shaders/ShaderChunk/envmap_vertex.glsl.js b/src/renderers/shaders/ShaderChunk/envmap_vertex.glsl.js index c753974ffd61a9..537c94f1bbde6e 100644 --- a/src/renderers/shaders/ShaderChunk/envmap_vertex.glsl.js +++ b/src/renderers/shaders/ShaderChunk/envmap_vertex.glsl.js @@ -9,7 +9,7 @@ export default /* glsl */` vec3 cameraToVertex; - if ( isOrthographic ) { + if ( isOrthographic ) { cameraToVertex = normalize( vec3( - viewMatrix[ 0 ][ 2 ], - viewMatrix[ 1 ][ 2 ], - viewMatrix[ 2 ][ 2 ] ) ); diff --git a/src/renderers/shaders/ShaderChunk/fog_vertex.glsl.js b/src/renderers/shaders/ShaderChunk/fog_vertex.glsl.js index ecfc773911a311..b634db9d2e1046 100644 --- a/src/renderers/shaders/ShaderChunk/fog_vertex.glsl.js +++ b/src/renderers/shaders/ShaderChunk/fog_vertex.glsl.js @@ -1,7 +1,7 @@ export default /* glsl */` #ifdef USE_FOG - fogDepth = -mvPosition.z; + fogDepth = - mvPosition.z; #endif `; diff --git a/src/renderers/shaders/ShaderChunk/gradientmap_pars_fragment.glsl.js b/src/renderers/shaders/ShaderChunk/gradientmap_pars_fragment.glsl.js index 6b4a5ab747c7ff..d8e15e06db0c45 100644 --- a/src/renderers/shaders/ShaderChunk/gradientmap_pars_fragment.glsl.js +++ b/src/renderers/shaders/ShaderChunk/gradientmap_pars_fragment.glsl.js @@ -23,5 +23,4 @@ vec3 getGradientIrradiance( vec3 normal, vec3 lightDirection ) { #endif } - `; diff --git a/src/renderers/shaders/ShaderChunk/lights_phong_pars_fragment.glsl.js b/src/renderers/shaders/ShaderChunk/lights_phong_pars_fragment.glsl.js index da3d7e22129ca1..0f64f57df5574f 100644 --- a/src/renderers/shaders/ShaderChunk/lights_phong_pars_fragment.glsl.js +++ b/src/renderers/shaders/ShaderChunk/lights_phong_pars_fragment.glsl.js @@ -10,10 +10,10 @@ varying vec3 vViewPosition; struct BlinnPhongMaterial { - vec3 diffuseColor; - vec3 specularColor; - float specularShininess; - float specularStrength; + vec3 diffuseColor; + vec3 specularColor; + float specularShininess; + float specularStrength; }; diff --git a/src/renderers/shaders/ShaderChunk/lights_physical_pars_fragment.glsl.js b/src/renderers/shaders/ShaderChunk/lights_physical_pars_fragment.glsl.js index 2aa411d1a1aea9..e200b6d0509227 100644 --- a/src/renderers/shaders/ShaderChunk/lights_physical_pars_fragment.glsl.js +++ b/src/renderers/shaders/ShaderChunk/lights_physical_pars_fragment.glsl.js @@ -1,9 +1,9 @@ export default /* glsl */` struct PhysicalMaterial { - vec3 diffuseColor; - float specularRoughness; - vec3 specularColor; + vec3 diffuseColor; + float specularRoughness; + vec3 specularColor; #ifdef CLEARCOAT float clearcoat; diff --git a/src/renderers/shaders/ShaderChunk/lights_toon_pars_fragment.glsl.js b/src/renderers/shaders/ShaderChunk/lights_toon_pars_fragment.glsl.js index ea603415008ea8..b22dc8e09224ce 100644 --- a/src/renderers/shaders/ShaderChunk/lights_toon_pars_fragment.glsl.js +++ b/src/renderers/shaders/ShaderChunk/lights_toon_pars_fragment.glsl.js @@ -10,7 +10,7 @@ varying vec3 vViewPosition; struct ToonMaterial { - vec3 diffuseColor; + vec3 diffuseColor; }; diff --git a/src/renderers/shaders/ShaderChunk/morphtarget_pars_vertex.glsl.js b/src/renderers/shaders/ShaderChunk/morphtarget_pars_vertex.glsl.js index 6d50e1a6056e2b..1046b94682f1fa 100644 --- a/src/renderers/shaders/ShaderChunk/morphtarget_pars_vertex.glsl.js +++ b/src/renderers/shaders/ShaderChunk/morphtarget_pars_vertex.glsl.js @@ -5,11 +5,11 @@ export default /* glsl */` #ifndef USE_MORPHNORMALS - uniform float morphTargetInfluences[ 8 ]; + uniform float morphTargetInfluences[ 8 ]; #else - uniform float morphTargetInfluences[ 4 ]; + uniform float morphTargetInfluences[ 4 ]; #endif diff --git a/src/renderers/shaders/ShaderChunk/morphtarget_vertex.glsl.js b/src/renderers/shaders/ShaderChunk/morphtarget_vertex.glsl.js index b4cdb8ae1ebfa8..dfa405851c1324 100644 --- a/src/renderers/shaders/ShaderChunk/morphtarget_vertex.glsl.js +++ b/src/renderers/shaders/ShaderChunk/morphtarget_vertex.glsl.js @@ -12,10 +12,10 @@ export default /* glsl */` #ifndef USE_MORPHNORMALS - transformed += morphTarget4 * morphTargetInfluences[ 4 ]; - transformed += morphTarget5 * morphTargetInfluences[ 5 ]; - transformed += morphTarget6 * morphTargetInfluences[ 6 ]; - transformed += morphTarget7 * morphTargetInfluences[ 7 ]; + transformed += morphTarget4 * morphTargetInfluences[ 4 ]; + transformed += morphTarget5 * morphTargetInfluences[ 5 ]; + transformed += morphTarget6 * morphTargetInfluences[ 6 ]; + transformed += morphTarget7 * morphTargetInfluences[ 7 ]; #endif