Skip to content

Commit 3f1bc60

Browse files
committed
WIP - Support Unity Input System (and XR Interaction Toolkit)
- Input System needs to ignore focus. - Issues when switching between hands and controllers. - Needs to add targetRaySpace for hands. - Needs to update main project to newer Unity version. - Needs to add a new sample, based on the XR Interaction Toolkit hands sample.
1 parent 5c5d8a7 commit 3f1bc60

24 files changed

+994
-60
lines changed

Build/Build/Build.data

-5.15 MB
Binary file not shown.

Build/Build/Build.framework.js

Lines changed: 18 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Build/Build/Build.wasm

-3.24 MB
Binary file not shown.
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: c46f07b5ed07e4e92aa78254188d3d10, type: 3}
13+
m_Name: InputSystem.inputsettings
14+
m_EditorClassIdentifier:
15+
m_SupportedDevices: []
16+
m_UpdateMode: 1
17+
m_MaxEventBytesPerUpdate: 5242880
18+
m_MaxQueuedEventsPerUpdate: 1000
19+
m_CompensateForScreenOrientation: 1
20+
m_BackgroundBehavior: 2
21+
m_EditorInputBehaviorInPlayMode: 0
22+
m_DefaultDeadzoneMin: 0.125
23+
m_DefaultDeadzoneMax: 0.925
24+
m_DefaultButtonPressPoint: 0.5
25+
m_ButtonReleaseThreshold: 0.75
26+
m_DefaultTapTime: 0.2
27+
m_DefaultSlowTapTime: 0.5
28+
m_DefaultHoldTime: 0.4
29+
m_TapRadius: 5
30+
m_MultiTapDelayTime: 0.75
31+
m_DisableRedundantEventsMerging: 0
32+
m_ShortcutKeysConsumeInputs: 0
33+
m_iOSSettings:
34+
m_MotionUsage:
35+
m_Enabled: 0
36+
m_Description:

MainProject/Assets/XR/Loaders/Oculus Loader.asset.meta renamed to MainProject/Assets/InputSystem.inputsettings.asset.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

MainProject/Assets/XR/Loaders/Oculus Loader.asset

Lines changed: 0 additions & 14 deletions
This file was deleted.

MainProject/Assets/XR/Settings/Oculus Settings.asset

Lines changed: 0 additions & 22 deletions
This file was deleted.

MainProject/Assets/XR/XRGeneralSettings.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ MonoBehaviour:
3030
m_AutomaticLoading: 0
3131
m_AutomaticRunning: 0
3232
m_Loaders:
33-
- {fileID: 11400000, guid: 9c6ad1e0a43d0924a957e24c0cfa99e2, type: 2}
33+
- {fileID: 11400000, guid: 797666f8ebb38454598dca4bc1e8d0e1, type: 2}
3434
--- !u!114 &-121488861701520503
3535
MonoBehaviour:
3636
m_ObjectHideFlags: 0

MainProject/Packages/manifest.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,14 @@
1414
"com.unity.ide.rider": "2.0.7",
1515
"com.unity.ide.visualstudio": "2.0.8",
1616
"com.unity.ide.vscode": "1.2.3",
17+
"com.unity.inputsystem": "1.0.2",
1718
"com.unity.test-framework": "1.1.24",
1819
"com.unity.timeline": "1.4.8",
1920
"com.unity.ugui": "1.0.0",
21+
"com.unity.xr.interaction.toolkit": "2.3.2",
2022
"com.unity.xr.management": "4.0.1",
21-
"com.unity.xr.oculus": "1.9.1",
23+
"com.unity.xr.openxr": "1.2.8",
24+
"com.unity.xr.hands": "1.1.0",
2225
"com.unity.modules.ai": "1.0.0",
2326
"com.unity.modules.androidjni": "1.0.0",
2427
"com.unity.modules.animation": "1.0.0",

MainProject/Packages/packages-lock.json

Lines changed: 53 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,18 @@
8080
"dependencies": {},
8181
"url": "https://packages.unity.com"
8282
},
83+
"com.unity.inputsystem": {
84+
"version": "1.4.4",
85+
"depth": 1,
86+
"source": "registry",
87+
"dependencies": {
88+
"com.unity.modules.uielements": "1.0.0"
89+
},
90+
"url": "https://packages.unity.com"
91+
},
8392
"com.unity.mathematics": {
84-
"version": "1.2.1",
85-
"depth": 2,
93+
"version": "1.2.6",
94+
"depth": 1,
8695
"source": "registry",
8796
"dependencies": {},
8897
"url": "https://packages.unity.com"
@@ -133,8 +142,45 @@
133142
"com.unity.modules.imgui": "1.0.0"
134143
}
135144
},
145+
"com.unity.xr.core-utils": {
146+
"version": "2.2.0",
147+
"depth": 1,
148+
"source": "registry",
149+
"dependencies": {
150+
"com.unity.modules.xr": "1.0.0"
151+
},
152+
"url": "https://packages.unity.com"
153+
},
154+
"com.unity.xr.hands": {
155+
"version": "1.1.0",
156+
"depth": 0,
157+
"source": "registry",
158+
"dependencies": {
159+
"com.unity.inputsystem": "1.4.3",
160+
"com.unity.modules.xr": "1.0.0",
161+
"com.unity.xr.core-utils": "2.0.0",
162+
"com.unity.xr.management": "4.0.1"
163+
},
164+
"url": "https://packages.unity.com"
165+
},
166+
"com.unity.xr.interaction.toolkit": {
167+
"version": "2.3.2",
168+
"depth": 0,
169+
"source": "registry",
170+
"dependencies": {
171+
"com.unity.inputsystem": "1.4.4",
172+
"com.unity.mathematics": "1.2.6",
173+
"com.unity.ugui": "1.0.0",
174+
"com.unity.xr.core-utils": "2.2.0",
175+
"com.unity.xr.legacyinputhelpers": "2.1.10",
176+
"com.unity.modules.audio": "1.0.0",
177+
"com.unity.modules.imgui": "1.0.0",
178+
"com.unity.modules.physics": "1.0.0"
179+
},
180+
"url": "https://packages.unity.com"
181+
},
136182
"com.unity.xr.legacyinputhelpers": {
137-
"version": "2.1.7",
183+
"version": "2.1.10",
138184
"depth": 1,
139185
"source": "registry",
140186
"dependencies": {
@@ -156,13 +202,14 @@
156202
},
157203
"url": "https://packages.unity.com"
158204
},
159-
"com.unity.xr.oculus": {
160-
"version": "1.9.1",
205+
"com.unity.xr.openxr": {
206+
"version": "1.2.8",
161207
"depth": 0,
162208
"source": "registry",
163209
"dependencies": {
164210
"com.unity.xr.management": "4.0.1",
165-
"com.unity.ugui": "1.0.0"
211+
"com.unity.xr.legacyinputhelpers": "2.1.2",
212+
"com.unity.inputsystem": "1.0.2"
166213
},
167214
"url": "https://packages.unity.com"
168215
},

0 commit comments

Comments
 (0)