Changeset 9511

Timestamp:

01/20/09 13:39:26 (3 years ago)

Author:

robert

Message:

Added AlphaFunc? support into osgVolume::AlphaFuncProperty?.

Location:

OpenSceneGraph/trunk

Files:

• examples/osgvolume/osgvolume.cpp (modified) (3 diffs)
• include/osgVolume/Property (modified) (3 diffs)
• src/osgVolume/FixedFunctionTechnique.cpp (modified) (1 diff)
• src/osgVolume/Property.cpp (modified) (2 diffs)
• src/osgVolume/ShaderTechnique.cpp (modified) (1 diff)
• src/osgVolume/Shaders/volume_frag.cpp (modified) (3 diffs)
• src/osgVolume/Shaders/volume_mip_frag.cpp (modified) (2 diffs)
• src/osgVolume/Shaders/volume_n_frag.cpp (modified) (2 diffs)
• src/osgVolume/Shaders/volume_tf_frag.cpp (modified) (3 diffs)
• src/osgVolume/Shaders/volume_tf_mip_frag.cpp (modified) (2 diffs)
• src/osgVolume/Shaders/volume_tf_n_frag.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

@@ -783 +783 @@
                     if (_updateAlphaCutOff && cpv._afProperty.valid())
                     {
+                        osg::notify(osg::NOTICE)<<"Setting afProperty to "<<v<<std::endl;
                         cpv._afProperty->setValue(v);
                     }
@@ -1346 +1347 @@
             {
                 case(Standard):
+                    layer->addProperty(new osgVolume::AlphaFuncProperty(alphaFunc));
                     break;
                 case(Light):
+                    layer->addProperty(new osgVolume::AlphaFuncProperty(alphaFunc));
                     layer->addProperty(new osgVolume::LightingProperty);
                     break;
@@ -1354 +1357 @@
                     break;
                 case(MaximumIntensityProjection):
+                    layer->addProperty(new osgVolume::AlphaFuncProperty(alphaFunc));
                     layer->addProperty(new osgVolume::MaximumIntensityProjectionProperty);
                     break;
             }
             
+        
+            tile->setVolumeTechnique(new osgVolume::ShaderTechnique);
+        }
+        else
+        {
             layer->addProperty(new osgVolume::AlphaFuncProperty(alphaFunc));
-        
-            tile->setVolumeTechnique(new osgVolume::ShaderTechnique);
-        }
-        else
-        {
             tile->setVolumeTechnique(new osgVolume::FixedFunctionTechnique);
         }

OpenSceneGraph/trunk/include/osgVolume/Property

@@ -17 +17 @@
 #include <osg/TransferFunction>
 #include <osg/Uniform>
+#include <osg/AlphaFunc>
 
 #include <osgVolume/Export>
@@ -151 +152 @@
 
         /** Set the value.*/
-        void setValue(float v) { _uniform->set(v); }
+        virtual void setValue(float v) { _uniform->set(v); }
 
         /** Get the value.*/
@@ -199 +200 @@
         virtual void accept(PropertyVisitor& pv) { pv.apply(*this); }
 
+        virtual void setValue(float v);
+        
+        osg::AlphaFunc* getAlphaFunc() { return _alphaFunc.get(); }
+
+        const osg::AlphaFunc* getAlphaFunc() const { return _alphaFunc.get(); }
+
+
     protected:
     
         virtual ~AlphaFuncProperty() {}
+        
+        osg::ref_ptr<osg::AlphaFunc> _alphaFunc;
 };
 

OpenSceneGraph/trunk/src/osgVolume/FixedFunctionTechnique.cpp

@@ -184 +184 @@
     stateset->setMode(GL_LIGHTING,osg::StateAttribute::ON);
     stateset->setMode(GL_BLEND,osg::StateAttribute::ON);
-    stateset->setAttributeAndModes(new osg::AlphaFunc(osg::AlphaFunc::GREATER,alphaFuncValue), osg::StateAttribute::ON);
+    
+    if (cpv._afProperty.valid())
+    {
+        stateset->setAttributeAndModes(cpv._afProperty->getAlphaFunc(), osg::StateAttribute::ON);
+    }
+    else
+    {
+        stateset->setAttributeAndModes(new osg::AlphaFunc(osg::AlphaFunc::GREATER,alphaFuncValue), osg::StateAttribute::ON);
+    }
     
     osg::Material* material = new osg::Material;

OpenSceneGraph/trunk/src/osgVolume/Property.cpp

@@ -107 +107 @@
     ScalarProperty("AlphaFuncValue",value)
 {
+    _alphaFunc = new osg::AlphaFunc(osg::AlphaFunc::GREATER, value);
 }
 
@@ -112 +113 @@
     ScalarProperty(afp, copyop)
 {
+    _alphaFunc = new osg::AlphaFunc(osg::AlphaFunc::GREATER, getValue());
+}
+
+void AlphaFuncProperty::setValue(float v)
+{
+    _uniform->set(v); 
+    _alphaFunc->setReferenceValue(v);
 }
 

OpenSceneGraph/trunk/src/osgVolume/ShaderTechnique.cpp

@@ -301 +301 @@
         stateset->addUniform(transpancy);
 
-        osg::Uniform* alphaCutOff = new osg::Uniform("alphaCutOff",alphaFuncValue);
-        stateset->addUniform(alphaCutOff);
+        if (cpv._afProperty.valid())
+        {
+            stateset->addUniform(cpv._afProperty->getUniform());
+        }
 
         stateset->setMode(GL_CULL_FACE, osg::StateAttribute::ON);

OpenSceneGraph/trunk/src/osgVolume/Shaders/volume_frag.cpp

@@ -2 +2 @@
                      "uniform float sampleDensity;\n"
                      "uniform float transparency;\n"
-                     "uniform float alphaCutOff;\n"
+                     "uniform float AlphaFuncValue;\n"
                      "\n"
                      "varying vec4 cameraPos;\n"
@@ -75 +75 @@
                      "        vec4 color = texture3D( baseTexture, texcoord);\n"
                      "        float r = color[3]*transparency;\n"
-                     "        if (r>alphaCutOff)\n"
+                     "        if (r>AlphaFuncValue)\n"
                      "        {\n"
                      "            fragColor.xyz = fragColor.xyz*(1.0-r)+color.xyz*r;\n"
@@ -93 +93 @@
                      "\n"
                      "    if (fragColor.w>1.0) fragColor.w = 1.0; \n"
-                     "    if (fragColor.w<alphaCutOff) discard;\n"
+                     "    if (fragColor.w<AlphaFuncValue) discard;\n"
                      "    \n"
                      "    gl_FragColor = fragColor;\n"

OpenSceneGraph/trunk/src/osgVolume/Shaders/volume_mip_frag.cpp

@@ -2 +2 @@
                          "uniform float sampleDensity;\n"
                          "uniform float transparency;\n"
-                         "uniform float alphaCutOff;\n"
+                         "uniform float AlphaFuncValue;\n"
                          "\n"
                          "varying vec4 cameraPos;\n"
@@ -86 +86 @@
                          "\n"
                          "    if (fragColor.w>1.0) fragColor.w = 1.0; \n"
-                         "    if (fragColor.w<alphaCutOff) discard;\n"
+                         "    if (fragColor.w<AlphaFuncValue) discard;\n"
                          "    \n"
                          "    gl_FragColor = fragColor;\n"

OpenSceneGraph/trunk/src/osgVolume/Shaders/volume_n_frag.cpp

@@ -3 +3 @@
                        "uniform float sampleDensity;\n"
                        "uniform float transparency;\n"
-                       "uniform float alphaCutOff;\n"
+                       "uniform float AlphaFuncValue;\n"
                        "\n"
                        "varying vec4 cameraPos;\n"
@@ -104 +104 @@
                        "        float r = color[3]*transparency;\n"
                        "#endif        \n"
-                       "        if (r>alphaCutOff)\n"
+                       "        if (r>AlphaFuncValue)\n"
                        "        {\n"
                        "            fragColor.xyz = fragColor.xyz*(1.0-r)+color.xyz*r;\n"

OpenSceneGraph/trunk/src/osgVolume/Shaders/volume_tf_frag.cpp

@@ -3 +3 @@
                         "uniform float sampleDensity;\n"
                         "uniform float transparency;\n"
-                        "uniform float alphaCutOff;\n"
+                        "uniform float AlphaFuncValue;\n"
                         "\n"
                         "varying vec4 cameraPos;\n"
@@ -78 +78 @@
                         "\n"
                         "        float r = color[3]*transparency;\n"
-                        "        if (r>alphaCutOff)\n"
+                        "        if (r>AlphaFuncValue)\n"
                         "        {\n"
                         "            fragColor.xyz = fragColor.xyz*(1.0-r)+color.xyz*r;\n"
@@ -96 +96 @@
                         "\n"
                         "    if (fragColor.w>1.0) fragColor.w = 1.0; \n"
-                        "    if (fragColor.w<alphaCutOff) discard;\n"
+                        "    if (fragColor.w<AlphaFuncValue) discard;\n"
                         "    \n"
                         "    gl_FragColor = fragColor;\n"

OpenSceneGraph/trunk/src/osgVolume/Shaders/volume_tf_mip_frag.cpp

@@ -3 +3 @@
                             "uniform float sampleDensity;\n"
                             "uniform float transparency;\n"
-                            "uniform float alphaCutOff;\n"
+                            "uniform float AlphaFuncValue;\n"
                             "\n"
                             "varying vec4 cameraPos;\n"
@@ -88 +88 @@
                             "\n"
                             "    if (fragColor.w>1.0) fragColor.w = 1.0; \n"
-                            "    if (fragColor.w<alphaCutOff) discard;\n"
+                            "    if (fragColor.w<AlphaFuncValue) discard;\n"
                             "    gl_FragColor = fragColor;\n"
                             "}\n"

OpenSceneGraph/trunk/src/osgVolume/Shaders/volume_tf_n_frag.cpp

@@ -4 +4 @@
                           "uniform float sampleDensity;\n"
                           "uniform float transparency;\n"
-                          "uniform float alphaCutOff;\n"
+                          "uniform float AlphaFuncValue;\n"
                           "\n"
                           "varying vec4 cameraPos;\n"
@@ -91 +91 @@
                           "\n"
                           "        float r = normal[3]*transparency;\n"
-                          "        if (r>alphaCutOff)\n"
+                          "        if (r>AlphaFuncValue)\n"
                           "        {\n"
                           "            fragColor.xyz = fragColor.xyz*(1.0-r)+color.xyz*r;\n"