Skip to content

Commit e33dd7c

Browse files
authored
Merge pull request #1 from Microsoft/mrtk_development
getting in latest changes from main branch
2 parents ad2cfda + e68b246 commit e33dd7c

File tree

207 files changed

+1269
-651
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+1269
-651
lines changed

Assets/MixedRealityToolkit.Examples/Demos/SpatialAwareness/Scripts/DemoSpatialMeshHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Microsoft.MixedReality.Toolkit.Examples.Demos
1313
{
1414
/// <summary>
15-
/// This class is an example of the <see cref="IMixedRealitySpatialAwarenessMeshHandler"/> interface. It keeps track
15+
/// This class is an example of the <see cref="Microsoft.MixedReality.Toolkit.Core.Interfaces.SpatialAwarenessSystem.Handlers.IMixedRealitySpatialAwarenessObservationHandler{T}"/> interface. It keeps track
1616
/// of the IDs of each mesh and tracks the number of updates they have received.
1717
/// </summary>
1818
public class DemoSpatialMeshHandler : MonoBehaviour, IMixedRealitySpatialAwarenessObservationHandler<SpatialAwarenessMeshObject>
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
- name: Demos
2+
href: Demos/README.md
3+
items:
4+
- name: Standard Shader
5+
href: Demos/StandardShader/README.md
6+
- name: SDK
7+
href: SDK/README.md
8+
items:
9+
- name: Basic Introduction
10+
href: SDK/Example01-BasicIntroduction/README.md
11+
- name: Standard Assets
12+
href: StandardAssets/README.md

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealitySpatialMeshObserver.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,14 @@ public override void Destroy()
124124
private GameObject observedObjectParent = null;
125125

126126
/// <summary>
127-
/// The <see cref="GameObject"/> to which observed objects are parented.
127+
/// The <see cref="UnityEngine.GameObject"/> to which observed objects are parented.
128128
/// </summary>
129-
private GameObject ObservedObjectParent => observedObjectParent ?? (observedObjectParent = SpatialAwarenessSystem?.CreateSpatialAwarenessObjectParent("WindowsMixedRealitySpatialMeshObserver"));
130-
129+
private GameObject ObservedObjectParent => observedObjectParent != null ? observedObjectParent : (observedObjectParent = SpatialAwarenessSystem?.CreateSpatialAwarenessObjectParent("WindowsMixedRealitySpatialMeshObserver"));
131130

132131
private IMixedRealitySpatialAwarenessSystem spatialAwarenessSystem = null;
133132

134133
/// <summary>
135-
/// The currently active instance of <see cref="IMixedRealitySpatialAwarenessSystem"/>.
134+
/// The currently active instance of <see cref="Microsoft.MixedReality.Toolkit.Core.Interfaces.SpatialAwarenessSystem.IMixedRealitySpatialAwarenessSystem"/>.
136135
/// </summary>
137136
private IMixedRealitySpatialAwarenessSystem SpatialAwarenessSystem => spatialAwarenessSystem ?? (spatialAwarenessSystem = MixedRealityToolkit.SpatialAwarenessSystem);
138137

@@ -248,7 +247,7 @@ public SpatialAwarenessMeshLevelOfDetail LevelOfDetail
248247

249248
/// <inheritdoc />
250249
public Material VisibleMaterial { get; set; } = null;
251-
250+
252251
/// <inheritdoc/>
253252
public override void Resume()
254253
{

Assets/MixedRealityToolkit.SDK/Features/Audio/Influencers/AudioInfluencerController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
namespace Microsoft.MixedReality.Toolkit.SDK.Audio.Influencers
1111
{
1212
/// <summary>
13-
/// Class which supports components implementing <see cref="IAudioInfluencer"/> being used with audio sources.
13+
/// Class which supports components implementing <see cref="Microsoft.MixedReality.Toolkit.Core.Interfaces.Audio.IAudioInfluencer"/> being used with audio sources.
1414
/// </summary>
1515
/// <remarks>
16-
/// AudioInfluencerController requires an <see cref="AudioSource"/> component. If one is not attached, it will be added automatically.
16+
/// AudioInfluencerController requires an <see cref="UnityEngine.AudioSource"/> component. If one is not attached, it will be added automatically.
1717
/// Each sound playing game object needs to have an AudioInfluencerController attached in order to have it's audio influenced.
1818
/// </remarks>
1919
[RequireComponent(typeof(AudioSource))]

Assets/MixedRealityToolkit.SDK/Features/Audio/Influencers/AudioOccluder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
namespace Microsoft.MixedReality.Toolkit.SDK.Audio.Influencers
99
{
1010
/// <summary>
11-
/// Class that implements <see cref="IAudioInfluencer"/> to provide an audio occlusion effect, similar
11+
/// Class that implements <see cref="Microsoft.MixedReality.Toolkit.Core.Interfaces.Audio.IAudioInfluencer"/> to provide an audio occlusion effect, similar
1212
/// to listening to sound from outside of an enclosed space.
1313
/// </summary>
1414
/// <remarks>

Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/BaseFocusHandler.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
namespace Microsoft.MixedReality.Toolkit.SDK.Input.Handlers
1111
{
1212
/// <summary>
13-
/// Base Component for handling Focus on <see cref="GameObject"/>s.
13+
/// Base Component for handling Focus on <see cref="UnityEngine.GameObject"/>s.
1414
/// </summary>
1515
[RequireComponent(typeof(Collider))]
1616
public abstract class BaseFocusHandler : MonoBehaviour, IMixedRealityFocusHandler
@@ -20,7 +20,7 @@ public abstract class BaseFocusHandler : MonoBehaviour, IMixedRealityFocusHandle
2020
private bool focusEnabled = true;
2121

2222
/// <summary>
23-
/// Is focus enabled for this <see cref="Component"/>?
23+
/// Is focus enabled for this <see cref="UnityEngine.Component"/>?
2424
/// </summary>
2525
public virtual bool FocusEnabled
2626
{
@@ -29,12 +29,12 @@ public virtual bool FocusEnabled
2929
}
3030

3131
/// <summary>
32-
/// Does this object currently have focus by any <see cref="IMixedRealityPointer"/>?
32+
/// Does this object currently have focus by any <see cref="Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem.IMixedRealityPointer"/>?
3333
/// </summary>
3434
public virtual bool HasFocus => FocusEnabled && Focusers.Count > 0;
3535

3636
/// <summary>
37-
/// The list of <see cref="IMixedRealityPointer"/>s that are currently focused on this <see cref="GameObject"/>
37+
/// The list of <see cref="Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem.IMixedRealityPointer"/>s that are currently focused on this <see cref="UnityEngine.GameObject"/>
3838
/// </summary>
3939
public List<IMixedRealityPointer> Focusers { get; } = new List<IMixedRealityPointer>(0);
4040

Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/ControllerPoseSynchronizer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public bool DestroyOnSourceLost
4747
public bool IsTracked { get; protected set; } = false;
4848

4949
/// <summary>
50-
/// The current tracking state of the assigned <see cref="IMixedRealityController"/>
50+
/// The current tracking state of the assigned <see cref="Microsoft.MixedReality.Toolkit.Core.Interfaces.Devices.IMixedRealityController"/>
5151
/// </summary>
5252
protected TrackingState TrackingState = TrackingState.NotTracked;
5353

Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/DragAndDropHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
namespace Microsoft.MixedReality.Toolkit.SDK.Input.Handlers
1515
{
1616
/// <summary>
17-
/// Component that allows dragging a <see cref="GameObject"/>.
17+
/// Component that allows dragging a <see cref="UnityEngine.GameObject"/>.
1818
/// Dragging is done by calculating the angular delta and z-delta between the current and previous hand positions,
1919
/// and then repositioning the object based on that.
2020
/// </summary>

Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/ManipulationHandler.cs

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

44
using UnityEngine;
5-
using System.Linq;
65
using UnityEngine.Assertions;
76
using Microsoft.MixedReality.Toolkit.SDK.Input.Handlers;
87
using Microsoft.MixedReality.Toolkit.Core.EventDatum.Input;
@@ -24,7 +23,7 @@ namespace Microsoft.MixedReality.Toolkit.SDK.UX.Utilities
2423
///
2524
public class ManipulationHandler : BaseFocusHandler,
2625
IMixedRealityInputHandler,
27-
IMixedRealityInputHandler<MixedRealityPose>,
26+
IMixedRealityInputHandler<MixedRealityPose>,
2827
IMixedRealitySourceStateHandler
2928
{
3029
#region Private Enums
@@ -236,40 +235,32 @@ private void InvokeStateUpdateFunctions(State oldState, State newState)
236235
#endregion Private Methods
237236

238237
#region Event Handlers From Interfaces
239-
/// <summary>
240-
/// /// Event Handler receives input from inputSource
241-
/// </summary>
238+
239+
/// <inheritdoc />
242240
public void OnInputDown(InputEventData eventData)
243241
{
244242
gazeHandHelper.AddSource(eventData);
245243
UpdateStateMachine();
246244
eventData.Use();
247245
}
248246

249-
/// <summary>
250-
/// Event Handler receives input from inputSource
251-
/// </summary>
247+
/// <inheritdoc />
252248
public void OnInputUp(InputEventData eventData)
253249
{
254250
gazeHandHelper.RemoveSource(eventData);
255251
UpdateStateMachine();
256252
eventData.Use();
257253
}
258254

259-
/// <summary>
260-
/// Event Handler receives input from IMixedRealityInputHandler<MixedRealityPose>
261-
/// </summary>
262-
/// <param name="eventData"></param>
255+
/// <inheritdoc />
263256
public void OnInputChanged(InputEventData<MixedRealityPose> eventData)
264257
{
265258
gazeHandHelper.UpdateSource(eventData);
266259
UpdateStateMachine();
267260
eventData.Use();
268261
}
269262

270-
/// <summary>
271-
/// Event Handler when a InputSource is lost- part of IMixedRealitySourceStateHander interface
272-
/// </summary>
263+
/// <inheritdoc />
273264
public void OnSourceLost(SourceStateEventData eventData)
274265
{
275266
gazeHandHelper.RemoveSource(eventData);

Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/TeleportHotSpot.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace Microsoft.MixedReality.Toolkit.SDK.Input.Handlers
1111
{
1212
/// <summary>
1313
/// SDK component handling teleportation to a specific position &amp; orientation when a user focuses
14-
/// this <see cref="GameObject"/> and triggers the teleport action.
14+
/// this <see cref="UnityEngine.GameObject"/> and triggers the teleport action.
1515
/// </summary>
1616
public class TeleportHotSpot : BaseFocusHandler, IMixedRealityTeleportHotSpot
1717
{

0 commit comments

Comments
 (0)