Merge branch 'mrtk_development' into mrtk_development

Author: wiwei

Assets/MixedRealityToolkit.Examples/toc.yml.meta

@@ -6,7 +6,6 @@
     "optionalUnityReferences": [],
     "includePlatforms": [
         "Editor",
-        "LinuxStandalone32",
         "LinuxStandalone64",
         "macOSStandalone",
         "WindowsStandalone32",

Assets/MixedRealityToolkit.Providers/OpenVR/MixedRealityToolkit.Providers.OpenVR.asmdef

@@ -11,6 +11,7 @@
 using Microsoft.MixedReality.Toolkit.SDK.UX.Interactable.Profile;
 using Microsoft.MixedReality.Toolkit.SDK.UX.Interactable.States;
 using Microsoft.MixedReality.Toolkit.SDK.UX.Interactable.Themes;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -41,7 +42,7 @@ public class Interactable : MonoBehaviour, IMixedRealityFocusHandler, IMixedReal
         /// </summary>
         private static IMixedRealityInputSystem inputSystem = null;
         protected static IMixedRealityInputSystem InputSystem => inputSystem ?? (inputSystem = MixedRealityToolkit.Instance.GetService<IMixedRealityInputSystem>());
-        
+
         // list of pointers
         protected List<IMixedRealityPointer> pointers = new List<IMixedRealityPointer>();
         public List<IMixedRealityPointer> Focusers => pointers;
@@ -156,23 +157,25 @@ public void RemoveHandler(IInteractableHandler handler)
         }
 
         #region InspectorHelpers
-        /// <summary>
-        /// Gets a list of input actions, used by the inspector
-        /// </summary>
-        /// <returns></returns>
-        public static string[] GetInputActions()
+        public static bool TryGetInputActions(out string[] descriptionsArray)
         {
+            if (!MixedRealityToolkit.IsInitialized || !MixedRealityToolkit.HasActiveProfile)
+            {
+                descriptionsArray = null;
+                return false;
+            }
+
             MixedRealityInputAction[] actions = MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.InputActionsProfile.InputActions;
 
-            List<string> list = new List<string>();
+            descriptionsArray = new string[actions.Length];
             for (int i = 0; i < actions.Length; i++)
             {
-                list.Add(actions[i].Description);
+                descriptionsArray[i] = actions[i].Description;
             }
 
-            return list.ToArray();
+            return true;
         }
-        
+
         /// <summary>
         /// Returns a list of states assigned to the Interactable
         /// </summary>
@@ -183,7 +186,7 @@ public State[] GetStates()
             {
                 return States.GetStates();
             }
-            
+
             return new State[0];
         }
         #endregion InspectorHelpers
@@ -208,17 +211,17 @@ private void OnEnable()
 
             SetupVoiceCommand();
         }
-        
+
         private void OnDisable()
         {
             if (IsGlobal)
             {
                 InputSystem.Unregister(gameObject);
             }
-            
+
             StopVoiceCommand();
         }
-        
+
         protected virtual void Update()
         {
             if (rollOffTimer < rollOffTime && HasPress)
@@ -320,7 +323,6 @@ protected virtual void SetupThemes()
                             InteractableThemePropertySettings settings = theme.Settings[n];
 
                             settings.Theme = InteractableProfileItem.GetTheme(settings, Profiles[i].Target);
-                            
                             // add themes to theme list based on dimension
                             if (j == dimensionIndex)
                             {
@@ -329,7 +331,7 @@ protected virtual void SetupThemes()
 
                             tempSettings.Add(settings);
                         }
-                        
+
                         themeSettings.Settings = tempSettings;
                         themeSettingsList.Add(themeSettings);
                     }
@@ -341,7 +343,7 @@ protected virtual void SetupThemes()
         }
 
         #endregion InteractableInitiation
-        
+
         #region SetButtonStates
 
         /// <summary>
@@ -361,7 +363,7 @@ public int GetStateValue(InteractableStates.InteractableStateEnum state)
         public virtual void SetFocus(bool focus)
         {
             HasFocus = focus;
-            if(!focus && HasPress)
+            if (!focus && HasPress)
             {
                 rollOffTimer = 0;
             }
@@ -373,14 +375,14 @@ public virtual void SetFocus(bool focus)
             StateManager.SetStateValue(InteractableStates.InteractableStateEnum.Focus, focus ? 1 : 0);
             UpdateState();
         }
-        
+
         public virtual void SetPress(bool press)
         {
             HasPress = press;
             StateManager.SetStateValue(InteractableStates.InteractableStateEnum.Pressed, press ? 1 : 0);
             UpdateState();
         }
-        
+
         public virtual void SetDisabled(bool disabled)
         {
             IsDisabled = disabled;
@@ -543,7 +545,7 @@ public void OnFocusExit(FocusEventData eventData)
         #endregion MixedRealityFocusHandlers
 
         #region MixedRealityPointerHandlers
-        
+
         /// <summary>
         /// pointer up event has fired
         /// </summary>
@@ -689,7 +691,7 @@ public void OnInputDown(InputEventData eventData)
             {
                 return;
             }
-            
+
             if (StateManager != null)
             {
                 if (eventData != null && ShouldListen(eventData.MixedRealityInputAction) && (eventData.MixedRealityInputAction != pointerInputAction || pointerInputAction == MixedRealityInputAction.None))
@@ -783,8 +785,8 @@ protected void IncreaseDimensionIndex()
             {
                 dimensionIndex = 0;
             }
-            
-            if(currentIndex != dimensionIndex)
+
+            if (currentIndex != dimensionIndex)
             {
                 FilterThemesByDimensions();
                 forceUpdate = true;
@@ -847,7 +849,7 @@ protected virtual bool CanInteract()
                 return false;
             }
 
-            if (Dimensions > 1 && ((dimensionIndex != Dimensions -1 & !CanSelect) || (dimensionIndex == Dimensions - 1 & !CanDeselect)) )
+            if (Dimensions > 1 && ((dimensionIndex != Dimensions - 1 & !CanSelect) || (dimensionIndex == Dimensions - 1 & !CanDeselect)))
             {
                 return false;
             }
@@ -911,9 +913,10 @@ protected void StartGlobalVisual(bool voiceCommand = false)
         protected IEnumerator GlobalVisualReset(float time)
         {
             yield return new WaitForSeconds(time);
-            
+
             StateManager.SetStateValue(InteractableStates.InteractableStateEnum.VoiceCommand, 0);
-            if (!HasFocus) {
+            if (!HasFocus)
+            {
                 StateManager.SetStateValue(InteractableStates.InteractableStateEnum.Focus, 0);
             }
 
@@ -952,7 +955,7 @@ public void OnSpeechKeywordRecognized(SpeechEventData eventData)
             if (Enabled && ShouldListen(eventData.MixedRealityInputAction))
             {
                 StartGlobalVisual(true);
-                
+
                 IncreaseDimensionIndex();
                 SendVoiceCommands(eventData.RecognizedText, 0, 1);
 
@@ -969,15 +972,15 @@ protected void SetupVoiceCommand()
 #if UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
             if (!string.IsNullOrEmpty(VoiceCommand) && VoiceCommand.Length > 2)
             {
-                voiceCommands = new string[] { VoiceCommand }; 
+                voiceCommands = new string[] { VoiceCommand };
                 if (VoiceCommand.IndexOf(",") > -1)
                 {
                     voiceCommands = VoiceCommand.Split(',');
                 }
 
                 recognitionConfidenceLevel = MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.SpeechCommandsProfile.SpeechRecognitionConfidenceLevel;
 
-                if(keywordRecognizer == null)
+                if (keywordRecognizer == null)
                 {
                     keywordRecognizer = new KeywordRecognizer(voiceCommands, (ConfidenceLevel)recognitionConfidenceLevel);
                     keywordRecognizer.OnPhraseRecognized += KeywordRecognizer_OnPhraseRecognized;
@@ -1012,7 +1015,7 @@ protected void KeywordRecognizer_OnPhraseRecognized(PhraseRecognizedEventArgs ar
         {
             if (args.text == VoiceCommand && (!RequiresFocus || HasFocus) && CanInteract())
             {
-                
+
                 if (CanInteract())
                 {
                     StartGlobalVisual(true);
@@ -1063,11 +1066,11 @@ protected void SendVoiceCommands(string command, int index, int length)
         /// <returns></returns>
         protected int GetVoiceCommandIndex(string command)
         {
-            if(voiceCommands.Length > 1)
+            if (voiceCommands.Length > 1)
             {
                 for (int i = 0; i < voiceCommands.Length; i++)
                 {
-                    if(command == voiceCommands[i])
+                    if (command == voiceCommands[i])
                     {
                         return i;
                     }
@@ -1076,7 +1079,7 @@ protected int GetVoiceCommandIndex(string command)
 
             return 0;
         }
-        
+
         #endregion VoiceCommands
 
     }

Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Interactable.cs

@@ -233,7 +233,7 @@ public virtual void OnPointerUp(MixedRealityPointerEventData eventData)
 
         #region MonoBehaviour Implementation
 
-        private void Update()
+        private void LateUpdate()
         {
             UpdateCursorState();
             UpdateCursorTransform();

Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/BaseCursor.cs

@@ -120,6 +120,8 @@ public override void OnPreRaycast()
             Vector3 pointerPosition;
             TryGetPointerPosition(out pointerPosition);
 
+            lineBase.UpdateMatrix();
+
             // Set our first and last points
             lineBase.FirstPoint = pointerPosition;