Commit d16c3ede authored by David E. DeMarle's avatar David E. DeMarle Committed by Kitware Robot

Merge topic 'expose-optix'

b2871d3b fixup tests and benchmarks that used the EnableOSPRay API
1ce7818f add backwards compatibility for state files
c1b1a8f9 Bump VTK to get combined ospray and optix Ray Tracing module.
ac7ce81d add backwards compatibilty mapping for Python interface
903c6d41 Expose the new optix backend, make GUI labels reflect independence
a3b3d02d Update to use the name of the new unified ray tracing module
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit's avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !3181
parents 92813d0d b2871d3b
Pipeline #134976 running with stage
......@@ -5189,7 +5189,7 @@
<Element index="0" value="0"/>
<Domain name="bool" id="106147.DrawCells.bool"/>
</Property>
<Property name="EnableOSPRay" id="106147.EnableOSPRay" number_of_elements="1">
<Property name="EnableRayTracing" id="106147.EnableOSPRay" number_of_elements="1">
<Element index="0" value="0"/>
<Domain name="bool" id="106147.EnableOSPRay.bool"/>
</Property>
......
......@@ -1483,7 +1483,7 @@
<Element index="0" value="0"/>
<Domain name="bool" id="1967.DrawCells.bool"/>
</Property>
<Property name="EnableOSPRay" id="1967.EnableOSPRay" number_of_elements="1">
<Property name="EnableRayTracing" id="1967.EnableOSPRay" number_of_elements="1">
<Element index="0" value="0"/>
<Domain name="bool" id="1967.EnableOSPRay.bool"/>
</Property>
......
......@@ -530,7 +530,7 @@ else()
TruchasReader.xml)
endif()
if(PARAVIEW_USE_OSPRAY)
if(PARAVIEW_USE_RAYTRACING)
list(APPEND TESTS_WITH_BASELINES
OSPRay.xml)
endif()
......
......@@ -2795,7 +2795,7 @@
<Element index="0" value="0"/>
<Domain name="bool" id="8800.DrawCells.bool"/>
</Property>
<Property name="EnableOSPRay" id="8800.EnableOSPRay" number_of_elements="1">
<Property name="EnableRayTracing" id="8800.EnableOSPRay" number_of_elements="1">
<Element index="0" value="0"/>
<Domain name="bool" id="8800.EnableOSPRay.bool"/>
</Property>
......
......@@ -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_USE_MPI "Enable MPI support for parallel computing" OFF)
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)
mark_as_advanced(PARAVIEW_ENABLE_LOGGING)
......@@ -408,9 +416,9 @@ if (PARAVIEW_USE_VTKM)
VTK::AcceleratorsVTKm)
endif ()
if (PARAVIEW_USE_OSPRAY)
if (PARAVIEW_USE_RAYTRACING)
list(APPEND paraview_requested_modules
VTK::RenderingOSPRay)
VTK::RenderingRayTracing)
endif ()
if (PARAVIEW_ENABLE_NVPIPE)
......
......@@ -15,7 +15,7 @@ endif()
list(APPEND __dependencies vtkglew)
if(PARAVIEW_USE_OSPRAY)
if(PARAVIEW_USE_RAYTRACING)
#list(APPEND __dependencies vtkRenderingOSPRay)
endif()
......
......@@ -15,7 +15,7 @@ endif()
list(APPEND __dependencies vtkglew)
if(PARAVIEW_USE_OSPRAY)
if(PARAVIEW_USE_RAYTRACING)
#list(APPEND __dependencies vtkRenderingOSPRay)
endif()
......
......@@ -26,7 +26,7 @@ OPTIONAL_DEPENDS
VTK::AcceleratorsVTKm
VTK::FiltersOpenTurns
VTK::ParallelMPI
VTK::RenderingOSPRay
VTK::RenderingRayTracing
VTK::vtkm
# These affect the public API.
......
......@@ -50,7 +50,7 @@
#include "vtkTransform.h"
#include "vtkUnstructuredGrid.h"
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
#include "vtkOSPRayActorNode.h"
#endif
......@@ -762,7 +762,7 @@ void vtkGeometryRepresentation::SetOpacity(double val)
//----------------------------------------------------------------------------
void vtkGeometryRepresentation::SetLuminosity(double val)
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkOSPRayActorNode::SetLuminosity(val, this->Property);
#else
(void)val;
......@@ -1083,7 +1083,7 @@ void vtkGeometryRepresentation::UpdateBlockAttributes(vtkMapper* mapper)
//----------------------------------------------------------------------------
void vtkGeometryRepresentation::SetEnableScaling(int val)
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
this->Actor->SetEnableScaling(val);
#else
(void)val;
......@@ -1093,7 +1093,7 @@ void vtkGeometryRepresentation::SetEnableScaling(int val)
//----------------------------------------------------------------------------
void vtkGeometryRepresentation::SetScalingArrayName(const char* val)
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
this->Actor->SetScalingArrayName(val);
#else
(void)val;
......@@ -1103,7 +1103,7 @@ void vtkGeometryRepresentation::SetScalingArrayName(const char* val)
//----------------------------------------------------------------------------
void vtkGeometryRepresentation::SetScalingFunction(vtkPiecewiseFunction* pwf)
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
this->Actor->SetScalingFunction(pwf);
#else
(void)pwf;
......@@ -1113,7 +1113,7 @@ void vtkGeometryRepresentation::SetScalingFunction(vtkPiecewiseFunction* pwf)
//----------------------------------------------------------------------------
void vtkGeometryRepresentation::SetMaterial(const char* val)
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
if (!strcmp(val, "None"))
{
this->Property->SetMaterialName(nullptr);
......
......@@ -19,7 +19,7 @@
#include "vtkObjectFactory.h"
#include "vtkPVConfig.h"
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
#include "vtkOSPRayLightNode.h"
#endif
......@@ -45,7 +45,7 @@ void vtkPVLight::PrintSelf(ostream& os, vtkIndent indent)
//----------------------------------------------------------------------------
void vtkPVLight::SetRadius(double r)
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkOSPRayLightNode::SetRadius(r, this);
#else
(void)r;
......@@ -74,14 +74,14 @@ void vtkPVLight::SetLightType(int t)
if (t < VTK_LIGHT_TYPE_AMBIENT_LIGHT)
{
this->Superclass::SetLightType(t);
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkOSPRayLightNode::SetIsAmbient(0, this);
#endif
}
else
{
this->Superclass::SetLightType(VTK_LIGHT_TYPE_HEADLIGHT);
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkOSPRayLightNode::SetIsAmbient(1, this);
#endif
}
......
......@@ -18,7 +18,7 @@
#include "vtkNew.h"
#include "vtkObjectFactory.h"
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
#include "vtkOSPRayMaterialLibrary.h"
#endif
#include "vtkResourceFileLocator.h"
......@@ -41,7 +41,7 @@ vtkStandardNewMacro(vtkPVMaterialLibrary);
vtkPVMaterialLibrary::vtkPVMaterialLibrary()
{
// 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();
#else
this->MaterialLibrary = nullptr;
......@@ -107,7 +107,7 @@ void vtkPVMaterialLibrary::PrintSelf(ostream& os, vtkIndent indent)
//-----------------------------------------------------------------------------
void vtkPVMaterialLibrary::ReadRelativeFile(const char* FileName)
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
std::vector<std::string> paths;
vtksys::SystemTools::Split(this->SearchPaths, paths, ENV_PATH_SEP);
for (size_t cc = 0; cc < paths.size(); cc++)
......@@ -137,7 +137,7 @@ vtkObject* vtkPVMaterialLibrary::GetMaterialLibrary()
//-----------------------------------------------------------------------------
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);
#else
(void)FileName;
......@@ -148,7 +148,7 @@ bool vtkPVMaterialLibrary::ReadFile(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);
#else
(void)FileName;
......@@ -159,7 +159,7 @@ bool vtkPVMaterialLibrary::ReadBuffer(const char* FileName)
//-----------------------------------------------------------------------------
const char* vtkPVMaterialLibrary::WriteBuffer()
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
return vtkOSPRayMaterialLibrary::SafeDownCast(this->GetMaterialLibrary())->WriteBuffer();
#else
return nullptr;
......
......@@ -102,7 +102,7 @@
#include "vtkIceTSynchronizedRenderers.h"
#endif
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
#include "vtkOSPRayLightNode.h"
#include "vtkOSPRayMaterialLibrary.h"
#include "vtkOSPRayPass.h"
......@@ -122,7 +122,7 @@ class vtkPVRenderView::vtkInternals
public:
vtkNew<vtkValuePass> ValuePasses;
vtkNew<vtkLightingMapPass> LightingMapPass;
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkNew<vtkOSPRayPass> OSPRayPass;
#endif
vtkSmartPointer<vtkRenderPass> SavedRenderPass;
......@@ -3040,7 +3040,7 @@ vtkFloatArray* vtkPVRenderView::GetCapturedValuesFloat()
//----------------------------------------------------------------------------
void vtkPVRenderView::SetViewTime(double value)
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer();
vtkOSPRayRendererNode::SetViewTime(value, ren);
#endif
......@@ -3050,7 +3050,7 @@ void vtkPVRenderView::SetViewTime(double value)
//----------------------------------------------------------------------------
void vtkPVRenderView::SetEnableOSPRay(bool v)
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
if (this->Internals->IsInOSPRay == v)
{
return;
......@@ -3087,7 +3087,7 @@ bool vtkPVRenderView::GetEnableOSPRay()
//----------------------------------------------------------------------------
void vtkPVRenderView::SetMaterialLibrary(vtkPVMaterialLibrary* ml)
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer();
vtkOSPRayRendererNode::SetMaterialLibrary(
vtkOSPRayMaterialLibrary::SafeDownCast(ml->GetMaterialLibrary()), ren);
......@@ -3099,7 +3099,7 @@ void vtkPVRenderView::SetMaterialLibrary(vtkPVMaterialLibrary* ml)
//----------------------------------------------------------------------------
void vtkPVRenderView::SetOSPRayRendererType(std::string name)
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer();
vtkOSPRayRendererNode::SetRendererType(name, ren);
#else
......@@ -3110,7 +3110,7 @@ void vtkPVRenderView::SetOSPRayRendererType(std::string name)
//----------------------------------------------------------------------------
void vtkPVRenderView::SetShadows(bool v)
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
this->Internals->OSPRayShadows = v;
vtkRenderer* ren = this->GetRenderer();
if (this->Internals->IsInOSPRay)
......@@ -3125,7 +3125,7 @@ void vtkPVRenderView::SetShadows(bool v)
//----------------------------------------------------------------------------
bool vtkPVRenderView::GetShadows()
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer();
return (ren->GetUseShadows() == 1);
#else
......@@ -3136,7 +3136,7 @@ bool vtkPVRenderView::GetShadows()
//----------------------------------------------------------------------------
void vtkPVRenderView::SetAmbientOcclusionSamples(int v)
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer();
vtkOSPRayRendererNode::SetAmbientSamples(v, ren);
#else
......@@ -3147,7 +3147,7 @@ void vtkPVRenderView::SetAmbientOcclusionSamples(int v)
//----------------------------------------------------------------------------
int vtkPVRenderView::GetAmbientOcclusionSamples()
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer();
return vtkOSPRayRendererNode::GetAmbientSamples(ren);
#else
......@@ -3158,7 +3158,7 @@ int vtkPVRenderView::GetAmbientOcclusionSamples()
//----------------------------------------------------------------------------
void vtkPVRenderView::SetSamplesPerPixel(int v)
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer();
vtkOSPRayRendererNode::SetSamplesPerPixel(v, ren);
#else
......@@ -3169,7 +3169,7 @@ void vtkPVRenderView::SetSamplesPerPixel(int v)
//----------------------------------------------------------------------------
int vtkPVRenderView::GetSamplesPerPixel()
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer();
return vtkOSPRayRendererNode::GetSamplesPerPixel(ren);
#else
......@@ -3180,7 +3180,7 @@ int vtkPVRenderView::GetSamplesPerPixel()
//----------------------------------------------------------------------------
void vtkPVRenderView::SetMaxFrames(int v)
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer();
vtkOSPRayRendererNode::SetMaxFrames(v, ren);
#else
......@@ -3191,7 +3191,7 @@ void vtkPVRenderView::SetMaxFrames(int v)
//----------------------------------------------------------------------------
int vtkPVRenderView::GetMaxFrames()
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer();
return vtkOSPRayRendererNode::GetMaxFrames(ren);
#else
......@@ -3202,7 +3202,7 @@ int vtkPVRenderView::GetMaxFrames()
//----------------------------------------------------------------------------
void vtkPVRenderView::SetDenoise(bool v)
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
this->Internals->OSPRayDenoise = v;
vtkRenderer* ren = this->GetRenderer();
vtkOSPRayRendererNode::SetEnableDenoiser(v, ren);
......@@ -3214,7 +3214,7 @@ void vtkPVRenderView::SetDenoise(bool v)
//----------------------------------------------------------------------------
bool vtkPVRenderView::GetDenoise()
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer();
return (vtkOSPRayRendererNode::GetEnableDenoiser(ren) == 1);
#else
......@@ -3225,7 +3225,7 @@ bool vtkPVRenderView::GetDenoise()
//----------------------------------------------------------------------------
void vtkPVRenderView::SetLightScale(double v)
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkOSPRayLightNode::SetLightScale(v);
#else
(void)v;
......@@ -3235,7 +3235,7 @@ void vtkPVRenderView::SetLightScale(double v)
//----------------------------------------------------------------------------
double vtkPVRenderView::GetLightScale()
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
return vtkOSPRayLightNode::GetLightScale();
#else
return 0.5;
......@@ -3245,7 +3245,7 @@ double vtkPVRenderView::GetLightScale()
//----------------------------------------------------------------------------
bool vtkPVRenderView::GetOSPRayContinueStreaming()
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
if (!this->Internals->IsInOSPRay)
{
return false;
......@@ -3265,7 +3265,7 @@ bool vtkPVRenderView::GetOSPRayContinueStreaming()
//----------------------------------------------------------------------------
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();
double dir[3] = { x, y, z };
vtkOSPRayRendererNode::SetNorthPole(dir, ren);
......@@ -3279,7 +3279,7 @@ void vtkPVRenderView::SetBackgroundNorth(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();
double dir[3] = { x, y, z };
vtkOSPRayRendererNode::SetEastPole(dir, ren);
......@@ -3293,7 +3293,7 @@ void vtkPVRenderView::SetBackgroundEast(double x, double y, double z)
//----------------------------------------------------------------------------
void vtkPVRenderView::SetTimeCacheSize(int v)
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer();
vtkOSPRayRendererNode::SetTimeCacheSize(v, ren);
#else
......@@ -3304,7 +3304,7 @@ void vtkPVRenderView::SetTimeCacheSize(int v)
//----------------------------------------------------------------------------
int vtkPVRenderView::GetTimeCacheSize()
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkRenderer* ren = this->GetRenderer();
return vtkOSPRayRendererNode::GetTimeCacheSize(ren);
#else
......
......@@ -17,7 +17,7 @@ PRIVATE_DEPENDS
OPTIONAL_DEPENDS
VTK::Python
VTK::PythonInterpreter
VTK::RenderingOSPRay
VTK::RenderingRayTracing
VTK::WrappingPythonCore
TEST_DEPENDS
ParaView::ServerManagerApplication
......
......@@ -401,7 +401,7 @@ bool vtkSMParaViewPipelineController::InitializeSession(vtkSMSession* session)
vtkSmartPointer<vtkSMProxy> materialLib = this->FindMaterialLibrary(session);
if (!materialLib)
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
materialLib.TakeReference(vtkSafeNewProxy(pxm, "materials", "MaterialLibrary"));
if (materialLib)
{
......
......@@ -626,7 +626,8 @@ struct Process_5_6_to_5_7
{
bool operator()(xml_document& document)
{
return ConvertResampleWithDataset(document) && ConvertIdsFilter(document);
return ConvertResampleWithDataset(document) && ConvertIdsFilter(document) &&
ConvertOSPRayNames(document);
}
static bool ConvertResampleWithDataset(xml_document& document)
......@@ -672,6 +673,25 @@ struct Process_5_6_to_5_7
return true;
};
static bool ConvertOSPRayNames(xml_document& document)
{
// The `EnableOSPray` property for the first time got a label, which is `Enable Ray Tracing`.
// Other OSPRay label changes appear to have no effect on the state file.
pugi::xpath_node_set elements =
document.select_nodes("//ServerManagerState/Proxy[@group='views' "
"and @type='RenderView']/Property[@name='EnableOSPRay']");
for (auto iter = elements.begin(); iter != elements.end(); ++iter)
{
auto property_node = iter->node();
auto proxy_node = property_node.parent();
property_node.attribute("name").set_value("EnableRayTracing");
proxy_node.append_copy(property_node);
}
return true;
};
};
} // end of namespace
......
......@@ -16,7 +16,7 @@ PRIVATE_DEPENDS
VTK::CommonColor
VTK::vtksys
OPTIONAL_DEPENDS
VTK::RenderingOSPRay
VTK::RenderingRayTracing
# These affect the public API.
ParaView::ClientServerCorePython
......
......@@ -26,7 +26,7 @@
#include "vtkPVConfig.h"
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
#include "vtkOSPRayMaterialLibrary.h"
#endif
......@@ -42,7 +42,7 @@ public:
vtkSMMaterialObserver()
{
this->Owner = nullptr;
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
this->Watchee = nullptr;
#endif
}
......@@ -56,7 +56,7 @@ public:
void StartWatching()
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkNew<vtkSMParaViewPipelineController> controller;
vtkSMMaterialLibraryProxy* mlp = vtkSMMaterialLibraryProxy::SafeDownCast(
controller->FindMaterialLibrary(this->Owner->GetSession()));
......@@ -74,7 +74,7 @@ public:
}
void StopWatching()
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
if (this->Watchee)
{
this->Watchee->RemoveObserver(this);
......@@ -82,7 +82,7 @@ public:
#endif
}
vtkWeakPointer<vtkSMMaterialDomain> Owner;
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkWeakPointer<vtkOSPRayMaterialLibrary> Watchee;
#endif
};
......@@ -113,7 +113,7 @@ void vtkSMMaterialDomain::PrintSelf(ostream& os, vtkIndent indent)
//---------------------------------------------------------------------------
int vtkSMMaterialDomain::ReadXMLAttributes(vtkSMProperty* prop, vtkPVXMLElement* element)
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
int retVal = this->Superclass::ReadXMLAttributes(prop, element);
if (!retVal)
{
......@@ -142,7 +142,7 @@ void vtkSMMaterialDomain::CallMeSometime()
//---------------------------------------------------------------------------
void vtkSMMaterialDomain::Update(vtkSMProperty* vtkNotUsed(prop))
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
// find the material library we reflect contents of
vtkNew<vtkSMParaViewPipelineController> controller;
vtkSMMaterialLibraryProxy* mlp =
......
......@@ -25,7 +25,7 @@
#include "vtkSMSession.h"
#include "vtkSmartPointer.h"
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
#include "vtkOSPRayMaterialLibrary.h"
#endif
......@@ -43,7 +43,7 @@ vtkSMMaterialLibraryProxy::~vtkSMMaterialLibraryProxy()
//-----------------------------------------------------------------------------
void vtkSMMaterialLibraryProxy::LoadMaterials(const char* filename)
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
vtkClientServerStream stream;
stream << vtkClientServerStream::Invoke << VTKOBJECT(this) << "ReadFile" << filename
<< vtkClientServerStream::End;
......@@ -59,7 +59,7 @@ void vtkSMMaterialLibraryProxy::LoadMaterials(const char* filename)
//-----------------------------------------------------------------------------
void vtkSMMaterialLibraryProxy::LoadDefaultMaterials()
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
// todo: this should be relative to binary or in prefs/settings, see pq
vtkClientServerStream stream;
stream << vtkClientServerStream::Invoke << VTKOBJECT(this) << "ReadRelativeFile"
......@@ -73,7 +73,7 @@ void vtkSMMaterialLibraryProxy::LoadDefaultMaterials()
//-----------------------------------------------------------------------------
void vtkSMMaterialLibraryProxy::Synchronize()
{
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
bool builtinMode = false;
if (!this->GetSession() || (this->GetSession()->GetProcessRoles() & vtkPVSession::SERVERS) != 0)
{
......
......@@ -2579,6 +2579,7 @@
are encoded into RGB.</Documentation>
</Property>
<IntVectorProperty name="EnableOSPRay"
label="Enable Ray Tracing"
command="SetEnableOSPRay"
default_values="0"
animateable="0"
......@@ -2608,12 +2609,13 @@
</IntVectorProperty>
<StringVectorProperty name="OSPRayRendererType"
command="SetOSPRayRendererType"
label="OSPRay Renderer"
label="Back End"
default_values="scivis"
number_of_elements="1">
<StringListDomain name="list">
<String value="scivis" />
<String value="pathtracer" />
<String value="OSPRay raycaster" />
<String value="OSPRay pathtracer" />
<String value="OptiX pathtracer" />
</StringListDomain>
<Documentation>Set the OSPRay renderer to use.</Documentation>
<Hints>
......@@ -2690,7 +2692,7 @@
animateable="0"
number_of_elements="1">
<BooleanDomain name="bool" />
<Documentation>Controls whether to denoise images.</Documentation>
<Documentation>Controls whether to denoise images (if available).</Documentation>
<Hints>
<PropertyWidgetDecorator type="OSPRayHidingDecorator" />
<PropertyWidgetDecorator type="GenericDecorator"
......@@ -2843,7 +2845,7 @@
<Property name="StartCaptureLuminance" />
<Property name="StopCaptureLuminance" />
</PropertyGroup>
<PropertyGroup label="OSPRay Rendering"
<PropertyGroup label="Ray Traced Rendering"
panel_visibility="advanced">
<Property name="EnableOSPRay"/>
<Property name="Shadows"/>
......@@ -3835,7 +3837,7 @@
</PropertyGroup>
<PropertyGroup panel_visibility="advanced"
label="OSPRay" >
label="Ray Tracing" >
<Property name="OSPRayUseScaleArray" />
<Property name="OSPRayScaleArray" />
<Property name="OSPRayScaleFunction" />
......@@ -10767,7 +10769,7 @@
<IntVectorProperty command="SetEnableScaling"
default_values="0"
name="OSPRayUseScaleArray"
label="OSPRay Use Scale Array"
label="Use Scale Array"
number_of_elements="1">
<Documentation>
Allows OSPRay implicit points and lines to be sized by an array.
......@@ -10780,7 +10782,7 @@
<StringVectorProperty command="SetScalingArrayName"
default_values=""
name="OSPRayScaleArray"
label="OSPRay Scale Array"
label="Scale Array"
number_of_elements="1"
panel_visibility="advanced">
<ArrayListDomain input_domain_name="input_array_point"
......@@ -10798,7 +10800,7 @@
</StringVectorProperty>
<ProxyProperty command="SetScalingFunction"
name="OSPRayScaleFunction"
label="OSPRay Scale Function"
label="Scale Function"
panel_visibility="advanced"
panel_widget="transfer_function_editor" >
<Documentation>Set the piecewise function used to map data array to sprite size.
......@@ -10816,7 +10818,7 @@
</ProxyProperty>
<StringVectorProperty command="SetMaterial"
name="OSPRayMaterial"
label="OSPRay Material"
label="Material"
number_of_elements="1"
panel_visibility="advanced"
default_values="None">
......
......@@ -38,8 +38,8 @@ OPTIONAL_DEPENDS
ParaView::icet
ParaView::nvpipe
VTK::FiltersParallelMPI
VTK::RenderingOSPRay
VTK::RenderingMatplotlib
VTK::RenderingRayTracing
# These affect the public API.
ParaView::icet
VTK::ParallelMPI
......
......@@ -30,7 +30,7 @@
#include <math.h>
#if VTK_MODULE_ENABLE_VTK_RenderingOSPRay
#if VTK_MODULE_ENABLE_VTK_RenderingRayTracing
#include "vtkOSPRayActorNode.h"
#endif
......@@ -320,7 +320,7 @@ void vtkPVLODActor::PrintSelf(ostream& os, vtkIndent indent)
//----------------------------------------------------------------------------
void vtkPVLODActor::SetEnableScaling(int val)
{