Changeset 9580 for OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

Timestamp:

01/29/09 10:24:45 (4 years ago)

Author:

robert

Message:

Removed now redundent shader files.

Fixed the adding of transfer function property.

Files:

• OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp (modified) (6 diffs)

OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

@@ -936 +936 @@
     while(arguments.read("--num-components", numComponentsDesired)) {}
 
-    bool useOsgVolume = true; 
-    while(arguments.read("--osgVolume")) { useOsgVolume = true; }
-    while(arguments.read("--no-osgVolume")) { useOsgVolume = false; }
-
     bool useShader = true; 
     while(arguments.read("--shader")) { useShader = true; }
@@ -1274 +1270 @@
         osgVolume::SampleDensityProperty* sd = new osgVolume::SampleDensityProperty(0.005);
         osgVolume::TransparencyProperty* tp = new osgVolume::TransparencyProperty(1.0);
+        osgVolume::TransferFunctionProperty* tfp = new osgVolume::TransferFunctionProperty(transferFunction.get());
 
         {
@@ -1281 +1278 @@
             cp->addProperty(sd);
             cp->addProperty(tp);
+            if (tfp) cp->addProperty(tfp);
 
             sp->addProperty(cp);
@@ -1292 +1290 @@
             cp->addProperty(tp);
             cp->addProperty(new osgVolume::LightingProperty);
+            if (tfp) cp->addProperty(tfp);
 
             sp->addProperty(cp);
@@ -1302 +1301 @@
             cp->addProperty(tp);
             cp->addProperty(new osgVolume::IsoSurfaceProperty(alphaFunc));
+            if (tfp) cp->addProperty(tfp);
 
             sp->addProperty(cp);
@@ -1313 +1313 @@
             cp->addProperty(tp);
             cp->addProperty(new osgVolume::MaximumIntensityProjectionProperty);
+            if (tfp) cp->addProperty(tfp);
 
             sp->addProperty(cp);
         }
 
+        switch(shadingModel)
+        {
+            case(Standard):                     sp->setActiveProperty(0); break;
+            case(Light):                        sp->setActiveProperty(1); break;
+            case(Isosurface):                   sp->setActiveProperty(2); break;
+            case(MaximumIntensityProjection):   sp->setActiveProperty(3); break;
+        }
         layer->addProperty(sp);
 
-        if (transferFunction.valid())
-        {
-            osg::notify(osg::NOTICE)<<"Attaching transferFunction"<<std::endl;
-            layer->addProperty(new osgVolume::TransferFunctionProperty(transferFunction.get()));
-        }
 
         tile->setVolumeTechnique(new osgVolume::RayTracedTechnique);