Merge remote-tracking branch 'upstream/mrtk_development' into sostel-patch-1

Author: keveleigh

Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Themes/HolographicButtonSeeItSayItLabel.asset

@@ -515,7 +515,7 @@ MonoBehaviour:
         Animation: {fileID: 0}
       ShaderName: 
     Easing:
-      Enabled: 0
+      Enabled: 1
       Curve:
         serializedVersion: 2
         m_Curve:

Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/AppBar/AppBarButton.cs

@@ -18,7 +18,7 @@ public class AppBarButton : MonoBehaviour
 
         public int DisplayOrder { get { return displayOrder; } }
 
-        public bool Visible { get { return visible; } }
+        public bool Visible { get { return gameObject.activeSelf; } }
 
         [SerializeField]
         private PressableButton button = null;
@@ -34,8 +34,6 @@ public class AppBarButton : MonoBehaviour
         private AppBar.ButtonTypeEnum buttonType = AppBar.ButtonTypeEnum.Custom;
         [SerializeField]
         private int displayOrder;
-        [SerializeField]
-        private bool visible;
 
         private AppBar parentToolBar;
         private Vector3 targetPosition;
@@ -81,26 +79,14 @@ public void InitializeButtonContent(AppBar parentToolBar)
                         primaryLabels[i].text = buttonText;
 
                     seeItSayItLabel.text = "Say \"" + buttonText + "\"";
-
-                    // TODO use property blocks once Interactable no longer uses instanced materials
-                    /*if (iconPropertyBlock == null)
-                        iconPropertyBlock = new MaterialPropertyBlock();
-
-                    if (icon.HasPropertyBlock())
-                    {
-                        icon.GetPropertyBlock(iconPropertyBlock);
-                    }
-                    iconPropertyBlock.SetTexture("_MainTex", buttonIcon);
-                    icon.SetPropertyBlock(iconPropertyBlock);*/
-
                     icon.material.mainTexture = buttonIcon;
                     break;
             }
         }
 
         private void UpdateButton()
         {
-            transform.localPosition = Vector3.Lerp(transform.localPosition, visible ? targetPosition : Vector3.zero, Time.deltaTime * changeSpeed);
+            transform.localPosition = Vector3.Lerp(transform.localPosition, Visible ? targetPosition : Vector3.zero, Time.deltaTime * changeSpeed);
         }
 
         public void SetTargetPosition(Vector3 targetPosition)
@@ -110,11 +96,11 @@ public void SetTargetPosition(Vector3 targetPosition)
 
         public void SetVisible(bool visible)
         {
-            this.visible = visible;
-
+            gameObject.SetActive(visible);
             // Use the interactable theme to make button invisible
             button.enabled = visible;
             interactable.Enabled = visible;
+
         }
     }
 }

Assets/MixedRealityToolkit.Services/InputSystem/MixedRealityInputSystem.cs

@@ -94,7 +94,7 @@ private enum TouchableSurface
         public static IReadOnlyCollection<NearInteractionTouchable> Instances { get { return instances.AsReadOnly(); } }
         private static readonly List<NearInteractionTouchable> instances = new List<NearInteractionTouchable>();
 
-        public bool ColliderEnabled { get { return !usesCollider || touchableCollider.enabled; } }
+        public bool ColliderEnabled { get { return !usesCollider || touchableCollider.enabled && touchableCollider.gameObject.activeInHierarchy; } }
 
         /// <summary>
         /// Local space forward direction

Assets/MixedRealityToolkit.Services/InputSystem/NearInteractionTouchable.cs

@@ -0,0 +1,53 @@
+# Authors
+
+The Mixed Reality Toolkit is a collaborative project containing contributions from individuals around the world.
+
+## Special Thanks
+
+The Mixed Reality Toolkit team would like to extend a special thank you to contributors **Stephen Hodgson** and **Simon Jackson** for contributions above and beyond the call of duty to bring MRTK v2 into reality!
+
+## Authors
+
+The Mixed Reality Toolkit v2 is authored by:
+
+- achaperon
+- Alex Cooper
+- Alexees
+- andreiborodin
+- Cameron-Micka
+- chbecker-ms
+- chrisfromwork
+- cre8ivepark
+- danielhofmann-ms
+- davidkline-ms
+- Ecnassianer
+- Jarodshow
+- Jerome Humbert
+- johnppella
+- JonathanPalmerGD
+- julenka
+- jwittner
+- keveleigh
+- killerantz
+- luis-valverde-ms
+- lukastonneMS
+- MenelvagorMilsom
+- Nakda
+- Nick K.
+- Norbert Nemec
+- paco-ms
+- phosphoer
+- provencher
+- radicalad
+- Railboy
+- ryzngard
+- sgwin
+- SimonDarksideJ
+- sostel
+- stefan.wasserbauer
+- StephenHodgson
+- thalbern
+- wassx
+- witian
+- wiwei
+- Yoyozilla

Documentation/Authors.md

@@ -46,4 +46,4 @@ The speed at which to move the profiler window to maintain visibility within the
 ## See Also
 
 - [Diagnostics System](DiagnosticsSystemGettingStarted.md)
-- [Using the Visual Profiler](../TODO.md)
+- [Using the Visual Profiler](UsingVisualProfiler.md)

Documentation/Diagnostics/ConfiguringDiagnostics.md

@@ -59,5 +59,5 @@ accurately reflect actual application performance when run from within the edito
 
 - [Diagnostics API documentation](xref:Microsoft.MixedReality.Toolkit.Diagnostics)
 - [Configuring the Diagnostics System](ConfiguringDiagnostics.md)
-- [Using the Visual Profiler](../TODO.md)
+- [Using the Visual Profiler](UsingVisualProfiler.md)
 

Documentation/Diagnostics/DiagnosticsSystemGettingStarted.md

@@ -1,6 +1,64 @@
 # Using the Visual Profiler
 
-<< >>
+The VisualProfiler provides an easy to use, in application view of a mixed reality application's performance. The profiler is supported on all Mixed Reality Toolkit platforms, including:
+
+- Microsoft HoloLens
+- Microsoft HoloLens 2
+- Windows Mixed Reality Immersive headsets
+- OpenVR
+
+While developing an application, be sure to focus on multiple parts of the scene as the Visual Profiler displays data relative to the current view. 
+
+> Focus attention on portions of the scene with complex objects, particle effects or activity. These and other factors often contribute to reduction in application performance and a less than ideal user experience.
+
+## Visual Profiler Interface
+
+![Visual Profiler Interface](../../External/ReadMeImages/Diagnostics/VisualProfiler.png)
+
+The Visual Profiler interface includes the following components:
+
+- [Frame Rate](#frame-rate)
+- [Frame Time](#frame-time)
+- [Frame Graph](#frame-graph)
+- [Memory Utilization](#memory-utilization)
+
+### Frame Rate
+
+In the upper left corner of the interface is the frame rate, measured in frames per second. For the best user experience and comfort, this value should be as high as possible. 
+
+The specific platform and hardware configuration will play a significant role in the maximum achievable frame rate. Some common target values include:
+
+- Microsoft HoloLens: 60
+- Windows Mixed Reality Ultra: 90
+
+### Frame Time
+
+To the right of the frame rate is the frame time, in milliseconds, spent on the CPU. To achieve the target frame rates mentioned previously, an application can spend the following amount of time per frame:
+
+- 60 fps: 16.6 ms
+- 90 fps: 11.1 ms
+
+> GPU time is planned to be added in a future release.
+
+### Frame Graph
+
+The frame graph provides a graphical display of the application frame rate history.
+
+![Visual Profiler Frame Graph](../../External/ReadMeImages/Diagnostics/VisualProfilerMissedFrames.png)
+
+> When using the application, look for missed frames. Missed frames indicate the application is not hitting its target frame rate and may need optimization work.
+
+### Memory Utilization
+
+The memory utilization display allows for easy understanding of how the current view is impacting an application's memory consumption. 
+
+![Visual Profiler Frame Graph](../../External/ReadMeImages/Diagnostics/VisualProfilerMemory.png)
+
+> When using application, look for total memory usage. Key indicators include: nearing the memory limit and rapid changes in usage.
+
+## Customizing the Visual Profiler
+
+The Visual Profiler's appearance and behavior are customizable via the diagnostics system profile. Please see [Configuring the Diagnostics System](ConfiguringDiagnostics.md) for more information.
 
 ## See Also
 

Documentation/Diagnostics/UsingVisualProfiler.md

@@ -2,6 +2,8 @@
   items:
   - name: MRTK v2
     href: ../MRTK-vNext.md
+  - name: Authors
+    href: Authors.md
   - name: Mixed Reality Services
     href: ../External/Documentation/MixedRealityServices.md
 - name: How-tos
@@ -15,7 +17,6 @@
     - name: Upgrading from the HoloToolkit (HTK)
       href: HTKToMRTKPortingGuide.md
   - name: Core Features
-    href: TODO.md
     items:
     - name: Packages
       href: Packaging/MRTK_Packages.md
@@ -49,10 +50,7 @@
         href: InputSystem/HandTracking.md
       - name: Eyes
         href: EyeTracking/EyeTracking_Main.md
-      - name: Gaze
-        href: TODO.md
     - name: Interactions and UX Building Blocks
-      href: TODO.md
       items:
       - name: Interactable
         href: README_Interactable.md
@@ -94,23 +92,21 @@
       - name: Configuring the Diagnostics System
         href: Diagnostics/ConfiguringDiagnostics.md
       - name: Using the Visual Profiler
-        href: TODO.md
+        href: Diagnostics/UsingVisualProfiler.md
   - name: Other Features
-    href: TODO.md
     items:
     - name: QR Tracking
       href: TODO.md
     - name: Spatial Audio
       href: TODO.md
   - name: Advanced topics
-    href: TODO.md
     items:
     - name: Performance
       href: Performance/PerfGettingStarted.md
     - name: Shared Experiences
       href: TODO.md
     - name: Moving your project from HTK to MRTK
-      href: TODO.md
+      href: HTKToMRTKPortingGuide.md
 - name: Contributing
   href: ../CONTRIBUTING.md
   items: