wrapped the motion controller example XR APIs

StephenHodgson · StephenHodgson · commit af0228d44bd8 · 2017-10-16T20:08:58.000-07:00
diff --git a/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scripts/BaseGrabber.cs b/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scripts/BaseGrabber.cs
@@ -4,7 +4,10 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
+
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
 using UnityEngine.XR.WSA.Input;
+#endif
 
 namespace HoloToolkit.Unity.InputModule.Examples.Grabbables
 {
@@ -17,7 +20,9 @@ public abstract class BaseGrabber : MonoBehaviour
         public event Action<BaseGrabber> OnGrabStateChange;
         public event Action<BaseGrabber> OnContactStateChange;
 
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
         public InteractionSourceHandedness Handedness { get { return handedness; } set { handedness = value; } }
+#endif
 
         public List<BaseGrabbable> GrabbedObjects { get { return new List<BaseGrabbable>(grabbedObjects); } }
 
@@ -75,8 +80,10 @@ public Transform GrabHandle
         private GrabStateEnum prevGrabState = GrabStateEnum.Inactive;
         private GrabStateEnum prevContactState = GrabStateEnum.Inactive;
 
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
         [SerializeField]
         protected InteractionSourceHandedness handedness;
+#endif
 
         public bool IsGrabbing(BaseGrabbable grabbable)
         {
diff --git a/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scripts/BaseUsable.cs b/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scripts/BaseUsable.cs
@@ -2,7 +2,10 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using UnityEngine;
+
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
 using UnityEngine.XR.WSA.Input;
+#endif
 
 namespace HoloToolkit.Unity.InputModule.Examples.Grabbables
 {
@@ -12,6 +15,7 @@ namespace HoloToolkit.Unity.InputModule.Examples.Grabbables
     /// </summary>
     public abstract class BaseUsable : MonoBehaviour
     {
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
         [SerializeField]
         private InteractionSourceHandedness handedness;
 
@@ -20,9 +24,11 @@ public abstract class BaseUsable : MonoBehaviour
         /// </summary>
         [SerializeField]
         private InteractionSourcePressType pressType;
+#endif
 
         private UseStateEnum state;
 
+
         public UseStateEnum UseState
         {
             get { return state; }
@@ -42,16 +48,21 @@ protected virtual void UseEnd()
 
         protected virtual void OnEnable()
         {
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
             InteractionManager.InteractionSourcePressed += UseInputStart;
             InteractionManager.InteractionSourceReleased += UseInputEnd;
+#endif
         }
 
         protected virtual void OnDisable()
         {
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
             InteractionManager.InteractionSourcePressed -= UseInputStart;
             InteractionManager.InteractionSourceReleased -= UseInputEnd;
+#endif
         }
 
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
         private void UseInputStart(InteractionSourcePressedEventArgs obj)
         {
             if (/*obj.pressType == pressType && (*/handedness == InteractionSourceHandedness.Unknown || handedness == obj.state.source.handedness)
@@ -73,5 +84,6 @@ private void UseInputEnd(InteractionSourceReleasedEventArgs obj)
                 UseEnd();
             }
         }
+#endif
     }
 }
diff --git a/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scripts/ExtensionMethod.cs b/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scripts/ExtensionMethod.cs
@@ -1,6 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
 using UnityEngine;
 using HoloToolkit.Unity.InputModule.Examples.Grabbables;
 using UnityEngine.XR.WSA.Input;
@@ -27,3 +28,4 @@ public static ControllerReleaseData GetThrowReleasedVelocityAndAngularVelocity(t
         return new ControllerReleaseData(setVel, angVel);
     }
 }
+#endif
diff --git a/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scripts/Grabber.cs b/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scripts/Grabber.cs
@@ -2,7 +2,10 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using UnityEngine;
+
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
 using UnityEngine.XR.WSA.Input;
+#endif
 
 namespace HoloToolkit.Unity.InputModule.Examples.Grabbables
 {
@@ -12,21 +15,34 @@ namespace HoloToolkit.Unity.InputModule.Examples.Grabbables
     /// </summary>
     public class Grabber : BaseGrabber
     {
+        [SerializeField]
+        private LayerMask grabbableLayers = ~0;
+
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
+        [SerializeField]
+        private InteractionSourcePressType pressType;
+#endif
+
         ///Subscribe GrabStart and GrabEnd to InputEvents for GripPressed
         protected override void OnEnable()
         {
             base.OnEnable();
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
             InteractionManager.InteractionSourcePressed += InteractionSourcePressed;
             InteractionManager.InteractionSourceReleased += InteractionSourceReleased;
+#endif
         }
 
         protected override void OnDisable()
         {
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
             InteractionManager.InteractionSourcePressed -= InteractionSourcePressed;
             InteractionManager.InteractionSourceReleased -= InteractionSourceReleased;
+#endif
             base.OnDisable();
         }
 
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
         private void InteractionSourcePressed(InteractionSourcePressedEventArgs obj)
         {
             if (obj.pressType == pressType && obj.state.source.handedness == handedness)
@@ -43,6 +59,7 @@ private void InteractionSourceReleased(InteractionSourceReleasedEventArgs obj)
                 GrabEnd();
             }
         }
+#endif
 
         /// <summary>
         /// Controller grabbers find available grabbable objects via triggers
@@ -96,6 +113,7 @@ protected virtual void OnTriggerExit(Collider other)
             RemoveContact(bg);
         }
 
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
         public bool TrySetThrowableObject(BaseGrabbable grabbable, InteractionSourcePose poseInfo)
         {
             if (grabbable == null)
@@ -124,11 +142,6 @@ public bool TrySetThrowableObject(BaseGrabbable grabbable, InteractionSourcePose
             grabbable.GetComponent<BaseThrowable>().LatestControllerThrowAngularVelocity = controlReleaseData.AngleVelocity;
             return true;
         }
-
-        [SerializeField]
-        private LayerMask grabbableLayers = ~0;
-
-        [SerializeField]
-        private InteractionSourcePressType pressType;
+#endif
     }
 }
diff --git a/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scripts/RotatableObject.cs b/Assets/HoloToolkit-Examples/MotionControllers-GrabMechanics/Scripts/RotatableObject.cs
@@ -1,9 +1,12 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using System.Collections;
 using UnityEngine;
+
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
+using System.Collections;
 using UnityEngine.XR.WSA.Input;
+#endif
 
 namespace HoloToolkit.Unity.InputModule.Examples.Grabbables
 {
@@ -20,7 +23,9 @@ protected override void OnEnable()
         {
             base.OnEnable();
 
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
             InteractionManager.InteractionSourceUpdated += GetTouchPadPosition;
+#endif
 
             if (baseGrabbable == null)
             {
@@ -30,7 +35,9 @@ protected override void OnEnable()
 
         protected override void OnDisable()
         {
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
             InteractionManager.InteractionSourceUpdated -= GetTouchPadPosition;
+#endif
 
             base.OnDisable();
         }
@@ -43,10 +50,13 @@ protected override void UseStart()
         {
             if (baseGrabbable.GrabberPrimary != null)
             {
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
                 StartCoroutine(MakeRotate());
+#endif
             }
         }
 
+#if UNITY_WSA && UNITY_2017_2_OR_NEWER
         private IEnumerator MakeRotate()
         {
             while (UseState == UseStateEnum.Active && baseGrabbable.GrabberPrimary && touchPadPressed)
@@ -79,5 +89,6 @@ private void GetTouchPadPosition(InteractionSourceUpdatedEventArgs obj)
         }
 
         private bool touchPadPressed;
+#endif
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,10 @@`
`2`	`2`	`// Licensed under the MIT License. See LICENSE in the project root for license information.`
`3`	`3`
`4`	`4`	`using UnityEngine;`
	`5`	`+`
	`6`	`+#if UNITY_WSA && UNITY_2017_2_OR_NEWER`
`5`	`7`	`using UnityEngine.XR.WSA.Input;`
	`8`	`+#endif`
`6`	`9`
`7`	`10`	`namespace HoloToolkit.Unity.InputModule.Examples.Grabbables`
`8`	`11`	`{`
`@@ -12,6 +15,7 @@ namespace HoloToolkit.Unity.InputModule.Examples.Grabbables`
`12`	`15`	`/// </summary>`
`13`	`16`	`public abstract class BaseUsable : MonoBehaviour`
`14`	`17`	`{`
	`18`	`+#if UNITY_WSA && UNITY_2017_2_OR_NEWER`
`15`	`19`	`[SerializeField]`
`16`	`20`	`private InteractionSourceHandedness handedness;`
`17`	`21`
`@@ -20,9 +24,11 @@ public abstract class BaseUsable : MonoBehaviour`
`20`	`24`	`/// </summary>`
`21`	`25`	`[SerializeField]`
`22`	`26`	`private InteractionSourcePressType pressType;`
	`27`	`+#endif`
`23`	`28`
`24`	`29`	`private UseStateEnum state;`
`25`	`30`
	`31`	`+`
`26`	`32`	`public UseStateEnum UseState`
`27`	`33`	`{`
`28`	`34`	`get { return state; }`
`@@ -42,16 +48,21 @@ protected virtual void UseEnd()`
`42`	`48`
`43`	`49`	`protected virtual void OnEnable()`
`44`	`50`	`{`
	`51`	`+#if UNITY_WSA && UNITY_2017_2_OR_NEWER`
`45`	`52`	`InteractionManager.InteractionSourcePressed += UseInputStart;`
`46`	`53`	`InteractionManager.InteractionSourceReleased += UseInputEnd;`
	`54`	`+#endif`
`47`	`55`	`}`
`48`	`56`
`49`	`57`	`protected virtual void OnDisable()`
`50`	`58`	`{`
	`59`	`+#if UNITY_WSA && UNITY_2017_2_OR_NEWER`
`51`	`60`	`InteractionManager.InteractionSourcePressed -= UseInputStart;`
`52`	`61`	`InteractionManager.InteractionSourceReleased -= UseInputEnd;`
	`62`	`+#endif`
`53`	`63`	`}`
`54`	`64`
	`65`	`+#if UNITY_WSA && UNITY_2017_2_OR_NEWER`
`55`	`66`	`private void UseInputStart(InteractionSourcePressedEventArgs obj)`
`56`	`67`	`{`
`57`	`68`	`if (/obj.pressType == pressType && (/handedness == InteractionSourceHandedness.Unknown \|\| handedness == obj.state.source.handedness)`
`@@ -73,5 +84,6 @@ private void UseInputEnd(InteractionSourceReleasedEventArgs obj)`
`73`	`84`	`UseEnd();`
`74`	`85`	`}`
`75`	`86`	`}`
	`87`	`+#endif`
`76`	`88`	`}`
`77`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`// Copyright (c) Microsoft Corporation. All rights reserved.`
`2`	`2`	`// Licensed under the MIT License. See LICENSE in the project root for license information.`
`3`	`3`
	`4`	`+#if UNITY_WSA && UNITY_2017_2_OR_NEWER`
`4`	`5`	`using UnityEngine;`
`5`	`6`	`using HoloToolkit.Unity.InputModule.Examples.Grabbables;`
`6`	`7`	`using UnityEngine.XR.WSA.Input;`
`@@ -27,3 +28,4 @@ public static ControllerReleaseData GetThrowReleasedVelocityAndAngularVelocity(t`
`27`	`28`	`return new ControllerReleaseData(setVel, angVel);`
`28`	`29`	`}`
`29`	`30`	`}`
	`31`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,12 @@`
`1`	`1`	`// Copyright (c) Microsoft Corporation. All rights reserved.`
`2`	`2`	`// Licensed under the MIT License. See LICENSE in the project root for license information.`
`3`	`3`
`4`		`-using System.Collections;`
`5`	`4`	`using UnityEngine;`
	`5`	`+`
	`6`	`+#if UNITY_WSA && UNITY_2017_2_OR_NEWER`
	`7`	`+using System.Collections;`
`6`	`8`	`using UnityEngine.XR.WSA.Input;`
	`9`	`+#endif`
`7`	`10`
`8`	`11`	`namespace HoloToolkit.Unity.InputModule.Examples.Grabbables`
`9`	`12`	`{`
`@@ -20,7 +23,9 @@ protected override void OnEnable()`
`20`	`23`	`{`
`21`	`24`	`base.OnEnable();`
`22`	`25`
	`26`	`+#if UNITY_WSA && UNITY_2017_2_OR_NEWER`
`23`	`27`	`InteractionManager.InteractionSourceUpdated += GetTouchPadPosition;`
	`28`	`+#endif`
`24`	`29`
`25`	`30`	`if (baseGrabbable == null)`
`26`	`31`	`{`
`@@ -30,7 +35,9 @@ protected override void OnEnable()`
`30`	`35`
`31`	`36`	`protected override void OnDisable()`
`32`	`37`	`{`
	`38`	`+#if UNITY_WSA && UNITY_2017_2_OR_NEWER`
`33`	`39`	`InteractionManager.InteractionSourceUpdated -= GetTouchPadPosition;`
	`40`	`+#endif`
`34`	`41`
`35`	`42`	`base.OnDisable();`
`36`	`43`	`}`
`@@ -43,10 +50,13 @@ protected override void UseStart()`
`43`	`50`	`{`
`44`	`51`	`if (baseGrabbable.GrabberPrimary != null)`
`45`	`52`	`{`
	`53`	`+#if UNITY_WSA && UNITY_2017_2_OR_NEWER`
`46`	`54`	`StartCoroutine(MakeRotate());`
	`55`	`+#endif`
`47`	`56`	`}`
`48`	`57`	`}`
`49`	`58`
	`59`	`+#if UNITY_WSA && UNITY_2017_2_OR_NEWER`
`50`	`60`	`private IEnumerator MakeRotate()`
`51`	`61`	`{`
`52`	`62`	`while (UseState == UseStateEnum.Active && baseGrabbable.GrabberPrimary && touchPadPressed)`
`@@ -79,5 +89,6 @@ private void GetTouchPadPosition(InteractionSourceUpdatedEventArgs obj)`
`79`	`89`	`}`
`80`	`90`
`81`	`91`	`private bool touchPadPressed;`
	`92`	`+#endif`
`82`	`93`	`}`
`83`	`94`	`}`