Skip to content

Commit 4f8ccb2

Browse files
danielhofmann-msdanielhofmann-ms
authored
Fix MRTK Pointer Unity UI interaction (#3749)
* - Introduce reliable mechanism for a pointer to detect when its current pointer target is about to change. - Make all objects of a NearInteractionTouchable subtree touchable, needed for Unity UI. Remove raycast code-duplication (and thus knowledge about FocusProvider implementation) in PokePointer. We need to make sure to also take into account Unity UI graphics raycasts. * Add MixedRealityInputModule inheriting from StandaloneInputModule to add MRTK pointer events for Unity UI.
1 parent 5a97cff commit 4f8ccb2

34 files changed

+1163
-928
lines changed

‎Assets/MixedRealityToolkit.Examples/Demos/Audio/Scenes/AudioLoFiEffectDemo.unity‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ GameObject:
694694
- component: {fileID: 1701341181}
695695
- component: {fileID: 1701341185}
696696
- component: {fileID: 1701341188}
697-
- component: {fileID: 1701341187}
697+
- component: {fileID: 1701341186}
698698
m_Layer: 0
699699
m_Name: Main Camera
700700
m_TagString: MainCamera
@@ -796,7 +796,7 @@ MonoBehaviour:
796796
gazeTransform: {fileID: 0}
797797
minHeadVelocityThreshold: 0.5
798798
maxHeadVelocityThreshold: 2
799-
--- !u!114 &1701341187
799+
--- !u!114 &1701341186
800800
MonoBehaviour:
801801
m_ObjectHideFlags: 0
802802
m_CorrespondingSourceObject: {fileID: 0}
@@ -805,16 +805,9 @@ MonoBehaviour:
805805
m_GameObject: {fileID: 1701341180}
806806
m_Enabled: 1
807807
m_EditorHideFlags: 0
808-
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
808+
m_Script: {fileID: 11500000, guid: 7a21b486d0bb44444b1418aaa38b44de, type: 3}
809809
m_Name:
810810
m_EditorClassIdentifier:
811-
m_HorizontalAxis: Horizontal
812-
m_VerticalAxis: Vertical
813-
m_SubmitButton: Submit
814-
m_CancelButton: Cancel
815-
m_InputActionsPerSecond: 10
816-
m_RepeatDelay: 0.5
817-
m_ForceModuleActive: 0
818811
--- !u!114 &1701341188
819812
MonoBehaviour:
820813
m_ObjectHideFlags: 0

‎Assets/MixedRealityToolkit.Examples/Demos/Audio/Scenes/AudioOcclusionDemo.unity‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ GameObject:
498498
- component: {fileID: 1460686211}
499499
- component: {fileID: 1460686215}
500500
- component: {fileID: 1460686217}
501-
- component: {fileID: 1460686218}
501+
- component: {fileID: 1460686216}
502502
m_Layer: 0
503503
m_Name: Main Camera
504504
m_TagString: MainCamera
@@ -600,7 +600,7 @@ MonoBehaviour:
600600
gazeTransform: {fileID: 0}
601601
minHeadVelocityThreshold: 0.5
602602
maxHeadVelocityThreshold: 2
603-
--- !u!114 &1460686217
603+
--- !u!114 &1460686216
604604
MonoBehaviour:
605605
m_ObjectHideFlags: 0
606606
m_CorrespondingSourceObject: {fileID: 0}
@@ -609,13 +609,10 @@ MonoBehaviour:
609609
m_GameObject: {fileID: 1460686210}
610610
m_Enabled: 1
611611
m_EditorHideFlags: 0
612-
m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
612+
m_Script: {fileID: 11500000, guid: 7a21b486d0bb44444b1418aaa38b44de, type: 3}
613613
m_Name:
614614
m_EditorClassIdentifier:
615-
m_FirstSelected: {fileID: 0}
616-
m_sendNavigationEvents: 1
617-
m_DragThreshold: 10
618-
--- !u!114 &1460686218
615+
--- !u!114 &1460686217
619616
MonoBehaviour:
620617
m_ObjectHideFlags: 0
621618
m_CorrespondingSourceObject: {fileID: 0}
@@ -624,16 +621,12 @@ MonoBehaviour:
624621
m_GameObject: {fileID: 1460686210}
625622
m_Enabled: 1
626623
m_EditorHideFlags: 0
627-
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
624+
m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
628625
m_Name:
629626
m_EditorClassIdentifier:
630-
m_HorizontalAxis: Horizontal
631-
m_VerticalAxis: Vertical
632-
m_SubmitButton: Submit
633-
m_CancelButton: Cancel
634-
m_InputActionsPerSecond: 10
635-
m_RepeatDelay: 0.5
636-
m_ForceModuleActive: 0
627+
m_FirstSelected: {fileID: 0}
628+
m_sendNavigationEvents: 1
629+
m_DragThreshold: 10
637630
--- !u!1 &1552166284
638631
GameObject:
639632
m_ObjectHideFlags: 0

‎Assets/MixedRealityToolkit.Examples/Demos/Boundary/Scenes/BoundaryVisualization.unity‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ GameObject:
715715
- component: {fileID: 1491404207}
716716
- component: {fileID: 1491404211}
717717
- component: {fileID: 1491404205}
718-
- component: {fileID: 1491404210}
718+
- component: {fileID: 1491404206}
719719
m_Layer: 0
720720
m_Name: Main Camera
721721
m_TagString: MainCamera
@@ -759,6 +759,18 @@ MonoBehaviour:
759759
gazeTransform: {fileID: 0}
760760
minHeadVelocityThreshold: 0.5
761761
maxHeadVelocityThreshold: 2
762+
--- !u!114 &1491404206
763+
MonoBehaviour:
764+
m_ObjectHideFlags: 0
765+
m_CorrespondingSourceObject: {fileID: 0}
766+
m_PrefabInstance: {fileID: 0}
767+
m_PrefabAsset: {fileID: 0}
768+
m_GameObject: {fileID: 1491404203}
769+
m_Enabled: 1
770+
m_EditorHideFlags: 0
771+
m_Script: {fileID: 11500000, guid: 7a21b486d0bb44444b1418aaa38b44de, type: 3}
772+
m_Name:
773+
m_EditorClassIdentifier:
762774
--- !u!81 &1491404207
763775
AudioListener:
764776
m_ObjectHideFlags: 0
@@ -817,25 +829,6 @@ Camera:
817829
m_OcclusionCulling: 1
818830
m_StereoConvergence: 10
819831
m_StereoSeparation: 0.022
820-
--- !u!114 &1491404210
821-
MonoBehaviour:
822-
m_ObjectHideFlags: 0
823-
m_CorrespondingSourceObject: {fileID: 0}
824-
m_PrefabInstance: {fileID: 0}
825-
m_PrefabAsset: {fileID: 0}
826-
m_GameObject: {fileID: 1491404203}
827-
m_Enabled: 1
828-
m_EditorHideFlags: 0
829-
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
830-
m_Name:
831-
m_EditorClassIdentifier:
832-
m_HorizontalAxis: Horizontal
833-
m_VerticalAxis: Vertical
834-
m_SubmitButton: Submit
835-
m_CancelButton: Cancel
836-
m_InputActionsPerSecond: 10
837-
m_RepeatDelay: 0.5
838-
m_ForceModuleActive: 0
839832
--- !u!114 &1491404211
840833
MonoBehaviour:
841834
m_ObjectHideFlags: 0

‎Assets/MixedRealityToolkit.Examples/Demos/Diagnostics/Scenes/DiagnosticsDemo.unity‎

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ GameObject:
199199
- component: {fileID: 469757470}
200200
- component: {fileID: 469757468}
201201
- component: {fileID: 469757473}
202-
- component: {fileID: 469757472}
202+
- component: {fileID: 469757469}
203203
m_Layer: 0
204204
m_Name: Main Camera
205205
m_TagString: MainCamera
@@ -243,6 +243,18 @@ MonoBehaviour:
243243
gazeTransform: {fileID: 0}
244244
minHeadVelocityThreshold: 0.5
245245
maxHeadVelocityThreshold: 2
246+
--- !u!114 &469757469
247+
MonoBehaviour:
248+
m_ObjectHideFlags: 0
249+
m_CorrespondingSourceObject: {fileID: 0}
250+
m_PrefabInstance: {fileID: 0}
251+
m_PrefabAsset: {fileID: 0}
252+
m_GameObject: {fileID: 469757466}
253+
m_Enabled: 1
254+
m_EditorHideFlags: 0
255+
m_Script: {fileID: 11500000, guid: 7a21b486d0bb44444b1418aaa38b44de, type: 3}
256+
m_Name:
257+
m_EditorClassIdentifier:
246258
--- !u!81 &469757470
247259
AudioListener:
248260
m_ObjectHideFlags: 0
@@ -293,25 +305,6 @@ Camera:
293305
m_OcclusionCulling: 1
294306
m_StereoConvergence: 10
295307
m_StereoSeparation: 0.022
296-
--- !u!114 &469757472
297-
MonoBehaviour:
298-
m_ObjectHideFlags: 0
299-
m_CorrespondingSourceObject: {fileID: 0}
300-
m_PrefabInstance: {fileID: 0}
301-
m_PrefabAsset: {fileID: 0}
302-
m_GameObject: {fileID: 469757466}
303-
m_Enabled: 1
304-
m_EditorHideFlags: 0
305-
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
306-
m_Name:
307-
m_EditorClassIdentifier:
308-
m_HorizontalAxis: Horizontal
309-
m_VerticalAxis: Vertical
310-
m_SubmitButton: Submit
311-
m_CancelButton: Cancel
312-
m_InputActionsPerSecond: 10
313-
m_RepeatDelay: 0.5
314-
m_ForceModuleActive: 0
315308
--- !u!114 &469757473
316309
MonoBehaviour:
317310
m_ObjectHideFlags: 0
@@ -558,16 +551,6 @@ PrefabInstance:
558551
propertyPath: m_Text
559552
value: DiagnosticDemoControls.cs
560553
objectReference: {fileID: 0}
561-
- target: {fileID: 114121190672569774, guid: a900c08743a94c328074df8bbe3eb63c,
562-
type: 3}
563-
propertyPath: m_Text
564-
value: ' Toggle Diagnostics'
565-
objectReference: {fileID: 0}
566-
- target: {fileID: 114186135864427680, guid: a900c08743a94c328074df8bbe3eb63c,
567-
type: 3}
568-
propertyPath: m_Text
569-
value: ' Toggle Profiler'
570-
objectReference: {fileID: 0}
571554
- target: {fileID: 224849082003076088, guid: a900c08743a94c328074df8bbe3eb63c,
572555
type: 3}
573556
propertyPath: m_AnchoredPosition.y
@@ -583,6 +566,16 @@ PrefabInstance:
583566
propertyPath: m_AnchoredPosition.y
584567
value: 0.055
585568
objectReference: {fileID: 0}
569+
- target: {fileID: 114186135864427680, guid: a900c08743a94c328074df8bbe3eb63c,
570+
type: 3}
571+
propertyPath: m_Text
572+
value: ' Toggle Profiler'
573+
objectReference: {fileID: 0}
574+
- target: {fileID: 114121190672569774, guid: a900c08743a94c328074df8bbe3eb63c,
575+
type: 3}
576+
propertyPath: m_Text
577+
value: ' Toggle Diagnostics'
578+
objectReference: {fileID: 0}
586579
m_RemovedComponents: []
587580
m_SourcePrefab: {fileID: 100100000, guid: a900c08743a94c328074df8bbe3eb63c, type: 3}
588581
--- !u!4 &1776170452 stripped

‎Assets/MixedRealityToolkit.Examples/Demos/Gltf/Scenes/Glb-Loading-Demo.unity‎

Lines changed: 76 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
41+
m_IndirectSpecularColor: {r: 0.4465782, g: 0.49641252, b: 0.5748167, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -143,6 +143,79 @@ Transform:
143143
m_Father: {fileID: 0}
144144
m_RootOrder: 2
145145
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
146+
--- !u!1 &732588822
147+
GameObject:
148+
m_ObjectHideFlags: 0
149+
m_CorrespondingSourceObject: {fileID: 0}
150+
m_PrefabInstance: {fileID: 0}
151+
m_PrefabAsset: {fileID: 0}
152+
serializedVersion: 6
153+
m_Component:
154+
- component: {fileID: 732588823}
155+
- component: {fileID: 732588824}
156+
m_Layer: 0
157+
m_Name: UIRaycastCamera
158+
m_TagString: Untagged
159+
m_Icon: {fileID: 0}
160+
m_NavMeshLayer: 0
161+
m_StaticEditorFlags: 0
162+
m_IsActive: 1
163+
--- !u!4 &732588823
164+
Transform:
165+
m_ObjectHideFlags: 0
166+
m_CorrespondingSourceObject: {fileID: 0}
167+
m_PrefabInstance: {fileID: 0}
168+
m_PrefabAsset: {fileID: 0}
169+
m_GameObject: {fileID: 732588822}
170+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
171+
m_LocalPosition: {x: 0, y: 0, z: 0}
172+
m_LocalScale: {x: 1, y: 1, z: 1}
173+
m_Children: []
174+
m_Father: {fileID: 1292482201}
175+
m_RootOrder: 0
176+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
177+
--- !u!20 &732588824
178+
Camera:
179+
m_ObjectHideFlags: 0
180+
m_CorrespondingSourceObject: {fileID: 0}
181+
m_PrefabInstance: {fileID: 0}
182+
m_PrefabAsset: {fileID: 0}
183+
m_GameObject: {fileID: 732588822}
184+
m_Enabled: 0
185+
serializedVersion: 2
186+
m_ClearFlags: 1
187+
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
188+
m_projectionMatrixMode: 1
189+
m_SensorSize: {x: 36, y: 24}
190+
m_LensShift: {x: 0, y: 0}
191+
m_GateFitMode: 2
192+
m_FocalLength: 50
193+
m_NormalizedViewPortRect:
194+
serializedVersion: 2
195+
x: 0
196+
y: 0
197+
width: 1
198+
height: 1
199+
near clip plane: 0.3
200+
far clip plane: 1000
201+
field of view: 60
202+
orthographic: 0
203+
orthographic size: 5
204+
m_Depth: 0
205+
m_CullingMask:
206+
serializedVersion: 2
207+
m_Bits: 4294967295
208+
m_RenderingPath: -1
209+
m_TargetTexture: {fileID: 0}
210+
m_TargetDisplay: 0
211+
m_TargetEye: 3
212+
m_HDR: 1
213+
m_AllowMSAA: 1
214+
m_AllowDynamicResolution: 0
215+
m_ForceIntoRT: 0
216+
m_OcclusionCulling: 1
217+
m_StereoConvergence: 10
218+
m_StereoSeparation: 0.022
146219
--- !u!1 &907065543
147220
GameObject:
148221
m_ObjectHideFlags: 0
@@ -262,7 +335,8 @@ Transform:
262335
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
263336
m_LocalPosition: {x: 0, y: 0, z: 0}
264337
m_LocalScale: {x: 1, y: 1, z: 1}
265-
m_Children: []
338+
m_Children:
339+
- {fileID: 732588823}
266340
m_Father: {fileID: 553589746}
267341
m_RootOrder: 0
268342
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

0 commit comments

Comments
 (0)