Skip to content

Commit 29bf493

Browse files
authored
Merge pull request #7193 from davidkline-ms/configurator19.3
First stage of configurator updates for 2019.3 and handle legacy XR apis becoming obsolete
2 parents 0b38eda + ca73a4b commit 29bf493

24 files changed

+183
-29
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-nowarn:618

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/XR2018/csc.rsp.meta

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

Assets/MixedRealityToolkit.SDK/Experimental/Features/Utilities/StabilizationPlaneModifier.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,12 @@ private Vector3 ConfigureOverridePlaneHelper(Vector3 position, float deltaTime)
311311
planePosition = gazeOrigin + (gazeToPlane * currentPlaneDistance);
312312

313313
#if UNITY_WSA
314+
// Ensure compatibility with the pre-2019.3 XR architecture for customers / platforms
315+
// with legacy requirements.
316+
#pragma warning disable 0618
314317
// Place the plane at the desired depth in front of the user and billboard it to the gaze origin.
315318
HolographicSettings.SetFocusPointForFrame(planePosition, OverridePlane.Normal, velocity);
319+
#pragma warning restore 0618
316320
#endif
317321

318322
return gazeToPlane;

Assets/MixedRealityToolkit.SDK/Experimental/Features/Utilities/WorldAnchorManager.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,11 @@ private void Awake()
121121

122122
private void Start()
123123
{
124+
// Ensure compatibility with the pre-2019.3 XR architecture for customers / platforms
125+
// with legacy requirements.
126+
#pragma warning disable 0618
124127
WorldAnchorStore.GetAsync(AnchorStoreReady);
128+
#pragma warning restore 0618
125129
}
126130

127131
private void Update()
@@ -151,7 +155,11 @@ private void AnchorStoreReady(WorldAnchorStore anchorStore)
151155

152156
if (!persistentAnchors)
153157
{
158+
// Ensure compatibility with the pre-2019.3 XR architecture for customers / platforms
159+
// with legacy requirements.
160+
#pragma warning disable 0618
154161
AnchorStore.Clear();
162+
#pragma warning restore 0618
155163
}
156164
}
157165

@@ -425,8 +433,12 @@ private void DoSaveAnchorOperation(string anchorId, GameObject anchoredGameObjec
425433
anchorId = anchoredGameObject.name;
426434
}
427435

436+
// Ensure compatibility with the pre-2019.3 XR architecture for customers / platforms
437+
// with legacy requirements.
438+
#pragma warning disable 0618
428439
// Try to load a previously saved world anchor.
429440
WorldAnchor savedAnchor = AnchorStore.Load(anchorId, anchoredGameObject);
441+
#pragma warning restore 0618
430442

431443
if (savedAnchor == null)
432444
{
@@ -527,8 +539,12 @@ private void CreateAnchor(GameObject gameObjectToAnchor, string anchorName)
527539
var anchor = gameObjectToAnchor.EnsureComponent<WorldAnchor>();
528540
anchor.name = anchorName;
529541

542+
// Ensure compatibility with the pre-2019.3 XR architecture for customers / platforms
543+
// with legacy requirements.
544+
#pragma warning disable 0618
530545
// Sometimes the anchor is located immediately. In that case it can be saved immediately.
531546
if (anchor.isLocated)
547+
#pragma warning restore 0618
532548
{
533549
SaveAnchor(anchor);
534550
}
@@ -545,8 +561,12 @@ private void CreateAnchor(GameObject gameObjectToAnchor, string anchorName)
545561
/// <param name="anchor">Anchor.</param>
546562
private bool SaveAnchor(WorldAnchor anchor)
547563
{
564+
// Ensure compatibility with the pre-2019.3 XR architecture for customers / platforms
565+
// with legacy requirements.
566+
#pragma warning disable 0618
548567
// Save the anchor to persist holograms across sessions.
549568
if (AnchorStore.Save(anchor.name, anchor))
569+
#pragma warning disable 0618
550570
{
551571
if (showDetailedLogs)
552572
{

Assets/MixedRealityToolkit.Services/BoundarySystem/XR2018.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.Services/BoundarySystem/AssemblyInfo.cs renamed to Assets/MixedRealityToolkit.Services/BoundarySystem/XR2018/AssemblyInfo.cs

File renamed without changes.

Assets/MixedRealityToolkit.Services/BoundarySystem/AssemblyInfo.cs.meta renamed to Assets/MixedRealityToolkit.Services/BoundarySystem/XR2018/AssemblyInfo.cs.meta

File renamed without changes.

Assets/MixedRealityToolkit.Services/BoundarySystem/Microsoft.MixedReality.Toolkit.Services.BoundarySystem.asmdef renamed to Assets/MixedRealityToolkit.Services/BoundarySystem/XR2018/Microsoft.MixedReality.Toolkit.Services.BoundarySystem.asmdef

File renamed without changes.

Assets/MixedRealityToolkit.Services/BoundarySystem/Microsoft.MixedReality.Toolkit.Services.BoundarySystem.asmdef.meta renamed to Assets/MixedRealityToolkit.Services/BoundarySystem/XR2018/Microsoft.MixedReality.Toolkit.Services.BoundarySystem.asmdef.meta

File renamed without changes.

Assets/MixedRealityToolkit.Services/BoundarySystem/MixedRealityBoundarySystem.cs renamed to Assets/MixedRealityToolkit.Services/BoundarySystem/XR2018/MixedRealityBoundarySystem.cs

File renamed without changes.

0 commit comments

Comments
 (0)