Skip to content

Commit e19a095

Browse files
authored
Merge branch 'mrtk_development' into performancedocs
2 parents f61a924 + 220a15d commit e19a095

File tree

75 files changed

+2408
-64
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+2408
-64
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,8 @@ Assets/StreamingAssets/GltfModels.meta
6868
Assets/StreamingAssets.meta
6969

7070
/mrtk_log_mostRecentET.csv
71+
72+
# =============== #
73+
# DocFX Generated #
74+
# =============== #
75+
doc/

Assets/MixedRealityToolkit.Examples/Demos/HandTracking/Script/ToggleBoundingBox.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

4-
using Microsoft.MixedReality.Toolkit.Utilities;
4+
using Microsoft.MixedReality.Toolkit.UI;
55
using UnityEngine;
66

77
namespace Microsoft.MixedReality.Toolkit.Examples.Demos

Assets/MixedRealityToolkit.Examples/Demos/Input/Scenes/Speech.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: b71cb900fa9dec5488df2deb180db58f, type: 3}
13+
m_Name: Speech.MixedRealityInputSystemProfile
14+
m_EditorClassIdentifier:
15+
isCustomProfile: 1
16+
focusProviderType:
17+
reference: Microsoft.MixedReality.Toolkit.Input.FocusProvider, Microsoft.MixedReality.Toolkit.Services.InputSystem
18+
inputActionsProfile: {fileID: 11400000, guid: 723eb97b02944311b92861f473eee53e,
19+
type: 2}
20+
inputActionRulesProfile: {fileID: 11400000, guid: 03945385d89102f41855bc8f5116b199,
21+
type: 2}
22+
pointerProfile: {fileID: 11400000, guid: 48aa63a9725047b28d4137fd0834bc31, type: 2}
23+
gesturesProfile: {fileID: 11400000, guid: bd7829a9b29409045a745b5a18299291, type: 2}
24+
speechCommandsProfile: {fileID: 11400000, guid: 5b1a29a26a15b48449c76091b0db0658,
25+
type: 2}
26+
enableControllerMapping: 1
27+
controllerMappingProfile: {fileID: 11400000, guid: 39ded1fd0711a0c448413d0e1ec4f7f3,
28+
type: 2}
29+
controllerVisualizationProfile: {fileID: 11400000, guid: 345c06fdf3732db46b96299bd3cba653,
30+
type: 2}
31+
handTrackingProfile: {fileID: 11400000, guid: 7f1e3cd673742f94ca860ac7ae733024,
32+
type: 2}

Assets/MixedRealityToolkit.Examples/Demos/Input/Scenes/Speech/Speech.MixedRealityInputSystemProfile.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 1f18fec9b55c4f818e284af454161962, type: 3}
13+
m_Name: Speech.MixedRealitySpeechCommandsProfile
14+
m_EditorClassIdentifier:
15+
isCustomProfile: 1
16+
startBehavior: 0
17+
recognitionConfidenceLevel: 1
18+
speechCommands:
19+
- localizationKey:
20+
keyword: Open
21+
keyCode: 111
22+
action:
23+
id: 0
24+
description: None
25+
axisConstraint: 0
26+
- localizationKey:
27+
keyword: Select
28+
keyCode: 115
29+
action:
30+
id: 1
31+
description: Select
32+
axisConstraint: 2
33+
- localizationKey:
34+
keyword: Close
35+
keyCode: 99
36+
action:
37+
id: 0
38+
description: Toggle Diagnostics
39+
axisConstraint: 0

Assets/MixedRealityToolkit.Examples/Demos/Input/Scenes/Speech/Speech.MixedRealitySpeechCommandsProfile.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 7612acbc1a4a4ed0afa5f4ccbe42bee4, type: 3}
13+
m_Name: Speech.MixedRealityToolkitConfigurationProfile
14+
m_EditorClassIdentifier:
15+
isCustomProfile: 1
16+
targetExperienceScale: 3
17+
enableCameraProfile: 1
18+
cameraProfile: {fileID: 11400000, guid: 8089ccfdd4494cd38f676f9fc1f46a04, type: 2}
19+
enableInputSystem: 1
20+
inputSystemProfile: {fileID: 11400000, guid: 00e306afacaf92a4a88a13bb31a11e4f, type: 2}
21+
inputSystemType:
22+
reference: Microsoft.MixedReality.Toolkit.Input.MixedRealityInputSystem, Microsoft.MixedReality.Toolkit.Services.InputSystem
23+
enableBoundarySystem: 1
24+
boundarySystemType:
25+
reference: Microsoft.MixedReality.Toolkit.Boundary.MixedRealityBoundarySystem,
26+
Microsoft.MixedReality.Toolkit.Services.BoundarySystem
27+
boundaryVisualizationProfile: {fileID: 11400000, guid: 6d28cce596b44bd3897ca86f8b24e076,
28+
type: 2}
29+
enableTeleportSystem: 1
30+
teleportSystemType:
31+
reference: Microsoft.MixedReality.Toolkit.Teleport.MixedRealityTeleportSystem,
32+
Microsoft.MixedReality.Toolkit.Services.TeleportSystem
33+
enableSpatialAwarenessSystem: 1
34+
spatialAwarenessSystemType:
35+
reference: Microsoft.MixedReality.Toolkit.SpatialAwareness.MixedRealitySpatialAwarenessSystem,
36+
Microsoft.MixedReality.Toolkit.Services.SpatialAwarenessSystem
37+
diagnosticsSystemProfile: {fileID: 11400000, guid: 478436bd1083882479a52d067e98e537,
38+
type: 2}
39+
enableDiagnosticsSystem: 0
40+
diagnosticsSystemType:
41+
reference: Microsoft.MixedReality.Toolkit.Diagnostics.MixedRealityDiagnosticsSystem,
42+
Microsoft.MixedReality.Toolkit.Services.DiagnosticsSystem
43+
registeredServiceProvidersProfile: {fileID: 11400000, guid: efbaf6ea540c69f4fb75415a5d145a53,
44+
type: 2}

Assets/MixedRealityToolkit.Examples/Demos/Input/Scenes/Speech/Speech.MixedRealityToolkitConfigurationProfile.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)