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

Updated built in volume shaders to honour the osg::Matierial setting

Browse Source
This commit is contained in:
Robert Osfield
2011-11-11 10:36:17 +00:00
parent d13bfb522b
commit 862c1c4af3
9 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@ char volume_frag[] = "uniform sampler3D baseTexture;\n"
"varying vec4 cameraPos;\n"
"varying vec4 vertexPos;\n"
"varying mat4 texgen;\n"
"varying vec4 baseColor;\n"
"\n"
"void main(void)\n"
"{ \n"
@@ -93,8 +94,10 @@ char volume_frag[] = "uniform sampler3D baseTexture;\n"
" }\n"
"\n"
" fragColor.w *= TransparencyValue;\n"
" if (fragColor.w>1.0) fragColor.w = 1.0;\n"
"\n"
" fragColor *= baseColor;\n"
"\n"
" if (fragColor.w>1.0) fragColor.w = 1.0; \n"
" if (fragColor.w<AlphaFuncValue) discard;\n"
" \n"
" gl_FragColor = fragColor;\n"

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

@@ -7,6 +7,7 @@ char volume_iso_frag[] = "uniform sampler3D baseTexture;\n"
"varying vec4 vertexPos;\n"
"varying vec3 lightDirection;\n"
"varying mat4 texgen;\n"
"varying vec4 baseColor;\n"
"\n"
"void main(void)\n"
"{ \n"
@@ -113,6 +114,8 @@ char volume_iso_frag[] = "uniform sampler3D baseTexture;\n"
"\n"
" color.a = 1.0;\n"
"\n"
" color *= baseColor;\n"
"\n"
" gl_FragColor = color;\n"
" \n"
" return;\n"

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

@@ -7,6 +7,7 @@ char volume_lit_frag[] = "uniform sampler3D baseTexture;\n"
"varying vec4 vertexPos;\n"
"varying vec3 lightDirection;\n"
"varying mat4 texgen;\n"
"varying vec4 baseColor;\n"
"\n"
"void main(void)\n"
"{ \n"
@@ -120,8 +121,10 @@ char volume_lit_frag[] = "uniform sampler3D baseTexture;\n"
" }\n"
"\n"
" fragColor.w *= TransparencyValue;\n"
"\n"
" if (fragColor.w>1.0) fragColor.w = 1.0; \n"
"\n"
" fragColor *= baseColor;\n"
"\n"
" if (fragColor.w<AlphaFuncValue) discard;\n"
" \n"
" gl_FragColor = fragColor;\n"

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

@@ -12,6 +12,7 @@ char volume_lit_tf_frag[] = "uniform sampler3D baseTexture;\n"
"varying vec4 vertexPos;\n"
"varying vec3 lightDirection;\n"
"varying mat4 texgen;\n"
"varying vec4 baseColor;\n"
"\n"
"void main(void)\n"
"{ \n"

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

@@ -6,6 +6,7 @@ char volume_mip_frag[] = "uniform sampler3D baseTexture;\n"
"varying vec4 cameraPos;\n"
"varying vec4 vertexPos;\n"
"varying mat4 texgen;\n"
"varying vec4 baseColor;\n"
"\n"
"void main(void)\n"
"{ \n"
@@ -86,8 +87,10 @@ char volume_mip_frag[] = "uniform sampler3D baseTexture;\n"
" }\n"
"\n"
" fragColor.w *= TransparencyValue;\n"
"\n"
" if (fragColor.w>1.0) fragColor.w = 1.0; \n"
"\n"
" fragColor *= baseColor;\n"
"\n"
" if (fragColor.w<AlphaFuncValue) discard;\n"
" \n"
" gl_FragColor = fragColor;\n"

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

@@ -11,6 +11,7 @@ char volume_tf_frag[] = "uniform sampler3D baseTexture;\n"
"varying vec4 cameraPos;\n"
"varying vec4 vertexPos;\n"
"varying mat4 texgen;\n"
"varying vec4 baseColor;\n"
"\n"
"void main(void)\n"
"{ \n"
@@ -100,8 +101,10 @@ char volume_tf_frag[] = "uniform sampler3D baseTexture;\n"
" }\n"
"\n"
" fragColor.w *= TransparencyValue;\n"
" if (fragColor.w>1.0) fragColor.w = 1.0;\n"
"\n"
" fragColor *= baseColor;\n"
"\n"
" if (fragColor.w>1.0) fragColor.w = 1.0; \n"
" if (fragColor.w<AlphaFuncValue) discard;\n"
" \n"
" gl_FragColor = fragColor;\n"

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

@@ -12,6 +12,7 @@ char volume_tf_iso_frag[] = "uniform sampler3D baseTexture;\n"
"varying vec4 vertexPos;\n"
"varying vec3 lightDirection;\n"
"varying mat4 texgen;\n"
"varying vec4 baseColor;\n"
"\n"
"void main(void)\n"
"{ \n"
@@ -117,6 +118,8 @@ char volume_tf_iso_frag[] = "uniform sampler3D baseTexture;\n"
" color.z *= lightScale;\n"
" }\n"
"\n"
" color *= baseColor;\n"
"\n"
" gl_FragColor = color;\n"
"\n"
" return;\n"

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

@@ -11,6 +11,7 @@ char volume_tf_mip_frag[] = "uniform sampler3D baseTexture;\n"
"varying vec4 cameraPos;\n"
"varying vec4 vertexPos;\n"
"varying mat4 texgen;\n"
"varying vec4 baseColor;\n"
"\n"
"void main(void)\n"
"{ \n"
@@ -89,8 +90,10 @@ char volume_tf_mip_frag[] = "uniform sampler3D baseTexture;\n"
" }\n"
"\n"
" fragColor.w *= TransparencyValue;\n"
" if (fragColor.w>1.0) fragColor.w = 1.0;\n"
"\n"
" fragColor *= baseColor;\n"
"\n"
" if (fragColor.w>1.0) fragColor.w = 1.0; \n"
" if (fragColor.w<AlphaFuncValue) discard;\n"
" gl_FragColor = fragColor;\n"
"}\n"

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

@@ -3,7 +3,7 @@ char volume_vert[] = "#version 110\n"
"varying vec4 vertexPos;\n"
"varying vec3 lightDirection;\n"
"varying mat4 texgen;\n"
"\n"
"varying vec4 baseColor;\n"
"\n"
"void main(void)\n"
"{\n"
@@ -11,6 +11,7 @@ char volume_vert[] = "#version 110\n"
"\n"
" cameraPos = gl_ModelViewMatrixInverse * vec4(0,0,0,1);\n"
" vertexPos = gl_Vertex;\n"
" baseColor = gl_FrontMaterial.diffuse;\n"
"\n"
" vec4 lightPosition = gl_ModelViewMatrixInverse * gl_LightSource[0].position;\n"
" if (lightPosition[3]==0.0)\n"