fly/fgdata
1
0
Fork 0
Code Activity

Disable self shadowing for now to gain some fps on older GPU. Should be configurable in the future

Browse source
This commit is contained in:
fredb 2010-04-01 20:59:17 +00:00
parent f71d794866
commit d73a93f284
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Shaders/landmass.frag
View file

@ -18,7 +18,7 @@ const float scale = 1.0;
float ray_intersect(sampler2D reliefMap, vec2 dp, vec2 ds) float ray_intersect(sampler2D reliefMap, vec2 dp, vec2 ds)
{ {
const int linear_search_steps = 20; const int linear_search_steps = 10;
float size = 1.0 / float(linear_search_steps); float size = 1.0 / float(linear_search_steps);
float depth = 0.0; float depth = 0.0;
@ -97,18 +97,18 @@ void main (void)
N = normalize(N.x * VTangent + N.y * VBinormal + N.z * VNormal); N = normalize(N.x * VTangent + N.y * VBinormal + N.z * VNormal);
vec3 l = gl_LightSource[0].position.xyz; vec3 l = gl_LightSource[0].position.xyz;
vec3 diffuse = gl_Color.rgb * max(0.0, dot(N, l)); vec3 diffuse = gl_Color.rgb * max(0.0, dot(N, l));
float shadow_factor = 1.0;
/*
// Shadow // Shadow
dp += ds * d; dp += ds * d;
vec3 sl = normalize( vec3( dot( l, VTangent ), dot( l, VBinormal ), dot( -l, VNormal ) ) ); vec3 sl = normalize( vec3( dot( l, VTangent ), dot( l, VBinormal ), dot( -l, VNormal ) ) );
ds = sl.xy * depth_factor / sl.z; ds = sl.xy * depth_factor / sl.z;
dp -= ds * d; dp -= ds * d;
float dl = ray_intersect(NormalTex, dp, ds); float dl = ray_intersect(NormalTex, dp, ds);
float shadow_factor = 1.0;
if ( dl < d - 0.05 ) if ( dl < d - 0.05 )
shadow_factor = dot( constantColor.xyz, vec3( 1.0, 1.0, 1.0 ) ) * 0.25; shadow_factor = dot( constantColor.xyz, vec3( 1.0, 1.0, 1.0 ) ) * 0.25;
// end shadow // end shadow
*/
vec4 ambient_light = constantColor + gl_LightSource[0].diffuse * shadow_factor * vec4(diffuse, 1.0); vec4 ambient_light = constantColor + gl_LightSource[0].diffuse * shadow_factor * vec4(diffuse, 1.0);
c1 *= ambient_light; c1 *= ambient_light;

8
Shaders/urban.frag
View file

@ -24,7 +24,7 @@ const float zNear = 100.0;
float ray_intersect(sampler2D reliefMap, vec2 dp, vec2 ds) float ray_intersect(sampler2D reliefMap, vec2 dp, vec2 ds)
{ {
const int linear_search_steps = 20; const int linear_search_steps = 10;
float size = 1.0 / float(linear_search_steps); float size = 1.0 / float(linear_search_steps);
float depth = 0.0; float depth = 0.0;
@ -76,18 +76,18 @@ void main (void)
vec3 l = gl_LightSource[0].position.xyz; vec3 l = gl_LightSource[0].position.xyz;
vec3 diffuse = gl_Color.rgb * max(0.0, dot(N, l)); vec3 diffuse = gl_Color.rgb * max(0.0, dot(N, l));
float shadow_factor = 1.0;
/*
// Shadow // Shadow
dp += ds * d; dp += ds * d;
vec3 sl = normalize( vec3( dot( l, VTangent ), dot( l, VBinormal ), dot( -l, VNormal ) ) ); vec3 sl = normalize( vec3( dot( l, VTangent ), dot( l, VBinormal ), dot( -l, VNormal ) ) );
ds = sl.xy * depth_factor / sl.z; ds = sl.xy * depth_factor / sl.z;
dp -= ds * d; dp -= ds * d;
float dl = ray_intersect(NormalTex, dp, ds); float dl = ray_intersect(NormalTex, dp, ds);
float shadow_factor = 1.0;
if ( dl < d - 0.05 ) if ( dl < d - 0.05 )
shadow_factor = dot( constantColor.xyz, vec3( 1.0, 1.0, 1.0 ) ) * 0.25; shadow_factor = dot( constantColor.xyz, vec3( 1.0, 1.0, 1.0 ) ) * 0.25;
// end shadow // end shadow
*/
vec4 ambient_light = constantColor + gl_LightSource[0].diffuse * vec4(diffuse, 1.0); vec4 ambient_light = constantColor + gl_LightSource[0].diffuse * vec4(diffuse, 1.0);
float reflectance = ambient_light.r * 0.3 + ambient_light.g * 0.59 + ambient_light.b * 0.11; float reflectance = ambient_light.r * 0.3 + ambient_light.g * 0.59 + ambient_light.b * 0.11;
if ( shadow_factor < 1.0 ) if ( shadow_factor < 1.0 )