Skip to content
This repository was archived by the owner on Aug 11, 2024. It is now read-only.

Commit 6b3b9b3

Browse files
StephenHodgsonSimonDarksideJ
StephenHodgson
and
SimonDarksideJ
authored
dev/platform-system (#114)
* Added the default profile for the platform system * Added editor platform to the platform profile * updated runtime platforms for all default configurations * bumped version numbers Co-authored-by: Simon (Darkside) Jackson <darkside@zenithmoon.com>
1 parent e9c4404 commit 6b3b9b3

5 files changed

Lines changed: 100 additions & 18 deletions

‎DefaultProfiles/DefaultMixedRealityToolkitConfigurationProfile.asset‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ MonoBehaviour:
1111
m_EditorHideFlags: 0
1212
m_Script: {fileID: 11500000, guid: 8053d706eb6545b99330d640fbe7e7d2, type: 3}
1313
m_Name: DefaultMixedRealityToolkitConfigurationProfile
14-
m_EditorClassIdentifier:
14+
m_EditorClassIdentifier:
1515
isEditable: 0
1616
enableCameraSystem: 1
1717
cameraSystemType:

‎DefaultProfiles/Diagnostics/DefaultMixedRealityDiagnosticsSystemProfile.asset‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,51 @@ MonoBehaviour:
1919
XRTK
2020
name: Memory Diagnostics Data Provider
2121
priority: 0
22-
runtimePlatform: -1
22+
platformEntries:
23+
runtimePlatforms:
24+
- reference: XRTK.Definitions.Platforms.AllPlatforms, XRTK
25+
- reference: XRTK.Definitions.Platforms.AndroidPlatform, XRTK
26+
- reference: XRTK.Definitions.Platforms.EditorPlatform, XRTK
27+
- reference: XRTK.Definitions.Platforms.IOSPlatform, XRTK
28+
- reference: XRTK.Definitions.Platforms.LuminPlatform, XRTK.Lumin
29+
- reference: XRTK.Definitions.Platforms.OSXPlatform, XRTK
30+
- reference: XRTK.Definitions.Platforms.UniversalWindowsPlatform, XRTK
31+
- reference: XRTK.Definitions.Platforms.WebGlPlatform, XRTK
32+
- reference: XRTK.Definitions.Platforms.WindowsStandalonePlatform, XRTK
2333
configurationProfile: {fileID: 0}
2434
- instancedType:
2535
reference: XRTK.Services.DiagnosticsSystem.MixedRealityFrameDiagnosticsDataProvider,
2636
XRTK
2737
name: Frame Diagnostics Data Provider
2838
priority: 1
29-
runtimePlatform: -1
39+
platformEntries:
40+
runtimePlatforms:
41+
- reference: XRTK.Definitions.Platforms.AllPlatforms, XRTK
42+
- reference: XRTK.Definitions.Platforms.AndroidPlatform, XRTK
43+
- reference: XRTK.Definitions.Platforms.EditorPlatform, XRTK
44+
- reference: XRTK.Definitions.Platforms.IOSPlatform, XRTK
45+
- reference: XRTK.Definitions.Platforms.LuminPlatform, XRTK.Lumin
46+
- reference: XRTK.Definitions.Platforms.OSXPlatform, XRTK
47+
- reference: XRTK.Definitions.Platforms.UniversalWindowsPlatform, XRTK
48+
- reference: XRTK.Definitions.Platforms.WebGlPlatform, XRTK
49+
- reference: XRTK.Definitions.Platforms.WindowsStandalonePlatform, XRTK
3050
configurationProfile: {fileID: 0}
3151
- instancedType:
3252
reference: XRTK.Services.DiagnosticsSystem.MixedRealityConsoleDiagnosticsDataProvider,
3353
XRTK
3454
name: Console Diagnostics Data Provider
3555
priority: 2
36-
runtimePlatform: -1
56+
platformEntries:
57+
runtimePlatforms:
58+
- reference: XRTK.Definitions.Platforms.AllPlatforms, XRTK
59+
- reference: XRTK.Definitions.Platforms.AndroidPlatform, XRTK
60+
- reference: XRTK.Definitions.Platforms.EditorPlatform, XRTK
61+
- reference: XRTK.Definitions.Platforms.IOSPlatform, XRTK
62+
- reference: XRTK.Definitions.Platforms.LuminPlatform, XRTK.Lumin
63+
- reference: XRTK.Definitions.Platforms.OSXPlatform, XRTK
64+
- reference: XRTK.Definitions.Platforms.UniversalWindowsPlatform, XRTK
65+
- reference: XRTK.Definitions.Platforms.WebGlPlatform, XRTK
66+
- reference: XRTK.Definitions.Platforms.WindowsStandalonePlatform, XRTK
3767
configurationProfile: {fileID: 0}
3868
diagnosticsWindowPrefab: {fileID: 2161880003638299081, guid: be9153b959e0d4d4aa50a4a1a6617daa,
3969
type: 3}

‎DefaultProfiles/Input/DefaultMixedRealityControllerDataProvidersProfile.asset‎

Lines changed: 57 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,55 +18,102 @@ MonoBehaviour:
1818
reference: XRTK.Providers.Controllers.UnityInput.MouseDataProvider, XRTK
1919
name: Mouse Controller Data Provider
2020
priority: 0
21-
runtimePlatform: 31
21+
platformEntries:
22+
runtimePlatforms:
23+
- reference: XRTK.Definitions.Platforms.EditorPlatform, XRTK
24+
- reference: XRTK.Definitions.Platforms.OSXPlatform, XRTK
25+
- reference: XRTK.Definitions.Platforms.WebGlPlatform, XRTK
26+
- reference: XRTK.Definitions.Platforms.WindowsStandalonePlatform, XRTK
27+
- reference: XRTK.Definitions.Platforms.UniversalWindowsPlatform, XRTK
2228
configurationProfile: {fileID: 0}
2329
- instancedType:
2430
reference: XRTK.Providers.Controllers.UnityInput.UnityTouchDataProvider, XRTK
2531
name: Touch Screen Controller Data Provider
2632
priority: 1
27-
runtimePlatform: 223
33+
platformEntries:
34+
runtimePlatforms:
35+
- reference: XRTK.Definitions.Platforms.AndroidPlatform, XRTK
36+
- reference: XRTK.Definitions.Platforms.EditorPlatform, XRTK
37+
- reference: XRTK.Definitions.Platforms.IOSPlatform, XRTK
38+
- reference: XRTK.Definitions.Platforms.OSXPlatform, XRTK
39+
- reference: XRTK.Definitions.Platforms.WebGlPlatform, XRTK
40+
- reference: XRTK.Definitions.Platforms.WindowsStandalonePlatform, XRTK
41+
- reference: XRTK.Definitions.Platforms.UniversalWindowsPlatform, XRTK
2842
configurationProfile: {fileID: 0}
2943
- instancedType:
3044
reference: XRTK.Providers.Controllers.UnityInput.UnityJoystickDataProvider,
3145
XRTK
3246
name: Unity Joystick Controller Data Provider
3347
priority: 2
34-
runtimePlatform: 223
48+
platformEntries:
49+
runtimePlatforms:
50+
- reference: XRTK.Definitions.Platforms.AndroidPlatform, XRTK
51+
- reference: XRTK.Definitions.Platforms.EditorPlatform, XRTK
52+
- reference: XRTK.Definitions.Platforms.IOSPlatform, XRTK
53+
- reference: XRTK.Definitions.Platforms.OSXPlatform, XRTK
54+
- reference: XRTK.Definitions.Platforms.WebGlPlatform, XRTK
55+
- reference: XRTK.Definitions.Platforms.WindowsStandalonePlatform, XRTK
56+
- reference: XRTK.Definitions.Platforms.UniversalWindowsPlatform, XRTK
3557
configurationProfile: {fileID: 0}
3658
- instancedType:
3759
reference: XRTK.Providers.Controllers.OpenVR.OpenVRDataProvider, XRTK
3860
name: Open VR Controller Data Provider
3961
priority: 3
40-
runtimePlatform: 31
62+
platformEntries:
63+
runtimePlatforms:
64+
- reference: XRTK.Definitions.Platforms.EditorPlatform, XRTK
65+
- reference: XRTK.Definitions.Platforms.OSXPlatform, XRTK
66+
- reference: XRTK.Definitions.Platforms.WebGlPlatform, XRTK
67+
- reference: XRTK.Definitions.Platforms.WindowsStandalonePlatform, XRTK
68+
- reference: XRTK.Definitions.Platforms.UniversalWindowsPlatform, XRTK
4169
configurationProfile: {fileID: 0}
4270
- instancedType:
4371
reference: XRTK.WindowsMixedReality.Controllers.WindowsMixedRealityControllerDataProvider,
4472
XRTK.WindowsMixedReality
4573
name: Windows Mixed Reality Controller Data Provider
4674
priority: 4
47-
runtimePlatform: 17
48-
configurationProfile: {fileID: 0}
75+
platformEntries:
76+
runtimePlatforms:
77+
- reference: XRTK.Definitions.Platforms.EditorPlatform, XRTK
78+
- reference: XRTK.Definitions.Platforms.UniversalWindowsPlatform, XRTK
79+
configurationProfile: {fileID: 11400000, guid: f0d940cf9cc45184bba3adf6d1350849,
80+
type: 2}
4981
- instancedType:
5082
reference: XRTK.Providers.Controllers.Speech.WindowsSpeechDataProvider, XRTK
5183
name: Windows Speech Data Provider
5284
priority: 5
53-
runtimePlatform: 19
85+
platformEntries:
86+
runtimePlatforms:
87+
- reference: XRTK.Definitions.Platforms.EditorPlatform, XRTK
88+
- reference: XRTK.Definitions.Platforms.WindowsStandalonePlatform, XRTK
89+
- reference: XRTK.Definitions.Platforms.UniversalWindowsPlatform, XRTK
5490
configurationProfile: {fileID: 0}
5591
- instancedType:
5692
reference: XRTK.Providers.Controllers.Speech.WindowsDictationDataProvider, XRTK
5793
name: Windows Dictation Data Provider
5894
priority: 6
59-
runtimePlatform: 19
95+
platformEntries:
96+
runtimePlatforms:
97+
- reference: XRTK.Definitions.Platforms.EditorPlatform, XRTK
98+
- reference: XRTK.Definitions.Platforms.UniversalWindowsPlatform, XRTK
99+
- reference: XRTK.Definitions.Platforms.WindowsStandalonePlatform, XRTK
60100
configurationProfile: {fileID: 0}
61101
- instancedType:
62102
reference: XRTK.Lumin.Controllers.LuminControllerDataProvider, XRTK.Lumin
63103
name: Lumin Controller Data Provider
64104
priority: 7
65-
runtimePlatform: 33
105+
platformEntries:
106+
runtimePlatforms:
107+
- reference: XRTK.Definitions.Platforms.LuminPlatform, XRTK.Lumin
108+
- reference: XRTK.Definitions.Platforms.EditorPlatform, XRTK
66109
configurationProfile: {fileID: 0}
67110
- instancedType:
68111
reference: XRTK.Oculus.Controllers.OculusControllerDataProvider, XRTK.Oculus
69112
name: Oculus Controller Data Provider
70113
priority: 8
71-
runtimePlatform: 67
114+
platformEntries:
115+
runtimePlatforms:
116+
- reference: XRTK.Definitions.Platforms.AndroidPlatform, XRTK
117+
- reference: XRTK.Definitions.Platforms.EditorPlatform, XRTK
118+
- reference: XRTK.Definitions.Platforms.WindowsStandalonePlatform, XRTK
72119
configurationProfile: {fileID: 0}

‎DefaultProfiles/SpatialAwareness/DefaultMixedRealitySpatialAwarenessSystemProfile.asset‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,19 @@ MonoBehaviour:
1919
XRTK.WindowsMixedReality
2020
name: Windows Mixed Reality Spatial Mesh Observer
2121
priority: 0
22-
runtimePlatform: 17
22+
platformEntries:
23+
runtimePlatforms:
24+
- reference: XRTK.Definitions.Platforms.WindowsStandalonePlatform, XRTK
25+
- reference: XRTK.Definitions.Platforms.EditorPlatform, XRTK
2326
configurationProfile: {fileID: 11400000, guid: 8e73975fd19e4224b46d0b0fea26349b,
2427
type: 2}
2528
- instancedType:
2629
reference: XRTK.Lumin.SpatialObservers.LuminSpatialMeshObserver, XRTK.Lumin
2730
name: Lumin Spatial Observer Data Provider
2831
priority: 1
29-
runtimePlatform: 32
32+
platformEntries:
33+
runtimePlatforms:
34+
- reference: XRTK.Definitions.Platforms.LuminPlatform, XRTK.Lumin
3035
configurationProfile: {fileID: 11400000, guid: 6cbcb6266beaa724780d064525cf2896,
3136
type: 2}
3237
meshDisplayOption: 0

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "com.xrtk.sdk",
33
"displayName": "XRTK.SDK",
44
"description": "The SDK for the Mixed Reality Toolkit",
5-
"version": "0.1.20",
5+
"version": "0.1.21",
66
"unity": "2019.1",
77
"license": "MIT",
88
"repository": {
@@ -12,7 +12,7 @@
1212
"src": "Assets/XRTK.Core",
1313
"author": "XRTK Team (https://github.com/XRTK)",
1414
"dependencies": {
15-
"com.xrtk.core": "0.1.31",
15+
"com.xrtk.core": "0.1.32",
1616
"com.unity.textmeshpro": "1.0.0"
1717
}
1818
}

0 commit comments

Comments
 (0)