Skip to content

Commit 1f8e58a

Browse files
committed
Gate code behind proper platform #ifdefs
1 parent a4fb464 commit 1f8e58a

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityDeviceManager.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
using Microsoft.MixedReality.Toolkit.Input;
66
using Microsoft.MixedReality.Toolkit.Windows.Input;
77
using Microsoft.MixedReality.Toolkit.Windows.Utilities;
8-
using UnityEngine;
98
using System;
9+
using UnityEngine;
1010

1111
#if UNITY_WSA
1212
using System.Collections.Generic;
@@ -98,7 +98,6 @@ public bool CheckCapability(MixedRealityCapability capability)
9898
#endregion IMixedRealityCapabilityCheck Implementation
9999

100100
#if UNITY_WSA
101-
102101
/// <summary>
103102
/// The initial size of interactionmanagerStates.
104103
/// </summary>
@@ -320,10 +319,12 @@ public override void Enable()
320319

321320
if (InputSystemProfile == null) { return; }
322321

322+
#if (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
323323
if (WindowsMixedRealityUtilities.WmrUtilitiesProvider == null)
324324
{
325325
WindowsMixedRealityUtilities.WmrUtilitiesProvider = new WindowsMixedRealityUtilitiesProvider();
326326
}
327+
#endif // (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
327328

328329
if (InputSystemProfile.GesturesProfile != null)
329330
{

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityUtilitiesProvider.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality
1313
public class WindowsMixedRealityUtilitiesProvider : IWindowsMixedRealityUtilitiesProvider
1414
{
1515
/// <inheritdoc />
16-
IntPtr IWindowsMixedRealityUtilitiesProvider.ISpatialCoordinateSystemPtr => WorldManager.GetNativeISpatialCoordinateSystemPtr();
16+
IntPtr IWindowsMixedRealityUtilitiesProvider.ISpatialCoordinateSystemPtr =>
17+
#if UNITY_WSA
18+
WorldManager.GetNativeISpatialCoordinateSystemPtr();
19+
#else
20+
IntPtr.Zero;
21+
#endif
1722

1823
/// <inheritdoc />
1924
IntPtr IWindowsMixedRealityUtilitiesProvider.IHolographicFramePtr

0 commit comments

Comments
 (0)