From a79efdae55095d13238f48976308529b6ade25c3 Mon Sep 17 00:00:00 2001 From: Kurtis Date: Fri, 22 Feb 2019 11:53:28 -0800 Subject: [PATCH 1/2] Pre-beta2 spell check pass --- .../Scripts/DiagnosticsDemoControls.cs | 2 +- .../InspectorFieldsExampleInspector.cs | 2 +- .../Scripts/InspectorFieldsExample.cs | 2 +- .../Input/Handlers/ManipulationHandler.cs | 4 ++-- .../UX/Interactable/Scripts/Interactable.cs | 12 ++++++------ .../Scripts/Layout/ButtonBackgroundSize.cs | 4 ++-- .../Layout/ButtonBackgroundSizeOffset.cs | 2 +- .../Scripts/States/InteractableStateModel.cs | 2 +- .../Scripts/States/InteractableStates.cs | 2 +- .../UX/Interactable/Scripts/States/States.cs | 2 +- .../Themes/InteractableAnimatorTheme.cs | 2 +- .../UX/Scripts/BoundingBox/BoundingBox.cs | 6 +++--- .../Collections/GridObjectCollection.cs | 2 +- .../Collections/TileGridObjectCollection.cs | 4 ++-- .../UX/Scripts/Cursors/CursorModifier.cs | 2 +- .../UX/Scripts/Pointers/MousePointer.cs | 18 +++++++++--------- .../Scripts/Receivers/InteractionReceiver.cs | 12 ++++++------ .../Features/UX/Scripts/Tooltips/ToolTip.cs | 4 ++-- .../Scripts/Tooltips/ToolTipBackgroundBlob.cs | 2 +- .../Scripts/Tooltips/ToolTipBackgroundMesh.cs | 2 +- .../Features/UX/Scripts/Utilities/Easing.cs | 2 +- .../Scripts/Utilities/InteractableHighlight.cs | 2 +- .../UX/Interactable/InteractableInspector.cs | 8 ++++---- .../UX/Interactable/StatesInspector.cs | 2 +- .../UX/Interactable/ThemeInspector.cs | 2 +- .../MixedRealityToolkitVisualProfiler.cs | 2 +- .../MixedRealitySpatialAwarenessSystem.cs | 2 +- .../TestFixture_01_MixedRealityToolkitTests.cs | 2 +- .../Extensions/LayerExtensions.cs | 2 +- .../Inspectors/MixedRealityPreferences.cs | 6 +++--- ...ialAwarenessMeshObserverProfileInspector.cs | 2 +- .../TypeReferencePropertyDrawer.cs | 2 +- .../Utilities/InspectorFieldsUtility.cs | 2 +- .../Inspectors/Utilities/InspectorUIUtility.cs | 8 ++++---- .../Providers/UnityInput/MouseController.cs | 1 - .../Services/BaseService.cs | 2 +- .../Utilities/Editor/EditorProjectUtilities.cs | 2 +- .../InspectorFields/InspectorField.cs | 6 +++--- .../Utilities/Physics/Interpolator.cs | 2 +- .../Utilities/Physics/TwoHandScaleLogic.cs | 2 +- 40 files changed, 73 insertions(+), 74 deletions(-) diff --git a/Assets/MixedRealityToolkit.Examples/Demos/Diagnostics/Scripts/DiagnosticsDemoControls.cs b/Assets/MixedRealityToolkit.Examples/Demos/Diagnostics/Scripts/DiagnosticsDemoControls.cs index c984aadc033..1cf29734c12 100644 --- a/Assets/MixedRealityToolkit.Examples/Demos/Diagnostics/Scripts/DiagnosticsDemoControls.cs +++ b/Assets/MixedRealityToolkit.Examples/Demos/Diagnostics/Scripts/DiagnosticsDemoControls.cs @@ -19,7 +19,7 @@ private async void Start() await new WaitUntil(() => MixedRealityToolkit.DiagnosticsSystem != null); - // Turn on the diagnotic visualizations for this demo. + // Turn on the diagnostic visualizations for this demo. MixedRealityToolkit.DiagnosticsSystem.ShowDiagnostics = true; } diff --git a/Assets/MixedRealityToolkit.Examples/Demos/Utilities/InspectorFields/Inspectors/InspectorFieldsExampleInspector.cs b/Assets/MixedRealityToolkit.Examples/Demos/Utilities/InspectorFields/Inspectors/InspectorFieldsExampleInspector.cs index 06e109f34a2..86e106200a9 100644 --- a/Assets/MixedRealityToolkit.Examples/Demos/Utilities/InspectorFields/Inspectors/InspectorFieldsExampleInspector.cs +++ b/Assets/MixedRealityToolkit.Examples/Demos/Utilities/InspectorFields/Inspectors/InspectorFieldsExampleInspector.cs @@ -41,7 +41,7 @@ public override void OnInspectorGUI() serializedObject.ApplyModifiedProperties(); - // to apply during runtime - only needed for monobehaviors + // to apply during runtime - only needed for MonoBehaviours InspectorGenericFields.LoadSettings(example, example.Settings); } } diff --git a/Assets/MixedRealityToolkit.Examples/Demos/Utilities/InspectorFields/Scripts/InspectorFieldsExample.cs b/Assets/MixedRealityToolkit.Examples/Demos/Utilities/InspectorFields/Scripts/InspectorFieldsExample.cs index d0220bcdde3..682161cb8b0 100644 --- a/Assets/MixedRealityToolkit.Examples/Demos/Utilities/InspectorFields/Scripts/InspectorFieldsExample.cs +++ b/Assets/MixedRealityToolkit.Examples/Demos/Utilities/InspectorFields/Scripts/InspectorFieldsExample.cs @@ -11,7 +11,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Utilities.InspectorFields /// Example of using InspectorFields attributes in a class to create custom inspectors /// This is on approach for building complex inspectors that need to be customized or the need to overcome lack of polymorphism support /// They provide a way to create one inspector for multiple classes - /// Example: Create a monobehavior or scriptable object with a custom inspector. + /// Example: Create a MonoBehaviour or scriptable object with a custom inspector. /// The functionality or settings can be changed by assigning a custom script to the object /// Use InspectorFields to render the custom properties inside the custom script in the inspector /// When the app launches, copy the properties to the new instance of the script diff --git a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/ManipulationHandler.cs b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/ManipulationHandler.cs index 2e95c37345a..1d9a3a6d8d4 100644 --- a/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/ManipulationHandler.cs +++ b/Assets/MixedRealityToolkit.SDK/Features/Input/Handlers/ManipulationHandler.cs @@ -88,7 +88,7 @@ private enum State private GazeHandHelper gazeHandHelper; #endregion - #region Monobehaviour Functions + #region MonoBehaviour Functions private void Awake() { gazeHandHelper = new GazeHandHelper(); @@ -110,7 +110,7 @@ private void Update() UpdateStateMachine(); } } - #endregion Monobehaviour Functions + #endregion MonoBehaviour Functions #region Private Methods private void SetManipulationMode(TwoHandedManipulation mode) diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Interactable.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Interactable.cs index 45386335266..49ddee45687 100644 --- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Interactable.cs +++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Interactable.cs @@ -23,7 +23,7 @@ namespace Microsoft.MixedReality.Toolkit.SDK.UX.Interactable { /// /// Uses input and action data to declare a set of states - /// Maintains a collection of themes that react to state changes and provide scensory feedback + /// Maintains a collection of themes that react to state changes and provide sensory feedback /// Passes state information and input data on to receivers that detect patterns and does stuff. /// @@ -76,7 +76,7 @@ public class Interactable : MonoBehaviour, IMixedRealityFocusHandler, IMixedReal /// public bool FocusEnabled { get { return !IsGlobal; } set { IsGlobal = !value; } } - // list of profiles can match themes with gameObjects + // list of profiles can match themes with GameObjects public List Profiles = new List(); // Base onclick event public UnityEvent OnClick; @@ -117,10 +117,10 @@ public class Interactable : MonoBehaviour, IMixedRealityFocusHandler, IMixedReal protected State lastState; protected bool wasDisabled = false; - // cache of current dimenion + // cache of current dimension protected int dimensionIndex = 0; - // allows for switching colliders without firing a lose focus imediately + // allows for switching colliders without firing a lose focus immediately // for advanced controls like drop-downs protected float rollOffTime = 0.25f; protected float rollOffTimer = 0.25f; @@ -782,7 +782,7 @@ public void SetDimensionIndex(int index) } /// - /// internal deminsion cycling + /// internal dimension cycling /// protected void IncreaseDimensionIndex() { @@ -975,7 +975,7 @@ public void OnSpeechKeywordRecognized(SpeechEventData eventData) /// /// Setup voice commands from component VoiceCommand input field - /// Supports toggles using a comma to seperate keywords, no spaces please + /// Supports toggles using a comma to separate keywords, no spaces please /// protected void SetupVoiceCommand() { diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Layout/ButtonBackgroundSize.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Layout/ButtonBackgroundSize.cs index 2a231b147f2..9f30f62eae7 100644 --- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Layout/ButtonBackgroundSize.cs +++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Layout/ButtonBackgroundSize.cs @@ -9,7 +9,7 @@ namespace Microsoft.MixedReality.Toolkit.SDK.UX.Interactable.Layout { /// /// The base layout component for a button or UI elements - easily build UI with Unity Primitives. - /// Helps to create consistancy by using values that scale to a designer's 2D layout program. + /// Helps to create consistency by using values that scale to a designer's 2D layout program. /// Based on a ratio of 2048 pixels for 1 meter of surface area. /// /// Use case: @@ -24,7 +24,7 @@ public class ButtonBackgroundSize : MonoBehaviour { /// /// A scale factor for button layouts, default is based on 2048 pixels to 1 meter. - /// Similar to values used in designer and 2D art programs and helps create consistancy across teams. + /// Similar to values used in designer and 2D art programs and helps create consistency across teams. /// [Tooltip("A pixel to Unity unit conversion, Default: 2048x2048 pixels covers a 1x1 Unity Unit or default primitive size")] [SerializeField] diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Layout/ButtonBackgroundSizeOffset.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Layout/ButtonBackgroundSizeOffset.cs index 254be457208..281aab6d4e0 100644 --- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Layout/ButtonBackgroundSizeOffset.cs +++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Layout/ButtonBackgroundSizeOffset.cs @@ -90,7 +90,7 @@ public Vector3 GetSOffset() } /// - /// Set the size based on the Achor's size and the buffers + /// Set the size based on the Anchor's size and the buffers /// private void UpdateSize() { diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/InteractableStateModel.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/InteractableStateModel.cs index b5399d8cae7..925e0ad47e9 100644 --- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/InteractableStateModel.cs +++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/InteractableStateModel.cs @@ -9,7 +9,7 @@ namespace Microsoft.MixedReality.Toolkit.SDK.UX.Interactable.States { /// - /// State data model, state management and comparison instrucitons + /// State data model, state management and comparison instructions /// /* diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/InteractableStates.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/InteractableStates.cs index a75d53afa1f..311cfe1807f 100644 --- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/InteractableStates.cs +++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/InteractableStates.cs @@ -50,7 +50,7 @@ public enum InteractableStateEnum { /// Visited, /// - /// Botton is toggled state, on/off + /// Button is toggled state, on/off /// Toggled, /// diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/States.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/States.cs index 2ccad1416a0..c6cec4596c3 100644 --- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/States.cs +++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/States/States.cs @@ -19,7 +19,7 @@ public class States : ScriptableObject public Type[] StateTypes; public string StateLogicName = "InteractableStates"; - //!!! finish making states work, they shoulg initiate the type and run the logic during play mode. + //!!! finish making states work, they should initiate the type and run the logic during play mode. private void OnEnable() { SetupStateOptions(); diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableAnimatorTheme.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableAnimatorTheme.cs index efefae63f35..fb1be9b03a8 100644 --- a/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableAnimatorTheme.cs +++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Scripts/Themes/InteractableAnimatorTheme.cs @@ -9,7 +9,7 @@ namespace Microsoft.MixedReality.Toolkit.SDK.UX.Interactable.Themes { /// - /// Uses Animator to control Interacable feedback based on state changes. + /// Uses Animator to control Interactable feedback based on state changes. /// public class InteractableAnimatorTheme : InteractableThemeBase { diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/BoundingBox/BoundingBox.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/BoundingBox/BoundingBox.cs index 54d27aacc69..868e5f3c1a5 100644 --- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/BoundingBox/BoundingBox.cs +++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/BoundingBox/BoundingBox.cs @@ -80,7 +80,7 @@ private enum CardinalAxisType } /// - /// This enum is used interally to define how an object's bounds are calculated in order to fit the boundingbox + /// This enum is used internally to define how an object's bounds are calculated in order to fit the boundingbox /// to it. /// private enum BoundsCalculationMethod @@ -297,7 +297,7 @@ public bool IsActive private HandleType currentHandleType; #endregion Private Properties - #region Monobehaviour Methods + #region MonoBehaviour Methods private void Start() { targetObject = this.gameObject; @@ -327,7 +327,7 @@ private void Update() UpdateRigHandles(); } - #endregion Monobehaviour Methods + #endregion MonoBehaviour Methods #region Private Methods private void CreateRig() diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/GridObjectCollection.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/GridObjectCollection.cs index b794a6b94ec..91b99e4dee7 100644 --- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/GridObjectCollection.cs +++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/GridObjectCollection.cs @@ -260,7 +260,7 @@ protected void ResolveGridLayout(Vector3[] grid, float offsetX, float offsetY, L } /// - /// Update the facing of a node given the nodes new position for facing orign with node and orientation type + /// Update the facing of a node given the nodes new position for facing origin with node and orientation type /// /// protected void UpdateNodeFacing(ObjectCollectionNode node) diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/TileGridObjectCollection.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/TileGridObjectCollection.cs index 1ba1ff82c65..9b03966b748 100644 --- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/TileGridObjectCollection.cs +++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Collections/TileGridObjectCollection.cs @@ -8,7 +8,7 @@ namespace Microsoft.MixedReality.Toolkit.SDK.UX.Collections { /// - /// A basic grid layout for game objects of a consistant size + /// A basic grid layout for game objects of a consistent size /// /// [ExecuteInEditMode] @@ -86,7 +86,7 @@ public enum GridDivisions { Rows, Columns}; /// gutter size in pixels /// normalized vector flow direction /// start position offset - /// center the grid or layotu from edge + /// center the grid or layout from edge public virtual void ConfigureGrid(int columns, Vector3 tileSize, Vector3 gutters, Vector3 layouDirection, Vector3 startPosition, bool centered) { Columns = columns; diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/CursorModifier.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/CursorModifier.cs index 1bf8512292e..44e0d3bf9be 100644 --- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/CursorModifier.cs +++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Cursors/CursorModifier.cs @@ -230,6 +230,6 @@ private void OnValidate() Debug.Assert(HostTransform.GetComponent() != null, $"A collider component is required on {hostTransform.gameObject.name} for the cursor modifier component on {gameObject.name} to function properly."); } - #endregion MonoBehaviour Implementaiton + #endregion MonoBehaviour Implementation } } diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/MousePointer.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/MousePointer.cs index 6c75abfa2e6..64565e7dc07 100644 --- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/MousePointer.cs +++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Pointers/MousePointer.cs @@ -25,7 +25,7 @@ public class MousePointer : BaseControllerPointer, IMixedRealityMousePointer private bool isDisabled = true; - #region IMixedRealityMousePointer Implementaiton + #region IMixedRealityMousePointer Implementation [SerializeField] [Tooltip("Should the mouse cursor be hidden when no active input is received?")] @@ -52,7 +52,7 @@ public class MousePointer : BaseControllerPointer, IMixedRealityMousePointer #endregion IMixedRealityMousePointer Implementation - #region IMixedRealityPointer Implementaiton + #region IMixedRealityPointer Implementation /// public override bool IsInteractionEnabled => isInteractionEnabled; @@ -90,9 +90,9 @@ public override void OnPreRaycast() } } - #endregion IMixedRealityPointer Implementaiton + #endregion IMixedRealityPointer Implementation - #region IMixedRealitySourcePoseHandler Implementaiton + #region IMixedRealitySourcePoseHandler Implementation /// public override void OnSourceDetected(SourceStateEventData eventData) @@ -137,9 +137,9 @@ public override void OnSourcePoseChanged(SourcePoseEventData eventData) } } - #endregion IMixedRealitySourcePoseHandler Implementaiton + #endregion IMixedRealitySourcePoseHandler Implementation - #region IMixedRealityInputHandler Implementaiton + #region IMixedRealityInputHandler Implementation /// public override void OnInputDown(InputEventData eventData) @@ -179,9 +179,9 @@ public override void OnInputChanged(InputEventData eventData) } } - #endregion IMixedRealityInputHandler Implementaiton + #endregion IMixedRealityInputHandler Implementation - #region Monobehaviour Implementaiton + #region MonoBehaviour Implementation protected override void Start() { @@ -218,7 +218,7 @@ private void Update() } } - #endregion Monobehaviour Implementaiton + #endregion MonoBehaviour Implementation private void UpdateMousePosition(float mouseX, float mouseY) { diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Receivers/InteractionReceiver.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Receivers/InteractionReceiver.cs index 2d458341b97..1fc87668b28 100644 --- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Receivers/InteractionReceiver.cs +++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Receivers/InteractionReceiver.cs @@ -57,7 +57,7 @@ public List Targets [Tooltip("When true, this interaction receiver will draw connections in the editor to Interactables and Targets")] private bool drawEditorConnections = true; - #region MonoBehaviour implementation + #region MonoBehaviour Implementation /// /// On enable, set the BaseInputHandler's IsFocusRequired to false to receive all events. @@ -105,7 +105,7 @@ protected virtual void OnDrawGizmosSelected() } } - #endregion MonoBehaviour implementation + #endregion MonoBehaviour Implementation /// /// Register an interactable with this receiver. @@ -177,7 +177,7 @@ void IMixedRealityFocusChangedHandler.OnFocusChanged(FocusEventData eventData) #endregion IMixedRealityFocusChangedHandler Implementation - #region IMixedRealityInputHandler Impmentations + #region IMixedRealityInputHandler Implementations /// void IMixedRealityInputHandler.OnInputUp(InputEventData eventData) @@ -228,9 +228,9 @@ void IMixedRealityInputHandler.OnInputChanged(InputEventData e } } - #endregion IMixedRealityInputHandler Impmentations + #endregion IMixedRealityInputHandler Implementations - #region IMixedRealityGestureHandler Impmentations + #region IMixedRealityGestureHandler Implementations /// void IMixedRealityGestureHandler.OnGestureStarted(InputEventData eventData) @@ -322,7 +322,7 @@ void IMixedRealityGestureHandler.OnGestureCanceled(InputEventData eventData) } } - #endregion IMixedRealityGestureHandler Impmentations + #endregion IMixedRealityGestureHandler Implementations #region Protected Virtual Callback Functions diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/ToolTip.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/ToolTip.cs index 62b8862146c..5e158fc2cb0 100644 --- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/ToolTip.cs +++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/ToolTip.cs @@ -577,8 +577,8 @@ public static Vector3 GetTextMeshLocalScale(TextMesh textMesh) localScale.x = (localScale.x * textMesh.characterSize * 0.1f) * transformScale.x; localScale.z = transformScale.z; - // We could calcualte the height based on line height and character size - // But I've found that method can be flakey and has a lot of magic numbers + // We could calculate the height based on line height and character size + // But I've found that method can be flaky and has a lot of magic numbers // that may break in future Unity versions Vector3 eulerAngles = textMesh.transform.eulerAngles; Vector3 rendererScale = Vector3.zero; diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/ToolTipBackgroundBlob.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/ToolTipBackgroundBlob.cs index bbe053c9b7f..ad36b009007 100644 --- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/ToolTipBackgroundBlob.cs +++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/ToolTipBackgroundBlob.cs @@ -198,7 +198,7 @@ public void OnContentChange(Vector3 localContentSize, Vector3 localContentOffset { // Get the size of the mesh and use this to adjust the local content size on the x / y axis - // This will accomodate meshes that aren't built to 1,1 scale + // This will accommodate meshes that aren't built to 1,1 scale Bounds meshBounds = backgroundRendererMeshFilter.sharedMesh.bounds; localContentSize.x /= meshBounds.size.x; localContentSize.y /= meshBounds.size.y; diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/ToolTipBackgroundMesh.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/ToolTipBackgroundMesh.cs index 1d4afdf611b..a943433e889 100644 --- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/ToolTipBackgroundMesh.cs +++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Tooltips/ToolTipBackgroundMesh.cs @@ -57,7 +57,7 @@ public void OnContentChange(Vector3 localContentSize, Vector3 localContentOffset return; //Get the size of the mesh and use this to adjust the local content size on the x / y axis - //This will accomodate meshes that aren't built to 1,1 scale + //This will accommodate meshes that aren't built to 1,1 scale Bounds meshBounds = BackgroundRenderer.GetComponent().sharedMesh.bounds; localContentSize.x /= meshBounds.size.x; localContentSize.y /= meshBounds.size.y; diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/Easing.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/Easing.cs index ad6a30f99ad..6df5fcd867b 100644 --- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/Easing.cs +++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/Easing.cs @@ -32,7 +32,7 @@ public enum BasicEaseCurves { Linear, EaseIn, EaseOut, EaseInOut } /// - /// The amounnt of time the ease should run + /// The amount of time the ease should run /// public float LerpTime = 0.5f; diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/InteractableHighlight.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/InteractableHighlight.cs index ae9fd2c6f25..23c25bffd9f 100644 --- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/InteractableHighlight.cs +++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Utilities/InteractableHighlight.cs @@ -110,7 +110,7 @@ public Renderer[] TargetRenderers private Dictionary> materialsBeforeFocus; - #region Monobehavior Implementation + #region MonoBehaviour Implementation public virtual void OnEnable() { diff --git a/Assets/MixedRealityToolkit.SDK/Inspectors/UX/Interactable/InteractableInspector.cs b/Assets/MixedRealityToolkit.SDK/Inspectors/UX/Interactable/InteractableInspector.cs index 05ae50bc51a..0777ad370b1 100644 --- a/Assets/MixedRealityToolkit.SDK/Inspectors/UX/Interactable/InteractableInspector.cs +++ b/Assets/MixedRealityToolkit.SDK/Inspectors/UX/Interactable/InteractableInspector.cs @@ -197,7 +197,7 @@ public virtual void RenderCustomInspector() } SerializedProperty dimensions = serializedObject.FindProperty("Dimensions"); - dimensions.intValue = EditorGUILayout.IntField(new GUIContent("Dimensions", "Toggle or squence button levels"), dimensions.intValue); + dimensions.intValue = EditorGUILayout.IntField(new GUIContent("Dimensions", "Toggle or sequence button levels"), dimensions.intValue); if (dimensions.intValue > 1) { @@ -285,7 +285,7 @@ public virtual void RenderCustomInspector() } } - // add themes when increading dimensions + // add themes when increasing dimensions if (themes.arraySize < dimensions.intValue) { int cnt = themes.arraySize; @@ -315,10 +315,10 @@ public virtual void RenderCustomInspector() for (int t = 0; t < themes.arraySize; t++) { SerializedProperty themeItem = themes.GetArrayElementAtIndex(t); - EditorGUILayout.PropertyField(themeItem, new GUIContent("Theme", "Theme properties for interation feedback")); + EditorGUILayout.PropertyField(themeItem, new GUIContent("Theme", "Theme properties for interaction feedback")); // TODO: we need the theme and target in order to figure out what properties to expose in the list - // TODO: or do we show them all and show alerts when a theme property is not compatable + // TODO: or do we show them all and show alerts when a theme property is not compatible if (themeItem.objectReferenceValue != null && gameObject.objectReferenceValue) { if (themeItem.objectReferenceValue.name == "DefaultTheme") diff --git a/Assets/MixedRealityToolkit.SDK/Inspectors/UX/Interactable/StatesInspector.cs b/Assets/MixedRealityToolkit.SDK/Inspectors/UX/Interactable/StatesInspector.cs index 410e788bca1..93cc59c6b87 100644 --- a/Assets/MixedRealityToolkit.SDK/Inspectors/UX/Interactable/StatesInspector.cs +++ b/Assets/MixedRealityToolkit.SDK/Inspectors/UX/Interactable/StatesInspector.cs @@ -43,7 +43,7 @@ public override void OnInspectorGUI() serializedObject.Update(); InspectorUIUtility.DrawTitle("States"); - InspectorUIUtility.DrawNotice("Manage state configurations to drive Interactables or Tansitions"); + InspectorUIUtility.DrawNotice("Manage state configurations to drive Interactables or Transitions"); // get the list of options and InteractableStates stateOptions = instance.StateOptions; diff --git a/Assets/MixedRealityToolkit.SDK/Inspectors/UX/Interactable/ThemeInspector.cs b/Assets/MixedRealityToolkit.SDK/Inspectors/UX/Interactable/ThemeInspector.cs index 843728d2617..889174cb063 100644 --- a/Assets/MixedRealityToolkit.SDK/Inspectors/UX/Interactable/ThemeInspector.cs +++ b/Assets/MixedRealityToolkit.SDK/Inspectors/UX/Interactable/ThemeInspector.cs @@ -921,7 +921,7 @@ public static void RenderThemeSettings(SerializedProperty themeSettings, Seriali EditorGUILayout.LabelField(new GUIContent("Text Property: " + (InteractableThemePropertyValueTypes)propId.intValue)); } - // Handle isse where the material color id renders on objects it shouldn't!!!!!!!!!!!!!! + // Handle issue where the material color id renders on objects it shouldn't!!!!!!!!!!!!!! // theme is save for a game object with a renderer, but when put on a textmesh, rendering prop values show up. // when changing the theme type on a TextMesh, everything works, but the rendering prop is removed from the theme on the renderer object. // make this passive, only show up when needed. diff --git a/Assets/MixedRealityToolkit.Services/DiagnosticsSystem/MixedRealityToolkitVisualProfiler.cs b/Assets/MixedRealityToolkit.Services/DiagnosticsSystem/MixedRealityToolkitVisualProfiler.cs index 93054b50e7a..bc28222ebeb 100644 --- a/Assets/MixedRealityToolkit.Services/DiagnosticsSystem/MixedRealityToolkitVisualProfiler.cs +++ b/Assets/MixedRealityToolkit.Services/DiagnosticsSystem/MixedRealityToolkitVisualProfiler.cs @@ -14,7 +14,7 @@ namespace Microsoft.MixedReality.Toolkit.Services.DiagnosticsSystem /// frames are displayed over time to visually find problem areas. Memory is reported /// as current, peak and max usage in a bar graph. /// - /// USAGE: To use this profiler simply add this script as a component of any gameobject in + /// USAGE: To use this profiler simply add this script as a component of any GameObject in /// your Unity scene. The profiler is initially disabled (toggle-able via the initiallyActive /// property), but can be toggled via the enabled/disable voice commands keywords. /// diff --git a/Assets/MixedRealityToolkit.Services/SpatialAwarenessSystem/MixedRealitySpatialAwarenessSystem.cs b/Assets/MixedRealityToolkit.Services/SpatialAwarenessSystem/MixedRealitySpatialAwarenessSystem.cs index 4217a279a6b..c530c2fe5e8 100644 --- a/Assets/MixedRealityToolkit.Services/SpatialAwarenessSystem/MixedRealitySpatialAwarenessSystem.cs +++ b/Assets/MixedRealityToolkit.Services/SpatialAwarenessSystem/MixedRealitySpatialAwarenessSystem.cs @@ -70,7 +70,7 @@ public override void Enable() public override void Reset() { base.Reset(); - // todo: base Reset should likly call Disable, then Initialize + // todo: base Reset should likely call Disable, then Initialize InitializeInternal(); } diff --git a/Assets/MixedRealityToolkit.Tests/Core/TestFixture_01_MixedRealityToolkitTests.cs b/Assets/MixedRealityToolkit.Tests/Core/TestFixture_01_MixedRealityToolkitTests.cs index 0589623a8f8..9ce30bd1636 100644 --- a/Assets/MixedRealityToolkit.Tests/Core/TestFixture_01_MixedRealityToolkitTests.cs +++ b/Assets/MixedRealityToolkit.Tests/Core/TestFixture_01_MixedRealityToolkitTests.cs @@ -226,7 +226,7 @@ public void Test_04_06_MixedRealityDataProviderDoesNotReturn() const string serviceName = "Test Data Provider"; - // Add test test data provider + // Add test data provider MixedRealityToolkit.Instance.RegisterService(typeof(ITestDataProvider1), new TestDataProvider1(serviceName, 10)); // Validate non-existent ExtensionService diff --git a/Assets/MixedRealityToolkit/Extensions/LayerExtensions.cs b/Assets/MixedRealityToolkit/Extensions/LayerExtensions.cs index 5eeeed1e45f..411c64aa0b2 100644 --- a/Assets/MixedRealityToolkit/Extensions/LayerExtensions.cs +++ b/Assets/MixedRealityToolkit/Extensions/LayerExtensions.cs @@ -75,7 +75,7 @@ public static LayerMask ToMask(int layerId) } /// - /// Gets a valid layer layer id using the layer name. + /// Gets a valid layer id using the layer name. /// /// The cached layer id. /// The name of the layer to look for if the is unset. diff --git a/Assets/MixedRealityToolkit/Inspectors/MixedRealityPreferences.cs b/Assets/MixedRealityToolkit/Inspectors/MixedRealityPreferences.cs index c18cf8200cc..af15e53387f 100644 --- a/Assets/MixedRealityToolkit/Inspectors/MixedRealityPreferences.cs +++ b/Assets/MixedRealityToolkit/Inspectors/MixedRealityPreferences.cs @@ -41,7 +41,7 @@ public static bool LockProfiles #region Ignore startup settings prompt - private static readonly GUIContent IgnoreContent = new GUIContent("Ignore Settings Prompt on Startup", "Prevents settings dialog popup from showing on startup.\n\nThis setting applies to all projects using MRTK."); + private static readonly GUIContent IgnoreContent = new GUIContent("Ignore Settings Prompt on Startup", "Prevents settings dialog pop-up from showing on startup.\n\nThis setting applies to all projects using MRTK."); private const string IgnoreKey = "_MixedRealityToolkit_Editor_IgnoreSettingsPrompts"; private static bool ignorePrefLoaded; private static bool ignoreSettingsPrompt; @@ -71,7 +71,7 @@ public static bool IgnoreSettingsPrompt #region Show Canvas Utility Prompt - private static readonly GUIContent CanvasUtilityContent = new GUIContent("Canvas World Space utility dialogs", "Enable or disable the dialog popups for the world space canvas settings.\n\nThis setting only applies to the currently running project."); + private static readonly GUIContent CanvasUtilityContent = new GUIContent("Canvas World Space utility dialogs", "Enable or disable the dialog pop-ups for the world space canvas settings.\n\nThis setting only applies to the currently running project."); private const string CanvasKey = "_EnableCanvasUtilityDialog"; private static bool isCanvasUtilityPrefLoaded; private static bool showCanvasUtilityPrompt; @@ -113,7 +113,7 @@ private static void Preferences() if (!LockProfiles) { - EditorGUILayout.HelpBox("This is only to be used to update the default SDK profiles. If any edits are made, and not checked into the MRTK's Github, the changes may be lost next time you update your local copy.", MessageType.Warning); + EditorGUILayout.HelpBox("This is only to be used to update the default SDK profiles. If any edits are made, and not checked into the MRTK's GitHub, the changes may be lost next time you update your local copy.", MessageType.Warning); } EditorGUI.BeginChangeCheck(); diff --git a/Assets/MixedRealityToolkit/Inspectors/Profiles/MixedRealitySpatialAwarenessMeshObserverProfileInspector.cs b/Assets/MixedRealityToolkit/Inspectors/Profiles/MixedRealitySpatialAwarenessMeshObserverProfileInspector.cs index db4592f2924..6747038eaa6 100644 --- a/Assets/MixedRealityToolkit/Inspectors/Profiles/MixedRealitySpatialAwarenessMeshObserverProfileInspector.cs +++ b/Assets/MixedRealityToolkit/Inspectors/Profiles/MixedRealitySpatialAwarenessMeshObserverProfileInspector.cs @@ -142,7 +142,7 @@ public override void OnInspectorGUI() { EditorGUILayout.PropertyField(levelOfDetail, lodContent); EditorGUILayout.PropertyField(trianglesPerCubicMeter, trianglesPerCubicMeterContent); - EditorGUILayout.HelpBox("The value of Triangls per Cubic Meter is ignored unless Level of Detail is set to Custom.", MessageType.Info); + EditorGUILayout.HelpBox("The value of Triangles per Cubic Meter is ignored unless Level of Detail is set to Custom.", MessageType.Info); } } diff --git a/Assets/MixedRealityToolkit/Inspectors/PropertyDrawers/TypeReferencePropertyDrawer.cs b/Assets/MixedRealityToolkit/Inspectors/PropertyDrawers/TypeReferencePropertyDrawer.cs index d9f94d9c880..b8c3dd9a682 100644 --- a/Assets/MixedRealityToolkit/Inspectors/PropertyDrawers/TypeReferencePropertyDrawer.cs +++ b/Assets/MixedRealityToolkit/Inspectors/PropertyDrawers/TypeReferencePropertyDrawer.cs @@ -178,7 +178,7 @@ private static string DrawTypeSelectionControl(Rect position, GUIContent label, break; case EventType.Repaint: - // Remove assembly name and namespace from content of popup control. + // Remove assembly name and namespace from content of pop-up control. var classRefParts = classRef.Split(','); var className = classRefParts[0].Trim(); className = className.Substring(className.LastIndexOf(".", StringComparison.Ordinal) + 1); diff --git a/Assets/MixedRealityToolkit/Inspectors/Utilities/InspectorFieldsUtility.cs b/Assets/MixedRealityToolkit/Inspectors/Utilities/InspectorFieldsUtility.cs index 824d97fefc1..0f478f10fad 100644 --- a/Assets/MixedRealityToolkit/Inspectors/Utilities/InspectorFieldsUtility.cs +++ b/Assets/MixedRealityToolkit/Inspectors/Utilities/InspectorFieldsUtility.cs @@ -12,7 +12,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Inspectors.Utilities { /// - /// A colleciton of helper functions for adding InspectorFields to a custom Inspector + /// A collection of helper functions for adding InspectorFields to a custom Inspector /// public static class InspectorFieldsUtility diff --git a/Assets/MixedRealityToolkit/Inspectors/Utilities/InspectorUIUtility.cs b/Assets/MixedRealityToolkit/Inspectors/Utilities/InspectorUIUtility.cs index de313b3ef1d..68c2cf0211f 100644 --- a/Assets/MixedRealityToolkit/Inspectors/Utilities/InspectorUIUtility.cs +++ b/Assets/MixedRealityToolkit/Inspectors/Utilities/InspectorUIUtility.cs @@ -258,7 +258,7 @@ public static void DrawTitle(string title) } /// - /// Draw a basic lable + /// Draw a basic label /// /// /// @@ -425,7 +425,7 @@ public static List AdjustListSettings(List listSetti } /// - /// Get an array of strings from a serialized list of strings, popup field helper + /// Get an array of strings from a serialized list of strings, pop-up field helper /// /// /// @@ -441,7 +441,7 @@ public static string[] GetOptions(SerializedProperty options) } /// - /// Get the index of a serialized array item based on it's name, popup field helper + /// Get the index of a serialized array item based on it's name, pop-up field helper /// /// /// @@ -460,7 +460,7 @@ public static int GetOptionsIndex(SerializedProperty options, string selection) } /// - /// Get the index of an array item based on it's name, popup field helper + /// Get the index of an array item based on it's name, pop-up field helper /// /// /// diff --git a/Assets/MixedRealityToolkit/Providers/UnityInput/MouseController.cs b/Assets/MixedRealityToolkit/Providers/UnityInput/MouseController.cs index 09745eb5474..d6a8fb8030f 100644 --- a/Assets/MixedRealityToolkit/Providers/UnityInput/MouseController.cs +++ b/Assets/MixedRealityToolkit/Providers/UnityInput/MouseController.cs @@ -75,7 +75,6 @@ public void Update() controllerPose.Rotation = InputSource.Pointers[0].BaseCursor.Rotation; } - // Don't ask me why it's mapped weird. Bc Unity... mouseDelta.x = -Input.GetAxis("Mouse Y"); mouseDelta.y = Input.GetAxis("Mouse X"); MixedRealityToolkit.InputSystem?.RaiseSourcePositionChanged(InputSource, this, mouseDelta); diff --git a/Assets/MixedRealityToolkit/Services/BaseService.cs b/Assets/MixedRealityToolkit/Services/BaseService.cs index f72f09bf7a7..b3d4cd9fa0d 100644 --- a/Assets/MixedRealityToolkit/Services/BaseService.cs +++ b/Assets/MixedRealityToolkit/Services/BaseService.cs @@ -64,7 +64,7 @@ public void Dispose() // Clean up our resources (managed and unmanaged resources) Dispose(true); - // Suppress finalization as the the finalizer also calls our cleanup code. + // Suppress finalization as the finalizer also calls our cleanup code. GC.SuppressFinalize(this); } diff --git a/Assets/MixedRealityToolkit/Utilities/Editor/EditorProjectUtilities.cs b/Assets/MixedRealityToolkit/Utilities/Editor/EditorProjectUtilities.cs index b14c9321364..7fd2139933c 100644 --- a/Assets/MixedRealityToolkit/Utilities/Editor/EditorProjectUtilities.cs +++ b/Assets/MixedRealityToolkit/Utilities/Editor/EditorProjectUtilities.cs @@ -32,7 +32,7 @@ public static void CheckMinimumEditorVersion() /// /// Displays a message indicating that a project was loaded in an unsupported version of Unity and allows the user - /// to continu or exit. + /// to continue or exit. /// private static void DisplayIncorrectEditorVersionDialog() { diff --git a/Assets/MixedRealityToolkit/Utilities/InspectorFields/InspectorField.cs b/Assets/MixedRealityToolkit/Utilities/InspectorFields/InspectorField.cs index 4afa3b14df9..30893e98e4b 100644 --- a/Assets/MixedRealityToolkit/Utilities/InspectorFields/InspectorField.cs +++ b/Assets/MixedRealityToolkit/Utilities/InspectorFields/InspectorField.cs @@ -11,7 +11,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Utilities.InspectorFields { /// - /// A set of field/proptery tags used to define how a property should render in a custom inspector + /// A set of field/property tags used to define how a property should render in a custom inspector /// public class InspectorField : Attribute { @@ -42,7 +42,7 @@ public enum FieldTypes } /// - /// The type of field or propterty value type + /// The type of field or property value type /// public FieldTypes Type { get; set; } @@ -57,7 +57,7 @@ public enum FieldTypes public string Tooltip { get; set; } /// - /// A string list of options for a popup list + /// A string list of options for a pop-up list /// public string[] Options { get; set; } diff --git a/Assets/MixedRealityToolkit/Utilities/Physics/Interpolator.cs b/Assets/MixedRealityToolkit/Utilities/Physics/Interpolator.cs index 5c1b8060dac..69ac15969db 100644 --- a/Assets/MixedRealityToolkit/Utilities/Physics/Interpolator.cs +++ b/Assets/MixedRealityToolkit/Utilities/Physics/Interpolator.cs @@ -250,7 +250,7 @@ private void Update() /// /// Stops the transform in place and terminates any animations. - /// Reset() is usually reserved as a MonoBehaviour API call in editor, but is used in this case as a convienence method. + /// Reset() is usually reserved as a MonoBehaviour API call in editor, but is used in this case as a convenience method. /// public void Reset() { diff --git a/Assets/MixedRealityToolkit/Utilities/Physics/TwoHandScaleLogic.cs b/Assets/MixedRealityToolkit/Utilities/Physics/TwoHandScaleLogic.cs index 52104042e67..2a06acf1f38 100644 --- a/Assets/MixedRealityToolkit/Utilities/Physics/TwoHandScaleLogic.cs +++ b/Assets/MixedRealityToolkit/Utilities/Physics/TwoHandScaleLogic.cs @@ -32,7 +32,7 @@ public virtual void Setup(Dictionary handsPressedMap, Transform m } /// - /// update Gameobject with new Scale state + /// update GameObject with new Scale state /// /// /// a Vector3 describing the new Scale of the object being manipulated From 39c731f8917e78f6a6f1584d753977074f074916 Mon Sep 17 00:00:00 2001 From: Kurtis Date: Fri, 22 Feb 2019 12:00:03 -0800 Subject: [PATCH 2/2] Update InteractionReceiver.cs --- .../Features/UX/Scripts/Receivers/InteractionReceiver.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Receivers/InteractionReceiver.cs b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Receivers/InteractionReceiver.cs index 1fc87668b28..0ff4b0d7fc1 100644 --- a/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Receivers/InteractionReceiver.cs +++ b/Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Receivers/InteractionReceiver.cs @@ -177,7 +177,7 @@ void IMixedRealityFocusChangedHandler.OnFocusChanged(FocusEventData eventData) #endregion IMixedRealityFocusChangedHandler Implementation - #region IMixedRealityInputHandler Implementations + #region IMixedRealityInputHandler Implementation /// void IMixedRealityInputHandler.OnInputUp(InputEventData eventData) @@ -228,9 +228,9 @@ void IMixedRealityInputHandler.OnInputChanged(InputEventData e } } - #endregion IMixedRealityInputHandler Implementations + #endregion IMixedRealityInputHandler Implementation - #region IMixedRealityGestureHandler Implementations + #region IMixedRealityGestureHandler Implementation /// void IMixedRealityGestureHandler.OnGestureStarted(InputEventData eventData) @@ -322,7 +322,7 @@ void IMixedRealityGestureHandler.OnGestureCanceled(InputEventData eventData) } } - #endregion IMixedRealityGestureHandler Implementations + #endregion IMixedRealityGestureHandler Implementation #region Protected Virtual Callback Functions