Skip to content

Commit e888c7a

Browse files
committed
Merge branch 'mrtk_development' into users/trferrel/project-preferences
2 parents a31244e + 2754047 commit e888c7a

35 files changed

+313
-71
lines changed

Assets/MixedRealityToolkit.Extensions/Providers.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.Extensions/Providers/Experimental.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.Providers/UnityAR.meta renamed to Assets/MixedRealityToolkit.Extensions/Providers/Experimental/UnityAR.meta

File renamed without changes.

Assets/MixedRealityToolkit.Extensions/Providers/Experimental/UnityAR/Definitions.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.
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License. See LICENSE in the project root for license information.
3+
4+
namespace Microsoft.MixedReality.Toolkit.Experimental.UnityAR
5+
{
6+
/// <summary>
7+
/// Enumeration indicating the available types of augmented reality tracking poses.
8+
/// </summary>
9+
public enum ArTrackedPose
10+
{
11+
/// <summary>
12+
/// The left eye of a head mounted device.
13+
/// </summary>
14+
LeftEye = 0,
15+
16+
/// <summary>
17+
/// The left eye of a head mounted device.
18+
/// </summary>
19+
RightEye = 1,
20+
21+
/// <summary>
22+
/// The center eye of a head mounted device, this is typically the default for most such devices.
23+
/// </summary>
24+
Center = 2,
25+
26+
/// <summary>
27+
/// The "head" eye of a head mounted device, this location is often slightly above the center eye for most such devices.
28+
/// </summary>
29+
Head = 3,
30+
31+
/// <summary>
32+
/// The left hand controller pose.
33+
/// </summary>
34+
LeftPose = 4,
35+
36+
/// <summary>
37+
/// The right hand controller pose.
38+
/// </summary>
39+
RightPose = 5,
40+
41+
/// <summary>
42+
/// The color camera of a mobile (ex: phone) device.
43+
/// </summary>
44+
ColorCamera = 6
45+
}
46+
}

Assets/MixedRealityToolkit.Extensions/Providers/Experimental/UnityAR/Definitions/ArTrackedPose.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License. See LICENSE in the project root for license information.
3+
4+
namespace Microsoft.MixedReality.Toolkit.Experimental.UnityAR
5+
{
6+
/// <summary>
7+
/// Enumeration indicating the portion of the pose that will be used when tracking.
8+
/// </summary>
9+
public enum ArTrackingType
10+
{
11+
/// <summary>
12+
/// The pose rotation and position will be used.
13+
/// </summary>
14+
RotationAndPosition = 0,
15+
16+
/// <summary>
17+
/// The pose rotation will be used.
18+
/// </summary>
19+
Rotation = 1,
20+
21+
/// <summary>
22+
/// The pose rotation will be used.
23+
/// </summary>
24+
Position = 2
25+
}
26+
}

Assets/MixedRealityToolkit.Extensions/Providers/Experimental/UnityAR/Definitions/ArTrackingType.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT License. See LICENSE in the project root for license information.
3+
4+
namespace Microsoft.MixedReality.Toolkit.Experimental.UnityAR
5+
{
6+
/// <summary>
7+
/// Enumeration defining when, during frame processing, the tracked pose will be sampled.
8+
/// </summary>
9+
public enum ArUpdateType
10+
{
11+
/// <summary>
12+
/// Sampling occurs during update and just before rendering. This is the recommended value for smooth tracking.
13+
/// </summary>
14+
UpdateAndBeforeRender = 0,
15+
16+
/// <summary>
17+
/// Sampling occurs during update.
18+
/// </summary>
19+
Update = 1,
20+
21+
/// <summary>
22+
/// Sampling occurs just before rendering.
23+
/// </summary>
24+
BeforeRender = 2
25+
}
26+
}

Assets/MixedRealityToolkit.Extensions/Providers/Experimental/UnityAR/Definitions/ArUpdateType.cs.meta

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

0 commit comments

Comments
 (0)