Merge pull request #332 from HodgsonSDAS/ExtensibleInputModule

Merge branch 'master' into ExtensibleInputModule & Perf optimizations

Author: NeerajW

Assets/HoloToolkit/Input/Scripts/Cursor/Cursor.cs

@@ -345,10 +345,6 @@ public virtual void OnInputEnabled()
         /// <param name="eventData"></param>
         public virtual void OnInputUp(InputEventData eventData)
         {
-            if (IsInputSourceDown == false)
-            {
-                return;
-            }
             IsInputSourceDown = false;
         }
 

Assets/HoloToolkit/Input/Scripts/Gaze/GazeManager.cs

@@ -92,6 +92,11 @@ public class GazeManager : Singleton<GazeManager>
         /// </summary>
         public PointerEventData UnityUIPointerEvent { get; private set; }
 
+        /// <summary>
+        /// Cached results of racast results.
+        /// </summary>
+        private List<RaycastResult> raycastResultList = new List<RaycastResult>();
+
         protected override void Awake()
         {
             base.Awake();
@@ -171,14 +176,12 @@ private GameObject RaycastPhysics()
             // If there is only one priority, don't prioritize
             if (RaycastLayerMasks.Length == 1)
             {
-                IsGazingAtObject = Physics.Raycast(GazeOrigin, GazeNormal, out hitInfo, MaxGazeCollisionDistance,
-                    RaycastLayerMasks[0]);
+                IsGazingAtObject = Physics.Raycast(GazeOrigin, GazeNormal, out hitInfo, MaxGazeCollisionDistance, RaycastLayerMasks[0]);
             }
             else
             {
                 // Raycast across all layers and prioritize
-                RaycastHit? hit =
-                    PrioritizeHits(Physics.RaycastAll(new Ray(GazeOrigin, GazeNormal), MaxGazeCollisionDistance, -1));
+                RaycastHit? hit = PrioritizeHits(Physics.RaycastAll(new Ray(GazeOrigin, GazeNormal), MaxGazeCollisionDistance, -1));
 
                 IsGazingAtObject = hit.HasValue;
                 if (IsGazingAtObject)
@@ -217,7 +220,7 @@ private void RaycastUnityUI()
             UnityUIPointerEvent.position = cursorScreenPos;
 
             // Graphics raycast
-            List<RaycastResult> raycastResultList = new List<RaycastResult>();
+            raycastResultList.Clear();
             EventSystem.current.RaycastAll(UnityUIPointerEvent, raycastResultList);
             RaycastResult uiRaycastResult = FindFirstRaycastInLayermasks(raycastResultList, RaycastLayerMasks);
             UnityUIPointerEvent.pointerCurrentRaycast = uiRaycastResult;

Assets/HoloToolkit/Input/Scripts/HandGuidance.cs

@@ -159,11 +159,11 @@ private void RemoveTrackedHand(InteractionSourceState hand)
 
         protected override void OnDestroy()
         {
-            base.OnDestroy();
-
             InteractionManager.SourceLost -= InteractionManager_SourceLost;
             InteractionManager.SourceUpdated -= InteractionManager_SourceUpdated;
             InteractionManager.SourceReleased -= InteractionManager_SourceReleased;
+
+            base.OnDestroy();
         }
     }
 }

Assets/HoloToolkit/Input/Scripts/InputManager.cs

@@ -20,7 +20,7 @@ public class TestButton : MonoBehaviour, IInputClickHandler, IFocusable
         public float ToolTipDelayTime = 0.5f;
 
         [SerializeField]
-        protected Animator ButtonAnimator = null;
+        protected Animator ButtonAnimator;
 
         private static int focusedButtonId;
         private static int selectedButtonId;
@@ -32,6 +32,8 @@ public class TestButton : MonoBehaviour, IInputClickHandler, IFocusable
 
         public bool EnableActivation = true;
 
+        private AnimatorControllerParameter[] animatorHashes;
+
         private bool focused;
         public bool Focused
         {
@@ -144,7 +146,11 @@ public void DehydrateButton()
         {
             if (ButtonAnimator != null && ButtonAnimator.isInitialized)
             {
-                var animatorHashes = ButtonAnimator.parameters;
+                if (animatorHashes == null)
+                {
+                    animatorHashes = ButtonAnimator.parameters;
+                }
+
                 for (int i = 0; i < animatorHashes.Length; i++)
                 {
                     if (animatorHashes[i].nameHash == deHydrateButtonId)
@@ -164,7 +170,11 @@ private void UpdateButtonAnimation()
         {
             if (ButtonAnimator != null && ButtonAnimator.gameObject.activeInHierarchy)
             {
-                var animatorHashes = ButtonAnimator.parameters;
+                if (animatorHashes == null)
+                {
+                    animatorHashes = ButtonAnimator.parameters;
+                }
+
                 for (int i = 0; i < animatorHashes.Length; i++)
                 {
                     if (animatorHashes[i].nameHash == focusedButtonId)

Assets/HoloToolkit/Input/Tests/Scripts/TestButton.cs

@@ -1,9 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+using System;
+using System.Collections.Generic;
 using HoloToolkit.Sharing;
 using HoloToolkit.Unity;
-using System.Collections.Generic;
 using UnityEngine;
 
 public class CustomMessages : Singleton<CustomMessages>
@@ -21,7 +22,7 @@ public enum TestMessageID : byte
 
     public enum UserMessageChannels
     {
-        Anchors = MessageChannel.UserMessageChannelStart,
+        Anchors = MessageChannel.UserMessageChannelStart
     }
 
     /// <summary>
@@ -58,7 +59,7 @@ void Start()
         SharingStage.Instance.SharingManagerConnected += SharingManagerConnected;
     }
 
-    private void SharingManagerConnected(object sender, System.EventArgs e)
+    private void SharingManagerConnected(object sender, EventArgs e)
     {
         InitializeMessageHandlers();
     }
@@ -84,7 +85,7 @@ void InitializeMessageHandlers()
         connectionAdapter.MessageReceivedCallback += OnMessageReceived;
 
         // Cache the local user ID
-        this.localUserID = SharingStage.Instance.Manager.GetLocalUser().GetID();
+        localUserID = SharingStage.Instance.Manager.GetLocalUser().GetID();
 
         for (byte index = (byte)TestMessageID.HeadTransform; index < (byte)TestMessageID.Max; index++)
         {
@@ -109,15 +110,15 @@ private NetworkOutMessage CreateMessage(byte MessageType)
     public void SendHeadTransform(Vector3 position, Quaternion rotation)
     {
         // If we are connected to a session, broadcast our head info
-        if (this.serverConnection != null && this.serverConnection.IsConnected())
+        if (serverConnection != null && serverConnection.IsConnected())
         {
             // Create an outgoing network message to contain all the info we want to send
             NetworkOutMessage msg = CreateMessage((byte)TestMessageID.HeadTransform);
 
             AppendTransform(msg, position, rotation);
 
             // Send the message as a broadcast, which will cause the server to forward it to all other users in the session.
-            this.serverConnection.Broadcast(
+            serverConnection.Broadcast(
                 msg,
                 MessagePriority.Immediate,
                 MessageReliability.UnreliableSequenced,
@@ -127,16 +128,16 @@ public void SendHeadTransform(Vector3 position, Quaternion rotation)
 
     protected override void OnDestroy()
     {
-        base.OnDestroy();
-
-        if (this.serverConnection != null)
+        if (serverConnection != null)
         {
             for (byte index = (byte)TestMessageID.HeadTransform; index < (byte)TestMessageID.Max; index++)
             {
-                this.serverConnection.RemoveListener(index, this.connectionAdapter);
+                serverConnection.RemoveListener(index, connectionAdapter);
             }
-            this.connectionAdapter.MessageReceivedCallback -= OnMessageReceived;
+            connectionAdapter.MessageReceivedCallback -= OnMessageReceived;
         }
+
+        base.OnDestroy();
     }
 
     void OnMessageReceived(NetworkConnection connection, NetworkInMessage msg)