X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=packages%2Fvtk%2Fsrc%2FbbvtkVolumeRenderer.cxx;h=f0674b2db32db3a2e97376dc8741dfbd95ea2957;hb=ce89f878310f2d109f9e71f5632377b7c14a10fe;hp=0273d3c66215bde502cdc8e34c451fdaa62f6e11;hpb=17ac9460f5ea5600d1065fbe3ee4ad826d7bb4fc;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkVolumeRenderer.cxx b/packages/vtk/src/bbvtkVolumeRenderer.cxx
index 0273d3c..f0674b2 100644
--- a/packages/vtk/src/bbvtkVolumeRenderer.cxx
+++ b/packages/vtk/src/bbvtkVolumeRenderer.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbvtkVolumeRenderer.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/05/15 14:58:01 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2009/10/16 08:52:13 $
+  Version:   $Revision: 1.5 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -58,6 +58,7 @@ namespace bbvtk
 	   mMapper			= NULL;
 	   mVolume			= NULL;
 	   bbSetInputColorFunction(0);
+		bbSetInputColorFunction1(0);
 	   bbSetInputOpacityFunction(0);
    }
 	
@@ -75,8 +76,18 @@ namespace bbvtk
     mRayCastFunction = vtkVolumeRayCastCompositeFunction::New();
     mMapper = vtkVolumeRayCastMapper::New();
 	   mMapper->SetVolumeRayCastFunction(mRayCastFunction);
+	   mMapper->AutoAdjustSampleDistancesOn();
+
+	   _volumeProperty = vtkVolumeProperty::New();	
+	_volumeProperty->SetInterpolationTypeToLinear();
+	_volumeProperty->ShadeOn();
+	_volumeProperty->DisableGradientOpacityOn();	
+	//_volumeProperty->SetColor(_ctfun);
+	//_volumeProperty->SetScalarOpacity(_tfun );
+
     mVolume = vtkVolume::New();
 	   mVolume->SetMapper(mMapper);
+	   mVolume->SetProperty(_volumeProperty );
 
     //  mMapper->ScalarVisibilityOff();
     //    mMapper->ImmediateModeRenderingOn();
@@ -113,12 +124,21 @@ namespace bbvtk
 	 mMapper->SetInput( bbGetInputIn() );
 	 changed = true;
        }
-     if ( ( bbGetInputStatus("ColorFunction") != bbtk::UPTODATE ) &&
+
+	   if ( ( bbGetInputStatus("ColorFunction") != bbtk::UPTODATE ) &&
 	  ( bbGetInputColorFunction() != 0 ) )
        {
 	 mVolume->GetProperty()->SetColor( bbGetInputColorFunction() );
 	 changed = true;
        }
+
+     if ( ( bbGetInputStatus("ColorFunction1") != bbtk::UPTODATE ) &&
+	  ( bbGetInputColorFunction1() != 0 ) )
+       {
+	 mVolume->GetProperty()->SetColor( bbGetInputColorFunction1() );
+	 changed = true;
+       }
+
      if ( ( bbGetInputStatus("OpacityFunction") != bbtk::UPTODATE ) &&
 	  ( bbGetInputOpacityFunction() != 0 ) )
        {