Skip to content

Controller tracking #617

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 133 commits into
base: main
Choose a base branch
from
Open

Controller tracking #617

wants to merge 133 commits into from

Conversation

smlpt
Copy link
Contributor

@smlpt smlpt commented Feb 11, 2025 •
edited
Loading

This an extension to #523 (the eyetracking utilization branch) and only works in conjunction with this repository.
Everything from 1501761 onward is part of this branch (17 Dec 2024). The changes include:

  • new VR behaviors like VRGrabTheWorld and VR2HandWorldTransform
  • It also introduces a MultiVRButtonStateManager to distinguish between behaviors where only a single (grab) button is pressed, and one where both grab buttons are pressed. In the latter case we don't want to trigger the single button behaviors
  • cell editing tools for the VR controllers (instance selection and painting, spot creation, movement and deletion)
  • controller-based cell tracking
  • wrist menu for triggering callbacks for Elephant actions and for playback controls and undo/redu menu
  • fixed toggleVRRendering causes camera to lose arcball logic and inputhandler to lose custom keybindings #612
  • introduces a button mapping manager that automatically chooses different binding layouts for different VR headsets
  • spot and 3D cursor radius adjustments via the right controller joystick

RuoshanLan and others added 30 commits August 2, 2021 10:42
@RuoshanLan
utilize eyetracking in sciview
ac16240
@RuoshanLan
a working version and adjust the size of some messages
c3bc1b4
@RuoshanLan
code clean
f1f00c7
@RuoshanLan
let the volume show before starting the eye tracking
9eb458e
@RuoshanLan
update bionic tracking
785eb2c
@RuoshanLan
solve conflict
0c8afc7
@RuoshanLan
add headset for cell tracking
b4f7188
@RuoshanLan
add test without VR headset
0d613f6
@RuoshanLan
a working version of utilizing VRHeadset for cell tracking - part of …
3ddfcfc 
…sandbox function
@RuoshanLan
add function of tracking with controllers
efe9902
@RuoshanLan
replace numerictype with realtype
7370519
@RuoshanLan
resolve conflicts
7e4c128
@RuoshanLan
fix issue in controller version
9fb6c22
@RuoshanLan
improve the VRHeadsSettTrackingDemo and fix a bug caused by UV coordi…
e1c6013 
…nate
@RuoshanLan
add VR interaction to VRHeadSetTrackingDemo and add nodetaggedevent
9348a25
@RuoshanLan
code clean
8aa32f4
@RuoshanLan
merge
3eb8741
@RuoshanLan
Fix line endings
1d59a30
@RuoshanLan
Gradle: Add missing transitive dependencies
a7057b0
@RuoshanLan
SciView: Revert failed merge for addVolume functions
12cd940
@RuoshanLan
clean and add comment
e909c79
@smlpt
Merge branch 'master' into eyetracking-utilization
954ae8e
@smlpt
Gradle Build: update to scenery 0.9.0
3735f6c
@smlpt
Gradle Build: fixing outdated code
1ecaf0f
@smlpt
SciView: bring back openDirTiff and openTrackFile
0a78f66
@smlpt
Gradle: fix directories dep issue
9efcb08
@smlpt
build: update gradle and make the build compatible with java 21
80aeccd
@smlpt
Merge branch 'main' into eyetracking-utilization
f116a80 
# Conflicts:
#	build.gradle.kts
#	gradle/wrapper/gradle-wrapper.jar
#	gradle/wrapper/gradle-wrapper.properties
#	settings.gradle.kts
@smlpt
improve volume loading from scene
8b2839d
@smlpt
fix filtering for volumes in the scene
6136a3c
smlpt added 12 commits May 12, 2025 15:24
@smlpt
MultiVRButtonStateManager: add overloads and getRegisteredButtons method
aeb6fdb
@smlpt
ConfirmableClickBehaviour: add delayed execution parameter
b0673af
@smlpt
MultiButtonManager: renamed class, changed two hand state to always t…
b91eb10 
…rigger if any button on both hands is active
@smlpt
VR2HandNodeTransform: fix 3D rotation and enable Y axis locking behavior
5498edb
@smlpt
CellTrackingBase: add double button mapping for Y axis locking, add b…
f0ae3d1 
…ranch deletion via drag behavior
@smlpt
CellTrackingBase: improve branch deletion hold gesture interaction
ea1c90d
@smlpt
CellTrackingBase: add drag selection behavior to quickly paint select…
fb7161e 
…ions
@smlpt
CellTrackingBase: clean up old commented code
e79d20e
@smlpt
CellTrackingBase: change default track preview button state to true
f4e70e4
@smlpt
Added CellTrackingButtonMapper
67942ed
@smlpt
Merge remote-tracking branch 'origin/controller-tracking' into contro…
323e1de 
…ller-tracking
@smlpt
Let CellTrackingButtonMapper handle all keybindings
f78d521
@smlpt smlpt mentioned this pull request Jun 24, 2025
Open
4 tasks
@smlpt smlpt linked an issue Jun 26, 2025 that may be closed by this pull request
toggleVRRendering causes camera to lose arcball logic and inputhandler to lose custom keybindings #612
Open
@smlpt smlpt marked this pull request as ready for review July 17, 2025 08:05
@smlpt
Copy link
Contributor Author

smlpt commented Jul 17, 2025

@skalarproduktraum @kephale This PR is now also ready to be merged. Of course the eye tracking PR needs to be merged before this one.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skalarproduktraum skalarproduktraum Awaiting requested review from skalarproduktraum

@kephale kephale Awaiting requested review from kephale

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

toggleVRRendering causes camera to lose arcball logic and inputhandler to lose custom keybindings
2 participants
@smlpt @RuoshanLan