]> Creatis software - creaMaracasVisu.git/commitdiff
no message
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Thu, 10 Nov 2011 14:21:11 +0000 (14:21 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Thu, 10 Nov 2011 14:21:11 +0000 (14:21 +0000)
lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx

index 5805818a311b170f25d0ce263ac4e7b0c089c842..d25f4a8c98f8779adab20ac9ecfc03d2facbe4c8 100644 (file)
@@ -91,25 +91,21 @@ void VolumeRendererManagerData::Initialize(vtkImageData* vol, std::string datana
        VolumeMapper = 0;
        
        
-#if VTK_MAJOR_VERSION >= 5
-    #if VTK_MINOR_VERSION >= 6
-       vtkGPUVolumeRayCastMapper * volumeMappergpu = vtkGPUVolumeRayCastMapper::New();
-//         vtkSmartVolumeMapper * volumeMappergpu = vtkSmartVolumeMapper::New();
+#if ( VTK_MAJOR_VERSION >= 5 && VTK_MINOR_VERSION >= 8  )
+       
+//EED 10/Nov/2011       vtkGPUVolumeRayCastMapper * volumeMappergpu = vtkGPUVolumeRayCastMapper::New();
+         vtkSmartVolumeMapper * volumeMappergpu = vtkSmartVolumeMapper::New();
+       
        volumeMappergpu->AutoAdjustSampleDistancesOn();
        VolumeMapper = volumeMappergpu;
-    #endif
 #else
-
-       _volumeProperty->SetColor(_ctfun);
-
-
-       _compositeFunction                                                              = vtkVolumeRayCastCompositeFunction::New();
-       _MIPFunction                                                                    = vtkVolumeRayCastMIPFunction::New();
-       vtkVolumeRayCastMapper* volumeMapper                                                                    = vtkVolumeRayCastMapper::New();
-       volumeMapper->SetVolumeRayCastFunction(_compositeFunction);
-               volumeMapper->AutoAdjustSampleDistancesOn();
-               VolumeMapper                                                                    = volumeMapper;
+               _volumeProperty->SetColor(_ctfun);
+               _compositeFunction                                                                                      = vtkVolumeRayCastCompositeFunction::New();
+               _MIPFunction                                                                                            = vtkVolumeRayCastMIPFunction::New();
+               vtkVolumeRayCastMapper* volumeMapper                                            = vtkVolumeRayCastMapper::New();
+               volumeMapper->SetVolumeRayCastFunction(_compositeFunction);
+               volumeMapper->AutoAdjustSampleDistancesOn();
+               VolumeMapper                                                                                            = volumeMapper;
 #endif