Fixing up some scripts running in-editor / with HMD / etc

Author: keveleigh

Assets/HoloToolkit/Input/Scripts/EditorInputSelector.cs

@@ -29,10 +29,15 @@ public class EditorInputSelector : MonoBehaviour
 
         private void Awake()
         {
+#if UNITY_EDITOR
             if (UnityEngine.XR.XRDevice.isPresent)
             {
+#endif
                 Destroy(gameObject);
+                return;
+#if UNITY_EDITOR
             }
+#endif
 
             Inputs = new List<GameObject>();
 

Assets/HoloToolkit/Input/Scripts/InputSources/GamepadInput.cs

@@ -64,7 +64,7 @@ protected override void Start()
             if (inputManager == null)
             {
                 Debug.LogError("Ensure your scene has the InputManager prefab.");
-                gameObject.SetActive(false);
+                Destroy(this);
             }
         }
 
@@ -156,30 +156,26 @@ private void HandleGamepadAReleased()
                 {
                     case GestureState.NavigationStarted:
                         navigationCompleted = true;
-                        Debug.Log("Gamepad: Navigation Completed");
                         CancelInvoke("HandleHoldStarted");
                         CancelInvoke("HandleHoldCompleted");
                         inputManager.RaiseNavigationCompleted(this, GamePadId, Vector3.zero);
                         Reset();
                         break;
 
                     case GestureState.HoldStarted:
-                        Debug.Log("Gamepad: Hold Canceled");
                         CancelInvoke("HandleHoldCompleted");
                         inputManager.RaiseHoldCanceled(this, GamePadId);
                         Reset();
                         break;
 
                     case GestureState.HoldCompleted:
-                        Debug.Log("Gamepad: Hold Completed");
                         inputManager.RaiseHoldCompleted(this, GamePadId);
                         Reset();
                         break;
 
                     default:
                         CancelInvoke("HandleHoldStarted");
                         CancelInvoke("HandleHoldCompleted");
-                        Debug.Log("Gamepad: Tap");
                         inputManager.RaiseInputClicked(this, GamePadId, InteractionSourcePressType.Select, 1);
                         Reset();
                         break;
@@ -205,7 +201,6 @@ private void HandleHoldStarted()
             holdStarted = true;
 
             currentGestureState = GestureState.HoldStarted;
-            Debug.Log("Gamepad: Hold Started");
             inputManager.RaiseHoldStarted(this, GamePadId);
             raiseOnce = true;
 

Assets/HoloToolkit/Input/Scripts/Utilities/ManualGazeControl.cs

@@ -34,9 +34,16 @@ public class ManualGazeControl : MonoBehaviour
 
         private void Awake()
         {
-#if !UNITY_EDITOR
-            Destroy(this);
+#if UNITY_EDITOR
+            if (UnityEngine.XR.XRDevice.isPresent)
+            {
+#endif
+                Destroy(this);
+                return;
+#if UNITY_EDITOR
+            }
 #endif
+
             cameraTransform = GetComponent<Camera>().transform;
             if (cameraTransform == null)
             {
@@ -55,7 +62,6 @@ private void Awake()
             JoystickXYRotationAxisControl.enabled = JoystickSupported;
             JoystickXYTranslationAxisControl.enabled = JoystickSupported;
             JoystickXZTranslationAxisControl.enabled = JoystickSupported;
-
         }
 
         private void Update()