From cd218b8c09482f9f9f2d15285d55ad955673697f Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Tue, 14 Oct 2014 19:44:41 -0300 Subject: Fixes -=-=- -Fixed normalmap depth parameter -Fixes to DirAccess on Windows -Double click on resource dock will open them -Fixes to doc generator (should make github wiki on class list more up to date) --- drivers/gles2/shaders/material.glsl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'drivers/gles2/shaders') diff --git a/drivers/gles2/shaders/material.glsl b/drivers/gles2/shaders/material.glsl index 870004fd10..44337e1197 100644 --- a/drivers/gles2/shaders/material.glsl +++ b/drivers/gles2/shaders/material.glsl @@ -824,6 +824,8 @@ void main() { vec3 normalmap = vec3(0.0); #endif + float normaldepth=1.0; + #if defined(ENABLE_DISCARD) @@ -839,7 +841,8 @@ FRAGMENT_SHADER_CODE #if defined(ENABLE_NORMALMAP) - normal = normalize( tangent_interp * normalmap.x + binormal_interp * normalmap.y + normal_interp * normalmap.z ) * side; + normal = normalize( mix(normal_interp,tangent_interp * normalmap.x + binormal_interp * normalmap.y + normal_interp * normalmap.z,normaldepth) ) * side; + #endif #if defined(ENABLE_DISCARD) -- cgit v1.2.3