added error helpbox if viz type is unset.

fixed spacing and hardened string extension proper case method.

Author: StephenHodgson

Assets/MixedRealityToolkit/_Core/Extensions/StringExtensions.cs

@@ -43,6 +43,8 @@ public static string ToProperCase(this string value)
             // If there are 0 or 1 characters, just return the string.
             if (value == null) { return value; }
             if (value.Length < 2) { return value.ToUpper(); }
+            // If there's already spaces in the string, return.
+            if (value.Contains(" ")) { return value; }
 
             // Start with the first character.
             string result = value.Substring(0, 1).ToUpper();
@@ -52,12 +54,14 @@ public static string ToProperCase(this string value)
             {
                 var wasLastCharacterUpper = false;
 
-                if (i < value.Length)
+                if (i < value.Length && i != 0)
                 {
-                    wasLastCharacterUpper = char.IsUpper(value[i - 1]);
+                    wasLastCharacterUpper = char.IsLetter(result[i - 1]) && char.IsUpper(result[i - 1]);
                 }
 
-                if (char.IsUpper(value[i]) && !wasLastCharacterUpper)
+                if (char.IsLetter(value[i]) &&
+                    char.IsUpper(value[i]) &&
+                    !wasLastCharacterUpper)
                 {
                     result += " ";
                 }

Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityControllerVisualizationProfileInspector.cs

@@ -102,6 +102,13 @@ public override void OnInspectorGUI()
                 var rightHandModelPrefab = globalRightHandModel.objectReferenceValue as GameObject;
 
                 EditorGUILayout.PropertyField(controllerVisualizationType);
+
+                if (thisProfile.ControllerVisualizationType == null ||
+                    thisProfile.ControllerVisualizationType.Type == null)
+                {
+                    EditorGUILayout.HelpBox("A controller visualization type must be defined!", MessageType.Error);
+                }
+
                 EditorGUILayout.PropertyField(useDefaultModels);
 
                 if (useDefaultModels.boolValue && (leftHandModelPrefab != null || rightHandModelPrefab != null))
@@ -164,14 +171,14 @@ private void RenderControllerList(SerializedProperty controllerList)
                 var mixedRealityControllerMappingDescription = controllerSetting.FindPropertyRelative("description");
                 bool hasValidType = thisProfile.ControllerVisualizationSettings[i].ControllerType != null &&
                                     thisProfile.ControllerVisualizationSettings[i].ControllerType.Type != null;
-                if (hasValidType)
-                {
-                    mixedRealityControllerMappingDescription.stringValue = thisProfile.ControllerVisualizationSettings[i].ControllerType.Type.Name.ToProperCase();
-                }
+
+                mixedRealityControllerMappingDescription.stringValue = hasValidType
+                    ? thisProfile.ControllerVisualizationSettings[i].ControllerType.Type.Name.ToProperCase()
+                    : "Undefined Controller";
 
                 serializedObject.ApplyModifiedProperties();
                 var mixedRealityControllerHandedness = controllerSetting.FindPropertyRelative("handedness");
-                EditorGUILayout.LabelField($"{mixedRealityControllerMappingDescription.stringValue.ToProperCase()} {((Handedness)mixedRealityControllerHandedness.intValue).ToString().ToProperCase()} Hand");
+                EditorGUILayout.LabelField($"{mixedRealityControllerMappingDescription.stringValue} {((Handedness)mixedRealityControllerHandedness.intValue).ToString().ToProperCase()} Hand");
 
                 EditorGUIUtility.fieldWidth = defaultFieldWidth;
                 EditorGUIUtility.labelWidth = defaultLabelWidth;