Merge pull request #1256 from StephenHodgson/MRTK-uGUIraycastingFix

Pointer uGUI raycasting fix
microsoft · Nov 9, 2017 · 59726cd · 59726cd
2 parents d209770 + 6783c87
commit 59726cd
Show file tree

Hide file tree

Showing 27 changed files with 495 additions and 157 deletions.
diff --git a/Assets/HoloToolkit-Examples/ColorPicker/ColorPickerExample.unity b/Assets/HoloToolkit-Examples/ColorPicker/ColorPickerExample.unity
@@ -188,7 +188,7 @@ Canvas:
   m_Enabled: 1
   serializedVersion: 3
   m_RenderMode: 2
-  m_Camera: {fileID: 0}
+  m_Camera: {fileID: 1596720591}
   m_PlaneDistance: 100
   m_PixelPerfect: 0
   m_ReceivesEvents: 1
@@ -701,3 +701,8 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2}
   m_IsPrefabParent: 0
+--- !u!20 &1596720591 stripped
+Camera:
+  m_PrefabParentObject: {fileID: 20049547090947856, guid: 3eddd1c29199313478dd3f912bfab2ab,
+    type: 2}
+  m_PrefabInternal: {fileID: 1596720590}
diff --git a/Assets/HoloToolkit-Examples/Input/Scenes/CanvasUiRaycasts.unity b/Assets/HoloToolkit-Examples/Input/Scenes/CanvasUiRaycasts.unity
@@ -274,6 +274,11 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2}
   m_IsPrefabParent: 0
+--- !u!20 &41258885 stripped
+Camera:
+  m_PrefabParentObject: {fileID: 20049547090947856, guid: 3eddd1c29199313478dd3f912bfab2ab,
+    type: 2}
+  m_PrefabInternal: {fileID: 41258884}
 --- !u!1 &47967669
 GameObject:
   m_ObjectHideFlags: 0
@@ -408,7 +413,7 @@ Canvas:
   m_Enabled: 1
   serializedVersion: 3
   m_RenderMode: 2
-  m_Camera: {fileID: 0}
+  m_Camera: {fileID: 41258885}
   m_PlaneDistance: 100
   m_PixelPerfect: 0
   m_ReceivesEvents: 1
@@ -436,7 +441,7 @@ RectTransform:
   - {fileID: 1577322405}
   - {fileID: 1354349145}
   m_Father: {fileID: 603432406}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -862,8 +867,8 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 160117912}
   - {fileID: 1748863526}
+  - {fileID: 160117912}
   - {fileID: 1985735395}
   m_Father: {fileID: 0}
   m_RootOrder: 3
@@ -2205,7 +2210,7 @@ Canvas:
   m_Enabled: 1
   serializedVersion: 3
   m_RenderMode: 2
-  m_Camera: {fileID: 0}
+  m_Camera: {fileID: 41258885}
   m_PlaneDistance: 100
   m_PixelPerfect: 0
   m_ReceivesEvents: 1
@@ -2233,7 +2238,7 @@ RectTransform:
   - {fileID: 576869519}
   - {fileID: 1825249308}
   m_Father: {fileID: 603432406}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -2719,7 +2724,7 @@ Canvas:
   m_Enabled: 1
   serializedVersion: 3
   m_RenderMode: 2
-  m_Camera: {fileID: 0}
+  m_Camera: {fileID: 41258885}
   m_PlaneDistance: 100
   m_PixelPerfect: 0
   m_ReceivesEvents: 1

diff --git a/Assets/HoloToolkit-Examples/Input/Scenes/InputManagerTest.unity b/Assets/HoloToolkit-Examples/Input/Scenes/InputManagerTest.unity
@@ -1397,7 +1397,7 @@ Canvas:
   m_Enabled: 1
   serializedVersion: 3
   m_RenderMode: 2
-  m_Camera: {fileID: 0}
+  m_Camera: {fileID: 485146271}
   m_PlaneDistance: 100
   m_PixelPerfect: 0
   m_ReceivesEvents: 1
@@ -1650,9 +1650,19 @@ Prefab:
       propertyPath: Cursor
       value: 
       objectReference: {fileID: 759629491}
+    - target: {fileID: 114950568511066590, guid: 3eddd1c29199313478dd3f912bfab2ab,
+        type: 2}
+      propertyPath: simulateHandsInEditor
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2}
   m_IsPrefabParent: 0
+--- !u!20 &485146271 stripped
+Camera:
+  m_PrefabParentObject: {fileID: 20049547090947856, guid: 3eddd1c29199313478dd3f912bfab2ab,
+    type: 2}
+  m_PrefabInternal: {fileID: 485146270}
 --- !u!1 &502235477
 GameObject:
   m_ObjectHideFlags: 0
@@ -3148,6 +3158,11 @@ Prefab:
       propertyPath: ShapeModule.radius.value
       value: 0.02237308
       objectReference: {fileID: 0}
+    - target: {fileID: 199000010866415596, guid: 31ed45da60c98354380578a9bde4814d,
+        type: 2}
+      propertyPath: m_SelectedEditorRenderState
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 31ed45da60c98354380578a9bde4814d, type: 2}
   m_IsPrefabParent: 0

diff --git a/Assets/HoloToolkit-Examples/Input/Scenes/KeyboardTest.unity b/Assets/HoloToolkit-Examples/Input/Scenes/KeyboardTest.unity
@@ -656,6 +656,10 @@ Prefab:
       propertyPath: m_Pivot.y
       value: 0.5
       objectReference: {fileID: 0}
+    - target: {fileID: 22335612, guid: c4e389e44d96da64ea974ab237ce1a9a, type: 2}
+      propertyPath: m_Camera
+      value: 
+      objectReference: {fileID: 1003701765}
     m_RemovedComponents:
     - {fileID: 114513796278864976, guid: c4e389e44d96da64ea974ab237ce1a9a, type: 2}
   m_ParentPrefab: {fileID: 100100000, guid: c4e389e44d96da64ea974ab237ce1a9a, type: 2}
@@ -707,6 +711,11 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2}
   m_IsPrefabParent: 0
+--- !u!20 &1003701765 stripped
+Camera:
+  m_PrefabParentObject: {fileID: 20049547090947856, guid: 3eddd1c29199313478dd3f912bfab2ab,
+    type: 2}
+  m_PrefabInternal: {fileID: 1003701764}
 --- !u!1 &1083211976
 GameObject:
   m_ObjectHideFlags: 0
@@ -968,11 +977,6 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1483467051}
---- !u!20 &1532151206 stripped
-Camera:
-  m_PrefabParentObject: {fileID: 20770519707920992, guid: d29bc40b7f3df26479d6a0aac211c355,
-    type: 2}
-  m_PrefabInternal: {fileID: 1571667773}
 --- !u!1 &1555344818
 GameObject:
   m_ObjectHideFlags: 0
@@ -1172,7 +1176,7 @@ Canvas:
   m_Enabled: 1
   serializedVersion: 3
   m_RenderMode: 2
-  m_Camera: {fileID: 1532151206}
+  m_Camera: {fileID: 1003701765}
   m_PlaneDistance: 100
   m_PixelPerfect: 0
   m_ReceivesEvents: 1

diff --git a/Assets/HoloToolkit-Examples/Input/Scenes/XboxControllerExample.unity b/Assets/HoloToolkit-Examples/Input/Scenes/XboxControllerExample.unity
@@ -508,6 +508,11 @@ Prefab:
       propertyPath: m_FontData.m_HorizontalOverflow
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 223000013180475572, guid: 022450106439a8946ae18a9e20cc92d8,
+        type: 2}
+      propertyPath: m_Camera
+      value: 
+      objectReference: {fileID: 1635556076}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 022450106439a8946ae18a9e20cc92d8, type: 2}
   m_IsPrefabParent: 0
@@ -609,6 +614,11 @@ Transform:
   m_PrefabParentObject: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab,
     type: 2}
   m_PrefabInternal: {fileID: 1635556074}
+--- !u!20 &1635556076 stripped
+Camera:
+  m_PrefabParentObject: {fileID: 20049547090947856, guid: 3eddd1c29199313478dd3f912bfab2ab,
+    type: 2}
+  m_PrefabInternal: {fileID: 1635556074}
 --- !u!1001 &1763047398
 Prefab:
   m_ObjectHideFlags: 0

diff --git a/Assets/HoloToolkit-Examples/Input/Scripts/InputTest.cs b/Assets/HoloToolkit-Examples/Input/Scripts/InputTest.cs
@@ -2,14 +2,15 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using UnityEngine;
+using UnityEngine.EventSystems;
 
 namespace HoloToolkit.Unity.InputModule.Tests
 {
     /// <summary>
     /// Test behaviour that simply prints out a message very time a supported event is received from the input module.
     /// This is used to make sure that the input module routes events appropriately to game objects.
     /// </summary>
-    public class InputTest : MonoBehaviour, IInputHandler, IInputClickHandler, IFocusable, ISourceStateHandler, IHoldHandler, IManipulationHandler, INavigationHandler
+    public class InputTest : MonoBehaviour, IInputHandler, IInputClickHandler, IFocusable, ISourceStateHandler, IHoldHandler, IManipulationHandler, INavigationHandler, IPointerClickHandler
     {
         [Tooltip("Set to true if gestures update (ManipulationUpdated, NavigationUpdated) should be logged. Note that this can impact performance.")]
         public bool LogGesturesUpdateEvents = false;
@@ -32,6 +33,14 @@ public void OnInputClicked(InputClickedEventData eventData)
             eventData.Use(); // Mark the event as used, so it doesn't fall through to other handlers.
         }
 
+        /// <summary>
+        /// Just a public method called by the Unity OnClick Event.
+        /// </summary>
+        public void OnPointerClick(PointerEventData pointerEventData)
+        {
+            Debug.Log("OnPointerClick: " + pointerEventData.pointerId);
+        }
+
         public void OnFocusEnter()
         {
             Debug.Log("OnFocusEnter");
@@ -74,7 +83,7 @@ public void OnHoldCanceled(HoldEventData eventData)
 
         public void OnManipulationStarted(ManipulationEventData eventData)
         {
-            Debug.LogFormat("OnManipulationStarted\r\nSource: {0}  SourceId: {1}\r\nCumulativeDelta: {2} {3} {4}", 
+            Debug.LogFormat("OnManipulationStarted\r\nSource: {0}  SourceId: {1}\r\nCumulativeDelta: {2} {3} {4}",
                 eventData.InputSource,
                 eventData.SourceId,
                 eventData.CumulativeDelta.x,

diff --git a/Assets/HoloToolkit-Examples/Medical/Scenes/MedicalExample.unity b/Assets/HoloToolkit-Examples/Medical/Scenes/MedicalExample.unity
@@ -402,6 +402,11 @@ Transform:
   m_PrefabParentObject: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab,
     type: 2}
   m_PrefabInternal: {fileID: 357232768}
+--- !u!20 &357232770 stripped
+Camera:
+  m_PrefabParentObject: {fileID: 20049547090947856, guid: 3eddd1c29199313478dd3f912bfab2ab,
+    type: 2}
+  m_PrefabInternal: {fileID: 357232768}
 --- !u!1 &512838807
 GameObject:
   m_ObjectHideFlags: 0
@@ -1381,7 +1386,7 @@ Canvas:
   m_Enabled: 1
   serializedVersion: 3
   m_RenderMode: 2
-  m_Camera: {fileID: 0}
+  m_Camera: {fileID: 357232770}
   m_PlaneDistance: 100
   m_PixelPerfect: 0
   m_ReceivesEvents: 1

diff --git a/Assets/HoloToolkit-Examples/Prototyping/Scenes/PanelLayout.unity b/Assets/HoloToolkit-Examples/Prototyping/Scenes/PanelLayout.unity
@@ -4668,7 +4668,7 @@ Canvas:
   m_Enabled: 1
   serializedVersion: 3
   m_RenderMode: 2
-  m_Camera: {fileID: 0}
+  m_Camera: {fileID: 2076036018}
   m_PlaneDistance: 100
   m_PixelPerfect: 0
   m_ReceivesEvents: 1
@@ -12296,7 +12296,7 @@ Canvas:
   m_Enabled: 1
   serializedVersion: 3
   m_RenderMode: 2
-  m_Camera: {fileID: 0}
+  m_Camera: {fileID: 2076036018}
   m_PlaneDistance: 100
   m_PixelPerfect: 0
   m_ReceivesEvents: 1
@@ -13818,6 +13818,11 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2}
   m_IsPrefabParent: 0
+--- !u!20 &2076036018 stripped
+Camera:
+  m_PrefabParentObject: {fileID: 20049547090947856, guid: 3eddd1c29199313478dd3f912bfab2ab,
+    type: 2}
+  m_PrefabInternal: {fileID: 2076036017}
 --- !u!1 &2091594862
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/HoloToolkit-Examples/Sharing/SharingService/Scenes/SharingTest.unity b/Assets/HoloToolkit-Examples/Sharing/SharingService/Scenes/SharingTest.unity
@@ -395,6 +395,11 @@ Prefab:
       propertyPath: m_Pivot.y
       value: 0.5
       objectReference: {fileID: 0}
+    - target: {fileID: 223417620871411940, guid: 9a2f56337670a294baaf9bba300b1c1c,
+        type: 2}
+      propertyPath: m_Camera
+      value: 
+      objectReference: {fileID: 1376606041}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 9a2f56337670a294baaf9bba300b1c1c, type: 2}
   m_IsPrefabParent: 0
@@ -602,6 +607,11 @@ Transform:
   m_PrefabParentObject: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab,
     type: 2}
   m_PrefabInternal: {fileID: 1376606039}
+--- !u!20 &1376606041 stripped
+Camera:
+  m_PrefabParentObject: {fileID: 20049547090947856, guid: 3eddd1c29199313478dd3f912bfab2ab,
+    type: 2}
+  m_PrefabInternal: {fileID: 1376606039}
 --- !u!1001 &1703234099
 Prefab:
   m_ObjectHideFlags: 0

diff --git a/Assets/HoloToolkit-Examples/SpatialUnderstanding/Scenes/SpatialUnderstandingExample.unity b/Assets/HoloToolkit-Examples/SpatialUnderstanding/Scenes/SpatialUnderstandingExample.unity
@@ -164,6 +164,11 @@ Transform:
   m_PrefabParentObject: {fileID: 4000011656901714, guid: 3eddd1c29199313478dd3f912bfab2ab,
     type: 2}
   m_PrefabInternal: {fileID: 14992882}
+--- !u!20 &14992884 stripped
+Camera:
+  m_PrefabParentObject: {fileID: 20049547090947856, guid: 3eddd1c29199313478dd3f912bfab2ab,
+    type: 2}
+  m_PrefabInternal: {fileID: 14992882}
 --- !u!1001 &54805934
 Prefab:
   m_ObjectHideFlags: 0
@@ -2266,7 +2271,7 @@ Canvas:
   m_Enabled: 1
   serializedVersion: 3
   m_RenderMode: 2
-  m_Camera: {fileID: 0}
+  m_Camera: {fileID: 14992884}
   m_PlaneDistance: 100
   m_PixelPerfect: 0
   m_ReceivesEvents: 1

diff --git a/Assets/HoloToolkit-Examples/UX/Scenes/TextPrefabSamplesTest.unity b/Assets/HoloToolkit-Examples/UX/Scenes/TextPrefabSamplesTest.unity
@@ -209,6 +209,11 @@ Prefab:
       propertyPath: m_Pivot.y
       value: 0.5
       objectReference: {fileID: 0}
+    - target: {fileID: 223000011899940670, guid: 72ede623ddd22404eab348f24dab8757,
+        type: 2}
+      propertyPath: m_Camera
+      value: 
+      objectReference: {fileID: 1206782514}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 72ede623ddd22404eab348f24dab8757, type: 2}
   m_IsPrefabParent: 0
@@ -508,3 +513,8 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2}
   m_IsPrefabParent: 0
+--- !u!20 &1206782514 stripped
+Camera:
+  m_PrefabParentObject: {fileID: 20049547090947856, guid: 3eddd1c29199313478dd3f912bfab2ab,
+    type: 2}
+  m_PrefabInternal: {fileID: 1206782513}
diff --git a/Assets/HoloToolkit-Examples/Utilities/Scenes/TextToSpeechManager.unity b/Assets/HoloToolkit-Examples/Utilities/Scenes/TextToSpeechManager.unity
@@ -643,6 +643,11 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2}
   m_IsPrefabParent: 0
+--- !u!20 &994161603 stripped
+Camera:
+  m_PrefabParentObject: {fileID: 20049547090947856, guid: 3eddd1c29199313478dd3f912bfab2ab,
+    type: 2}
+  m_PrefabInternal: {fileID: 994161602}
 --- !u!1001 &1220876088
 Prefab:
   m_ObjectHideFlags: 0
@@ -1215,7 +1220,7 @@ Canvas:
   m_Enabled: 1
   serializedVersion: 3
   m_RenderMode: 2
-  m_Camera: {fileID: 0}
+  m_Camera: {fileID: 994161603}
   m_PlaneDistance: 100
   m_PixelPerfect: 0
   m_ReceivesEvents: 1