Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.6] ENH: Update VTK backporting SlicerVirtualReality extension specific changes #7677

Merged
merged 1 commit into from Apr 5, 2024

Conversation

jcfr
Copy link
Member

@jcfr jcfr commented Apr 5, 2024

This commit updates the external project to explicitly reference the VTK version that was manually checked out within the Slicer release-specific build tree to support building the SlicerVirtualReality extension.

Backport of these Slicer pull requests:

Related Slicer/VTK pull requests:

List of VTK changes:

$ git shortlog 46201478c..d4be5ea25 --no-merges
Alexy Pellegrini (6):
      [Backport] Enable switching from remoting XR runtime to default XR runtime dynamically
      [Backport] Add a utility function to query OpenXR instance version
      [Backport] OpenXR: Add missing EndInitialize in QueryInstanceVersion
      [Backport] VR: enable interaction methods to be overrideable
      [Backport] VR: Add VTKIS_USCALE support in VR interactor style
      [Backport] XR: Move device pose update in interactor

Ben Boeckel (1):
      [Backport] Rendering/VR: make `glew` a public dependency

Jean-Christophe Fillion-Robin (24):
      Revert "[Backport MR-10450] OpenXRRemoting: Fix windows build using XrCheckOutput instead of XrCheckError"
      Revert "[Backport MR-10450] OpenXR: Improve XrCheckOutput API fixing constness of level parameter"
      Revert "[Backport MR-10449] OpenXRRemoting: Streamline integration as plugin"
      [Backport] OpenXRRemoting: Streamline integration as plugin
      [SlicerVirtualReality] ENH: Update OpenVR json binding to map right and left trigger with triggeraction
      [Backport MR-10778] BUG: Recognize OpenVR gesture where buttons are pressed consecutively
      [SlicerVirtualReality] BUG: Support Slicer 5.6.1 adding fixed Dolly3D function to vtkVRInteractorStyle
      [Backport MR-10784] VR: Update interactor style API adding GetMappedAction()
      [Backport MR-10785] VR: Declare AddAction() functions as virtual
      [Backport MR-10786] VR: Mark ComplexGesture recognition functions as public
      [Backport MR-10786] VR: Add GetCurrentGesture() API for retrieving the gesture being recognized
      [Backport MR-10786] VR: Add SetCurrentGesture() API for setting the gesture being recognized
      [Backport MR-10786] VR: Add GetDeviceInputDownCount() API
:...skipping...
Alexy Pellegrini (6):
      [Backport] Enable switching from remoting XR runtime to default XR runtime dynamically
      [Backport] Add a utility function to query OpenXR instance version
      [Backport] OpenXR: Add missing EndInitialize in QueryInstanceVersion
      [Backport] VR: enable interaction methods to be overrideable
      [Backport] VR: Add VTKIS_USCALE support in VR interactor style
      [Backport] XR: Move device pose update in interactor

Ben Boeckel (1):
      [Backport] Rendering/VR: make `glew` a public dependency

Jean-Christophe Fillion-Robin (24):
      Revert "[Backport MR-10450] OpenXRRemoting: Fix windows build using XrCheckOutput instead of XrCheckError"
      Revert "[Backport MR-10450] OpenXR: Improve XrCheckOutput API fixing constness of level parameter"
      Revert "[Backport MR-10449] OpenXRRemoting: Streamline integration as plugin"
      [Backport] OpenXRRemoting: Streamline integration as plugin
      [SlicerVirtualReality] ENH: Update OpenVR json binding to map right and left trigger with triggeraction
      [Backport MR-10778] BUG: Recognize OpenVR gesture where buttons are pressed consecutively
      [SlicerVirtualReality] BUG: Support Slicer 5.6.1 adding fixed Dolly3D function to vtkVRInteractorStyle
      [Backport MR-10784] VR: Update interactor style API adding GetMappedAction()
      [Backport MR-10785] VR: Declare AddAction() functions as virtual
      [Backport MR-10786] VR: Mark ComplexGesture recognition functions as public
      [Backport MR-10786] VR: Add GetCurrentGesture() API for retrieving the gesture being recognized
      [Backport MR-10786] VR: Add SetCurrentGesture() API for setting the gesture being recognized
      [Backport MR-10786] VR: Add GetDeviceInputDownCount() API
      [Backport MR-10786] VR: Add SetDeviceInputDownCount() API
      [Backport MR-10786] VR: Add SetStartingPhysicalToWorldMatrix() API
      [Backport MR-10786] VR: Add SetStartingPhysicalEventPose() API
      [Backport MR-10789] VR: Add SetInteractionState() API to VR interactor style
      [Backport MR-10789] VR: Improve robustness of GetInteractionState() by checking input
      Revert "[Backport MR-10785] VR: Declare AddAction() functions as virtual"
      [Backport MR-10785] VR: Improve consistency in OpenVR interactor AddAction()
      [Backport MR-10785] VR: Declare AddAction() functions as virtual
      [Backport MR-10794] VR: Resolve "Not rendered" warnings after XR RenderWindow Initialization
      [SlicerVirtualReality] ENH: Add OpenXR bindings for oculus_touch
      [Backport MR-10814] OpenXRRemoting: Support building against Holographic.Remoting.OpenXr >= 2.9.3

Mathieu Westphal (2):
      [Backport] OpenXRRemoting: Using XrCheckOutput
      [Backport] Dolly3D: Remove incorrect check in Y axis only

Mohamed Mssaouri (2):
      [Backport] Add teleportation to VR
      [Backport] Move teleportation to interaction modes

Sankhesh Jhaveri (4):
      [Backport MR-10783] VR: Move the TrackHMD flag to the camera
      [Backport MR-10783] VR: Deprecate vtkVRRenderWindow::TrackHMD
      [Backport MR-10783] VR: Provide stereo projection transforms for rendering
      [Backport MR-10792] OpenXR: Use the OpenXRConfig.cmake files provided by OpenXR-SDK

Software Solution Team (1):
      [Backport] improve FindOpenXR.cmake for windows platform

Thibault Bruyère (1):
      [Backport] Add volume clipping to vtkVRInteractorStyle

Tiffany Chhim (1):
      [Backport] VR Renderer: Add cross markers at tip of controllers

willdunklin (1):
      [Backport] vtkDeprecation: add VTK_DEPRECATED_IN_9_4_0 macro

…hanges

This commit updates the external project to explicitly reference the
VTK version that was manually checked out within the Slicer release-specific
build tree to support building the SlicerVirtualReality extension.

List of VTK changes:

```
$ git shortlog 46201478c..d4be5ea25 --no-merges
Alexy Pellegrini (6):
      [Backport] Enable switching from remoting XR runtime to default XR runtime dynamically
      [Backport] Add a utility function to query OpenXR instance version
      [Backport] OpenXR: Add missing EndInitialize in QueryInstanceVersion
      [Backport] VR: enable interaction methods to be overrideable
      [Backport] VR: Add VTKIS_USCALE support in VR interactor style
      [Backport] XR: Move device pose update in interactor

Ben Boeckel (1):
      [Backport] Rendering/VR: make `glew` a public dependency

Jean-Christophe Fillion-Robin (24):
      Revert "[Backport MR-10450] OpenXRRemoting: Fix windows build using XrCheckOutput instead of XrCheckError"
      Revert "[Backport MR-10450] OpenXR: Improve XrCheckOutput API fixing constness of level parameter"
      Revert "[Backport MR-10449] OpenXRRemoting: Streamline integration as plugin"
      [Backport] OpenXRRemoting: Streamline integration as plugin
      [SlicerVirtualReality] ENH: Update OpenVR json binding to map right and left trigger with triggeraction
      [Backport MR-10778] BUG: Recognize OpenVR gesture where buttons are pressed consecutively
      [SlicerVirtualReality] BUG: Support Slicer 5.6.1 adding fixed Dolly3D function to vtkVRInteractorStyle
      [Backport MR-10784] VR: Update interactor style API adding GetMappedAction()
      [Backport MR-10785] VR: Declare AddAction() functions as virtual
      [Backport MR-10786] VR: Mark ComplexGesture recognition functions as public
      [Backport MR-10786] VR: Add GetCurrentGesture() API for retrieving the gesture being recognized
      [Backport MR-10786] VR: Add SetCurrentGesture() API for setting the gesture being recognized
      [Backport MR-10786] VR: Add GetDeviceInputDownCount() API
:...skipping...
Alexy Pellegrini (6):
      [Backport] Enable switching from remoting XR runtime to default XR runtime dynamically
      [Backport] Add a utility function to query OpenXR instance version
      [Backport] OpenXR: Add missing EndInitialize in QueryInstanceVersion
      [Backport] VR: enable interaction methods to be overrideable
      [Backport] VR: Add VTKIS_USCALE support in VR interactor style
      [Backport] XR: Move device pose update in interactor

Ben Boeckel (1):
      [Backport] Rendering/VR: make `glew` a public dependency

Jean-Christophe Fillion-Robin (24):
      Revert "[Backport MR-10450] OpenXRRemoting: Fix windows build using XrCheckOutput instead of XrCheckError"
      Revert "[Backport MR-10450] OpenXR: Improve XrCheckOutput API fixing constness of level parameter"
      Revert "[Backport MR-10449] OpenXRRemoting: Streamline integration as plugin"
      [Backport] OpenXRRemoting: Streamline integration as plugin
      [SlicerVirtualReality] ENH: Update OpenVR json binding to map right and left trigger with triggeraction
      [Backport MR-10778] BUG: Recognize OpenVR gesture where buttons are pressed consecutively
      [SlicerVirtualReality] BUG: Support Slicer 5.6.1 adding fixed Dolly3D function to vtkVRInteractorStyle
      [Backport MR-10784] VR: Update interactor style API adding GetMappedAction()
      [Backport MR-10785] VR: Declare AddAction() functions as virtual
      [Backport MR-10786] VR: Mark ComplexGesture recognition functions as public
      [Backport MR-10786] VR: Add GetCurrentGesture() API for retrieving the gesture being recognized
      [Backport MR-10786] VR: Add SetCurrentGesture() API for setting the gesture being recognized
      [Backport MR-10786] VR: Add GetDeviceInputDownCount() API
      [Backport MR-10786] VR: Add SetDeviceInputDownCount() API
      [Backport MR-10786] VR: Add SetStartingPhysicalToWorldMatrix() API
      [Backport MR-10786] VR: Add SetStartingPhysicalEventPose() API
      [Backport MR-10789] VR: Add SetInteractionState() API to VR interactor style
      [Backport MR-10789] VR: Improve robustness of GetInteractionState() by checking input
      Revert "[Backport MR-10785] VR: Declare AddAction() functions as virtual"
      [Backport MR-10785] VR: Improve consistency in OpenVR interactor AddAction()
      [Backport MR-10785] VR: Declare AddAction() functions as virtual
      [Backport MR-10794] VR: Resolve "Not rendered" warnings after XR RenderWindow Initialization
      [SlicerVirtualReality] ENH: Add OpenXR bindings for oculus_touch
      [Backport MR-10814] OpenXRRemoting: Support building against Holographic.Remoting.OpenXr >= 2.9.3

Mathieu Westphal (2):
      [Backport] OpenXRRemoting: Using XrCheckOutput
      [Backport] Dolly3D: Remove incorrect check in Y axis only

Mohamed Mssaouri (2):
      [Backport] Add teleportation to VR
      [Backport] Move teleportation to interaction modes

Sankhesh Jhaveri (4):
      [Backport MR-10783] VR: Move the TrackHMD flag to the camera
      [Backport MR-10783] VR: Deprecate vtkVRRenderWindow::TrackHMD
      [Backport MR-10783] VR: Provide stereo projection transforms for rendering
      [Backport MR-10792] OpenXR: Use the OpenXRConfig.cmake files provided by OpenXR-SDK

Software Solution Team (1):
      [Backport] improve FindOpenXR.cmake for windows platform

Thibault Bruyère (1):
      [Backport] Add volume clipping to vtkVRInteractorStyle

Tiffany Chhim (1):
      [Backport] VR Renderer: Add cross markers at tip of controllers

willdunklin (1):
      [Backport] vtkDeprecation: add VTK_DEPRECATED_IN_9_4_0 macro
```
@jcfr jcfr added this to the Slicer 5.6.2 milestone Apr 5, 2024
@jcfr jcfr merged commit d5571b4 into Slicer:5.6 Apr 5, 2024
6 checks passed
@jcfr jcfr deleted the slicer-5.6-update-vtk-backporting-vr-changes branch April 5, 2024 02:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant