Merge pull request #1415 from StephenHodgson/MRTK-ControllerRefactor

MRTK Xbox Controller & Motion Controller reconciliation

Author: keveleigh

Assets/HoloToolkit-Examples/Input/Scenes/XboxControllerExample.unity

@@ -112,6 +112,12 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+--- !u!114 &332498722 stripped
+MonoBehaviour:
+  m_PrefabParentObject: {fileID: 114000010164638790, guid: 022450106439a8946ae18a9e20cc92d8,
+    type: 2}
+  m_PrefabInternal: {fileID: 1246058044}
+  m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
 --- !u!1001 &340683729
 Prefab:
   m_ObjectHideFlags: 0
@@ -151,6 +157,11 @@ Prefab:
       propertyPath: m_RootOrder
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 114812681035175298, guid: d29bc40b7f3df26479d6a0aac211c355,
+        type: 2}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: d29bc40b7f3df26479d6a0aac211c355, type: 2}
   m_IsPrefabParent: 0
@@ -180,9 +191,8 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1635556075}
-  - {fileID: 1895018971}
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &473449477
 GameObject:
@@ -215,10 +225,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   IsGlobalListener: 1
+  HoldStartedInterval: 2
+  HoldCompletedInterval: 3
+  SelectButton: 10
+  HorizontalNavigationAxis: 1
   movementSpeedMultiplier: 0.01
   rotationSpeedMultiplier: 1
   resetButton: 13
-  DebugText: {fileID: 1246058048}
+  debugText: {fileID: 332498722}
 --- !u!23 &473449479
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -377,6 +391,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 906323c940a3fad4f8f7e9e4fcd747f4, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  containerObject: {fileID: 0}
+  alignmentType: 0
+  stationarySpaceTypePosition: {x: 0, y: 0, z: 0}
+  roomScaleSpaceTypePosition: {x: 0, y: 0, z: 0}
 --- !u!4 &1131149986
 Transform:
   m_ObjectHideFlags: 0
@@ -551,12 +569,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   PivotAxis: 0
   TargetTransform: {fileID: 0}
---- !u!114 &1246058048 stripped
+--- !u!114 &1523391984 stripped
 MonoBehaviour:
-  m_PrefabParentObject: {fileID: 114000010164638790, guid: 022450106439a8946ae18a9e20cc92d8,
+  m_PrefabParentObject: {fileID: 114611684728110934, guid: a611e772ef8ddf64d8106a9cbb70f31c,
     type: 2}
-  m_PrefabInternal: {fileID: 1246058044}
-  m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+  m_PrefabInternal: {fileID: 1802791002}
+  m_Script: {fileID: 11500000, guid: 0decd33ba8702954885a62b5bc1a778e, type: 3}
 --- !u!1001 &1635556074
 Prefab:
   m_ObjectHideFlags: 0
@@ -600,12 +618,7 @@ Prefab:
         type: 2}
       propertyPath: Cursor
       value: 
-      objectReference: {fileID: 1763047399}
-    - target: {fileID: 114708646396671696, guid: 3eddd1c29199313478dd3f912bfab2ab,
-        type: 2}
-      propertyPath: debugDrawPointingRays
-      value: 1
-      objectReference: {fileID: 0}
+      objectReference: {fileID: 1523391984}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 3eddd1c29199313478dd3f912bfab2ab, type: 2}
   m_IsPrefabParent: 0
@@ -619,7 +632,7 @@ Camera:
   m_PrefabParentObject: {fileID: 20049547090947856, guid: 3eddd1c29199313478dd3f912bfab2ab,
     type: 2}
   m_PrefabInternal: {fileID: 1635556074}
---- !u!1001 &1763047398
+--- !u!1001 &1802791002
 Prefab:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -656,100 +669,8 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4000011792100794, guid: a611e772ef8ddf64d8106a9cbb70f31c, type: 2}
       propertyPath: m_RootOrder
-      value: 2
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: a611e772ef8ddf64d8106a9cbb70f31c, type: 2}
   m_IsPrefabParent: 0
---- !u!114 &1763047399 stripped
-MonoBehaviour:
-  m_PrefabParentObject: {fileID: 114611684728110934, guid: a611e772ef8ddf64d8106a9cbb70f31c,
-    type: 2}
-  m_PrefabInternal: {fileID: 1763047398}
-  m_Script: {fileID: 11500000, guid: 0decd33ba8702954885a62b5bc1a778e, type: 3}
---- !u!1 &1895018970
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 1895018971}
-  - component: {fileID: 1895018972}
-  m_Layer: 0
-  m_Name: XboxControllerInputSource
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1895018971
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1895018970}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 402900810}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1895018972
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1895018970}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f53e0243d951df74baba23d966f61986, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  DeviceRefreshInterval: 3
-  horizontalAxis: 3
-  verticalAxis: 4
-  submitButton: 10
-  cancelButton: 11
-  mapping:
-  - Type: 0
-    Value: 
-  - Type: 1
-    Value: 
-  - Type: 2
-    Value: 
-  - Type: 3
-    Value: 
-  - Type: 4
-    Value: 
-  - Type: 5
-    Value: 
-  - Type: 6
-    Value: 
-  - Type: 7
-    Value: 
-  - Type: 8
-    Value: 
-  - Type: 9
-    Value: 
-  - Type: 10
-    Value: 
-  - Type: 11
-    Value: 
-  - Type: 12
-    Value: 
-  - Type: 13
-    Value: 
-  - Type: 14
-    Value: 
-  - Type: 15
-    Value: 
-  - Type: 16
-    Value: 
-  - Type: 17
-    Value: 
-  - Type: 18
-    Value: 
-  - Type: 19
-    Value: 

Assets/HoloToolkit-Examples/Input/Scripts/XboxControllerHandlerTest.cs

@@ -8,7 +8,7 @@ namespace HoloToolkit.Unity.InputModule.Tests
 {
     public class XboxControllerHandlerTest : XboxControllerHandlerBase
     {
-
+        [Header("Xbox Controller Test Options")]
         [SerializeField]
         private float movementSpeedMultiplier = 1f;
 
@@ -18,7 +18,9 @@ public class XboxControllerHandlerTest : XboxControllerHandlerBase
         [SerializeField]
         private XboxControllerMappingTypes resetButton = XboxControllerMappingTypes.XboxY;
 
-        public Text DebugText;
+        [SerializeField]
+        private Text debugText;
+
         private Vector3 initialPosition;
         private Vector3 newPosition;
         private Vector3 newRotation;
@@ -29,41 +31,44 @@ protected override void Start()
             initialPosition = transform.position;
         }
 
-        public override void OnGamePadDetected(GamePadEventData eventData)
+        public override void OnSourceLost(SourceStateEventData eventData)
         {
-            base.OnGamePadDetected(eventData);
-            Debug.LogFormat("Joystick \"{0}\" Connected with id: {1}", eventData.GamePadName, eventData.SourceId);
+            Debug.LogFormat("Joystick {0} with id: \"{1}\" Disconnected", GamePadName, eventData.SourceId);
+            base.OnSourceLost(eventData);
+            debugText.text = "No Controller Connected";
         }
 
-        public override void OnGamePadLost(GamePadEventData eventData)
+        public override void OnXboxInputUpdate(XboxControllerEventData eventData)
         {
-            base.OnGamePadLost(eventData);
-            Debug.LogFormat("Joystick \"{0}\" Disconnected with id: {1}", eventData.GamePadName, eventData.SourceId);
-            DebugText.text = "No Controller Connected";
-        }
+            if (string.IsNullOrEmpty(GamePadName))
+            {
+                Debug.LogFormat("Joystick {0} with id: \"{1}\" Connected", eventData.GamePadName, eventData.SourceId);
+            }
 
-        public override void OnXboxAxisUpdate(XboxControllerEventData eventData)
-        {
-            base.OnXboxAxisUpdate(eventData);
+            base.OnXboxInputUpdate(eventData);
+
+            // Reset our new vectors
             newPosition = Vector3.zero;
             newRotation = Vector3.zero;
 
+            // Assign new Position Data
             newPosition.x += eventData.XboxLeftStickHorizontalAxis * movementSpeedMultiplier;
             newPosition.z += eventData.XboxLeftStickVerticalAxis * movementSpeedMultiplier;
             newPosition.y += eventData.XboxSharedTriggerAxis * movementSpeedMultiplier;
 
             transform.position += newPosition;
 
+            // Assign new rotation data
             newRotation.y += eventData.XboxRightStickHorizontalAxis * rotationSpeedMultiplier;
 
             transform.rotation *= Quaternion.Euler(newRotation);
 
-            if (OnButton_Up(resetButton, eventData))
+            if (XboxControllerMapping.GetButton_Up(resetButton, eventData))
             {
                 transform.position = initialPosition;
             }
 
-            DebugText.text =
+            debugText.text =
                 string.Format(
                     "{19}\n" +
                     "LS Horizontal: {0:0.000} Vertical: {1:0.000}\n" +