From 6173a948bed01df05ab4e36cdb5c65e64ea3bffc Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Thu, 10 Nov 2011 14:21:11 +0000 Subject: [PATCH] no message --- .../volumerenderermanagerdata.cxx | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx index 5805818..d25f4a8 100644 --- a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx +++ b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx @@ -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 -- 2.45.2