From 862c1c4af3a1e943fd70fe2812964519d47def00 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 11 Nov 2011 10:36:17 +0000
Subject: [PATCH] Updated built in volume shaders to honour the osg::Matierial
 setting

---
 src/osgVolume/Shaders/volume_frag.cpp        | 5 ++++-
 src/osgVolume/Shaders/volume_iso_frag.cpp    | 3 +++
 src/osgVolume/Shaders/volume_lit_frag.cpp    | 5 ++++-
 src/osgVolume/Shaders/volume_lit_tf_frag.cpp | 1 +
 src/osgVolume/Shaders/volume_mip_frag.cpp    | 5 ++++-
 src/osgVolume/Shaders/volume_tf_frag.cpp     | 5 ++++-
 src/osgVolume/Shaders/volume_tf_iso_frag.cpp | 3 +++
 src/osgVolume/Shaders/volume_tf_mip_frag.cpp | 5 ++++-
 src/osgVolume/Shaders/volume_vert.cpp        | 3 ++-
 9 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/osgVolume/Shaders/volume_frag.cpp b/src/osgVolume/Shaders/volume_frag.cpp
index 96b23a739..c53bb7855 100644
--- a/src/osgVolume/Shaders/volume_frag.cpp
+++ b/src/osgVolume/Shaders/volume_frag.cpp
@@ -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"
diff --git a/src/osgVolume/Shaders/volume_iso_frag.cpp b/src/osgVolume/Shaders/volume_iso_frag.cpp
index e55117492..29ea225a3 100644
--- a/src/osgVolume/Shaders/volume_iso_frag.cpp
+++ b/src/osgVolume/Shaders/volume_iso_frag.cpp
@@ -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"
diff --git a/src/osgVolume/Shaders/volume_lit_frag.cpp b/src/osgVolume/Shaders/volume_lit_frag.cpp
index 6955a8b97..9dcc15a4e 100644
--- a/src/osgVolume/Shaders/volume_lit_frag.cpp
+++ b/src/osgVolume/Shaders/volume_lit_frag.cpp
@@ -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"
diff --git a/src/osgVolume/Shaders/volume_lit_tf_frag.cpp b/src/osgVolume/Shaders/volume_lit_tf_frag.cpp
index 7f97dfee9..f1b12702e 100644
--- a/src/osgVolume/Shaders/volume_lit_tf_frag.cpp
+++ b/src/osgVolume/Shaders/volume_lit_tf_frag.cpp
@@ -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"
diff --git a/src/osgVolume/Shaders/volume_mip_frag.cpp b/src/osgVolume/Shaders/volume_mip_frag.cpp
index 8f9bd3d2f..4732673a8 100644
--- a/src/osgVolume/Shaders/volume_mip_frag.cpp
+++ b/src/osgVolume/Shaders/volume_mip_frag.cpp
@@ -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"
diff --git a/src/osgVolume/Shaders/volume_tf_frag.cpp b/src/osgVolume/Shaders/volume_tf_frag.cpp
index e4aa23ea0..35129df23 100644
--- a/src/osgVolume/Shaders/volume_tf_frag.cpp
+++ b/src/osgVolume/Shaders/volume_tf_frag.cpp
@@ -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"
diff --git a/src/osgVolume/Shaders/volume_tf_iso_frag.cpp b/src/osgVolume/Shaders/volume_tf_iso_frag.cpp
index 25f6f1887..b5d3886da 100644
--- a/src/osgVolume/Shaders/volume_tf_iso_frag.cpp
+++ b/src/osgVolume/Shaders/volume_tf_iso_frag.cpp
@@ -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"
diff --git a/src/osgVolume/Shaders/volume_tf_mip_frag.cpp b/src/osgVolume/Shaders/volume_tf_mip_frag.cpp
index 17d03e747..059b1fee4 100644
--- a/src/osgVolume/Shaders/volume_tf_mip_frag.cpp
+++ b/src/osgVolume/Shaders/volume_tf_mip_frag.cpp
@@ -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"
diff --git a/src/osgVolume/Shaders/volume_vert.cpp b/src/osgVolume/Shaders/volume_vert.cpp
index 14ee7f553..c0995becd 100644
--- a/src/osgVolume/Shaders/volume_vert.cpp
+++ b/src/osgVolume/Shaders/volume_vert.cpp
@@ -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"