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

Timestamp:

06/09/11 12:48:19 (2 years ago)

Author:

robert

Message:

Changed the defaults volume setting to not enable the SampleDensityWhenMoving? property.

Files:

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

OpenSceneGraph/trunk/examples/osgvolume/osgvolume.cpp

@@ -548 +548 @@
     arguments.getApplicationUsage()->addCommandLineOption("--sequence-length <num>","Set the length of time that a sequence of images with run for.");
     arguments.getApplicationUsage()->addCommandLineOption("--sd <num>","Short hand for --sequence-length");
+    arguments.getApplicationUsage()->addCommandLineOption("--sdwm <num>","Set the SampleDensityWhenMovingProperty to specified value");
+    arguments.getApplicationUsage()->addCommandLineOption("--lod","Enable techniques to reduce the level of detail when moving.");
 //    arguments.getApplicationUsage()->addCommandLineOption("--raw <sizeX> <sizeY> <sizeZ> <numberBytesPerComponent> <numberOfComponents> <endian> <filename>","read a raw image data");
 
@@ -721 +723 @@
     while(arguments.read("--cpu-tf")) { gpuTransferFunction = false; }
 
+    double sampleDensityWhenMoving = 0.0;
+    while(arguments.read("--sdwm", sampleDensityWhenMoving)) {}
+
+    while(arguments.read("--lod")) { sampleDensityWhenMoving = 0.02; }
+
     double sequenceLength = 10.0;
     while(arguments.read("--sequence-duration", sequenceLength) ||
-        arguments.read("--sd", sequenceLength)) {}
+          arguments.read("--sd", sequenceLength)) {}
 
     typedef std::list< osg::ref_ptr<osg::Image> > Images;
@@ -1119 +1126 @@
         osgVolume::AlphaFuncProperty* ap = new osgVolume::AlphaFuncProperty(alphaFunc);
         osgVolume::SampleDensityProperty* sd = new osgVolume::SampleDensityProperty(0.005);
-        osgVolume::SampleDensityWhenMovingProperty* sdwm = new osgVolume::SampleDensityWhenMovingProperty(0.02);
+        osgVolume::SampleDensityWhenMovingProperty* sdwm = sampleDensityWhenMoving!=0.0 ? new osgVolume::SampleDensityWhenMovingProperty(sampleDensityWhenMoving) : 0;
         osgVolume::TransparencyProperty* tp = new osgVolume::TransparencyProperty(1.0);
         osgVolume::TransferFunctionProperty* tfp = transferFunction.valid() ? new osgVolume::TransferFunctionProperty(transferFunction.get()) : 0;
@@ -1128 +1135 @@
             cp->addProperty(ap);
             cp->addProperty(sd);
-            cp->addProperty(sdwm);
             cp->addProperty(tp);
+            if (sdwm) cp->addProperty(sdwm);
             if (tfp) cp->addProperty(tfp);
 
@@ -1142 +1149 @@
             cp->addProperty(tp);
             cp->addProperty(new osgVolume::LightingProperty);
+            if (sdwm) cp->addProperty(sdwm);
             if (tfp) cp->addProperty(tfp);
 
@@ -1153 +1161 @@
             cp->addProperty(tp);
             cp->addProperty(new osgVolume::IsoSurfaceProperty(alphaFunc));
+            if (sdwm) cp->addProperty(sdwm);
             if (tfp) cp->addProperty(tfp);
 
@@ -1165 +1174 @@
             cp->addProperty(tp);
             cp->addProperty(new osgVolume::MaximumIntensityProjectionProperty);
+            if (sdwm) cp->addProperty(sdwm);
             if (tfp) cp->addProperty(tfp);