FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Mathieu Marache, "I replaced the Vec4 by a float and used only the x component of the shadow2DProj . This works on my apple box."

Browse Source
This commit is contained in:
Robert Osfield 2009-12-04 09:57:08 +00:00
parent 8080f46444
commit c262112fbb
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/osgShadow/SoftShadowMap.cpp
View File

@ -62,7 +62,7 @@ static const char fragmentSoftShaderSource_noBaseTexture[] =
" float softFactor = osgShadow_softnessWidth * sceneShadowProj.w; \n" " float softFactor = osgShadow_softnessWidth * sceneShadowProj.w; \n"
" vec4 smCoord = sceneShadowProj; \n" " vec4 smCoord = sceneShadowProj; \n"
" vec3 jitterCoord = vec3( gl_FragCoord.xy / osgShadow_jitteringScale, 0.0 ); \n" " vec3 jitterCoord = vec3( gl_FragCoord.xy / osgShadow_jitteringScale, 0.0 ); \n"
" vec4 shadow = vec4(0.0, 0.0, 0.0, 0.0); \n" " float shadow = 0.0; \n"
// First "cheap" sample test // First "cheap" sample test
" const float pass_div = 1.0 / (2.0 * 4.0); \n" " const float pass_div = 1.0 / (2.0 * 4.0); \n"
" for ( int i = 0; i < 4; ++i ) \n" " for ( int i = 0; i < 4; ++i ) \n"
@ -72,10 +72,10 @@ static const char fragmentSoftShaderSource_noBaseTexture[] =
" jitterCoord.z += 1.0 / SAMPLECOUNT_D2_FLOAT; \n" " jitterCoord.z += 1.0 / SAMPLECOUNT_D2_FLOAT; \n"
" smCoord.xy = sceneShadowProj.xy + (offset.xy) * softFactor; \n" " smCoord.xy = sceneShadowProj.xy + (offset.xy) * softFactor; \n"
" shadow += shadow2DProj( osgShadow_shadowTexture, smCoord ) * pass_div; \n" " shadow += shadow2DProj( osgShadow_shadowTexture, smCoord ).x * pass_div; \n"
" smCoord.xy = sceneShadowProj.xy + (offset.zw) * softFactor; \n" " smCoord.xy = sceneShadowProj.xy + (offset.zw) * softFactor; \n"
" shadow += shadow2DProj( osgShadow_shadowTexture, smCoord ) *pass_div; \n" " shadow += shadow2DProj( osgShadow_shadowTexture, smCoord ).x *pass_div; \n"
" } \n" " } \n"
// skip all the expensive shadow sampling if not needed // skip all the expensive shadow sampling if not needed
" if ( shadow * (shadow -1.0) != 0.0 ) \n" " if ( shadow * (shadow -1.0) != 0.0 ) \n"
@ -86,10 +86,10 @@ static const char fragmentSoftShaderSource_noBaseTexture[] =
" jitterCoord.z += 1.0 / SAMPLECOUNT_D2_FLOAT; \n" " jitterCoord.z += 1.0 / SAMPLECOUNT_D2_FLOAT; \n"
" smCoord.xy = sceneShadowProj.xy + offset.xy * softFactor; \n" " smCoord.xy = sceneShadowProj.xy + offset.xy * softFactor; \n"
" shadow += shadow2DProj( osgShadow_shadowTexture, smCoord ) * INV_SAMPLECOUNT; \n" " shadow += shadow2DProj( osgShadow_shadowTexture, smCoord ).x * INV_SAMPLECOUNT; \n"
" smCoord.xy = sceneShadowProj.xy + offset.zw * softFactor; \n" " smCoord.xy = sceneShadowProj.xy + offset.zw * softFactor; \n"
" shadow += shadow2DProj( osgShadow_shadowTexture, smCoord ) * INV_SAMPLECOUNT; \n" " shadow += shadow2DProj( osgShadow_shadowTexture, smCoord ).x * INV_SAMPLECOUNT; \n"
" } \n" " } \n"
" } \n" " } \n"
// apply shadow, modulo the ambient bias // apply shadow, modulo the ambient bias
@ -122,7 +122,7 @@ static const char fragmentSoftShaderSource_withBaseTexture[] =
" float softFactor = osgShadow_softnessWidth * sceneShadowProj.w; \n" " float softFactor = osgShadow_softnessWidth * sceneShadowProj.w; \n"
" vec4 smCoord = sceneShadowProj; \n" " vec4 smCoord = sceneShadowProj; \n"
" vec3 jitterCoord = vec3( gl_FragCoord.xy / osgShadow_jitteringScale, 0.0 ); \n" " vec3 jitterCoord = vec3( gl_FragCoord.xy / osgShadow_jitteringScale, 0.0 ); \n"
" vec4 shadow = vec4(0.0, 0.0, 0.0, 0.0); \n" " float shadow = 0.0; \n"
// First "cheap" sample test // First "cheap" sample test
" const float pass_div = 1.0 / (2.0 * 4.0); \n" " const float pass_div = 1.0 / (2.0 * 4.0); \n"
" for ( int i = 0; i < 4; ++i ) \n" " for ( int i = 0; i < 4; ++i ) \n"
@ -132,10 +132,10 @@ static const char fragmentSoftShaderSource_withBaseTexture[] =
" jitterCoord.z += 1.0 / SAMPLECOUNT_D2_FLOAT; \n" " jitterCoord.z += 1.0 / SAMPLECOUNT_D2_FLOAT; \n"
" smCoord.xy = sceneShadowProj.xy + (offset.xy) * softFactor; \n" " smCoord.xy = sceneShadowProj.xy + (offset.xy) * softFactor; \n"
" shadow += shadow2DProj( osgShadow_shadowTexture, smCoord ) * pass_div; \n" " shadow += shadow2DProj( osgShadow_shadowTexture, smCoord ).x * pass_div; \n"
" smCoord.xy = sceneShadowProj.xy + (offset.zw) * softFactor; \n" " smCoord.xy = sceneShadowProj.xy + (offset.zw) * softFactor; \n"
" shadow += shadow2DProj( osgShadow_shadowTexture, smCoord ) *pass_div; \n" " shadow += shadow2DProj( osgShadow_shadowTexture, smCoord ).x *pass_div; \n"
" } \n" " } \n"
// skip all the expensive shadow sampling if not needed // skip all the expensive shadow sampling if not needed
" if ( shadow * (shadow -1.0) != 0.0 ) \n" " if ( shadow * (shadow -1.0) != 0.0 ) \n"
@ -146,10 +146,10 @@ static const char fragmentSoftShaderSource_withBaseTexture[] =
" jitterCoord.z += 1.0 / SAMPLECOUNT_D2_FLOAT; \n" " jitterCoord.z += 1.0 / SAMPLECOUNT_D2_FLOAT; \n"
" smCoord.xy = sceneShadowProj.xy + offset.xy * softFactor; \n" " smCoord.xy = sceneShadowProj.xy + offset.xy * softFactor; \n"
" shadow += shadow2DProj( osgShadow_shadowTexture, smCoord ) * INV_SAMPLECOUNT; \n" " shadow += shadow2DProj( osgShadow_shadowTexture, smCoord ).x * INV_SAMPLECOUNT; \n"
" smCoord.xy = sceneShadowProj.xy + offset.zw * softFactor; \n" " smCoord.xy = sceneShadowProj.xy + offset.zw * softFactor; \n"
" shadow += shadow2DProj( osgShadow_shadowTexture, smCoord ) * INV_SAMPLECOUNT; \n" " shadow += shadow2DProj( osgShadow_shadowTexture, smCoord ).x * INV_SAMPLECOUNT; \n"
" } \n" " } \n"
" } \n" " } \n"
// apply color and object base texture // apply color and object base texture