Skip to content

Commit 725f33b

Browse files
thalbernthalbern
authored
Merge branch 'mrtk_development' into feature/cref_fixes_docfx
2 parents 895aec4 + ff606cf commit 725f33b

File tree

135 files changed

+1044
-426
lines changed

Some content is hidden

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

135 files changed

+1044
-426
lines changed

‎Assets/MixedRealityToolkit.Examples/toc.yml‎

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: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,7 @@ public override void Destroy()
126126
/// <summary>
127127
/// 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

@@ -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/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/UX/Interactable/Scripts/Events/IInteractableHandler.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33

44
using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem;
55
using Microsoft.MixedReality.Toolkit.SDK.UX.Interactable.States;
6-
using System.Collections;
7-
using System.Collections.Generic;
8-
using UnityEngine;
9-
106

117
namespace Microsoft.MixedReality.Toolkit.SDK.UX.Interactable.Events
128
{
@@ -20,13 +16,16 @@ public interface IInteractableHandler
2016
/// <param name="state"></param>
2117
/// <param name="source"></param>
2218
/// <param name="command"></param>
19+
/// <param name="index"></param>
20+
/// <param name="length"></param>
2321
void OnVoiceCommand(InteractableStates state, Interactable source, string command, int index = 0, int length = 1);
2422

2523
/// <summary>
2624
/// A click event happened
2725
/// </summary>
2826
/// <param name="state"></param>
2927
/// <param name="source"></param>
28+
/// <param name="pointer"></param>
3029
void OnClick(InteractableStates state, Interactable source, IMixedRealityPointer pointer = null);
3130
}
3231
}

‎Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/ReceiverBase.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem;
55
using Microsoft.MixedReality.Toolkit.SDK.UX.Interactable.States;
6-
using System.Collections;
7-
using System.Collections.Generic;
86
using UnityEngine;
97
using UnityEngine.Events;
108

@@ -39,6 +37,8 @@ public ReceiverBase(UnityEvent ev)
3937
/// <param name="state"></param>
4038
/// <param name="source"></param>
4139
/// <param name="command"></param>
40+
/// <param name="index"></param>
41+
/// <param name="length"></param>
4242
public virtual void OnVoiceCommand(InteractableStates state, Interactable source, string command, int index = 0, int length = 1)
4343
{
4444
// voice command called
@@ -49,6 +49,7 @@ public virtual void OnVoiceCommand(InteractableStates state, Interactable source
4949
/// </summary>
5050
/// <param name="state"></param>
5151
/// <param name="source"></param>
52+
/// <param name="pointer"></param>
5253
public virtual void OnClick(InteractableStates state, Interactable source, IMixedRealityPointer pointer = null)
5354
{
5455
// click called

‎Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Events/ReceiverBaseMonoBehavior.cs‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem;
55
using Microsoft.MixedReality.Toolkit.SDK.UX.Interactable.States;
6-
using System.Collections;
7-
using System.Collections.Generic;
86
using UnityEngine;
97

108
namespace Microsoft.MixedReality.Toolkit.SDK.UX.Interactable.Events
@@ -17,7 +15,7 @@ namespace Microsoft.MixedReality.Toolkit.SDK.UX.Interactable.Events
1715
/// </summary>
1816
public class ReceiverBaseMonoBehavior : MonoBehaviour, IInteractableHandler
1917
{
20-
public enum SearchScopes { Self, Parent, Children};
18+
public enum SearchScopes { Self, Parent, Children };
2119
public Interactable Interactable;
2220
public SearchScopes InteractableSearchScope;
2321
protected State lastState;
@@ -57,7 +55,7 @@ protected virtual void OnEnable()
5755
/// <param name="interactable"></param>
5856
public void AddInteractable(Interactable interactable)
5957
{
60-
if(Interactable != null)
58+
if (Interactable != null)
6159
{
6260
Interactable.RemoveHandler(this);
6361
}
@@ -81,7 +79,7 @@ protected virtual void Update()
8179
{
8280
if (Interactable != null && Interactable.StateManager != null)
8381
{
84-
if(Interactable.StateManager.CurrentState()!= lastState)
82+
if (Interactable.StateManager.CurrentState() != lastState)
8583
{
8684
OnStateChange(Interactable.StateManager, Interactable);
8785

@@ -131,23 +129,13 @@ public virtual void OnStateChange(InteractableStates state, Interactable source)
131129
*/
132130
}
133131

134-
/// <summary>
135-
/// A voice command was called
136-
/// </summary>
137-
/// <param name="state"></param>
138-
/// <param name="source"></param>
139-
/// <param name="command"></param>
132+
/// <inheritdoc />
140133
public virtual void OnVoiceCommand(InteractableStates state, Interactable source, string command, int index = 0, int length = 1)
141134
{
142135
// Voice Command Happened
143136
}
144137

145-
/// <summary>
146-
/// A click event happened
147-
/// </summary>
148-
/// <param name="state"></param>
149-
/// <param name="source"></param>
150-
/// <param name="command"></param>
138+
/// <inheritdoc />
151139
public virtual void OnClick(InteractableStates state, Interactable source, IMixedRealityPointer pointer = null)
152140
{
153141
// Click Happened

0 commit comments

Comments
 (0)