Skip to content

Commit

Permalink
MRTK3 Example Scene Polish (#11744)
Browse files Browse the repository at this point in the history
## Overview
This change polishes the existing MRTK3 example scenes.  Things fixed

- Where possible, the scene's description panel was updated to include an "Object Manipulator" so the scene content can be moved
- The 'Simple Profiler' added to every scene
- Hand Rays disabled by default in eye-gaze interaction scene
- Updated 'Example Hand Menu' to initialize its state based on interactors' enablement at start time.
- The dictation example now re-enables keyword recognition once dictation stops.
- Improved 'Solver Example' scene layout
- Improved 'Speech Input Example' scene layout, and change 'global speech' sample to change shape/mesh of the game objects to better demonstrate using stateful interactor's keyword feature.
- Improved 'Dwell Example' scene layout
- Improved all eye gaze scene layouts
- Improved 'Disable Interactor Example' scene layout
- Improved 'Virtualized Scroll Rect List' scene layout, and added touch scrolling to the list
- Improved 'Scrolling Example' scene layout, and improved its performance by reducing game objects
- Updated 'Disable Interactor Example' so it's harder to get stuck.
- Fixed 'Eye Tracking Visualizer Example' scene so eye tracking recording works on device
- Fixing text example scene to use TextMeshPro


## Changes
- Fixes: #11731
- Fixes: #11730
- Fixes: #11726
- Fixes: #11725
  • Loading branch information
AMollis authored Jul 27, 2023
1 parent 3e321a9 commit b30acdb
Show file tree
Hide file tree
Showing 84 changed files with 51,233 additions and 95,232 deletions.
33 changes: 25 additions & 8 deletions UnityProjects/MRTKDevTemplate/Assets/BuildAssets/BuildApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ namespace Microsoft.MixedReality.Toolkit.Examples.Build
/// </summary>
public static class BuildApp
{
private static string[] scenes = {
"Assets/Scenes/Audio/AudioLoFiExample.unity",
"Assets/Scenes/Audio/AudioOcclusionExample.unity",
"Assets/Scenes/Experimental/ScrollingExample.unity",
"Assets/Scenes/Experimental/NonNativeKeyboard.unity",
"Assets/Scenes/Experimental/VirtualizedScrollRectList.unity",
private static string[] scenes =
{
"Assets/Scenes/BoundsControlExamples.unity",
"Assets/Scenes/CanvasExample.unity",
"Assets/Scenes/CanvasUITearsheet.unity",
"Assets/Scenes/ClippingExamples.unity",
"Assets/Scenes/ClippingInstancedExamples.unity",
"Assets/Scenes/DiagnosticsDemo.unity",
"Assets/Scenes/DialogExample.unity",
"Assets/Scenes/DictationExample.unity",
"Assets/Scenes/DirectionalIndicatorExample.unity",
"Assets/Scenes/DisableInteractorsExample.unity",
"Assets/Scenes/DwellExample.unity",
"Assets/Scenes/EyeGazeExample.unity",
"Assets/Scenes/FontIconExample.unity",
"Assets/Scenes/HandInteractionExamples.unity",
Expand All @@ -40,18 +40,35 @@ public static class BuildApp
"Assets/Scenes/LegacyConstraintsExample.unity",
"Assets/Scenes/MagicWindowExample.unity",
"Assets/Scenes/NearMenuExamples.unity",
"Assets/Scenes/NonCanvasDialogExample.unity",
"Assets/Scenes/NonCanvasObjectBarExample.unity",
"Assets/Scenes/NonCanvasUIBackplateExample.unity",
"Assets/Scenes/OutlineExamples.unity",
"Assets/Scenes/NonCanvasUITearSheet.unity",
"Assets/Scenes/OutlineExamples.unity",
"Assets/Scenes/PerformanceEvaluation.unity",
"Assets/Scenes/SeeItSayIt Example.unity",
"Assets/Scenes/SlateDrawingExample.unity",
"Assets/Scenes/SolverExamples.unity",
"Assets/Scenes/SpatialMappingExample.unity",
"Assets/Scenes/SpeechInputExamples.unity",
"Assets/Scenes/TapToPlaceExample.unity",
"Assets/Scenes/TextPrefabExamples.unity",
"Assets/Scenes/TextToSpeechExamples.unity",
"Assets/Scenes/ToggleCollectionExample.unity",
"Assets/Scenes/TopNavigationExample.unity",
"Assets/Scenes/VanillaUGUIExample.unity" };
"Assets/Scenes/VanillaUGUIExample.unity",
"Assets/Scenes/Audio/AudioLoFiExample.unity",
"Assets/Scenes/Audio/AudioOcclusionExample.unity",
"Assets/Scenes/Experimental/NonNativeKeyboard.unity",
"Assets/Scenes/Experimental/ScrollingExample.unity",
"Assets/Scenes/Experimental/SpatialMouseSample.unity",
"Assets/Scenes/Experimental/VirtualizedScrollRectList.unity",
"Assets/Scenes/EyeTracking/EyeTrackingBasicSetupExample.unity",
"Assets/Scenes/EyeTracking/EyeTrackingExampleNavigationExample.unity",
"Assets/Scenes/EyeTracking/EyeTrackingTargetPositioningExample.unity",
"Assets/Scenes/EyeTracking/EyeTrackingTargetSelectionExample.unity",
"Assets/Scenes/EyeTracking/EyeTrackingVisualizerExample.unity"
};

private static string buildPath = "build";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ RectTransform:
m_Father: {fileID: 7942278511449526407}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 98.91945, y: -20.7}
m_SizeDelta: {x: 189.8389, y: 33.4}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 33.4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &7942278510844116559
GameObject:
Expand All @@ -138,7 +138,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7942278510844116559}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0.008000612, z: -2.392}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
Expand Down Expand Up @@ -234,7 +234,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 12.226349}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7942278511449526400
CanvasRenderer:
Expand Down Expand Up @@ -342,10 +342,10 @@ RectTransform:
m_Father: {fileID: 7942278511449526407}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 98.91945, y: -50.68}
m_SizeDelta: {x: 189.8389, y: 26.56}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 26.56}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7942278511555745240
CanvasRenderer:
Expand Down Expand Up @@ -491,7 +491,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7942278511695666203}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 1.5}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
m_ConstrainProportionsScale: 0
m_Children:
Expand All @@ -501,7 +501,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0.13975337}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 197.8389, y: 159.73364}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &7942278511695666200
Expand Down Expand Up @@ -595,10 +595,10 @@ RectTransform:
m_Father: {fileID: 7942278511449526407}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 98.91945, y: -99.96}
m_SizeDelta: {x: 189.8389, y: 72}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 72}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7942278511777747276
CanvasRenderer:
Expand Down Expand Up @@ -634,7 +634,7 @@ MonoBehaviour:
Easiest way to get there? Simply <color=#FDFFB1>flip
your visor up and back down </color>and a notification should appear asking you
to go through the calibration. Otherwise you can also start it from<color=#FDFFB1>Settings
to go through the calibration. Otherwise you can also start it from <color=#FDFFB1>Settings
-> System -> Calibration -> Run eye calibration</color>.'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: fea6b26abeefbc547b6aca1dbda0a34d, type: 2}
Expand Down Expand Up @@ -737,51 +737,51 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: m_SizeDelta.x
value: 148.8389
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: m_SizeDelta.y
value: 31.999989
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: m_AnchoredPosition.x
value: 105.41945
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: m_AnchoredPosition.y
value: -15.999994
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: m_SizeDelta.x
value: 12
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: m_SizeDelta.y
value: 31.999989
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: m_AnchoredPosition.x
value: 16
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: m_AnchoredPosition.y
value: -15.999994
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: currentIconName
Expand All @@ -797,7 +797,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8376646494505211224, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: m_Size.x
value: 189.8389
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.size
Expand Down Expand Up @@ -885,19 +885,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: m_SizeDelta.x
value: 189.8389
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: m_SizeDelta.y
Expand Down Expand Up @@ -933,11 +933,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: m_AnchoredPosition.x
value: 98.91945
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: m_AnchoredPosition.y
value: -151.95999
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
Expand Down
Loading

0 comments on commit b30acdb

Please sign in to comment.