Commit a3b3d02d authored by David E. DeMarle's avatar David E. DeMarle

Update to use the name of the new unified ray tracing module

parent 92813d0d
...@@ -530,7 +530,7 @@ else() ...@@ -530,7 +530,7 @@ else()
TruchasReader.xml) TruchasReader.xml)
endif() endif()
if(PARAVIEW_USE_OSPRAY) if(PARAVIEW_USE_RAYTRACING)
list(APPEND TESTS_WITH_BASELINES list(APPEND TESTS_WITH_BASELINES
OSPRay.xml) OSPRay.xml)
endif() endif()
......
...@@ -166,7 +166,15 @@ option(PARAVIEW_BUILD_DEVELOPER_DOCUMENTATION "Build ParaView C++/Python docs" O ...@@ -166,7 +166,15 @@ option(PARAVIEW_BUILD_DEVELOPER_DOCUMENTATION "Build ParaView C++/Python docs" O
option(PARAVIEW_BUILD_QT_GUI "Enable ParaView Qt-based client" ON) option(PARAVIEW_BUILD_QT_GUI "Enable ParaView Qt-based client" ON)
option(PARAVIEW_USE_MPI "Enable MPI support for parallel computing" OFF) option(PARAVIEW_USE_MPI "Enable MPI support for parallel computing" OFF)
option(PARAVIEW_USE_VTKM "Enable VTK-m accelerated algorithms" ON) option(PARAVIEW_USE_VTKM "Enable VTK-m accelerated algorithms" ON)
option(PARAVIEW_USE_OSPRAY "Build ParaView with OSPRay Ray Traced rendering" OFF) set(raytracing_default OFF)
if (DEFINED PARAVIEW_USE_OSPRAY)
message(DEPRECATION
"PARAVIEW_USE_OSPRAY has been renamed to PARAVIEW_USE_RAYTRACING.")
set(raytracing_default "${PARAVIEW_USE_OSPRAY}")
unset(PARAVIEW_USE_OSPRAY)
unset(PARAVIEW_USE_OSPRAY CACHE)
endif ()
option(PARAVIEW_USE_RAYTRACING "Build ParaView with OSPRay and/or OptiX ray Traced rendering" ${raytracing_default})
option(PARAVIEW_ENABLE_LOGGING "Enable logging support." ON) option(PARAVIEW_ENABLE_LOGGING "Enable logging support." ON)
mark_as_advanced(PARAVIEW_ENABLE_LOGGING) mark_as_advanced(PARAVIEW_ENABLE_LOGGING)
...@@ -408,9 +416,9 @@ if (PARAVIEW_USE_VTKM) ...@@ -408,9 +416,9 @@ if (PARAVIEW_USE_VTKM)
VTK::AcceleratorsVTKm) VTK::AcceleratorsVTKm)
endif () endif ()
if (PARAVIEW_USE_OSPRAY) if (PARAVIEW_USE_RAYTRACING)
list(APPEND paraview_requested_modules list(APPEND paraview_requested_modules
VTK::RenderingOSPRay) VTK::RenderingRayTracing)
endif () endif ()
if (PARAVIEW_ENABLE_NVPIPE) if (PARAVIEW_ENABLE_NVPIPE)
......
...@@ -15,7 +15,7 @@ endif() ...@@ -15,7 +15,7 @@ endif()
list(APPEND __dependencies vtkglew) list(APPEND __dependencies vtkglew)
if(PARAVIEW_USE_OSPRAY) if(PARAVIEW_USE_RAYTRACING)
#list(APPEND __dependencies vtkRenderingOSPRay) #list(APPEND __dependencies vtkRenderingOSPRay)
endif() endif()
......
...@@ -15,7 +15,7 @@ endif() ...@@ -15,7 +15,7 @@ endif()
list(APPEND __dependencies vtkglew) list(APPEND __dependencies vtkglew)
if(PARAVIEW_USE_OSPRAY) if(PARAVIEW_USE_RAYTRACING)
#list(APPEND __dependencies vtkRenderingOSPRay) #list(APPEND __dependencies vtkRenderingOSPRay)
endif() endif()
......
...@@ -26,7 +26,7 @@ OPTIONAL_DEPENDS ...@@ -26,7 +26,7 @@ OPTIONAL_DEPENDS
VTK::AcceleratorsVTKm VTK::AcceleratorsVTKm
VTK::FiltersOpenTurns VTK::FiltersOpenTurns
VTK::ParallelMPI VTK::ParallelMPI
VTK::RenderingOSPRay VTK::RenderingRayTracing
VTK::vtkm VTK::vtkm
# These affect the public API. # These affect the public API.
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
#include "vtkTransform.h" #include "vtkTransform.h"
#include "vtkUnstructuredGrid.h" #include "vtkUnstructuredGrid.h"
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
#include "vtkOSPRayActorNode.h" #include "vtkOSPRayActorNode.h"
#endif #endif
...@@ -762,7 +762,7 @@ void vtkGeometryRepresentation::SetOpacity(double val) ...@@ -762,7 +762,7 @@ void vtkGeometryRepresentation::SetOpacity(double val)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkGeometryRepresentation::SetLuminosity(double val) void vtkGeometryRepresentation::SetLuminosity(double val)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkOSPRayActorNode::SetLuminosity(val, this->Property); vtkOSPRayActorNode::SetLuminosity(val, this->Property);
#else #else
(void)val; (void)val;
...@@ -1083,7 +1083,7 @@ void vtkGeometryRepresentation::UpdateBlockAttributes(vtkMapper* mapper) ...@@ -1083,7 +1083,7 @@ void vtkGeometryRepresentation::UpdateBlockAttributes(vtkMapper* mapper)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkGeometryRepresentation::SetEnableScaling(int val) void vtkGeometryRepresentation::SetEnableScaling(int val)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
this->Actor->SetEnableScaling(val); this->Actor->SetEnableScaling(val);
#else #else
(void)val; (void)val;
...@@ -1093,7 +1093,7 @@ void vtkGeometryRepresentation::SetEnableScaling(int val) ...@@ -1093,7 +1093,7 @@ void vtkGeometryRepresentation::SetEnableScaling(int val)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkGeometryRepresentation::SetScalingArrayName(const char* val) void vtkGeometryRepresentation::SetScalingArrayName(const char* val)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
this->Actor->SetScalingArrayName(val); this->Actor->SetScalingArrayName(val);
#else #else
(void)val; (void)val;
...@@ -1103,7 +1103,7 @@ void vtkGeometryRepresentation::SetScalingArrayName(const char* val) ...@@ -1103,7 +1103,7 @@ void vtkGeometryRepresentation::SetScalingArrayName(const char* val)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkGeometryRepresentation::SetScalingFunction(vtkPiecewiseFunction* pwf) void vtkGeometryRepresentation::SetScalingFunction(vtkPiecewiseFunction* pwf)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
this->Actor->SetScalingFunction(pwf); this->Actor->SetScalingFunction(pwf);
#else #else
(void)pwf; (void)pwf;
...@@ -1113,7 +1113,7 @@ void vtkGeometryRepresentation::SetScalingFunction(vtkPiecewiseFunction* pwf) ...@@ -1113,7 +1113,7 @@ void vtkGeometryRepresentation::SetScalingFunction(vtkPiecewiseFunction* pwf)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkGeometryRepresentation::SetMaterial(const char* val) void vtkGeometryRepresentation::SetMaterial(const char* val)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
if (!strcmp(val, "None")) if (!strcmp(val, "None"))
{ {
this->Property->SetMaterialName(nullptr); this->Property->SetMaterialName(nullptr);
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "vtkObjectFactory.h" #include "vtkObjectFactory.h"
#include "vtkPVConfig.h" #include "vtkPVConfig.h"
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
#include "vtkOSPRayLightNode.h" #include "vtkOSPRayLightNode.h"
#endif #endif
...@@ -45,7 +45,7 @@ void vtkPVLight::PrintSelf(ostream& os, vtkIndent indent) ...@@ -45,7 +45,7 @@ void vtkPVLight::PrintSelf(ostream& os, vtkIndent indent)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkPVLight::SetRadius(double r) void vtkPVLight::SetRadius(double r)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkOSPRayLightNode::SetRadius(r, this); vtkOSPRayLightNode::SetRadius(r, this);
#else #else
(void)r; (void)r;
...@@ -74,14 +74,14 @@ void vtkPVLight::SetLightType(int t) ...@@ -74,14 +74,14 @@ void vtkPVLight::SetLightType(int t)
if (t < VTK_LIGHT_TYPE_AMBIENT_LIGHT) if (t < VTK_LIGHT_TYPE_AMBIENT_LIGHT)
{ {
this->Superclass::SetLightType(t); this->Superclass::SetLightType(t);
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkOSPRayLightNode::SetIsAmbient(0, this); vtkOSPRayLightNode::SetIsAmbient(0, this);
#endif #endif
} }
else else
{ {
this->Superclass::SetLightType(VTK_LIGHT_TYPE_HEADLIGHT); this->Superclass::SetLightType(VTK_LIGHT_TYPE_HEADLIGHT);
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkOSPRayLightNode::SetIsAmbient(1, this); vtkOSPRayLightNode::SetIsAmbient(1, this);
#endif #endif
} }
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "vtkNew.h" #include "vtkNew.h"
#include "vtkObjectFactory.h" #include "vtkObjectFactory.h"
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
#include "vtkOSPRayMaterialLibrary.h" #include "vtkOSPRayMaterialLibrary.h"
#endif #endif
#include "vtkResourceFileLocator.h" #include "vtkResourceFileLocator.h"
...@@ -41,7 +41,7 @@ vtkStandardNewMacro(vtkPVMaterialLibrary); ...@@ -41,7 +41,7 @@ vtkStandardNewMacro(vtkPVMaterialLibrary);
vtkPVMaterialLibrary::vtkPVMaterialLibrary() vtkPVMaterialLibrary::vtkPVMaterialLibrary()
{ {
// initialize the class that will act as library of materials // initialize the class that will act as library of materials
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
this->MaterialLibrary = vtkOSPRayMaterialLibrary::New(); this->MaterialLibrary = vtkOSPRayMaterialLibrary::New();
#else #else
this->MaterialLibrary = nullptr; this->MaterialLibrary = nullptr;
...@@ -107,7 +107,7 @@ void vtkPVMaterialLibrary::PrintSelf(ostream& os, vtkIndent indent) ...@@ -107,7 +107,7 @@ void vtkPVMaterialLibrary::PrintSelf(ostream& os, vtkIndent indent)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void vtkPVMaterialLibrary::ReadRelativeFile(const char* FileName) void vtkPVMaterialLibrary::ReadRelativeFile(const char* FileName)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
std::vector<std::string> paths; std::vector<std::string> paths;
vtksys::SystemTools::Split(this->SearchPaths, paths, ENV_PATH_SEP); vtksys::SystemTools::Split(this->SearchPaths, paths, ENV_PATH_SEP);
for (size_t cc = 0; cc < paths.size(); cc++) for (size_t cc = 0; cc < paths.size(); cc++)
...@@ -137,7 +137,7 @@ vtkObject* vtkPVMaterialLibrary::GetMaterialLibrary() ...@@ -137,7 +137,7 @@ vtkObject* vtkPVMaterialLibrary::GetMaterialLibrary()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool vtkPVMaterialLibrary::ReadFile(const char* FileName) bool vtkPVMaterialLibrary::ReadFile(const char* FileName)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
return vtkOSPRayMaterialLibrary::SafeDownCast(this->GetMaterialLibrary())->ReadFile(FileName); return vtkOSPRayMaterialLibrary::SafeDownCast(this->GetMaterialLibrary())->ReadFile(FileName);
#else #else
(void)FileName; (void)FileName;
...@@ -148,7 +148,7 @@ bool vtkPVMaterialLibrary::ReadFile(const char* FileName) ...@@ -148,7 +148,7 @@ bool vtkPVMaterialLibrary::ReadFile(const char* FileName)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool vtkPVMaterialLibrary::ReadBuffer(const char* FileName) bool vtkPVMaterialLibrary::ReadBuffer(const char* FileName)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
return vtkOSPRayMaterialLibrary::SafeDownCast(this->GetMaterialLibrary())->ReadBuffer(FileName); return vtkOSPRayMaterialLibrary::SafeDownCast(this->GetMaterialLibrary())->ReadBuffer(FileName);
#else #else
(void)FileName; (void)FileName;
...@@ -159,7 +159,7 @@ bool vtkPVMaterialLibrary::ReadBuffer(const char* FileName) ...@@ -159,7 +159,7 @@ bool vtkPVMaterialLibrary::ReadBuffer(const char* FileName)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
const char* vtkPVMaterialLibrary::WriteBuffer() const char* vtkPVMaterialLibrary::WriteBuffer()
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
return vtkOSPRayMaterialLibrary::SafeDownCast(this->GetMaterialLibrary())->WriteBuffer(); return vtkOSPRayMaterialLibrary::SafeDownCast(this->GetMaterialLibrary())->WriteBuffer();
#else #else
return nullptr; return nullptr;
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
#include "vtkIceTSynchronizedRenderers.h" #include "vtkIceTSynchronizedRenderers.h"
#endif #endif
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
#include "vtkOSPRayLightNode.h" #include "vtkOSPRayLightNode.h"
#include "vtkOSPRayMaterialLibrary.h" #include "vtkOSPRayMaterialLibrary.h"
#include "vtkOSPRayPass.h" #include "vtkOSPRayPass.h"
...@@ -122,7 +122,7 @@ class vtkPVRenderView::vtkInternals ...@@ -122,7 +122,7 @@ class vtkPVRenderView::vtkInternals
public: public:
vtkNew<vtkValuePass> ValuePasses; vtkNew<vtkValuePass> ValuePasses;
vtkNew<vtkLightingMapPass> LightingMapPass; vtkNew<vtkLightingMapPass> LightingMapPass;
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkNew<vtkOSPRayPass> OSPRayPass; vtkNew<vtkOSPRayPass> OSPRayPass;
#endif #endif
vtkSmartPointer<vtkRenderPass> SavedRenderPass; vtkSmartPointer<vtkRenderPass> SavedRenderPass;
...@@ -3040,7 +3040,7 @@ vtkFloatArray* vtkPVRenderView::GetCapturedValuesFloat() ...@@ -3040,7 +3040,7 @@ vtkFloatArray* vtkPVRenderView::GetCapturedValuesFloat()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkPVRenderView::SetViewTime(double value) void vtkPVRenderView::SetViewTime(double value)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer(); vtkRenderer* ren = this->GetRenderer();
vtkOSPRayRendererNode::SetViewTime(value, ren); vtkOSPRayRendererNode::SetViewTime(value, ren);
#endif #endif
...@@ -3050,7 +3050,7 @@ void vtkPVRenderView::SetViewTime(double value) ...@@ -3050,7 +3050,7 @@ void vtkPVRenderView::SetViewTime(double value)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkPVRenderView::SetEnableOSPRay(bool v) void vtkPVRenderView::SetEnableOSPRay(bool v)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
if (this->Internals->IsInOSPRay == v) if (this->Internals->IsInOSPRay == v)
{ {
return; return;
...@@ -3087,7 +3087,7 @@ bool vtkPVRenderView::GetEnableOSPRay() ...@@ -3087,7 +3087,7 @@ bool vtkPVRenderView::GetEnableOSPRay()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkPVRenderView::SetMaterialLibrary(vtkPVMaterialLibrary* ml) void vtkPVRenderView::SetMaterialLibrary(vtkPVMaterialLibrary* ml)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer(); vtkRenderer* ren = this->GetRenderer();
vtkOSPRayRendererNode::SetMaterialLibrary( vtkOSPRayRendererNode::SetMaterialLibrary(
vtkOSPRayMaterialLibrary::SafeDownCast(ml->GetMaterialLibrary()), ren); vtkOSPRayMaterialLibrary::SafeDownCast(ml->GetMaterialLibrary()), ren);
...@@ -3099,7 +3099,7 @@ void vtkPVRenderView::SetMaterialLibrary(vtkPVMaterialLibrary* ml) ...@@ -3099,7 +3099,7 @@ void vtkPVRenderView::SetMaterialLibrary(vtkPVMaterialLibrary* ml)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkPVRenderView::SetOSPRayRendererType(std::string name) void vtkPVRenderView::SetOSPRayRendererType(std::string name)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer(); vtkRenderer* ren = this->GetRenderer();
vtkOSPRayRendererNode::SetRendererType(name, ren); vtkOSPRayRendererNode::SetRendererType(name, ren);
#else #else
...@@ -3110,7 +3110,7 @@ void vtkPVRenderView::SetOSPRayRendererType(std::string name) ...@@ -3110,7 +3110,7 @@ void vtkPVRenderView::SetOSPRayRendererType(std::string name)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkPVRenderView::SetShadows(bool v) void vtkPVRenderView::SetShadows(bool v)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
this->Internals->OSPRayShadows = v; this->Internals->OSPRayShadows = v;
vtkRenderer* ren = this->GetRenderer(); vtkRenderer* ren = this->GetRenderer();
if (this->Internals->IsInOSPRay) if (this->Internals->IsInOSPRay)
...@@ -3125,7 +3125,7 @@ void vtkPVRenderView::SetShadows(bool v) ...@@ -3125,7 +3125,7 @@ void vtkPVRenderView::SetShadows(bool v)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool vtkPVRenderView::GetShadows() bool vtkPVRenderView::GetShadows()
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer(); vtkRenderer* ren = this->GetRenderer();
return (ren->GetUseShadows() == 1); return (ren->GetUseShadows() == 1);
#else #else
...@@ -3136,7 +3136,7 @@ bool vtkPVRenderView::GetShadows() ...@@ -3136,7 +3136,7 @@ bool vtkPVRenderView::GetShadows()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkPVRenderView::SetAmbientOcclusionSamples(int v) void vtkPVRenderView::SetAmbientOcclusionSamples(int v)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer(); vtkRenderer* ren = this->GetRenderer();
vtkOSPRayRendererNode::SetAmbientSamples(v, ren); vtkOSPRayRendererNode::SetAmbientSamples(v, ren);
#else #else
...@@ -3147,7 +3147,7 @@ void vtkPVRenderView::SetAmbientOcclusionSamples(int v) ...@@ -3147,7 +3147,7 @@ void vtkPVRenderView::SetAmbientOcclusionSamples(int v)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
int vtkPVRenderView::GetAmbientOcclusionSamples() int vtkPVRenderView::GetAmbientOcclusionSamples()
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer(); vtkRenderer* ren = this->GetRenderer();
return vtkOSPRayRendererNode::GetAmbientSamples(ren); return vtkOSPRayRendererNode::GetAmbientSamples(ren);
#else #else
...@@ -3158,7 +3158,7 @@ int vtkPVRenderView::GetAmbientOcclusionSamples() ...@@ -3158,7 +3158,7 @@ int vtkPVRenderView::GetAmbientOcclusionSamples()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkPVRenderView::SetSamplesPerPixel(int v) void vtkPVRenderView::SetSamplesPerPixel(int v)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer(); vtkRenderer* ren = this->GetRenderer();
vtkOSPRayRendererNode::SetSamplesPerPixel(v, ren); vtkOSPRayRendererNode::SetSamplesPerPixel(v, ren);
#else #else
...@@ -3169,7 +3169,7 @@ void vtkPVRenderView::SetSamplesPerPixel(int v) ...@@ -3169,7 +3169,7 @@ void vtkPVRenderView::SetSamplesPerPixel(int v)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
int vtkPVRenderView::GetSamplesPerPixel() int vtkPVRenderView::GetSamplesPerPixel()
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer(); vtkRenderer* ren = this->GetRenderer();
return vtkOSPRayRendererNode::GetSamplesPerPixel(ren); return vtkOSPRayRendererNode::GetSamplesPerPixel(ren);
#else #else
...@@ -3180,7 +3180,7 @@ int vtkPVRenderView::GetSamplesPerPixel() ...@@ -3180,7 +3180,7 @@ int vtkPVRenderView::GetSamplesPerPixel()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkPVRenderView::SetMaxFrames(int v) void vtkPVRenderView::SetMaxFrames(int v)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer(); vtkRenderer* ren = this->GetRenderer();
vtkOSPRayRendererNode::SetMaxFrames(v, ren); vtkOSPRayRendererNode::SetMaxFrames(v, ren);
#else #else
...@@ -3191,7 +3191,7 @@ void vtkPVRenderView::SetMaxFrames(int v) ...@@ -3191,7 +3191,7 @@ void vtkPVRenderView::SetMaxFrames(int v)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
int vtkPVRenderView::GetMaxFrames() int vtkPVRenderView::GetMaxFrames()
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer(); vtkRenderer* ren = this->GetRenderer();
return vtkOSPRayRendererNode::GetMaxFrames(ren); return vtkOSPRayRendererNode::GetMaxFrames(ren);
#else #else
...@@ -3202,7 +3202,7 @@ int vtkPVRenderView::GetMaxFrames() ...@@ -3202,7 +3202,7 @@ int vtkPVRenderView::GetMaxFrames()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkPVRenderView::SetDenoise(bool v) void vtkPVRenderView::SetDenoise(bool v)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
this->Internals->OSPRayDenoise = v; this->Internals->OSPRayDenoise = v;
vtkRenderer* ren = this->GetRenderer(); vtkRenderer* ren = this->GetRenderer();
vtkOSPRayRendererNode::SetEnableDenoiser(v, ren); vtkOSPRayRendererNode::SetEnableDenoiser(v, ren);
...@@ -3214,7 +3214,7 @@ void vtkPVRenderView::SetDenoise(bool v) ...@@ -3214,7 +3214,7 @@ void vtkPVRenderView::SetDenoise(bool v)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool vtkPVRenderView::GetDenoise() bool vtkPVRenderView::GetDenoise()
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer(); vtkRenderer* ren = this->GetRenderer();
return (vtkOSPRayRendererNode::GetEnableDenoiser(ren) == 1); return (vtkOSPRayRendererNode::GetEnableDenoiser(ren) == 1);
#else #else
...@@ -3225,7 +3225,7 @@ bool vtkPVRenderView::GetDenoise() ...@@ -3225,7 +3225,7 @@ bool vtkPVRenderView::GetDenoise()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkPVRenderView::SetLightScale(double v) void vtkPVRenderView::SetLightScale(double v)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkOSPRayLightNode::SetLightScale(v); vtkOSPRayLightNode::SetLightScale(v);
#else #else
(void)v; (void)v;
...@@ -3235,7 +3235,7 @@ void vtkPVRenderView::SetLightScale(double v) ...@@ -3235,7 +3235,7 @@ void vtkPVRenderView::SetLightScale(double v)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
double vtkPVRenderView::GetLightScale() double vtkPVRenderView::GetLightScale()
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
return vtkOSPRayLightNode::GetLightScale(); return vtkOSPRayLightNode::GetLightScale();
#else #else
return 0.5; return 0.5;
...@@ -3245,7 +3245,7 @@ double vtkPVRenderView::GetLightScale() ...@@ -3245,7 +3245,7 @@ double vtkPVRenderView::GetLightScale()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool vtkPVRenderView::GetOSPRayContinueStreaming() bool vtkPVRenderView::GetOSPRayContinueStreaming()
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
if (!this->Internals->IsInOSPRay) if (!this->Internals->IsInOSPRay)
{ {
return false; return false;
...@@ -3265,7 +3265,7 @@ bool vtkPVRenderView::GetOSPRayContinueStreaming() ...@@ -3265,7 +3265,7 @@ bool vtkPVRenderView::GetOSPRayContinueStreaming()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkPVRenderView::SetBackgroundNorth(double x, double y, double z) void vtkPVRenderView::SetBackgroundNorth(double x, double y, double z)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer(); vtkRenderer* ren = this->GetRenderer();
double dir[3] = { x, y, z }; double dir[3] = { x, y, z };
vtkOSPRayRendererNode::SetNorthPole(dir, ren); vtkOSPRayRendererNode::SetNorthPole(dir, ren);
...@@ -3279,7 +3279,7 @@ void vtkPVRenderView::SetBackgroundNorth(double x, double y, double z) ...@@ -3279,7 +3279,7 @@ void vtkPVRenderView::SetBackgroundNorth(double x, double y, double z)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkPVRenderView::SetBackgroundEast(double x, double y, double z) void vtkPVRenderView::SetBackgroundEast(double x, double y, double z)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer(); vtkRenderer* ren = this->GetRenderer();
double dir[3] = { x, y, z }; double dir[3] = { x, y, z };
vtkOSPRayRendererNode::SetEastPole(dir, ren); vtkOSPRayRendererNode::SetEastPole(dir, ren);
...@@ -3293,7 +3293,7 @@ void vtkPVRenderView::SetBackgroundEast(double x, double y, double z) ...@@ -3293,7 +3293,7 @@ void vtkPVRenderView::SetBackgroundEast(double x, double y, double z)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkPVRenderView::SetTimeCacheSize(int v) void vtkPVRenderView::SetTimeCacheSize(int v)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer(); vtkRenderer* ren = this->GetRenderer();
vtkOSPRayRendererNode::SetTimeCacheSize(v, ren); vtkOSPRayRendererNode::SetTimeCacheSize(v, ren);
#else #else
...@@ -3304,7 +3304,7 @@ void vtkPVRenderView::SetTimeCacheSize(int v) ...@@ -3304,7 +3304,7 @@ void vtkPVRenderView::SetTimeCacheSize(int v)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
int vtkPVRenderView::GetTimeCacheSize() int vtkPVRenderView::GetTimeCacheSize()
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer(); vtkRenderer* ren = this->GetRenderer();
return vtkOSPRayRendererNode::GetTimeCacheSize(ren); return vtkOSPRayRendererNode::GetTimeCacheSize(ren);
#else #else
......
...@@ -17,7 +17,7 @@ PRIVATE_DEPENDS ...@@ -17,7 +17,7 @@ PRIVATE_DEPENDS
OPTIONAL_DEPENDS OPTIONAL_DEPENDS
VTK::Python VTK::Python
VTK::PythonInterpreter VTK::PythonInterpreter
VTK::RenderingOSPRay VTK::RenderingRayTracing
VTK::WrappingPythonCore VTK::WrappingPythonCore
TEST_DEPENDS TEST_DEPENDS
ParaView::ServerManagerApplication ParaView::ServerManagerApplication
......
...@@ -401,7 +401,7 @@ bool vtkSMParaViewPipelineController::InitializeSession(vtkSMSession* session) ...@@ -401,7 +401,7 @@ bool vtkSMParaViewPipelineController::InitializeSession(vtkSMSession* session)
vtkSmartPointer<vtkSMProxy> materialLib = this->FindMaterialLibrary(session); vtkSmartPointer<vtkSMProxy> materialLib = this->FindMaterialLibrary(session);
if (!materialLib) if (!materialLib)
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
materialLib.TakeReference(vtkSafeNewProxy(pxm, "materials", "MaterialLibrary")); materialLib.TakeReference(vtkSafeNewProxy(pxm, "materials", "MaterialLibrary"));
if (materialLib) if (materialLib)
{ {
......
...@@ -16,7 +16,7 @@ PRIVATE_DEPENDS ...@@ -16,7 +16,7 @@ PRIVATE_DEPENDS
VTK::CommonColor VTK::CommonColor
VTK::vtksys VTK::vtksys
OPTIONAL_DEPENDS OPTIONAL_DEPENDS
VTK::RenderingOSPRay VTK::RenderingRayTracing
# These affect the public API. # These affect the public API.
ParaView::ClientServerCorePython ParaView::ClientServerCorePython
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "vtkPVConfig.h" #include "vtkPVConfig.h"
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
#include "vtkOSPRayMaterialLibrary.h" #include "vtkOSPRayMaterialLibrary.h"
#endif #endif
...@@ -42,7 +42,7 @@ public: ...@@ -42,7 +42,7 @@ public:
vtkSMMaterialObserver() vtkSMMaterialObserver()
{ {
this->Owner = nullptr; this->Owner = nullptr;
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
this->Watchee = nullptr; this->Watchee = nullptr;
#endif #endif
} }
...@@ -56,7 +56,7 @@ public: ...@@ -56,7 +56,7 @@ public:
void StartWatching() void StartWatching()
{ {
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay #if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkNew<vtkSMParaViewPipelineController> controller; vtkNew<vtkSMParaViewPipelineController> controller;
vtkSMMaterialLibraryProxy* mlp = vtkSMMaterialLibraryProxy::SafeDownCast( vtkSMMaterialLibraryProxy* mlp = vtkSMMaterialLibraryProxy::SafeDownCast(
controller->FindMaterialLibrary(this->Owner->GetSession())); controller->FindMaterialLibrary(this->Owner->GetSession()));
...@@ -74,7 +74,7 @@ public: ...@@ -74,7 +74,7 @@ public:
} }
void StopWatching() void StopWatching()
{