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.

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

Adding Spatial Mouse to MRTK3 #11643

Merged
merged 22 commits into from
Jun 26, 2023
Merged

Adding Spatial Mouse to MRTK3 #11643

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
3a080a9
Port Spatial Mouse PR to GitHub
sgreenlay-msft Jun 29, 2022
e6585c1
Fix whitespace
sgreenlay-msft Jun 30, 2022
73711c1
Update cursor hotspot and add Finn's suggestions for default reticleD…
sgreenlay-msft Jun 30, 2022
77dcc3d
Add a test
sgreenlay-msft Jun 30, 2022
79e2558
Merge pull request #5 from sgreenlay-msft/mrtk3-spatial-mouse
marlenaklein-msft Jun 13, 2023
855c177
Fix warning
marlenaklein-msft Jun 13, 2023
f231fcb
Fix Z-scroll bug
marlenaklein-msft Jun 13, 2023
ac37d76
Fix visual
marlenaklein-msft Jun 13, 2023
a12365c
Don't remember the last depth
marlenaklein-msft Jun 14, 2023
b382738
Merge maps
marlenaklein-msft Jun 17, 2023
732ccdd
Experimental changes
marlenaklein-msft Jun 20, 2023
d14d4bc
Remove debug
marlenaklein-msft Jun 20, 2023
f6ff50a
Thing that works
marlenaklein-msft Jun 20, 2023
5f5ad5d
Remove scene and logger changes
marlenaklein-msft Jun 22, 2023
f99efd2
Move to experimental
marlenaklein-msft Jun 22, 2023
227de3e
Add meta files
marlenaklein-msft Jun 22, 2023
7d7a71f
Merge branch 'mrtk3' into ValidateSpatialMouse2
marlenaklein-msft Jun 22, 2023
638fda8
Experimental tag
marlenaklein-msft Jun 22, 2023
03b4dee
Merge branch 'mrtk3' into ValidateSpatialMouse2
marlenaklein-msft Jun 22, 2023
9d1c60f
Add comments, Fix references, Mark as experimental
marlenaklein-msft Jun 22, 2023
4e67580
PR fixes
marlenaklein-msft Jun 23, 2023
006362d
Remove extraneous variable
marlenaklein-msft Jun 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 88 additions & 0 deletions com.microsoft.mrtk.input/Assets/Input Actions/MRTK Default Input Actions.inputactions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1239,6 +1239,94 @@
"isPartOfComposite": true
}
]
},
{
"name": "MRTK Spatial Mouse",
"id": "d61a5015-577c-4668-b95f-2ab49dd82913",
"actions": [
{
"name": "Select",
"type": "Button",
"id": "03075bc5-ac04-4deb-986e-20a2e8203b74",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "MouseMove",
"type": "Value",
"id": "68f39cfe-a99b-4b0c-9ff5-12f59905d3a9",
"expectedControlType": "Vector2",
"processors": "",
"interactions": "",
"initialStateCheck": true
},
{
"name": "MouseScroll",
"type": "Value",
"id": "ff47dab1-a950-4924-b86d-0dfe19d7ba0c",
"expectedControlType": "Vector2",
"processors": "",
"interactions": "",
"initialStateCheck": true
},
{
"name": "Position",
"type": "Value",
"id": "6c8df8e3-46c8-4ab1-9c61-e32073f5a43b",
"expectedControlType": "Vector3",
"processors": "",
"interactions": "",
"initialStateCheck": true
}
],
"bindings": [
{
"name": "",
"id": "621f9734-1689-41a1-b9e4-ecd04939b8b8",
"path": "<Mouse>/press",
"interactions": "",
"processors": "",
"groups": "Generic XR Controller",
"action": "Select",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "861aef1b-f193-4c99-9f68-caabf2d22ecd",
"path": "<Mouse>/delta",
"interactions": "",
"processors": "",
"groups": "Generic XR Controller",
"action": "MouseMove",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "3a3379e8-1ad6-4435-8e72-c06c0b27ed31",
"path": "<Mouse>/scroll",
"interactions": "",
"processors": "",
"groups": "Generic XR Controller",
"action": "MouseScroll",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "01f16594-5472-4876-8596-9c4290ad4a06",
"path": "<XRHMD>/centerEyePosition",
"interactions": "",
"processors": "",
"groups": "Generic XR Controller",
"action": "Position",
"isComposite": false,
"isPartOfComposite": false
}
]
}
],
"controlSchemes": [
Expand Down
Loading
Loading