Skip to content

Commit 8f89555

Browse files
artsouflMSartsouflMS
authored
Merge pull request #5 from microsoft/mrtk_development
Mrtk development
2 parents 61ef619 + 0370994 commit 8f89555

File tree

95 files changed

+33114
-382
lines changed

Some content is hidden

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

95 files changed

+33114
-382
lines changed

‎Assets/MixedReality.Toolkit.Foundation.nuspec‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
<version>$version$</version>
66
<authors>Microsoft</authors>
77
<owners>Microsoft,MixedReality</owners>
8-
<licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/mrtk_release/License.txt</licenseUrl>
9-
<projectUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity</projectUrl>
8+
<licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/mrtk_development/License.txt</licenseUrl>
9+
<projectUrl>https://aka.ms/MRTK</projectUrl>
10+
<iconUrl>https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/Images/MRTK_Logo_NuGet.png</iconUrl>
1011
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1112
<description>The Mixed Reality Toolkit is a collection of scripts and components intended to accelerate development of applications targeting Microsoft HoloLens and Windows Mixed Reality headsets.</description>
1213
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1314
<releaseNotes>$releaseNotes$</releaseNotes>
14-
<tags>Unity MixedReality</tags>
15+
<tags>Unity MixedReality MixedRealityToolkit MRTK</tags>
1516
<dependencies>
1617
<dependency id="Microsoft.Windows.MixedReality.DotNetWinRT" version="0.5.1037" />
1718
</dependencies>
@@ -21,7 +22,7 @@
2122
</metadata>
2223
<files>
2324
<file src="MixedRealityToolkit\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit\toc.yml*" target="MRTK\" />
24-
<file src="MixedRealityToolkit.Providers\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.Providers\License.txt*;MixedRealityToolkit.Providers\Version.txt*" target="MRTK\" />
25+
<file src="MixedRealityToolkit.Providers\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.Providers\License.txt*;MixedRealityToolkit.Providers\Version.txt*;MixedRealityToolkit.Providers\WindowsMixedReality\DotNetAdapter*;MixedRealityToolkit.Providers\WindowsMixedReality\DotNetAdapter\**\*.*" target="MRTK\" />
2526
<file src="MixedRealityToolkit.SDK\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.SDK\License.txt*;MixedRealityToolkit.SDK\Version.txt*;MixedRealityToolkit.SDK\toc.yml*;MixedRealityToolkit.SDK\StandardAssets.meta;MixedRealityToolkit.SDK\StandardAssets\Fonts.meta;MixedRealityToolkit.SDK\StandardAssets\Materials.meta;MixedRealityToolkit.SDK\StandardAssets\Shaders.meta;MixedRealityToolkit.SDK\StandardAssets\Textures.meta" target="MRTK\" />
2627
<file src="MixedRealityToolkit.Services\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.Services\License.txt*;MixedRealityToolkit.Services\Version.txt*" target="MRTK\" />
2728

‎Assets/MixedRealityToolkit.Examples/Demos/Boundary/Scenes/BoundaryVisualization.unity‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,6 @@ MonoBehaviour:
256256
m_OnCullStateChanged:
257257
m_PersistentCalls:
258258
m_Calls: []
259-
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
260-
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
261259
m_FontData:
262260
m_Font: {fileID: 12800000, guid: e869342c56e54acf989b2422b4b80dcc, type: 3}
263261
m_FontSize: 40
@@ -540,8 +538,6 @@ MonoBehaviour:
540538
m_OnCullStateChanged:
541539
m_PersistentCalls:
542540
m_Calls: []
543-
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
544-
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
545541
m_FontData:
546542
m_Font: {fileID: 12800000, guid: e869342c56e54acf989b2422b4b80dcc, type: 3}
547543
m_FontSize: 40
@@ -698,8 +694,6 @@ MonoBehaviour:
698694
m_OnCullStateChanged:
699695
m_PersistentCalls:
700696
m_Calls: []
701-
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
702-
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
703697
m_FontData:
704698
m_Font: {fileID: 12800000, guid: e869342c56e54acf989b2422b4b80dcc, type: 3}
705699
m_FontSize: 40

‎Assets/MixedRealityToolkit.Examples/Experimental/ExamplesHub/Profiles/MRTKExamplesHubSceneSystemProfile.asset‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -33,92 +33,92 @@ MonoBehaviour:
3333
contentScenes:
3434
- Name: MRTKExamplesHubMainMenu
3535
Path: Assets/MixedRealityToolkit.Examples/Experimental/ExamplesHub/Scenes/MRTKExamplesHubMainMenu.unity
36-
Included: 1
37-
BuildIndex: 2
36+
Included: 0
37+
BuildIndex: -1
3838
Tag: Untagged
3939
Asset: {fileID: 102900000, guid: 63a00118e809c754f9c7911bb85d635f, type: 3}
4040
- Name: HandInteractionExamples
4141
Path: Assets/MixedRealityToolkit.Examples/Demos/HandTracking/Scenes/HandInteractionExamples.unity
4242
Included: 1
43-
BuildIndex: 1
43+
BuildIndex: 0
4444
Tag: Untagged
4545
Asset: {fileID: 102900000, guid: 3dd4a396b5225f8469b9a1eb608bfa57, type: 3}
4646
- Name: ClippingExamples
4747
Path: Assets/MixedRealityToolkit.Examples/Demos/StandardShader/Scenes/ClippingExamples.unity
48-
Included: 1
49-
BuildIndex: 3
48+
Included: 0
49+
BuildIndex: -1
5050
Tag: Untagged
5151
Asset: {fileID: 102900000, guid: e532091edada3e04aa706112e8d5f310, type: 3}
5252
- Name: TooltipExamples
5353
Path: Assets/MixedRealityToolkit.Examples/Demos/UX/Tooltips/Scenes/TooltipExamples.unity
54-
Included: 1
55-
BuildIndex: 4
54+
Included: 0
55+
BuildIndex: -1
5656
Tag: Untagged
5757
Asset: {fileID: 102900000, guid: de90a43947eced441b4c426e11f35f28, type: 3}
5858
- Name: MaterialGallery
5959
Path: Assets/MixedRealityToolkit.Examples/Demos/StandardShader/Scenes/MaterialGallery.unity
60-
Included: 1
61-
BuildIndex: 5
60+
Included: 0
61+
BuildIndex: -1
6262
Tag: Untagged
6363
Asset: {fileID: 102900000, guid: c6b1477d31864dff836e9738518eae60, type: 3}
6464
- Name: BoundingBoxExamples
6565
Path: Assets/MixedRealityToolkit.Examples/Demos/UX/BoundingBox/Scenes/BoundingBoxExamples.unity
66-
Included: 1
67-
BuildIndex: 6
66+
Included: 0
67+
BuildIndex: -1
6868
Tag: Untagged
6969
Asset: {fileID: 102900000, guid: 9da574c0affd04d42a6b1e5db09e82b4, type: 3}
7070
- Name: PressableButtonExample
7171
Path: Assets/MixedRealityToolkit.Examples/Demos/UX/PressableButton/Scenes/PressableButtonExample.unity
72-
Included: 1
73-
BuildIndex: 7
72+
Included: 0
73+
BuildIndex: -1
7474
Tag: Untagged
7575
Asset: {fileID: 102900000, guid: b2d06bb8d7f107d4783a56c796c5c120, type: 3}
7676
- Name: HandMenuExamples
7777
Path: Assets/MixedRealityToolkit.Examples/Demos/HandTracking/Scenes/HandMenuExamples.unity
78-
Included: 1
79-
BuildIndex: 8
78+
Included: 0
79+
BuildIndex: -1
8080
Tag: Untagged
8181
Asset: {fileID: 102900000, guid: 2792ec9767804e644906ab978f2eed23, type: 3}
8282
- Name: SlateExample
8383
Path: Assets/MixedRealityToolkit.Examples/Demos/UX/Slate/SlateExample.unity
84-
Included: 1
85-
BuildIndex: 9
84+
Included: 0
85+
BuildIndex: -1
8686
Tag: Untagged
8787
Asset: {fileID: 102900000, guid: 86e8b0c6246dbb74aa04ecd40a57d89c, type: 3}
8888
- Name: SliderExample
8989
Path: Assets/MixedRealityToolkit.Examples/Demos/UX/Slider/Scenes/SliderExample.unity
90-
Included: 1
91-
BuildIndex: 10
90+
Included: 0
91+
BuildIndex: -1
9292
Tag: Untagged
9393
Asset: {fileID: 102900000, guid: 086aad2912678d04e968264b2398004b, type: 3}
9494
- Name: EyeTrackingDemo-02-TargetSelection
9595
Path: Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-02-TargetSelection.unity
96-
Included: 1
97-
BuildIndex: 11
96+
Included: 0
97+
BuildIndex: -1
9898
Tag: Untagged
9999
Asset: {fileID: 102900000, guid: 55643f7e4eceb734784192b162f565e0, type: 3}
100100
- Name: EyeTrackingDemo-03-Navigation
101101
Path: Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-03-Navigation.unity
102-
Included: 1
103-
BuildIndex: 12
102+
Included: 0
103+
BuildIndex: -1
104104
Tag: Untagged
105105
Asset: {fileID: 102900000, guid: 5df475f0bf57b1f488d59e0e16040d9a, type: 3}
106106
- Name: EyeTrackingDemo-04-TargetPositioning
107107
Path: Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-04-TargetPositioning.unity
108-
Included: 1
109-
BuildIndex: 13
108+
Included: 0
109+
BuildIndex: -1
110110
Tag: Untagged
111111
Asset: {fileID: 102900000, guid: 91ded1f5ef2ae854ba4ac94eca7a2494, type: 3}
112112
- Name: EyeTrackingDemo-05-Visualizer
113113
Path: Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-05-Visualizer.unity
114-
Included: 1
115-
BuildIndex: 14
114+
Included: 0
115+
BuildIndex: -1
116116
Tag: Untagged
117117
Asset: {fileID: 102900000, guid: 2d6c43a82f3a88c4dbdc3b5e99a68d8a, type: 3}
118118
- Name: NearMenuExamples
119119
Path: Assets/MixedRealityToolkit.Examples/Demos/HandTracking/Scenes/NearMenuExamples.unity
120-
Included: 1
121-
BuildIndex: 15
120+
Included: 0
121+
BuildIndex: -1
122122
Tag: Untagged
123123
Asset: {fileID: 102900000, guid: bf3eb3415bffceb41810526380c2c71c, type: 3}
124124
permittedLightingSceneComponentTypes:

‎Assets/MixedRealityToolkit.Examples/Experimental/NonNativeKeyboard.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.

‎Assets/MixedRealityToolkit.Examples/Experimental/NonNativeKeyboard/Profiles.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.

‎Assets/MixedRealityToolkit.Examples/Experimental/NonNativeKeyboard/Profiles/NonNativeKeyboardMixedRealityInputPointerProfile.asset‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
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: db393d206eab4604ab74278cb6cda355, type: 3}
13+
m_Name: NonNativeKeyboardMixedRealityInputPointerProfile
14+
m_EditorClassIdentifier:
15+
isCustomProfile: 1
16+
pointingExtent: 10
17+
pointingRaycastLayerMasks:
18+
- serializedVersion: 2
19+
m_Bits: 4294967291
20+
debugDrawPointingRays: 1
21+
debugDrawPointingRayColors:
22+
- {r: 1, g: 0.58280706, b: 0, a: 1}
23+
- {r: 0.86426115, g: 1, b: 0, a: 1}
24+
- {r: 0, g: 1, b: 0.2163105, a: 1}
25+
- {r: 0, g: 0.3028021, b: 1, a: 1}
26+
- {r: 0.44855833, g: 0, b: 1, a: 1}
27+
gazeCursorPrefab: {fileID: 1000012072213228, guid: 5b3e2856904e43c680f84f326861032a,
28+
type: 3}
29+
gazeProviderType:
30+
reference: Microsoft.MixedReality.Toolkit.Input.GazeProvider, Microsoft.MixedReality.Toolkit.Services.InputSystem
31+
pointerOptions:
32+
- controllerType: 1071
33+
handedness: 7
34+
pointerPrefab: {fileID: 1247086986094436, guid: d5b94136462644c9873bb3347169ae7e,
35+
type: 3}
36+
- controllerType: 47
37+
handedness: 7
38+
pointerPrefab: {fileID: 1196247974088106, guid: c4fd3c6fc7ff484eb434775066e7f327,
39+
type: 3}
40+
- controllerType: 256
41+
handedness: 7
42+
pointerPrefab: {fileID: 1247086986094436, guid: 51e60b8742bc47640923ac9e75ea74e9,
43+
type: 3}
44+
- controllerType: 512
45+
handedness: 7
46+
pointerPrefab: {fileID: 8953170493194829522, guid: 840df22ff840d5540b58ca6088afde25,
47+
type: 3}
48+
- controllerType: 1024
49+
handedness: 7
50+
pointerPrefab: {fileID: 1507865967819406, guid: 38b548c6a2c270545a383296ad2bc4d5,
51+
type: 3}
52+
- controllerType: 1024
53+
handedness: 7
54+
pointerPrefab: {fileID: 1507865967819406, guid: 526b854247016cf47bc5c58e01d82407,
55+
type: 3}
56+
- controllerType: 2048
57+
handedness: 7
58+
pointerPrefab: {fileID: 1247086986094436, guid: 039b325c9e8fd0545a0475fd4aa35b10,
59+
type: 3}
60+
pointerMediator:
61+
reference: Microsoft.MixedReality.Toolkit.Input.DefaultPointerMediator, Microsoft.MixedReality.Toolkit.SDK
62+
primaryPointerSelector:
63+
reference: Microsoft.MixedReality.Toolkit.Input.DefaultPrimaryPointerSelector,
64+
Microsoft.MixedReality.Toolkit.SDK

‎Assets/MixedRealityToolkit.Examples/Experimental/NonNativeKeyboard/Profiles/NonNativeKeyboardMixedRealityInputPointerProfile.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.

‎Assets/MixedRealityToolkit.Examples/Experimental/NonNativeKeyboard/Profiles/NonNativeKeyboardMixedRealityInputSystemProfile.asset‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
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: NonNativeKeyboardMixedRealityInputSystemProfile
14+
m_EditorClassIdentifier:
15+
isCustomProfile: 1
16+
dataProviderConfigurations:
17+
- componentType:
18+
reference: Microsoft.MixedReality.Toolkit.WindowsMixedReality.Input.WindowsMixedRealityDeviceManager,
19+
Microsoft.MixedReality.Toolkit.Providers.WindowsMixedReality
20+
componentName: Windows Mixed Reality Device Manager
21+
priority: 0
22+
runtimePlatform: 8
23+
deviceManagerProfile: {fileID: 0}
24+
- componentType:
25+
reference: Microsoft.MixedReality.Toolkit.OpenVR.Input.OpenVRDeviceManager,
26+
Microsoft.MixedReality.Toolkit.Providers.OpenVR
27+
componentName: OpenVR Device Manager
28+
priority: 0
29+
runtimePlatform: 7
30+
deviceManagerProfile: {fileID: 0}
31+
- componentType:
32+
reference: Microsoft.MixedReality.Toolkit.Input.UnityInput.UnityJoystickManager,
33+
Microsoft.MixedReality.Toolkit
34+
componentName: Unity Joystick Manager
35+
priority: 0
36+
runtimePlatform: -1
37+
deviceManagerProfile: {fileID: 0}
38+
- componentType:
39+
reference: Microsoft.MixedReality.Toolkit.Input.UnityInput.UnityTouchDeviceManager,
40+
Microsoft.MixedReality.Toolkit
41+
componentName: Unity Touch Device Manager
42+
priority: 0
43+
runtimePlatform: -1
44+
deviceManagerProfile: {fileID: 0}
45+
- componentType:
46+
reference: Microsoft.MixedReality.Toolkit.Windows.Input.WindowsSpeechInputProvider,
47+
Microsoft.MixedReality.Toolkit.Providers.WindowsVoiceInput
48+
componentName: Windows Speech Input
49+
priority: 0
50+
runtimePlatform: 25
51+
deviceManagerProfile: {fileID: 0}
52+
- componentType:
53+
reference: Microsoft.MixedReality.Toolkit.Windows.Input.WindowsDictationInputProvider,
54+
Microsoft.MixedReality.Toolkit.Providers.WindowsVoiceInput
55+
componentName: Windows Dictation Input
56+
priority: 0
57+
runtimePlatform: 25
58+
deviceManagerProfile: {fileID: 0}
59+
- componentType:
60+
reference: Microsoft.MixedReality.Toolkit.Input.HandJointService, Microsoft.MixedReality.Toolkit
61+
componentName: Hand Joint Service
62+
priority: 0
63+
runtimePlatform: -1
64+
deviceManagerProfile: {fileID: 0}
65+
- componentType:
66+
reference: Microsoft.MixedReality.Toolkit.Input.InputSimulationService, Microsoft.MixedReality.Toolkit.Services.InputSimulation.Editor
67+
componentName: Input Simulation Service
68+
priority: 0
69+
runtimePlatform: 208
70+
deviceManagerProfile: {fileID: 11400000, guid: 41478039094d47641bf4e09c20e61a5a,
71+
type: 2}
72+
- componentType:
73+
reference: Microsoft.MixedReality.Toolkit.Input.InputRecordingService, Microsoft.MixedReality.Toolkit.Services.InputAnimation
74+
componentName: Input Recording Service
75+
priority: 0
76+
runtimePlatform: -1
77+
deviceManagerProfile: {fileID: 11400000, guid: d0f5a7f6d1f9f0b4cb6eb35c797a0f04,
78+
type: 2}
79+
- componentType:
80+
reference: Microsoft.MixedReality.Toolkit.Input.InputPlaybackService, Microsoft.MixedReality.Toolkit.Services.InputSimulation.Editor
81+
componentName: Input Playback Service
82+
priority: 0
83+
runtimePlatform: 208
84+
deviceManagerProfile: {fileID: 0}
85+
- componentType:
86+
reference: Microsoft.MixedReality.Toolkit.Input.UnityInput.MouseDeviceManager,
87+
Microsoft.MixedReality.Toolkit
88+
componentName: Unity Mouse Device Manager
89+
priority: 0
90+
runtimePlatform: 208
91+
deviceManagerProfile: {fileID: 11400000, guid: cc2a0fa97d2f9f14996ffd20776bab57,
92+
type: 2}
93+
focusProviderType:
94+
reference: Microsoft.MixedReality.Toolkit.Input.FocusProvider, Microsoft.MixedReality.Toolkit.Services.InputSystem
95+
raycastProviderType:
96+
reference: Microsoft.MixedReality.Toolkit.Input.DefaultRaycastProvider, Microsoft.MixedReality.Toolkit.Services.InputSystem
97+
focusQueryBufferSize: 128
98+
focusIndividualCompoundCollider: 0
99+
inputActionsProfile: {fileID: 11400000, guid: 723eb97b02944311b92861f473eee53e,
100+
type: 2}
101+
inputActionRulesProfile: {fileID: 11400000, guid: 03945385d89102f41855bc8f5116b199,
102+
type: 2}
103+
pointerProfile: {fileID: 11400000, guid: 365c2b0bd493dea4c82047935845d0ee, type: 2}
104+
gesturesProfile: {fileID: 11400000, guid: bd7829a9b29409045a745b5a18299291, type: 2}
105+
speechCommandsProfile: {fileID: 11400000, guid: e8d0393e66374dae9646851a57dc6bc1,
106+
type: 2}
107+
enableControllerMapping: 1
108+
controllerMappingProfile: {fileID: 11400000, guid: 39ded1fd0711a0c448413d0e1ec4f7f3,
109+
type: 2}
110+
controllerVisualizationProfile: {fileID: 11400000, guid: 345c06fdf3732db46b96299bd3cba653,
111+
type: 2}
112+
handTrackingProfile: {fileID: 11400000, guid: 7f1e3cd673742f94ca860ac7ae733024,
113+
type: 2}

‎Assets/MixedRealityToolkit.Examples/Experimental/NonNativeKeyboard/Profiles/NonNativeKeyboardMixedRealityInputSystemProfile.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)