[slicer-5.6-v9.2.20230607-1ff325c54-2] Backport VR related fixes to support SlicerVirtualReality extension built against Slicer 5.6.1 #47
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
White cross-like markers can be displayed at the tip of the controllers. This can be useful to help with point placement for example. Merge-request: vtk/vtk!10478 (cherry picked from commit Kitware/VTK@9014167) (cherry picked from commit 3811752)
Merge-request: vtk/vtk!10509 (cherry picked from commit Kitware/VTK@179d044) (cherry picked from commit 69c7dcd)
Merge-request: vtk/vtk!10546 (cherry picked from commit Kitware/VTK@8e8b0fe) (cherry picked from commit a923a45)
Merge-request: vtk/vtk!10450 (cherry picked from commit Kitware/VTK@8eee120) (cherry picked from commit 7cbc3d5)
…ntime dynamically The default OpenXRManagerConnection ensure that XR_RUNTIME_JSON environment variable is unset in Initialize. This enable multiple version queries or OpenXR render windows to use different OpenXR runtimes. Merge-request: vtk/vtk!10543 (cherry picked from commit Kitware/VTK@d32293b) (cherry picked from commit 57192b2)
This doesn't need a full vtkOpenXRManager initialization, this function instantiates an independent xrInstance to query the version. Merge-request: vtk/vtk!10543 (cherry picked from commit Kitware/VTK@b46651d) (cherry picked from commit 793aeb7)
To support scenario where OpenXRRemoting library and companion files provided by the "microsoft.holographic.remoting.openxr" package are not distributed along side the application executable, this commit updates the heuristic looking up for "RemotingXR.json" to first consider the vtkRenderingOpenXRRemoting library directory. Merge-request: vtk/vtk!10449 (cherry picked from commit Kitware/VTK@7c0474c) (cherry picked from commit 0233aff)
Merge-request: vtk/vtk!10550 (cherry picked from commit Kitware/VTK@b22f520) (cherry picked from commit ceb1fa2)
Fix ForEachNonWidgetProp Merge-request: vtk/vtk!10555 (cherry picked from commit Kitware/VTK@2904bb8) (cherry picked from commit be6f152)
It is included by `vtkVRRenderWindow.h`. Merge-request: vtk/vtk!10621 (cherry picked from commit Kitware/VTK@d79eba4) (cherry picked from commit fabb615)
Merge-request: vtk/vtk!10735 (cherry picked from commit Kitware/VTK@dd2a56a) (cherry picked from commit d43336b)
Merge-request: vtk/vtk!10735 (cherry picked from commit Kitware/VTK@d1699eb) (cherry picked from commit c003544)
This enables interactor styles to override controller pose, in events such as PositionProp or Move3D events, but still getting access to the up to date value in said events. Merge-request: vtk/vtk!10742 (cherry picked from commit Kitware/VTK@a155740) (cherry picked from commit 9e103ca)
…nd left trigger with triggeraction This is required to support using the trigger button for complex gesture. See vtkVirtualRealityViewInteractor::SetGestureButtonToTrigger() Co-authored-by: Lucas Gandel <lucas.gandel@kitware.com> (cherry picked from commit 2e91328)
…ressed consecutively This commit introduces an additional action named `ComplexGestureAction_Event2` to address the recognition of complex gestures in OpenVR. In cases where two complex gesture buttons are pressed consecutively, the `actionData.bChanged` condition (utilized in `DoOneEvent`) is already false when the user is already holding down one button, leading to the absence of additional event synthesis. By introducing `ComplexGestureAction_Event2`, a second event is synthesized, resulting in a second invocation of `HandleComplexGestureEvents`. This enables the function `RecognizeComplexGesture()` to effectively identify and recognize the associated gesture. Co-authored-by: Lucas Gandel <lucas.gandel@kitware.com> Merge-request: vtk/vtk!10778 (cherry picked from commit 0816137)
Merge-request: vtk/vtk!10435 (cherry picked from commit Kitware/VTK@3755243) (cherry picked from commit 4f26038)
… function to vtkVRInteractorStyle This commit reverts the previous commit and adds the fixed implementation of `Dolly3D()` directly in the `vtkVRInteractorStyle` class. This allow to build the extension with the fix without requiring to modify VTK already compiled and part of the Slicer 5.6.1 releases.
jcfr
changed the title
|
Locally build & testing confirmed the SlicerVirtuaReality extension could be packaged and uploaded ✅ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These fixes are specific to the
vtkRenderingVR,vtkRenderingOpenVRandvtkRenderingOpenXRbuilt and distributed through theSlicerVirtualRealityextension.Note that change to
Rendering/Core/vtkInteractorStyle.hconsist in defining the new macroVTKIS_TELEPORTATIONand has no impact on the ABI requirement related to the VTK libraries distributed within the Slicer 5.6.1 release.These changes are a subset of the ones integrated in branch
slicer-v9.2.20230607-1ff325c54-2through #46