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

Improved shaders to better handle region of constant values when doing normal generation

Browse Source
This commit is contained in:
Robert Osfield
2009-01-30 18:56:30 +00:00
parent a358bd7370
commit aed3339e43
8 changed files with 35 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/osgVolume/Shaders/volume_frag.cpp
View File

@@ -95,5 +95,4 @@ char volume_frag[] = "uniform sampler3D baseTexture;\n"
" if (fragColor.w<AlphaFuncValue) discard;\n"
" \n"
" gl_FragColor = fragColor;\n"
"}\n"
"\n";
"}\n";

31
src/osgVolume/Shaders/volume_iso_frag.cpp
View File

@@ -72,7 +72,6 @@ char volume_iso_frag[] = "uniform sampler3D baseTexture;\n"
" vec3 deltaTexCoord=(t0-te)/float(num_iterations-1.0);\n"
" vec3 texcoord = te;\n"
"\n"
" vec4 fragColor = vec4(0.0, 0.0, 0.0, 0.0); \n"
" vec4 previousColor = texture3D( baseTexture, texcoord);\n"
" \n"
" float normalSampleDistance = 1.0/512.0;\n"
@@ -100,25 +99,18 @@ char volume_iso_frag[] = "uniform sampler3D baseTexture;\n"
" float nz = texture3D( baseTexture, texcoord - deltaZ).a;\n"
" \n"
" vec3 grad = vec3(px-nx, py-ny, pz-nz);\n"
" vec3 normal = normalize(grad);\n"
" if (grad.x!=0.0 || grad.y!=0.0 || grad.z!=0.0)\n"
" {\n"
" vec3 normal = normalize(grad);\n"
" float lightScale = 0.1 + abs(dot(normal.xyz, eyeDirection))*0.9;\n"
"\n"
" float lightScale = 0.1 + abs(dot(normal.xyz, eyeDirection))*0.9;\n"
" color.x *= lightScale;\n"
" color.y *= lightScale;\n"
" color.z *= lightScale;\n"
" }\n"
" \n"
" \n"
"#if 0\n"
" color.x *= lightScale;\n"
" color.y *= lightScale;\n"
" color.z *= lightScale;\n"
"#else\n"
" color.x = lightScale;\n"
" color.y = lightScale;\n"
" color.z = lightScale;\n"
"#endif\n"
"\n"
" fragColor = vec4(lightScale, lightScale, lightScale, 1.0);\n"
" \n"
" if (fragColor.w>1.0) fragColor.w = 1.0; \n"
" gl_FragColor = fragColor;\n"
" if (color.w>1.0) color.w = 1.0; \n"
" gl_FragColor = color;\n"
" \n"
" return;\n"
" }\n"
@@ -132,5 +124,4 @@ char volume_iso_frag[] = "uniform sampler3D baseTexture;\n"
"\n"
" // we didn't find an intersection so just discard fragment\n"
" discard;\n"
"}\n"
"\n";
"}\n";

18
src/osgVolume/Shaders/volume_lit_frag.cpp
View File

@@ -80,6 +80,7 @@ char volume_lit_frag[] = "uniform sampler3D baseTexture;\n"
" while(num_iterations>0.0)\n"
" {\n"
" vec4 color = texture3D( baseTexture, texcoord);\n"
"\n"
" float a = color.a;\n"
" float px = texture3D( baseTexture, texcoord + deltaX).a;\n"
" float py = texture3D( baseTexture, texcoord + deltaY).a;\n"
@@ -90,13 +91,15 @@ char volume_lit_frag[] = "uniform sampler3D baseTexture;\n"
" float nz = texture3D( baseTexture, texcoord - deltaZ).a;\n"
"\n"
" vec3 grad = vec3(px-nx, py-ny, pz-nz);\n"
" vec3 normal = normalize(grad);\n"
" if (grad.x!=0.0 || grad.y!=0.0 || grad.z!=0.0)\n"
" {\n"
" vec3 normal = normalize(grad);\n"
" float lightScale = 0.1 + abs(dot(normal.xyz, eyeDirection))*0.9;\n"
"\n"
" float lightScale = 0.1 + abs(dot(normal.xyz, eyeDirection));\n"
"\n"
" color.x *= lightScale;\n"
" color.y *= lightScale;\n"
" color.z *= lightScale;\n"
" color.x *= lightScale;\n"
" color.y *= lightScale;\n"
" color.z *= lightScale;\n"
" }\n"
"\n"
" float r = color[3]*TransparencyValue;\n"
" if (r>AlphaFuncValue)\n"
@@ -120,5 +123,4 @@ char volume_lit_frag[] = "uniform sampler3D baseTexture;\n"
" if (fragColor.w<AlphaFuncValue) discard;\n"
" \n"
" gl_FragColor = fragColor;\n"
"}\n"
"\n";
"}\n";

16
src/osgVolume/Shaders/volume_lit_tf_frag.cpp
View File

@@ -93,13 +93,16 @@ char volume_lit_tf_frag[] = "uniform sampler3D baseTexture;\n"
" float nz = texture3D( baseTexture, texcoord - deltaZ).a;\n"
"\n"
" vec3 grad = vec3(px-nx, py-ny, pz-nz);\n"
" vec3 normal = normalize(grad);\n"
" if (grad.x!=0.0 || grad.y!=0.0 || grad.z!=0.0)\n"
" {\n"
" vec3 normal = normalize(grad);\n"
" float lightScale = 0.1 + abs(dot(normal.xyz, eyeDirection))*0.9;\n"
"\n"
" float lightScale = 0.1 + abs(dot(normal.xyz, eyeDirection));\n"
" color.x *= lightScale;\n"
" color.y *= lightScale;\n"
" color.z *= lightScale;\n"
" }\n"
"\n"
" color.x *= lightScale;\n"
" color.y *= lightScale;\n"
" color.z *= lightScale;\n"
"\n"
" float r = color[3]*TransparencyValue;\n"
" if (r>AlphaFuncValue)\n"
@@ -123,5 +126,4 @@ char volume_lit_tf_frag[] = "uniform sampler3D baseTexture;\n"
" if (fragColor.w<AlphaFuncValue) discard;\n"
" \n"
" gl_FragColor = fragColor;\n"
"}\n"
"\n";
"}\n";

3
src/osgVolume/Shaders/volume_mip_frag.cpp
View File

@@ -88,5 +88,4 @@ char volume_mip_frag[] = "uniform sampler3D baseTexture;\n"
" if (fragColor.w<AlphaFuncValue) discard;\n"
" \n"
" gl_FragColor = fragColor;\n"
"}\n"
"\n";
"}\n";

3
src/osgVolume/Shaders/volume_tf_frag.cpp
View File

@@ -98,5 +98,4 @@ char volume_tf_frag[] = "uniform sampler3D baseTexture;\n"
" if (fragColor.w<AlphaFuncValue) discard;\n"
" \n"
" gl_FragColor = fragColor;\n"
"}\n"
"\n";
"}\n";

3
src/osgVolume/Shaders/volume_tf_iso_frag.cpp
View File

@@ -126,5 +126,4 @@ char volume_tf_iso_frag[] = "uniform sampler3D baseTexture;\n"
" // we didn't find an intersection so just discard fragment\n"
" discard;\n"
"\n"
"}\n"
"\n";
"}\n";

3
src/osgVolume/Shaders/volume_tf_mip_frag.cpp
View File

@@ -89,5 +89,4 @@ char volume_tf_mip_frag[] = "uniform sampler3D baseTexture;\n"
" if (fragColor.w>1.0) fragColor.w = 1.0; \n"
" if (fragColor.w<AlphaFuncValue) discard;\n"
" gl_FragColor = fragColor;\n"
"}\n"
"\n";
"}\n";