Skip to content

Commit b878636

Browse files
authored
Merge pull request #10361 from Zee2/bc_docs_fix
Fix for missing BC docs + dead property
2 parents 03e6296 + 054ea03 commit b878636

File tree

1 file changed

+28
-2
lines changed

1 file changed

+28
-2
lines changed

Assets/MRTK/SDK/Features/UX/Scripts/BoundsControl/BoundsControl.cs

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Microsoft.MixedReality.Toolkit.Input;
66
using Microsoft.MixedReality.Toolkit.UI.BoundsControlTypes;
77
using Microsoft.MixedReality.Toolkit.Utilities;
8+
using System;
89
using System.Collections.Generic;
910
using UnityEngine;
1011
using UnityEngine.Events;
@@ -495,8 +496,11 @@ public ElasticsManager ElasticsManager
495496
private BoxDisplay boxDisplay;
496497
private ProximityEffect proximityEffect;
497498

498-
// Whether we should be displaying just the wireframe (if enabled) or the handles too
499+
/// <summary>
500+
/// Whether we should be displaying just the wireframe (if enabled) or the handles too
501+
/// </summary>
499502
public bool WireframeOnly { get => wireframeOnly; }
503+
500504
private bool wireframeOnly = false;
501505

502506
// Pointer that is being used to manipulate the bounds control
@@ -562,6 +566,11 @@ public ElasticsManager ElasticsManager
562566
private static readonly List<Vector3> TotalBoundsCorners = new List<Vector3>();
563567

564568
private Vector3[] boundsCorners = new Vector3[8];
569+
570+
/// <summary>
571+
/// This property is unused and will be removed in a future release. It has not, and does not, return any information.
572+
/// </summary>
573+
[Obsolete("The BoundsCorners property is unused and will be removed in a future release. It has not, and does not, return any information.")]
565574
public Vector3[] BoundsCorners { get; private set; }
566575

567576
// Current actual flattening axis, derived from FlattenAuto, if set
@@ -590,6 +599,14 @@ private FlattenModeType ActualFlattenAxis {
590599

591600
// TODO Review this, it feels like we should be using Behaviour.enabled instead.
592601
private bool active = false;
602+
603+
/// <summary>
604+
/// Whether the bounds control is currently active and will respond to input.
605+
/// </summary>
606+
/// <remarks>
607+
/// Setting this property will also set the entire gameObject's active state, as well as
608+
/// resetting the visuals and proximity scale effects.
609+
/// </remarks>
593610
public bool Active
594611
{
595612
get
@@ -636,7 +653,7 @@ private bool IsInitialized
636653
#region Public Methods
637654

638655
/// <summary>
639-
/// Allows to manually enable wire (edge) highlighting (edges) of the bounds control.
656+
/// Allows the manual enabling of the wireframe display of the bounds control.
640657
/// This is useful if connected to the Manipulation events of a
641658
/// <see cref="Microsoft.MixedReality.Toolkit.UI.ObjectManipulator"/>
642659
/// when used in conjunction with this MonoBehavior.
@@ -646,6 +663,9 @@ public void HighlightWires()
646663
SetHighlighted(null);
647664
}
648665

666+
/// <summary>
667+
/// Allows the manual disabling of the wireframe display.
668+
/// </summary>
649669
public void UnhighlightWires()
650670
{
651671
ResetVisuals();
@@ -1292,6 +1312,7 @@ private void TransformTarget(HandleType transformType)
12921312

12931313
#region Used Event Handlers
12941314

1315+
/// <inheritdoc />
12951316
void IMixedRealityFocusChangedHandler.OnFocusChanged(FocusEventData eventData)
12961317
{
12971318
if (eventData.NewFocusedObject == null)
@@ -1318,6 +1339,7 @@ void IMixedRealityFocusChangedHandler.OnFocusChanged(FocusEventData eventData)
13181339
}
13191340
}
13201341

1342+
/// <inheritdoc />
13211343
void IMixedRealityFocusHandler.OnFocusExit(FocusEventData eventData)
13221344
{
13231345
if (currentPointer != null && eventData.Pointer == currentPointer)
@@ -1326,6 +1348,7 @@ void IMixedRealityFocusHandler.OnFocusExit(FocusEventData eventData)
13261348
}
13271349
}
13281350

1351+
/// <inheritdoc />
13291352
void IMixedRealityFocusHandler.OnFocusEnter(FocusEventData eventData) { }
13301353

13311354
private void OnPointerUp(MixedRealityPointerEventData eventData)
@@ -1421,6 +1444,7 @@ private void OnPointerDown(MixedRealityPointerEventData eventData)
14211444

14221445
private void OnPointerDragged(MixedRealityPointerEventData eventData) { }
14231446

1447+
/// <inheritdoc />
14241448
public void OnSourceDetected(SourceStateEventData eventData)
14251449
{
14261450
if (eventData.Controller != null)
@@ -1432,6 +1456,7 @@ public void OnSourceDetected(SourceStateEventData eventData)
14321456
}
14331457
}
14341458

1459+
/// <inheritdoc />
14351460
public void OnSourceLost(SourceStateEventData eventData)
14361461
{
14371462
sourcesDetected.Remove(eventData.Controller);
@@ -1446,6 +1471,7 @@ public void OnSourceLost(SourceStateEventData eventData)
14461471

14471472
#region Unused Event Handlers
14481473

1474+
/// <inheritdoc />
14491475
void IMixedRealityFocusChangedHandler.OnBeforeFocusChange(FocusEventData eventData) { }
14501476

14511477
#endregion Unused Event Handlers

0 commit comments

Comments
 (0)