Skip to content

Commit 49f5c4c

Browse files
authored
Merge pull request #3152 from StephenHodgson/vNEXT-TeleportationMove
Moved teleportation system from sdk -> core.
2 parents 2a7922c + 212305d commit 49f5c4c

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityToolkitConfigurationProfile.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ MonoBehaviour:
2828
type: 2}
2929
enableTeleportSystem: 1
3030
teleportSystemType:
31-
reference: Microsoft.MixedReality.Toolkit.SDK.Teleportation.MixedRealityTeleportManager,
32-
Microsoft.MixedReality.Toolkit.SDK
31+
reference: Microsoft.MixedReality.Toolkit.Core.Services.Teleportation.MixedRealityTeleportSystem,
32+
Microsoft.MixedReality.Toolkit
3333
enableSpatialAwarenessSystem: 1
3434
spatialAwarenessSystemType:
3535
reference: Microsoft.MixedReality.Toolkit.SDK.SpatialAwarenessSystem.MixedRealitySpatialAwarenessSystem,

Assets/MixedRealityToolkit-SDK/Features/Teleportation.meta renamed to Assets/MixedRealityToolkit/_Core/Services/TeleportSystem.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/MixedRealityToolkit-SDK/Features/Teleportation/MixedRealityTeleportManager.cs renamed to Assets/MixedRealityToolkit/_Core/Services/TeleportSystem/MixedRealityTeleportSystem.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@
44
using Microsoft.MixedReality.Toolkit.Core.EventDatum.Teleport;
55
using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem;
66
using Microsoft.MixedReality.Toolkit.Core.Interfaces.TeleportSystem;
7-
using Microsoft.MixedReality.Toolkit.Core.Services;
87
using Microsoft.MixedReality.Toolkit.Core.Utilities;
98
using UnityEngine;
109
using UnityEngine.EventSystems;
1110

12-
namespace Microsoft.MixedReality.Toolkit.SDK.Teleportation
11+
namespace Microsoft.MixedReality.Toolkit.Core.Services.Teleportation
1312
{
1413
/// <summary>
1514
/// The Mixed Reality Toolkit's specific implementation of the <see cref="IMixedRealityTeleportSystem"/>
1615
/// </summary>
17-
public class MixedRealityTeleportManager : BaseEventSystem, IMixedRealityTeleportSystem
16+
public class MixedRealityTeleportSystem : BaseEventSystem, IMixedRealityTeleportSystem
1817
{
1918
private TeleportEventData teleportEventData;
2019

0 commit comments

Comments
 (0)