From 65a3e3618a0a8697687413a4e67c511ac0493794 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Mon, 23 Feb 2015 17:06:46 -0800 Subject: [PATCH] Trying to setup correctly the projection matrix for all the different cases... --- libraries/gpu/src/gpu/Config.slh | 20 +------------------ .../directional_ambient_light_shadow_map.slf | 2 -- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/libraries/gpu/src/gpu/Config.slh b/libraries/gpu/src/gpu/Config.slh index 89be6a4f54..b17bd7b2b8 100644 --- a/libraries/gpu/src/gpu/Config.slh +++ b/libraries/gpu/src/gpu/Config.slh @@ -12,25 +12,7 @@ <@def GPU_CONFIG_SLH@> <@if GLPROFILE == PC_GL @> - <@def VERSION_HEADER #version 410 compatibility -#@> - -<@func inputPosition name@> -layout(location = 0) in vec3 <$name$>; -<@endfunc@> - -<@func inputNormal name@> -layout(location = 1) in vec3 <$name$>; -<@endfunc@> - -<@func inputTexcoord name@> -layout(location = 4) in vec2 <$name$>; -<@endfunc@> - -<@func inputColor name@> -layout(location = 4) vec3 <$name$>; -<@endfunc@> - + <@def VERSION_HEADER #version 330 compatibility@> <@elif GLPROFILE == MAC_GL @> <@def VERSION_HEADER #version 120@> <@else@> diff --git a/libraries/render-utils/src/directional_ambient_light_shadow_map.slf b/libraries/render-utils/src/directional_ambient_light_shadow_map.slf index 3407cb03e3..7f098eac2e 100755 --- a/libraries/render-utils/src/directional_ambient_light_shadow_map.slf +++ b/libraries/render-utils/src/directional_ambient_light_shadow_map.slf @@ -46,6 +46,4 @@ void main(void) { gl_FragColor = vec4(color, frag.normalVal.a); } - - gl_FragColor = vec4(vec3(shadowAttenuation), 1.0); }