diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2018-11-06 22:50:37 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2018-11-07 02:19:14 +0300 |
commit | c3a0af736a4f6db5b3310cca947bfb103fd2cde2 (patch) | |
tree | b4fd009b59fcaa91ac31b6287a2dd7e615b74bc3 /source/blender/gpu/shaders | |
parent | 57b4e122fc9a1e8d0cb9160ab8652c654af76194 (diff) |
Eevee: Make Normal node interactive
Before it was triggering shader recompilation. Include small cleanup/opti.
Diffstat (limited to 'source/blender/gpu/shaders')
-rw-r--r-- | source/blender/gpu/shaders/gpu_shader_material.glsl | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl index 06e797db8c4..4039b20a082 100644 --- a/source/blender/gpu/shaders/gpu_shader_material.glsl +++ b/source/blender/gpu/shaders/gpu_shader_material.glsl @@ -468,16 +468,10 @@ void invert_z(vec3 v, out vec3 outv) outv = v; } -void normal(vec3 dir, vec3 nor, out vec3 outnor, out float outdot) +void normal_new_shading(vec3 nor, vec3 dir, out vec3 outnor, out float outdot) { - outnor = nor; - outdot = -dot(dir, nor); -} - -void normal_new_shading(vec3 dir, vec3 nor, out vec3 outnor, out float outdot) -{ - outnor = normalize(nor); - outdot = dot(normalize(dir), nor); + outnor = dir; + outdot = dot(normalize(nor), dir); } void curves_vec(float fac, vec3 vec, sampler1DArray curvemap, float layer, out vec3 outvec) |