Skip to content

Commit de3572f

Browse files
marwiemarwie
committed
start moving XRManager implementation into subsystem and changed XRManager to only expose API
1 parent dc54010 commit de3572f

21 files changed

+1101
-372
lines changed

‎MainProject/Assets/XR.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.

‎MainProject/Assets/XR/Loaders.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.

‎MainProject/Assets/XR/Loaders/Web XR Plugin Loader.asset

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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: b6dc105203eb445fa37284ce6e2e4353, type: 3}
13+
m_Name: Web XR Plugin Loader
14+
m_EditorClassIdentifier:

‎MainProject/Assets/XR/Loaders/Web XR Plugin Loader.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.

‎MainProject/Assets/XR/XRGeneralSettings.asset

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-7174462851341203133
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: d236b7d11115f2143951f1e14045df39, type: 3}
13+
m_Name: Standalone Settings
14+
m_EditorClassIdentifier:
15+
m_LoaderManagerInstance: {fileID: -4588426539544076110}
16+
m_InitManagerOnStart: 1
17+
--- !u!114 &-4588426539544076110
18+
MonoBehaviour:
19+
m_ObjectHideFlags: 0
20+
m_CorrespondingSourceObject: {fileID: 0}
21+
m_PrefabInstance: {fileID: 0}
22+
m_PrefabAsset: {fileID: 0}
23+
m_GameObject: {fileID: 0}
24+
m_Enabled: 1
25+
m_EditorHideFlags: 0
26+
m_Script: {fileID: 11500000, guid: f4c3631f5e58749a59194e0cf6baf6d5, type: 3}
27+
m_Name: Standalone Providers
28+
m_EditorClassIdentifier:
29+
m_RequiresSettingsUpdate: 0
30+
m_AutomaticLoading: 0
31+
m_AutomaticRunning: 0
32+
m_Loaders: []
33+
--- !u!114 &-121488861701520503
34+
MonoBehaviour:
35+
m_ObjectHideFlags: 0
36+
m_CorrespondingSourceObject: {fileID: 0}
37+
m_PrefabInstance: {fileID: 0}
38+
m_PrefabAsset: {fileID: 0}
39+
m_GameObject: {fileID: 0}
40+
m_Enabled: 1
41+
m_EditorHideFlags: 0
42+
m_Script: {fileID: 11500000, guid: f4c3631f5e58749a59194e0cf6baf6d5, type: 3}
43+
m_Name: WebGL Providers
44+
m_EditorClassIdentifier:
45+
m_RequiresSettingsUpdate: 0
46+
m_AutomaticLoading: 0
47+
m_AutomaticRunning: 0
48+
m_Loaders:
49+
- {fileID: 11400000, guid: 82aa0b958a0a27644821de7237298430, type: 2}
50+
--- !u!114 &11400000
51+
MonoBehaviour:
52+
m_ObjectHideFlags: 0
53+
m_CorrespondingSourceObject: {fileID: 0}
54+
m_PrefabInstance: {fileID: 0}
55+
m_PrefabAsset: {fileID: 0}
56+
m_GameObject: {fileID: 0}
57+
m_Enabled: 1
58+
m_EditorHideFlags: 0
59+
m_Script: {fileID: 11500000, guid: d2dc886499c26824283350fa532d087d, type: 3}
60+
m_Name: XRGeneralSettings
61+
m_EditorClassIdentifier:
62+
Keys: 0d00000001000000
63+
Values:
64+
- {fileID: 2478256764130162806}
65+
- {fileID: -7174462851341203133}
66+
--- !u!114 &2478256764130162806
67+
MonoBehaviour:
68+
m_ObjectHideFlags: 0
69+
m_CorrespondingSourceObject: {fileID: 0}
70+
m_PrefabInstance: {fileID: 0}
71+
m_PrefabAsset: {fileID: 0}
72+
m_GameObject: {fileID: 0}
73+
m_Enabled: 1
74+
m_EditorHideFlags: 0
75+
m_Script: {fileID: 11500000, guid: d236b7d11115f2143951f1e14045df39, type: 3}
76+
m_Name: WebGL Settings
77+
m_EditorClassIdentifier:
78+
m_LoaderManagerInstance: {fileID: -121488861701520503}
79+
m_InitManagerOnStart: 1

‎MainProject/Assets/XR/XRGeneralSettings.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.

‎MainProject/ProjectSettings/EditorBuildSettings.asset

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,6 @@ EditorBuildSettings:
88
- enabled: 1
99
path: Assets/WebXR/Samples/Desert/Scenes/Desert.unity
1010
guid: 85380d4847db7b74a850284461349c36
11-
m_configObjects: {}
11+
m_configObjects:
12+
com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 552445d583cb06c4eaf9d56596dd45c2,
13+
type: 2}

‎MainProject/ProjectSettings/ProjectSettings.asset

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -103,23 +103,30 @@ PlayerSettings:
103103
xboxOneMonoLoggingLevel: 0
104104
xboxOneLoggingLevel: 1
105105
xboxOneDisableEsram: 0
106+
xboxOneEnableTypeOptimization: 0
106107
xboxOnePresentImmediateThreshold: 0
107108
switchQueueCommandMemory: 0
108109
switchQueueControlMemory: 16384
109110
switchQueueComputeMemory: 262144
110111
switchNVNShaderPoolsGranularity: 33554432
111112
switchNVNDefaultPoolsGranularity: 16777216
112113
switchNVNOtherPoolsGranularity: 16777216
114+
switchNVNMaxPublicTextureIDCount: 0
115+
switchNVNMaxPublicSamplerIDCount: 0
116+
stadiaPresentMode: 0
117+
stadiaTargetFramerate: 0
113118
vulkanNumSwapchainBuffers: 3
114119
vulkanEnableSetSRGBWrite: 0
120+
vulkanEnableLateAcquireNextImage: 0
115121
m_SupportedAspectRatios:
116122
4:3: 1
117123
5:4: 1
118124
16:10: 1
119125
16:9: 1
120126
Others: 1
121127
bundleVersion: 0.1
122-
preloadedAssets: []
128+
preloadedAssets:
129+
- {fileID: 2478256764130162806, guid: 552445d583cb06c4eaf9d56596dd45c2, type: 2}
123130
metroInputSource: 0
124131
wsaTransparentSwapchain: 0
125132
m_HolographicPauseOnTrackingLoss: 1
@@ -189,22 +196,6 @@ PlayerSettings:
189196
uIStatusBarHidden: 1
190197
uIExitOnSuspend: 0
191198
uIStatusBarStyle: 0
192-
iPhoneSplashScreen: {fileID: 0}
193-
iPhoneHighResSplashScreen: {fileID: 0}
194-
iPhoneTallHighResSplashScreen: {fileID: 0}
195-
iPhone47inSplashScreen: {fileID: 0}
196-
iPhone55inPortraitSplashScreen: {fileID: 0}
197-
iPhone55inLandscapeSplashScreen: {fileID: 0}
198-
iPhone58inPortraitSplashScreen: {fileID: 0}
199-
iPhone58inLandscapeSplashScreen: {fileID: 0}
200-
iPadPortraitSplashScreen: {fileID: 0}
201-
iPadHighResPortraitSplashScreen: {fileID: 0}
202-
iPadLandscapeSplashScreen: {fileID: 0}
203-
iPadHighResLandscapeSplashScreen: {fileID: 0}
204-
iPhone65inPortraitSplashScreen: {fileID: 0}
205-
iPhone65inLandscapeSplashScreen: {fileID: 0}
206-
iPhone61inPortraitSplashScreen: {fileID: 0}
207-
iPhone61inLandscapeSplashScreen: {fileID: 0}
208199
appleTVSplashScreen: {fileID: 0}
209200
appleTVSplashScreen2x: {fileID: 0}
210201
tvOSSmallIconLayers: []
@@ -543,6 +534,7 @@ PlayerSettings:
543534
ps4UseResolutionFallback: 0
544535
ps4ReprojectionSupport: 0
545536
ps4UseAudio3dBackend: 0
537+
ps4UseLowGarlicFragmentationMode: 1
546538
ps4SocialScreenEnabled: 0
547539
ps4ScriptOptimizationLevel: 0
548540
ps4Audio3dVirtualSpeakerCount: 14
@@ -647,6 +639,7 @@ PlayerSettings:
647639
XboxOnePersistentLocalStorageSize: 0
648640
XboxOneXTitleMemory: 8
649641
XboxOneOverrideIdentityName:
642+
XboxOneOverrideIdentityPublisher:
650643
vrEditorSettings:
651644
daydream:
652645
daydreamIconForeground: {fileID: 0}

‎MainProject/ProjectSettings/XRPackageSettings.asset

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"m_Settings": [
3+
"RemoveLegacyInputHelpersForReload"
4+
]
5+
}

‎Packages/webxr/Editor/PluginMetadataStore.cs

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
using System.Collections.Generic;
2+
using UnityEditor;
3+
using UnityEngine;
4+
using UnityEditor.XR.Management.Metadata;
5+
6+
namespace WebXR.Editor
7+
{
8+
internal class XRPackage : IXRPackage
9+
{
10+
private class XRPluginSampleLoaderMetadata : IXRLoaderMetadata
11+
{
12+
public string loaderName { get; set; }
13+
public string loaderType { get; set; }
14+
public List<BuildTargetGroup> supportedBuildTargets { get; set; }
15+
}
16+
17+
private class XRPluginSampleMetadata : IXRPackageMetadata
18+
{
19+
public string packageName { get; set; }
20+
public string packageId { get; set; }
21+
public string settingsType { get; set; }
22+
public List<IXRLoaderMetadata> loaderMetadata { get; set; }
23+
}
24+
25+
static readonly IXRPackageMetadata s_Metadata = new XRPluginSampleMetadata()
26+
{
27+
packageName = "WebXR Export",
28+
packageId = "com.de-panther.webxr",
29+
settingsType = typeof(WebXRPluginLoader).FullName,
30+
loaderMetadata = new List<IXRLoaderMetadata>()
31+
{
32+
new XRPluginSampleLoaderMetadata()
33+
{
34+
loaderName = "Web XR Plugin",
35+
loaderType = typeof(WebXRPluginLoader).FullName,
36+
supportedBuildTargets = new List<BuildTargetGroup>()
37+
{
38+
BuildTargetGroup.WebGL
39+
}
40+
},
41+
}
42+
};
43+
44+
public IXRPackageMetadata metadata => s_Metadata;
45+
46+
public bool PopulateNewSettingsInstance(ScriptableObject obj)
47+
{
48+
return true;
49+
}
50+
}
51+
}

0 commit comments

Comments
 (0)