Skip to content

Commit 84c6667

Browse files
authored
Merge pull request #9423 from keveleigh/whitespace
Clean up inconsistent whitespace
2 parents 3034381 + b82bda8 commit 84c6667

File tree

110 files changed

+472
-473
lines changed

Some content is hidden

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

110 files changed

+472
-473
lines changed

Assets/MRTK/Core/Definitions/Devices/ArticulatedHandDefinition.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public float EnterPinchDistance
5959
else
6060
{
6161
Debug.LogError("EnterPinchDistance must be between 0.015 and 0.1, please change Enter Pinch Distance in the Leap Motion Device Manager Profile");
62-
}
62+
}
6363
}
6464
}
6565

Assets/MRTK/Core/Definitions/Devices/OculusTouchControllerDefinition.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class OculusTouchControllerDefinition : BaseInputSourceDefinition
1616
/// <param name="handedness">The handedness that this definition instance represents.</param>
1717
public OculusTouchControllerDefinition(Handedness handedness) : base(handedness)
1818
{
19-
if ((handedness != Handedness.Left) &&
19+
if ((handedness != Handedness.Left) &&
2020
(handedness != Handedness.Right))
2121
{
2222
throw new System.ArgumentException($"Unsupported Handedness ({handedness}). The OculusTouchControllerDefinition supports Left and Right.");

Assets/MRTK/Core/Definitions/InputSystem/SpeechCommands.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public string LocalizedKeyword
4949
var resourceLoader = global::Windows.ApplicationModel.Resources.ResourceLoader.GetForViewIndependentUse();
5050
localizedKeyword = resourceLoader.GetString(localizationKey);
5151
}
52-
catch(System.Exception e)
52+
catch (System.Exception e)
5353
{
5454
// Ignore the exception and just use the fallback
5555
Debug.LogError("GetLocalizedKeywordException: " + e.Message);

Assets/MRTK/Core/Definitions/SpatialAwareness/MixedRealitySpatialAwarenessMeshObserverProfile.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,16 @@ public class MixedRealitySpatialAwarenessMeshObserverProfile : BaseSpatialAwaren
8282
/// The material to be used when observed meshes should occlude other objects.
8383
/// </summary>
8484
public Material OcclusionMaterial => occlusionMaterial;
85-
86-
[SerializeField]
85+
86+
[SerializeField]
8787
[Tooltip("Optional physics material to apply to spatial mesh")]
8888
private PhysicMaterial physicsMaterial = null;
8989

9090
public PhysicMaterial PhysicsMaterial => physicsMaterial;
9191

9292
[SerializeField]
9393
[Tooltip("Optional prefab that is added to the runtime spatial mesh hierarchy. This prefab will only" +
94-
" be instantiated and appended to the hierarchy in a build, the behavior associated with this property is not" +
94+
" be instantiated and appended to the hierarchy in a build, the behavior associated with this property is not" +
9595
" enabled in editor.\n" +
9696
"\n" +
9797
"Default Runtime Spatial Awareness Hierarchy: \n" +

Assets/MRTK/Core/Definitions/SpatialAwareness/SpatialAwarenessPlanarObject.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ public static SpatialAwarenessPlanarObject CreateSpatialObject(
3838
Vector3 center,
3939
Vector3 size,
4040
Quaternion rotation,
41-
int layer,
42-
string name,
41+
int layer,
42+
string name,
4343
int planeId,
4444
SpatialAwarenessSurfaceTypes surfaceType = SpatialAwarenessSurfaceTypes.Unknown)
4545
{

Assets/MRTK/Core/Extensions/BoundsExtensions.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -437,15 +437,15 @@ public static void GetColliderBoundsPoints(GameObject target, List<Vector3> boun
437437
}
438438
}
439439

440-
private static void InverseTransformPoints(ref Vector3[] positions, Transform relativeTo)
441-
{
442-
if (relativeTo)
443-
{
444-
for (var i = 0; i < positions.Length; ++i)
445-
{
446-
positions[i] = relativeTo.InverseTransformPoint(positions[i]);
447-
}
448-
}
440+
private static void InverseTransformPoints(ref Vector3[] positions, Transform relativeTo)
441+
{
442+
if (relativeTo)
443+
{
444+
for (var i = 0; i < positions.Length; ++i)
445+
{
446+
positions[i] = relativeTo.InverseTransformPoint(positions[i]);
447+
}
448+
}
449449
}
450450

451451

Assets/MRTK/Core/Inspectors/ControllerPopupWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ private void RenderMappingList(List<string> controllerList)
345345

346346
for (int i = 0; i < controllerList.Count; i++)
347347
{
348-
var rectPosition = Vector2.up * (max_y + (i+5) * EditorGUIUtility.singleLineHeight);
348+
var rectPosition = Vector2.up * (max_y + (i + 5) * EditorGUIUtility.singleLineHeight);
349349
var rectSize = new Vector2(1000, EditorGUIUtility.singleLineHeight);
350350

351351
var labelRect = new Rect(rectPosition, rectSize);

Assets/MRTK/Core/Inspectors/Profiles/MixedRealityControllerMappingProfileInspector.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ private void RenderControllerList(SerializedProperty controllerList)
116116
SupportedControllerType supportedControllerType = controllerMapping.SupportedControllerType;
117117

118118
ControllerMappingSignature currentSignature = new ControllerMappingSignature(supportedControllerType, handedness);
119-
if(!controllersAffectedByMappingSignatures.ContainsKey(currentSignature))
119+
if (!controllersAffectedByMappingSignatures.ContainsKey(currentSignature))
120120
{
121121
controllersAffectedByMappingSignatures.Add(currentSignature, new List<string>());
122122
}
@@ -325,7 +325,7 @@ private void RenderControllerList(SerializedProperty controllerList)
325325

326326
EditorGUILayout.BeginHorizontal(EditorStyles.helpBox);
327327
var buttonContent = new GUIContent(controllerTitle, ControllerMappingLibrary.GetControllerTextureScaled(controllerType, handedness));
328-
if (GUILayout.Button(buttonContent, MixedRealityStylesUtility.ControllerButtonStyle, GUILayout.Height(128f), GUILayout.MinWidth(32), GUILayout.ExpandWidth(true)))
328+
if (GUILayout.Button(buttonContent, MixedRealityStylesUtility.ControllerButtonStyle, GUILayout.Height(128f), GUILayout.MinWidth(32), GUILayout.ExpandWidth(true)))
329329
{
330330
ControllerMappingSignature buttonSignature = new ControllerMappingSignature(supportedControllerType, handedness);
331331
ControllerPopupWindow.Show(controllerMapping, interactionsProperty, handedness, controllersAffectedByMappingSignatures[buttonSignature]);

Assets/MRTK/Core/Inspectors/Profiles/MixedRealitySpatialAwarenessMeshObserverProfileInspector.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Microsoft.MixedReality.Toolkit.Editor.SpatialAwareness
1212
{
1313
[CustomEditor(typeof(MixedRealitySpatialAwarenessMeshObserverProfile))]
1414
public class MixedRealitySpatialAwarenessMeshObserverProfileInspector : BaseMixedRealityToolkitConfigurationProfileInspector
15-
{
15+
{
1616
private SerializedProperty runtimeSpatialMeshPrefab;
1717

1818
// General settings

Assets/MRTK/Core/Inspectors/Utilities/InspectorUIUtility.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ static public bool DrawScriptableFoldout<T>(SerializedProperty scriptable, strin
641641
// case 5 -> can't create and/or store the local scriptable above - show link
642642
bool isStoredAsset = scriptable.objectReferenceValue != null && AssetDatabase.Contains(scriptable.objectReferenceValue);
643643
bool isEmptyInStagedPrefab = !isStoredAsset && ((Component)scriptable.serializedObject.targetObject).gameObject.scene.path == "";
644-
if (scriptable.objectReferenceValue == null || isEmptyInStagedPrefab)
644+
if (scriptable.objectReferenceValue == null || isEmptyInStagedPrefab)
645645
{
646646
EditorGUILayout.HelpBox("No scriptable " + scriptable.displayName + " linked to this prefab. Prefabs can't store " +
647647
"local versions of scriptables and need to be linked to a scriptable asset.", MessageType.Warning);
@@ -662,8 +662,7 @@ static public bool DrawScriptableFoldout<T>(SerializedProperty scriptable, strin
662662
#endif
663663
;
664664
}
665-
666-
665+
667666
if (isStoredAsset && !isNestedInCurrentPrefab)
668667
{
669668
// case 3 & 4 - greyed out drawer
@@ -699,8 +698,6 @@ static public bool DrawScriptableFoldout<T>(SerializedProperty scriptable, strin
699698
EditorGUILayout.PropertyField(scriptable, new GUIContent(scriptable.displayName + " (local): "));
700699
DrawScriptableSubEditor(scriptable);
701700
}
702-
703-
704701
}
705702
}
706703
}
@@ -717,7 +714,7 @@ static public bool DrawComponentTypeFoldout<T>(GameObject gameObject, bool isExp
717714
isExpanded = EditorGUILayout.Foldout(isExpanded, typeDescription + "s", true);
718715

719716
if (isExpanded)
720-
{
717+
{
721718
if (EditorGUILayout.DropdownButton(new GUIContent("Add " + typeDescription), FocusType.Keyboard))
722719
{
723720
// create the menu and add items to it

0 commit comments

Comments
 (0)