From 94b6f815e89d8d1a0f4ff931d91ce399e4d5d96a Mon Sep 17 00:00:00 2001 From: Spiros Tsalikis Date: Mon, 16 May 2022 09:34:10 -0400 Subject: [PATCH 1/2] Rename OpenVR to XRInterface --- README.md | 1 + projects/paraview.cmake | 2 +- projects/win32/paraview.bundle.cmake | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index bd879a62..eef23df9 100644 --- a/README.md +++ b/README.md @@ -341,6 +341,7 @@ The following flags affect ParaView directly: connection. VRUI support is enabled unconditionally on Linux. * `PARAVIEW_ENABLE_NODEEDITOR` (default `OFF`): Enables the NodeEditor plugin. + * `PARAVIEW_ENABLE_XRInterface` (default `ON`): Enables the XRInterface plugin. #### ParaView editions diff --git a/projects/paraview.cmake b/projects/paraview.cmake index 317886e7..05c7c0e3 100644 --- a/projects/paraview.cmake +++ b/projects/paraview.cmake @@ -216,7 +216,7 @@ superbuild_add_project(paraview -DPARAVIEW_PLUGIN_ENABLE_GmshIO:BOOL=${gmsh_enabled} -DPARAVIEW_PLUGIN_ENABLE_NodeEditor:BOOL=${PARAVIEW_ENABLE_NODEEDITOR} -DPARAVIEW_PLUGIN_ENABLE_LookingGlass:BOOL=${lookingglass_enabled} - -DPARAVIEW_PLUGIN_ENABLE_OpenVR:BOOL=${openvr_enabled} + -DPARAVIEW_PLUGIN_ENABLE_XRInterface:BOOL=${openvr_enabled} # No netcdftime module in the package. -DPARAVIEW_PLUGIN_ENABLE_NetCDFTimeAnnotationPlugin:BOOL=OFF -DPARAVIEW_PYTHON_VERSION:STRING=3 diff --git a/projects/win32/paraview.bundle.cmake b/projects/win32/paraview.bundle.cmake index b3ce2544..c78d8603 100644 --- a/projects/win32/paraview.bundle.cmake +++ b/projects/win32/paraview.bundle.cmake @@ -76,11 +76,11 @@ install( DESTINATION "${paraview_plugin_path}" COMPONENT superbuild) -if ("OpenVR" IN_LIST paraview_plugins) +if ("XRInterface" IN_LIST paraview_plugins) file(GLOB openvr_manifests - "${superbuild_install_location}/${paraview_plugin_path}/OpenVR/*.json") + "${superbuild_install_location}/${paraview_plugin_path}/XRInterface/*.json") install(FILES ${openvr_manifests} - DESTINATION "${paraview_plugin_path}/OpenVR" + DESTINATION "${paraview_plugin_path}/XRInterface" COMPONENT "superbuild" ) endif () -- GitLab From b746bffb368f6897fe412c133c6f8264916a044a Mon Sep 17 00:00:00 2001 From: Spiros Tsalikis Date: Mon, 16 May 2022 09:41:06 -0400 Subject: [PATCH 2/2] Rename VRPlugin to CAVEInteraction --- README.md | 4 ++-- projects/paraview.cmake | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index eef23df9..78b674a3 100644 --- a/README.md +++ b/README.md @@ -336,8 +336,8 @@ The following flags affect ParaView directly: * `PARAVIEW_EXTRA_CMAKE_ARGUMENTS` (default `""`: Extra CMake arguments to pass to ParaView's configure step. This can be used to set CMake variables for the build that are otherwise not exposed in the superbuild itself. - * `PARAVIEW_ENABLE_VRPLUGIN` (default `ON`): Enables the VRPlugin. If - `vrpn` is enabled, the VRPlugin will support input devices through a VRPN + * `PARAVIEW_ENABLE_CAVEInteraction` (default `ON`): Enables the CAVEInteraction. If + `vrpn` is enabled, the CAVEInteraction will support input devices through a VRPN connection. VRUI support is enabled unconditionally on Linux. * `PARAVIEW_ENABLE_NODEEDITOR` (default `OFF`): Enables the NodeEditor plugin. diff --git a/projects/paraview.cmake b/projects/paraview.cmake index 05c7c0e3..d5fa5ba9 100644 --- a/projects/paraview.cmake +++ b/projects/paraview.cmake @@ -89,13 +89,13 @@ endif () option(PARAVIEW_ENABLE_NODEEDITOR "Enable NodeEditor plugin" ON) mark_as_advanced(PARAVIEW_ENABLE_NODEEDITOR) -option(PARAVIEW_ENABLE_VRPLUGIN "Enable VRPlugin" ON) -mark_as_advanced(PARAVIEW_ENABLE_VRPLUGIN) +option(PARAVIEW_ENABLE_CAVEInteraction "Enable CAVEInteraction plugin" ON) +mark_as_advanced(PARAVIEW_ENABLE_CAVEInteraction) # vrui support is only available on linux -if (PARAVIEW_ENABLE_VRPLUGIN AND UNIX) +if (PARAVIEW_ENABLE_CAVEInteraction AND UNIX) list(APPEND paraview_extra_cmake_options - -DPARAVIEW_PLUGIN_VRPlugin_USE_VRUI:BOOL=ON + -DPARAVIEW_PLUGIN_CAVEInteraction_USE_VRUI:BOOL=ON ) endif() @@ -252,8 +252,8 @@ superbuild_add_project(paraview -DPARAVIEW_PLUGIN_ENABLE_pvNVIDIAIndeX:BOOL=${nvidiaindex_enabled} # vrpn - -DPARAVIEW_PLUGIN_ENABLE_VRPlugin:BOOL=${PARAVIEW_ENABLE_VRPLUGIN} - -DPARAVIEW_PLUGIN_VRPlugin_USE_VRPN:BOOL=${vrpn_enabled} + -DPARAVIEW_PLUGIN_ENABLE_CAVEInteraction:BOOL=${PARAVIEW_ENABLE_CAVEInteraction} + -DPARAVIEW_PLUGIN_CAVEInteraction_USE_VRPN:BOOL=${vrpn_enabled} # vtkm -DPARAVIEW_PLUGIN_ENABLE_VTKmFilters:BOOL=${vtkm_enabled} -- GitLab