Skip to content

Commit 1c8e1fc

Browse files
author
Robert El-Soudani
committed
Update InputManager for 6DoF compatibility
* Updating InputManager prefab to include SimpleSinglePointerManager. * Updating InputManagerTest scene to connect its cursor to SimpleSinglePointerManager. * Updating InputManagerTest scene to include mixed reality camera instead of HoloLens camera.
1 parent 981b846 commit 1c8e1fc

File tree

2 files changed

+116
-43
lines changed

2 files changed

+116
-43
lines changed

Assets/HoloToolkit/Input/Prefabs/InputManager.prefab

Lines changed: 58 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ GameObject:
2424
- component: {fileID: 114000012434513746}
2525
- component: {fileID: 114000013868099214}
2626
- component: {fileID: 114708646396671696}
27+
- component: {fileID: 114742747811649402}
2728
m_Layer: 0
2829
m_Name: InputManager
2930
m_TagString: Untagged
@@ -64,6 +65,22 @@ GameObject:
6465
m_NavMeshLayer: 0
6566
m_StaticEditorFlags: 0
6667
m_IsActive: 1
68+
--- !u!1 &1834357620357688
69+
GameObject:
70+
m_ObjectHideFlags: 0
71+
m_PrefabParentObject: {fileID: 0}
72+
m_PrefabInternal: {fileID: 100100000}
73+
serializedVersion: 5
74+
m_Component:
75+
- component: {fileID: 4532035439910448}
76+
- component: {fileID: 114345042324023316}
77+
m_Layer: 0
78+
m_Name: ControllerPointerStabilizer
79+
m_TagString: Untagged
80+
m_Icon: {fileID: 0}
81+
m_NavMeshLayer: 0
82+
m_StaticEditorFlags: 0
83+
m_IsActive: 1
6784
--- !u!4 &4000010261267946
6885
Transform:
6986
m_ObjectHideFlags: 1
@@ -89,6 +106,7 @@ Transform:
89106
m_Children:
90107
- {fileID: 4000013985985722}
91108
- {fileID: 4000010261267946}
109+
- {fileID: 4532035439910448}
92110
m_Father: {fileID: 0}
93111
m_RootOrder: 0
94112
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -105,6 +123,19 @@ Transform:
105123
m_Father: {fileID: 4000011656901714}
106124
m_RootOrder: 0
107125
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
126+
--- !u!4 &4532035439910448
127+
Transform:
128+
m_ObjectHideFlags: 1
129+
m_PrefabParentObject: {fileID: 0}
130+
m_PrefabInternal: {fileID: 100100000}
131+
m_GameObject: {fileID: 1834357620357688}
132+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
133+
m_LocalPosition: {x: 0, y: 0, z: 0}
134+
m_LocalScale: {x: 1, y: 1, z: 1}
135+
m_Children: []
136+
m_Father: {fileID: 4000011656901714}
137+
m_RootOrder: 2
138+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
108139
--- !u!114 &114000011980027866
109140
MonoBehaviour:
110141
m_ObjectHideFlags: 1
@@ -179,6 +210,18 @@ MonoBehaviour:
179210
UseGazeManager: 1
180211
DefaultPlaneDistance: 2
181212
DrawGizmos: 0
213+
--- !u!114 &114345042324023316
214+
MonoBehaviour:
215+
m_ObjectHideFlags: 1
216+
m_PrefabParentObject: {fileID: 0}
217+
m_PrefabInternal: {fileID: 100100000}
218+
m_GameObject: {fileID: 1834357620357688}
219+
m_Enabled: 1
220+
m_EditorHideFlags: 0
221+
m_Script: {fileID: 11500000, guid: b81e3e700505863408cacaa0346cb1a6, type: 3}
222+
m_Name:
223+
m_EditorClassIdentifier:
224+
StoredStabilitySamples: 60
182225
--- !u!114 &114708646396671696
183226
MonoBehaviour:
184227
m_ObjectHideFlags: 1
@@ -195,10 +238,24 @@ MonoBehaviour:
195238
- serializedVersion: 2
196239
m_Bits: 4294967291
197240
autoRegisteredPointers: []
198-
autoRegisterGazePointerIfNoPointersRegistered: 1
241+
autoRegisterGazePointerIfNoPointersRegistered: 0
199242
autoRegisteredPointableCanvases: []
200243
DebugDrawPointingRays: 0
201244
DebugDrawPointingRayColors: []
245+
--- !u!114 &114742747811649402
246+
MonoBehaviour:
247+
m_ObjectHideFlags: 1
248+
m_PrefabParentObject: {fileID: 0}
249+
m_PrefabInternal: {fileID: 100100000}
250+
m_GameObject: {fileID: 1000011070707148}
251+
m_Enabled: 1
252+
m_EditorHideFlags: 0
253+
m_Script: {fileID: 11500000, guid: 3a23bf9a6a8497a4490fdbd42c41357e, type: 3}
254+
m_Name:
255+
m_EditorClassIdentifier:
256+
ControllerPointerStabilizer: {fileID: 114345042324023316}
257+
Cursor: {fileID: 0}
258+
SearchForCursorIfUnset: 1
202259
--- !u!114 &114902642943532050
203260
MonoBehaviour:
204261
m_ObjectHideFlags: 1

Assets/HoloToolkit/Input/Tests/Scenes/InputManagerTest.unity

Lines changed: 58 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1692,48 +1692,6 @@ Animator:
16921692
m_PrefabParentObject: {fileID: 95000013881968268, guid: b3364a8b0a2a96a43b662045118b0a9e,
16931693
type: 2}
16941694
m_PrefabInternal: {fileID: 1550965883}
1695-
--- !u!1001 &525736251
1696-
Prefab:
1697-
m_ObjectHideFlags: 0
1698-
serializedVersion: 2
1699-
m_Modification:
1700-
m_TransformParent: {fileID: 0}
1701-
m_Modifications:
1702-
- target: {fileID: 4000010560871102, guid: d379ed0a5618c9f479f58bd83a2d0ad3, type: 2}
1703-
propertyPath: m_LocalPosition.x
1704-
value: 0
1705-
objectReference: {fileID: 0}
1706-
- target: {fileID: 4000010560871102, guid: d379ed0a5618c9f479f58bd83a2d0ad3, type: 2}
1707-
propertyPath: m_LocalPosition.y
1708-
value: 0
1709-
objectReference: {fileID: 0}
1710-
- target: {fileID: 4000010560871102, guid: d379ed0a5618c9f479f58bd83a2d0ad3, type: 2}
1711-
propertyPath: m_LocalPosition.z
1712-
value: 0
1713-
objectReference: {fileID: 0}
1714-
- target: {fileID: 4000010560871102, guid: d379ed0a5618c9f479f58bd83a2d0ad3, type: 2}
1715-
propertyPath: m_LocalRotation.x
1716-
value: 0
1717-
objectReference: {fileID: 0}
1718-
- target: {fileID: 4000010560871102, guid: d379ed0a5618c9f479f58bd83a2d0ad3, type: 2}
1719-
propertyPath: m_LocalRotation.y
1720-
value: 0
1721-
objectReference: {fileID: 0}
1722-
- target: {fileID: 4000010560871102, guid: d379ed0a5618c9f479f58bd83a2d0ad3, type: 2}
1723-
propertyPath: m_LocalRotation.z
1724-
value: 0
1725-
objectReference: {fileID: 0}
1726-
- target: {fileID: 4000010560871102, guid: d379ed0a5618c9f479f58bd83a2d0ad3, type: 2}
1727-
propertyPath: m_LocalRotation.w
1728-
value: 1
1729-
objectReference: {fileID: 0}
1730-
- target: {fileID: 4000010560871102, guid: d379ed0a5618c9f479f58bd83a2d0ad3, type: 2}
1731-
propertyPath: m_RootOrder
1732-
value: 1
1733-
objectReference: {fileID: 0}
1734-
m_RemovedComponents: []
1735-
m_ParentPrefab: {fileID: 100100000, guid: d379ed0a5618c9f479f58bd83a2d0ad3, type: 2}
1736-
m_IsPrefabParent: 0
17371695
--- !u!95 &526292728 stripped
17381696
Animator:
17391697
m_PrefabParentObject: {fileID: 95000013881968268, guid: b3364a8b0a2a96a43b662045118b0a9e,
@@ -2247,6 +2205,12 @@ Transform:
22472205
m_PrefabParentObject: {fileID: 4000014213108822, guid: b3364a8b0a2a96a43b662045118b0a9e,
22482206
type: 2}
22492207
m_PrefabInternal: {fileID: 1637635550}
2208+
--- !u!114 &763781730 stripped
2209+
MonoBehaviour:
2210+
m_PrefabParentObject: {fileID: 114611684728110934, guid: a611e772ef8ddf64d8106a9cbb70f31c,
2211+
type: 2}
2212+
m_PrefabInternal: {fileID: 873989050}
2213+
m_Script: {fileID: 11500000, guid: 0decd33ba8702954885a62b5bc1a778e, type: 3}
22502214
--- !u!1 &764860894
22512215
GameObject:
22522216
m_ObjectHideFlags: 0
@@ -3995,6 +3959,11 @@ Prefab:
39953959
propertyPath: m_RootOrder
39963960
value: 1
39973961
objectReference: {fileID: 0}
3962+
- target: {fileID: 114742747811649402, guid: 3eddd1c29199313478dd3f912bfab2ab,
3963+
type: 2}
3964+
propertyPath: Cursor
3965+
value:
3966+
objectReference: {fileID: 763781730}
39983967
m_RemovedComponents: []
39993968
m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2}
40003969
m_IsPrefabParent: 0
@@ -5099,6 +5068,53 @@ MeshRenderer:
50995068
m_SortingLayerID: 0
51005069
m_SortingLayer: 0
51015070
m_SortingOrder: 0
5071+
--- !u!1001 &1750729654
5072+
Prefab:
5073+
m_ObjectHideFlags: 0
5074+
serializedVersion: 2
5075+
m_Modification:
5076+
m_TransformParent: {fileID: 0}
5077+
m_Modifications:
5078+
- target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2}
5079+
propertyPath: m_LocalPosition.x
5080+
value: 0
5081+
objectReference: {fileID: 0}
5082+
- target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2}
5083+
propertyPath: m_LocalPosition.y
5084+
value: 0
5085+
objectReference: {fileID: 0}
5086+
- target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2}
5087+
propertyPath: m_LocalPosition.z
5088+
value: 0
5089+
objectReference: {fileID: 0}
5090+
- target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2}
5091+
propertyPath: m_LocalRotation.x
5092+
value: 0
5093+
objectReference: {fileID: 0}
5094+
- target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2}
5095+
propertyPath: m_LocalRotation.y
5096+
value: 0
5097+
objectReference: {fileID: 0}
5098+
- target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2}
5099+
propertyPath: m_LocalRotation.z
5100+
value: 0
5101+
objectReference: {fileID: 0}
5102+
- target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2}
5103+
propertyPath: m_LocalRotation.w
5104+
value: 1
5105+
objectReference: {fileID: 0}
5106+
- target: {fileID: 4541142303025740, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2}
5107+
propertyPath: m_RootOrder
5108+
value: 1
5109+
objectReference: {fileID: 0}
5110+
- target: {fileID: 114092548863884916, guid: d29bc40b7f3df26479d6a0aac211c355,
5111+
type: 2}
5112+
propertyPath: EnableTeleport
5113+
value: 1
5114+
objectReference: {fileID: 0}
5115+
m_RemovedComponents: []
5116+
m_ParentPrefab: {fileID: 100100000, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2}
5117+
m_IsPrefabParent: 0
51025118
--- !u!95 &1753714861 stripped
51035119
Animator:
51045120
m_PrefabParentObject: {fileID: 95000013881968268, guid: b3364a8b0a2a96a43b662045118b0a9e,

0 commit comments

Comments
 (0)