From 215a3475ea70cd93ffa776c539cded873e06963e Mon Sep 17 00:00:00 2001 From: Thor Kramer Brigsted Date: Tue, 28 Nov 2017 09:38:21 +0100 Subject: [PATCH] Small editor erformance gain. Removed PrettifyCamelCase. Use ObjectNames.NicifyVariableName instead --- Scripts/Editor/NodeEditor.cs | 2 +- Scripts/Editor/NodeEditorGUILayout.cs | 2 +- Scripts/Editor/NodeEditorUtilities.cs | 7 ------- Scripts/NodeGraph.cs | 2 ++ 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Scripts/Editor/NodeEditor.cs b/Scripts/Editor/NodeEditor.cs index 9f9ef5f..0a686f3 100644 --- a/Scripts/Editor/NodeEditor.cs +++ b/Scripts/Editor/NodeEditor.cs @@ -26,7 +26,7 @@ namespace XNodeEditor { public virtual void OnHeaderGUI() { GUI.color = Color.white; - string title = NodeEditorUtilities.PrettifyCamelCase(target.name); + string title = target.name; GUILayout.Label(title, NodeEditorResources.styles.nodeHeader, GUILayout.Height(30)); } diff --git a/Scripts/Editor/NodeEditorGUILayout.cs b/Scripts/Editor/NodeEditorGUILayout.cs index 7c0a1dc..2740fef 100644 --- a/Scripts/Editor/NodeEditorGUILayout.cs +++ b/Scripts/Editor/NodeEditorGUILayout.cs @@ -110,7 +110,7 @@ namespace XNodeEditor { /// Make a simple port field. public static void PortField(GUIContent label, NodePort port, params GUILayoutOption[] options) { if (port == null) return; - if (label == null) EditorGUILayout.LabelField(port.fieldName.PrettifyCamelCase(), options); + if (label == null) EditorGUILayout.LabelField(ObjectNames.NicifyVariableName(port.fieldName), options); else EditorGUILayout.LabelField(label, options); Rect rect = GUILayoutUtility.GetLastRect(); if (port.direction == NodePort.IO.Input) rect.position = rect.position - new Vector2(16, 0); diff --git a/Scripts/Editor/NodeEditorUtilities.cs b/Scripts/Editor/NodeEditorUtilities.cs index 47f0407..d0cbc7b 100644 --- a/Scripts/Editor/NodeEditorUtilities.cs +++ b/Scripts/Editor/NodeEditorUtilities.cs @@ -37,13 +37,6 @@ namespace XNodeEditor { return false; } - /// Turns camelCaseString into Camel Case String - public static string PrettifyCamelCase(this string camelCase) { - if (string.IsNullOrEmpty(camelCase)) return ""; - string s = System.Text.RegularExpressions.Regex.Replace(camelCase, "([A-Z])", " $1", System.Text.RegularExpressions.RegexOptions.Compiled).Trim(); - return char.ToUpper(s[0]) + s.Substring(1); - } - /// Returns true if this can be casted to public static bool IsCastableTo(this Type from, Type to) { if (to.IsAssignableFrom(from)) return true; diff --git a/Scripts/NodeGraph.cs b/Scripts/NodeGraph.cs index f6ff86d..f71642b 100644 --- a/Scripts/NodeGraph.cs +++ b/Scripts/NodeGraph.cs @@ -23,6 +23,7 @@ namespace XNode { if (!Application.isPlaying) { UnityEditor.AssetDatabase.AddObjectToAsset(node, this); UnityEditor.AssetDatabase.SaveAssets(); + node.name = UnityEditor.ObjectNames.NicifyVariableName(node.name); } #endif nodes.Add(node); @@ -38,6 +39,7 @@ namespace XNode { if (!Application.isPlaying) { UnityEditor.AssetDatabase.AddObjectToAsset(node, this); UnityEditor.AssetDatabase.SaveAssets(); + node.name = UnityEditor.ObjectNames.NicifyVariableName(node.name); } #endif nodes.Add(node);