Commit bc6c71ea authored by T.J. Corona's avatar T.J. Corona

Deprecating vtkVolumeRaycastMapper and vtkVolumeTextureMapper2D/3D.

parent bac2c36f
Pipeline #2155 passed with stage
......@@ -24,12 +24,16 @@ include(${VTK_USE_FILE})
add_executable(Medical1 MACOSX_BUNDLE Medical1.cxx)
add_executable(Medical2 MACOSX_BUNDLE Medical2.cxx)
add_executable(Medical3 MACOSX_BUNDLE Medical3.cxx)
if (NOT VTK_LEGACY_REMOVE)
add_executable(Medical4 MACOSX_BUNDLE Medical4.cxx)
endif()
target_link_libraries(Medical1 ${VTK_LIBRARIES})
target_link_libraries(Medical2 ${VTK_LIBRARIES})
target_link_libraries(Medical3 ${VTK_LIBRARIES})
if (NOT VTK_LEGACY_REMOVE)
target_link_libraries(Medical4 ${VTK_LIBRARIES})
endif()
add_executable(GenerateModelsFromLabels MACOSX_BUNDLE GenerateModelsFromLabels.cxx)
add_executable(GenerateCubesFromLabels MACOSX_BUNDLE GenerateCubesFromLabels.cxx)
......@@ -43,13 +47,19 @@ if(BUILD_TESTING)
set(TestMedical1_ARGS ${VTK_TEST_DATA_DIR}/Data/headsq/quarter)
set(TestMedical2_ARGS ${VTK_TEST_DATA_DIR}/Data/headsq/quarter)
set(TestMedical3_ARGS ${VTK_TEST_DATA_DIR}/Data/headsq/quarter)
if (NOT VTK_LEGACY_REMOVE)
set(TestMedical4_ARGS ${VTK_TEST_DATA_DIR}/Data/headsq/quarter)
endif()
vtk_add_test_cxx(${vtk-example}CxxTests tests
TestMedical1.cxx
TestMedical2.cxx
TestMedical3.cxx
)
if (NOT VTK_LEGACY_REMOVE)
vtk_add_test_cxx(${vtk-example}CxxTests tests
TestMedical4.cxx
)
endif()
vtk_test_cxx_executable(${vtk-example}CxxTests tests
RENDERING_FACTORY
)
......
......@@ -111,9 +111,14 @@ endif()
# These tests depend on volume rendering classes not build for OpenGL2
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL")
vtk_add_test_cxx(${vtk-module}CxxTests tests
TestButtonWidget.cxx
TestImageCroppingRegionsWidget.cxx
)
if(NOT VTK_LEGACY_REMOVE)
vtk_add_test_cxx(${vtk-module}CxxTests tests
TestButtonWidget.cxx
)
endif()
endif()
set(all_tests
......
......@@ -51,6 +51,28 @@ set_source_files_properties(
ABSTRACT
)
if (VTK_LEGACY_REMOVE)
set_source_files_properties(
vtkVolumeRayCastCompositeFunction.h
vtkVolumeRayCastCompositeFunction.cxx
vtkVolumeRayCastFunction.h
vtkVolumeRayCastFunction.cxx
vtkVolumeRayCastIsosurfaceFunction.h
vtkVolumeRayCastIsosurfaceFunction.cxx
vtkVolumeRayCastMIPFunction.h
vtkVolumeRayCastMIPFunction.cxx
vtkVolumeRayCastMapper.h
vtkVolumeRayCastMapper.cxx
vtkVolumeTextureMapper2D.h
vtkVolumeTextureMapper2D.cxx
vtkVolumeTextureMapper3D.h
vtkVolumeTextureMapper3D.cxx
PROPERTIES
WRAP_EXCLUDE 1
WRAP_EXCLUDE_PYTHON 1
)
endif()
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
set_source_files_properties(
vtkGPUVolumeRayCastMapper.cxx APPEND PROPERTIES
......
......@@ -40,12 +40,16 @@ set (VolumeOpenGLCxxTests
TestGPURayCastCompositeShadeMask.cxx # This test depends on vtkOpenGLExtensionManager
TestHAVSVolumeMapper.cxx
TestProjectedHexahedra.cxx
TestProp3DFollower.cxx
TestTM3DLightComponents.cxx
ZsweepConcavities.cxx
volProt.cxx
)
if (NOT VTK_LEGACY_REMOVE)
list (APPEND VolumeOpenGLCxxTests
TestProp3DFollower.cxx
TestTM3DLightComponents.cxx
volProt.cxx)
endif()
# These tests are only built for the OpenGL2 backend
set (VolumeOpenGL2CxxTests
TestGPURayCastCameraInside.cxx
......@@ -96,15 +100,19 @@ vtk_test_cxx_executable(${vtk-module}CxxTests tests
RENDERING_FACTORY
ExerciseUnstructuredGridRayCastMapper.cxx)
if(NOT VTK_TEST_TIMEOUT_TestProp3DFollower)
set(VTK_TEST_TIMEOUT_TestProp3DFollower 100)
if (NOT VTK_LEGACY_REMOVE)
if(NOT VTK_TEST_TIMEOUT_TestProp3DFollower)
set(VTK_TEST_TIMEOUT_TestProp3DFollower 100)
endif()
set_tests_properties(${vtk-module}Cxx-TestProp3DFollower
PROPERTIES TIMEOUT ${VTK_TEST_TIMEOUT_TestProp3DFollower})
endif()
set_tests_properties(${vtk-module}Cxx-TestProp3DFollower
PROPERTIES TIMEOUT ${VTK_TEST_TIMEOUT_TestProp3DFollower})
# Allow local customization of timeout for this test.
if(NOT VTK_TEST_TIMEOUT_TestTM3DLightComponents)
set(VTK_TEST_TIMEOUT_TestTM3DLightComponents 120)
if (NOT VTK_LEGACY_REMOVE)
# Allow local customization of timeout for this test.
if(NOT VTK_TEST_TIMEOUT_TestTM3DLightComponents)
set(VTK_TEST_TIMEOUT_TestTM3DLightComponents 120)
endif()
set_tests_properties(${vtk-module}Cxx-TestTM3DLightComponents
PROPERTIES TIMEOUT ${VTK_TEST_TIMEOUT_TestTM3DLightComponents})
endif()
set_tests_properties(${vtk-module}Cxx-TestTM3DLightComponents
PROPERTIES TIMEOUT ${VTK_TEST_TIMEOUT_TestTM3DLightComponents})
......@@ -129,10 +129,10 @@ int TestSmartVolumeMapper(int argc,
renWin->Render();
// 3D texture mode. For coverage.
#ifndef VTK_OPENGL2
#if !defined(VTK_LEGACY_REMOVE) && !defined(VTK_OPENGL2)
volumeMapper->SetRequestedRenderModeToRayCastAndTexture();
renWin->Render();
#endif
#endif // VTK_LEGACY_REMOVE
// Software mode, for coverage. It also makes sure we will get the same
// regression image on all platforms.
......
# These tests are built under all conditions
set (GenericVolumePythonTests
cursor3D.py
gaussian.py
TestFixedPointRayCasterLinearCropped.py,NO_RT
TestFixedPointRayCasterLinear.py,NO_RT
TestFixedPointRayCasterNearestCropped.py,NO_RT
TestFixedPointRayCasterNearest.py,NO_RT
volRCClipPlanes.py
volRCCropRegions.py
volRCRotateClip.py
VolumePickerCrop.py
VolumePicker.py,NO_RT)
TestFixedPointRayCasterNearest.py,NO_RT)
if (NOT VTK_LEGACY_REMOVE)
list(APPEND GenericVolumePythonTests
cursor3D.py
gaussian.py
volRCClipPlanes.py
volRCCropRegions.py
volRCRotateClip.py
VolumePicker.py,NO_RT
VolumePickerCrop.py)
endif()
# These tests are only built when the rendering backend is OpenGL
set (VolumeOpenGLPythonTests
TestBunykRayCastFunction.py
TestLODProp3D.py
TestPTZSweep.py
volTM2DCropRegions.py
volTM2DRotateClip.py
volTM3DCompressedCropRegions.py
volTM3DCropRegions.py
volTM3DRotateClip.py
VolumeOutlineSourceClipped.py
VolumeOutlineSource.py)
TestPTZSweep.py)
if (NOT VTK_LEGACY_REMOVE)
list(APPEND VolumeOpenGLPythonTests
TestLODProp3D.py
volTM2DRotateClip.py
volTM2DCropRegions.py
volTM3DCropRegions.py
volTM3DCompressedCropRegions.py
volTM3DRotateClip.py
VolumeOutlineSourceClipped.py
VolumeOutlineSource.py)
endif()
# These tests are only built when the rendering backend is OpenGL2
set (VolumeOpenGL2PythonTests
......@@ -41,10 +49,12 @@ else ()
${GenericVolumePythonTests}
${VolumeOpenGLPythonTests}
)
set_tests_properties(vtkRenderingVolumePython-volTM3DCompressedCropRegions
PROPERTIES TIMEOUT 250)
set_tests_properties(vtkRenderingVolumePython-volTM3DCropRegions
PROPERTIES TIMEOUT 250)
set_tests_properties(vtkRenderingVolumePython-volTM3DRotateClip
PROPERTIES TIMEOUT 80)
if (NOT VTK_LEGACY_REMOVE)
set_tests_properties(vtkRenderingVolumePython-volTM3DCompressedCropRegions
PROPERTIES TIMEOUT 250)
set_tests_properties(vtkRenderingVolumePython-volTM3DCropRegions
PROPERTIES TIMEOUT 250)
set_tests_properties(vtkRenderingVolumePython-volTM3DRotateClip
PROPERTIES TIMEOUT 80)
endif()
endif ()
# These tests are built under all conditions
set (GenericVolumeTclTests
gaussian.tcl
TestFixedPointRayCasterLinearCropped.tcl
TestFixedPointRayCasterLinear.tcl
TestFixedPointRayCasterNearestCropped.tcl
TestFixedPointRayCasterNearest.tcl
)
if (NOT VTK_LEGACY_REMOVE)
list (APPEND GENERICVolumeTclTests
gaussian.tcl
volRCClipPlanes.tcl
volRCCropRegions.tcl
volRCRotateClip.tcl
VolumePickerCrop.tcl
VolumePicker.tcl
)
endif()
# These tests are only built when the rendering backend is OpenGL
set (VolumeOpenGLTclTests
TestBunykRayCastFunction.tcl
TestLODProp3D.tcl
TestPTZSweep.tcl
volTM2DCropRegions.tcl
volTM2DRotateClip.tcl
volTM3DCompressedCropRegions.tcl
volTM3DCropRegions.tcl
volTM3DRotateClip.tcl
VolumeOutlineSourceClipped.tcl
VolumeOutlineSource.tcl
)
if (NOT VTK_LEGACY_REMOVE)
list (APPEND VolumeOpenGLTclTests
TestLODProp3D.tcl
volTM2DCropRegions.tcl
volTM2DRotateClip.tcl
volTM3DCompressedCropRegions.tcl
volTM3DCropRegions.tcl
volTM3DRotateClip.tcl
VolumeOutlineSourceClipped.tcl
VolumeOutlineSource.tcl
)
endif()
if ("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
vtk_add_test_tcl(
${GenericVolumeTclTests}
......
......@@ -14,6 +14,8 @@
=========================================================================*/
#include "vtkVolumeRayCastCompositeFunction.h"
#if !defined(VTK_LEGACY_REMOVE)
#include "vtkObjectFactory.h"
#include "vtkPiecewiseFunction.h"
#include "vtkVolume.h"
......@@ -2345,6 +2347,7 @@ void vtkCastRay_TrilinVertices_Shaded( T *data_ptr, vtkVolumeRayCastDynamicInfo
vtkVolumeRayCastCompositeFunction::vtkVolumeRayCastCompositeFunction()
{
this->CompositeMethod = VTK_COMPOSITE_INTERPOLATE_FIRST;
VTK_LEGACY_BODY(vtkVolumeRayCastCompositeFunction::vtkVolumeRayCastCompositeFunction,"VTK 7.0");
}
// Destruct the vtkVolumeRayCastCompositeFunction
......@@ -2528,6 +2531,7 @@ void vtkVolumeRayCastCompositeFunction::PrintSelf(ostream& os, vtkIndent indent)
}
#endif // VTK_LEGACY_REMOVE
......
......@@ -22,6 +22,7 @@
// .SECTION See Also
// vtkVolumeRayCastMapper vtkVolumeProperty vtkVolume
// @deprecated
#ifndef vtkVolumeRayCastCompositeFunction_h
#define vtkVolumeRayCastCompositeFunction_h
......@@ -29,6 +30,7 @@
#include "vtkRenderingVolumeModule.h" // For export macro
#include "vtkVolumeRayCastFunction.h"
#if !defined(VTK_LEGACY_REMOVE)
#define VTK_COMPOSITE_CLASSIFY_FIRST 0
#define VTK_COMPOSITE_INTERPOLATE_FIRST 1
......@@ -75,4 +77,5 @@ private:
};
#endif // VTK_LEGACY_REMOVE
#endif
......@@ -14,6 +14,8 @@
=========================================================================*/
#include "vtkVolumeRayCastFunction.h"
#if !defined(VTK_LEGACY_REMOVE)
#include "vtkEncodedGradientEstimator.h"
#include "vtkEncodedGradientShader.h"
#include "vtkImageData.h"
......@@ -133,3 +135,5 @@ void vtkVolumeRayCastFunction::PrintSelf(ostream& os, vtkIndent indent)
{
this->Superclass::PrintSelf(os,indent);
}
#endif // VTK_LEGACY_REMOVE
......@@ -24,6 +24,7 @@
// .SECTION See Also
// vtkVolumeRayCastCompositeFunction vtkVolumeRayCastMIPFunction
// vtkVolumeRayCastIsosurfaceFunction vtkVolumeRayCastMapper
// @deprecated
#ifndef vtkVolumeRayCastFunction_h
#define vtkVolumeRayCastFunction_h
......@@ -35,6 +36,7 @@ class vtkRenderer;
class vtkVolume;
class vtkVolumeRayCastMapper;
#if !defined(VTK_LEGACY_REMOVE)
// Define a couple of structures we need to hold all the important information
// This first structure hold the dynamic information - stuff that changes per
// ray
......@@ -155,7 +157,10 @@ public:
virtual float GetZeroOpacityThreshold( vtkVolume *vol )=0;
protected:
vtkVolumeRayCastFunction() {}
vtkVolumeRayCastFunction()
{
VTK_LEGACY_BODY(vtkVolumeRayCastMapper::vtkVolumeRayCastMapper,"VTK 7.0");
}
~vtkVolumeRayCastFunction() {}
//BTX
......@@ -171,5 +176,5 @@ private:
vtkVolumeRayCastFunction(const vtkVolumeRayCastFunction&); // Not implemented.
void operator=(const vtkVolumeRayCastFunction&); // Not implemented.
};
#endif // VTK_LEGACY_REMOVE
#endif
......@@ -14,6 +14,8 @@
=========================================================================*/
#include "vtkVolumeRayCastIsosurfaceFunction.h"
#if !defined(VTK_LEGACY_REMOVE)
#include "vtkCamera.h"
#include "vtkColorTransferFunction.h"
#include "vtkMath.h"
......@@ -1039,6 +1041,7 @@ void vtkCastRay_Trilin ( vtkVolumeRayCastIsosurfaceFunction *cast_function,
vtkVolumeRayCastIsosurfaceFunction::vtkVolumeRayCastIsosurfaceFunction()
{
this->IsoValue = 0;
VTK_LEGACY_BODY(vtkVolumeRayCastIsosurfaceFunction::vtkVolumeRayCastIsosurfaceFunction,"VTK 7.0");
}
// Destruct the vtkVolumeRayCastIsosurfaceFunction
......@@ -1138,4 +1141,5 @@ void vtkVolumeRayCastIsosurfaceFunction::PrintSelf(ostream& os, vtkIndent indent
os << indent << "Isosurface Value: " << this->IsoValue << "\n";
}
#endif // VTK_LEGACY_REMOVE
......@@ -26,6 +26,7 @@
// vtkVolumeRayCastFunction vtkVolumeRayCastMapper vtkVolumeProperty
// vtkVolumeRayCastCompositeFunction vtkVolumeRayCastMIPFunction
// vtkVolume vtkVolumeProperty
// @deprecated
#ifndef vtkVolumeRayCastIsosurfaceFunction_h
#define vtkVolumeRayCastIsosurfaceFunction_h
......@@ -33,6 +34,7 @@
#include "vtkRenderingVolumeModule.h" // For export macro
#include "vtkVolumeRayCastFunction.h"
#if !defined(VTK_LEGACY_REMOVE)
class VTKRENDERINGVOLUME_EXPORT vtkVolumeRayCastIsosurfaceFunction : public vtkVolumeRayCastFunction
{
public:
......@@ -80,4 +82,5 @@ private:
vtkVolumeRayCastIsosurfaceFunction(const vtkVolumeRayCastIsosurfaceFunction&); // Not implemented.
void operator=(const vtkVolumeRayCastIsosurfaceFunction&); // Not implemented.
};
#endif // VTK_LEGACY_REMOVE
#endif
......@@ -13,6 +13,9 @@
=========================================================================*/
#include "vtkVolumeRayCastMIPFunction.h"
#if !defined(VTK_LEGACY_REMOVE)
#include "vtkVolumeRayCastMapper.h"
#include "vtkVolume.h"
#include "vtkObjectFactory.h"
......@@ -438,6 +441,8 @@ void vtkCastMaxOpacityRay( T *data_ptr, vtkVolumeRayCastDynamicInfo *dynamicInfo
vtkVolumeRayCastMIPFunction::vtkVolumeRayCastMIPFunction()
{
this->MaximizeMethod = VTK_MAXIMIZE_SCALAR_VALUE;
VTK_LEGACY_BODY(vtkVolumeRayCastMIPFunction::vtkVolumeRayCastMIPFunction,
"VTK 7.0");
}
// Destruct the vtkVolumeRayCastMIPFunction
......@@ -535,3 +540,5 @@ void vtkVolumeRayCastMIPFunction::PrintSelf(ostream& os, vtkIndent indent)
os << indent << "Maximize Method: " << this->GetMaximizeMethodAsString()
<< "\n";
}
#endif // VTK_LEGACY_REMOVE
......@@ -27,6 +27,7 @@
// vtkVolumeRayCastFunction vtkVolumeRayCastMapper vtkVolumeProperty
// vtkVolumeRayCastCompositeFunction vtkVolumeRayCastIsosurfaceFunction
// vtkVolume vtkVolumeProperty
// @deprecated
#ifndef vtkVolumeRayCastMIPFunction_h
#define vtkVolumeRayCastMIPFunction_h
......@@ -34,6 +35,8 @@
#include "vtkRenderingVolumeModule.h" // For export macro
#include "vtkVolumeRayCastFunction.h"
#if !defined(VTK_LEGACY_REMOVE)
#define VTK_MAXIMIZE_SCALAR_VALUE 0
#define VTK_MAXIMIZE_OPACITY 1
......@@ -86,5 +89,5 @@ private:
};
#endif // VTK_LEGACY_REMOVE
#endif
......@@ -14,6 +14,8 @@
=========================================================================*/
#include "vtkVolumeRayCastMapper.h"
#if !defined(VTK_LEGACY_REMOVE)
#include "vtkCamera.h"
#include "vtkDataArray.h"
#include "vtkEncodedGradientEstimator.h"
......@@ -112,6 +114,8 @@ vtkVolumeRayCastMapper::vtkVolumeRayCastMapper()
this->ImageDisplayHelper = vtkRayCastImageDisplayHelper::New();
this->IntermixIntersectingGeometry = 1;
VTK_LEGACY_BODY(vtkVolumeRayCastMapper::vtkVolumeRayCastMapper,"VTK 7.0");
}
// Destruct a vtkVolumeRayCastMapper - clean up any memory used
......@@ -2021,3 +2025,5 @@ void vtkVolumeRayCastMapper::ReportReferences(vtkGarbageCollector* collector)
vtkGarbageCollectorReport(collector, this->GradientEstimator,
"GradientEstimator");
}
#endif // VTK_LEGACY_REMOVE
......@@ -19,6 +19,7 @@
// .SECTION see also
// vtkVolumeMapper
// @deprecated
#ifndef vtkVolumeRayCastMapper_h
#define vtkVolumeRayCastMapper_h
......@@ -36,11 +37,13 @@ class vtkPlaneCollection;
class vtkRenderer;
class vtkTimerLog;
class vtkVolume;
class vtkVolumeRayCastFunction;
class vtkVolumeTransform;
class vtkTransform;
class vtkRayCastImageDisplayHelper;
#if !defined(VTK_LEGACY_REMOVE)
class vtkVolumeRayCastFunction;
// Macro for tri-linear interpolation - do four linear interpolations on
// edges, two linear interpolations between pairs of edges, then a final
// interpolation between faces
......@@ -262,6 +265,6 @@ private:
vtkVolumeRayCastMapper(const vtkVolumeRayCastMapper&); // Not implemented.
void operator=(const vtkVolumeRayCastMapper&); // Not implemented.
};
#endif // VTK_LEGACY_REMOVE
#endif
......@@ -14,6 +14,8 @@
=========================================================================*/
#include "vtkVolumeTextureMapper2D.h"
#if !defined(VTK_LEGACY_REMOVE)
#include "vtkCamera.h"
#include "vtkDataArray.h"
#include "vtkObjectFactory.h"
......@@ -475,6 +477,8 @@ vtkVolumeTextureMapper2D::vtkVolumeTextureMapper2D()
this->MaximumStorageSize = 0;
this->Texture = NULL;
this->TextureSize = 0;
VTK_LEGACY_BODY(vtkVolumeTextureMapper2D::vtkVolumeTextureMapper2D,"VTK 7.0");
}
vtkVolumeTextureMapper2D::~vtkVolumeTextureMapper2D()
......@@ -1150,4 +1154,4 @@ void vtkVolumeTextureMapper2D::PrintSelf(ostream& os, vtkIndent indent)
this->Superclass::PrintSelf(os,indent);
}
#endif // VTK_LEGACY_REMOVE
......@@ -20,6 +20,7 @@
// .SECTION see also
// vtkVolumeMapper
// @deprecated
#ifndef vtkVolumeTextureMapper2D_h
#define vtkVolumeTextureMapper2D_h
......@@ -27,6 +28,7 @@
#include "vtkRenderingVolumeModule.h" // For export macro
#include "vtkVolumeTextureMapper.h"
#if !defined(VTK_LEGACY_REMOVE)
class VTKRENDERINGVOLUME_EXPORT vtkVolumeTextureMapper2D : public vtkVolumeTextureMapper
{
public:
......@@ -122,7 +124,7 @@ private:
void operator=(const vtkVolumeTextureMapper2D&); // Not implemented.
};
#endif // VTK_LEGACY_REMOVE
#endif
......@@ -14,6 +14,8 @@
=========================================================================*/
#include "vtkVolumeTextureMapper3D.h"
#if !defined(VTK_LEGACY_REMOVE)
#include "vtkCamera.h"
#include "vtkColorTransferFunction.h"
#include "vtkDataArray.h"
......@@ -676,6 +678,8 @@ vtkVolumeTextureMapper3D::vtkVolumeTextureMapper3D()
this->UseCompressedTexture = false;
this->SupportsNonPowerOfTwoTextures = false;
VTK_LEGACY_BODY(vtkVolumeTextureMapper3D::vtkVolumeTextureMapper3D,"VTK 7.0");
}
//-----------------------------------------------------------------------------
......@@ -1533,4 +1537,5 @@ int vtkVolumeTextureMapper3D::GetNumberOfScalarComponents(vtkImageData *input)
}
//-----------------------------------------------------------------------------
#endif // VTK_LEGACY_REMOVE
......@@ -69,6 +69,7 @@
//
// .SECTION see also
// vtkVolumeMapper
// @deprecated
#ifndef vtkVolumeTextureMapper3D_h
#define vtkVolumeTextureMapper3D_h
......@@ -80,7 +81,7 @@ class vtkImageData;
class vtkColorTransferFunction;
class vtkPiecewiseFunction;
class vtkVolumeProperty;
#if !defined(VTK_LEGACY_REMOVE)
class VTKRENDERINGVOLUME_EXPORT vtkVolumeTextureMapper3D : public vtkVolumeMapper
{
public:
......@@ -247,7 +248,7 @@ private:
void operator=(const vtkVolumeTextureMapper3D&); // Not implemented.
};
#endif // VTK_LEGACY_REMOVE
#endif
......
......@@ -85,16 +85,32 @@ foreach(file ${shader_files})
)
endforeach()
if (VTK_LEGACY_REMOVE)
set_source_files_properties(
vtkOpenGLVolumeTextureMapper2D.h
vtkOpenGLVolumeTextureMapper2D.cxx
vtkOpenGLVolumeTextureMapper3D.h
vtkOpenGLVolumeTextureMapper3D.cxx
PROPERTIES
WRAP_EXCLUDE 1
WRAP_EXCLUDE_PYTHON 1
)
endif()
# Nwo for the object factory.
set(opengl_overrides
HAVSVolumeMapper
ProjectedAAHexahedraMapper
ProjectedTetrahedraMapper
RayCastImageDisplayHelper
VolumeTextureMapper2D
VolumeTextureMapper3D
)
if (NOT VTK_LEGACY_REMOVE)
list (APPEND opengl_overrides
VolumeTextureMapper2D
VolumeTextureMapper3D)
endif()
if(NOT Module_vtkRenderingVolumeOpenGLNew)
list(APPEND opengl_overrides GPUVolumeRayCastMapper)
endif()
......
......@@ -14,6 +14,8 @@
=========================================================================*/
#include "vtkOpenGLVolumeTextureMapper2D.h"
#if !defined(VTK_LEGACY_REMOVE)
#include "vtkMatrix4x4.h"
#include "vtkObjectFactory.h"
#include "vtkTimerLog.h"
......@@ -26,6 +28,7 @@ vtkStandardNewMacro(vtkOpenGLVolumeTextureMapper2D);
vtkOpenGLVolumeTextureMapper2D::vtkOpenGLVolumeTextureMapper2D()
{
VTK_LEGACY_BODY(vtkOpenGLVolumeTextureMapper2D::vtkOpenGLVolumeTextureMapper2D,"VTK 7.0");
}
vtkOpenGLVolumeTextureMapper2D::~vtkOpenGLVolumeTextureMapper2D()
......@@ -184,3 +187,5 @@ void vtkOpenGLVolumeTextureMapper2D::PrintSelf(ostream& os, vtkIndent indent)
{
this->Superclass::PrintSelf(os,indent);
}
#endif // VTK_LEGACY_REMOVE
......@@ -20,6 +20,7 @@
// .SECTION see also
// vtkVolumeMapper
// @deprecated
#ifndef vtkOpenGLVolumeTextureMapper2D_h
#define vtkOpenGLVolumeTextureMapper2D_h
......@@ -27,6 +28,7 @@
#include "vtkRenderingVolumeOpenGLModule.h" // For export macro
#include "vtkVolumeTextureMapper2D.h"
#if !defined(VTK_LEGACY_REMOVE)
class VTKRENDERINGVOLUMEOPENGL_EXPORT vtkOpenGLVolumeTextureMapper2D
: public vtkVolumeTextureMapper2D
{
......@@ -57,5 +59,5 @@ private:
vtkOpenGLVolumeTextureMapper2D(const vtkOpenGLVolumeTextureMapper2D&); // Not implemented.
void operator=(const vtkOpenGLVolumeTextureMapper2D&); // Not implemented.
};
#endif // VTK_LEGACY_REMOVE
#endif
......@@ -15,6 +15,8 @@
#include "vtkWindows.h"
#include "vtkOpenGLVolumeTextureMapper3D.h"
#if !defined(VTK_LEGACY_REMOVE)
#include "vtkImageData.h"
#include "vtkMatrix4x4.h"
#include "vtkObjectFactory.h"
......@@ -52,6 +54,7 @@ vtkOpenGLVolumeTextureMapper3D::vtkOpenGLVolumeTextureMapper3D()
this->AlphaLookupIndex = 0;
this->RenderWindow = NULL;
this->SupportsCompressedTexture = false;
VTK_LEGACY_BODY(vtkOpenGLVolumeTextureMapper3D::vtkOpenGLVolumeTextureMapper3D,"VTK 7.0");
}
vtkOpenGLVolumeTextureMapper3D::~vtkOpenGLVolumeTextureMapper3D()
......@@ -2120,3 +2123,5 @@ void vtkOpenGLVolumeTextureMapper3D::PrintSelf(ostream& os, vtkIndent indent)
this->Superclass::PrintSelf(os,indent);
}
#endif // VTK_LEGACY_REMOVE
......@@ -20,6 +20,7 @@
// .SECTION see also
// vtkVolumeTextureMapper3D vtkVolumeMapper
// @deprecated
#ifndef vtkOpenGLVolumeTextureMapper3D_h
#define vtkOpenGLVolumeTextureMapper3D_h
......@@ -31,6 +32,7 @@
class vtkRenderWindow;
class vtkVolumeProperty;
#if !defined(VTK_LEGACY_REMOVE)
class VTKRENDERINGVOLUMEOPENGL_EXPORT vtkOpenGLVolumeTextureMapper3D
: public vtkVolumeTextureMapper3D
{
......@@ -156,5 +158,5 @@ private:
vtkOpenGLVolumeTextureMapper3D(const vtkOpenGLVolumeTextureMapper3D&); // Not implemented.
void operator=(const vtkOpenGLVolumeTextureMapper3D&); // Not implemented.
};
#endif // VTK_LEGACY_REMOVE
#endif
......@@ -57,19 +57,14 @@ vtkSmartVolumeMapper::vtkSmartVolumeMapper()
// Create all the mappers we might need
this->RayCastMapper = vtkFixedPointVolumeRayCastMapper::New();
// opengl2 back end only has fixed point mapper right now
#ifdef VTK_OPENGL2
this->GPUMapper = NULL;
this->TextureMapper = NULL;
this->GPULowResMapper = NULL;
#else
this->GPUMapper = vtkGPUVolumeRayCastMapper::New();
this->MaxMemoryInBytes=this->GPUMapper->GetMaxMemoryInBytes();