UnityMirror/xNode
1
0
Fork 0
mirror of https://github.com/Siccity/xNode.git synced 2026-03-26 22:49:02 +08:00
Code

Fixed internal values being displayed on node GUI

Browse Source
This commit is contained in:
Unknown 2017-09-25 00:14:48 +02:00
parent b10ff1a938
commit 59c1e0d576
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Scripts/Editor/NodeEditor.cs
View File

@ -46,7 +46,8 @@ public class NodeEditor {
FieldInfo[] fields = GetInspectorFields(target); FieldInfo[] fields = GetInspectorFields(target);
for (int i = 0; i < fields.Length; i++) { for (int i = 0; i < fields.Length; i++) {
Type fieldType = fields[i].FieldType; Type fieldType = fields[i].FieldType;
string fieldName = fields[i].Name.PrettifyCamelCase(); string fieldName = fields[i].Name;
string fieldPrettyName = fieldName.PrettifyCamelCase();
object fieldValue = fields[i].GetValue(target); object fieldValue = fields[i].GetValue(target);
object[] fieldAttribs = fields[i].GetCustomAttributes(false); object[] fieldAttribs = fields[i].GetCustomAttributes(false);
@ -60,13 +61,13 @@ public class NodeEditor {
EditorGUI.BeginChangeCheck(); EditorGUI.BeginChangeCheck();
if (fieldType == typeof(int)) { if (fieldType == typeof(int)) {
fieldValue = EditorGUILayout.IntField(fieldName, (int)fieldValue); fieldValue = EditorGUILayout.IntField(fieldPrettyName, (int)fieldValue);
} }
else if (fieldType == typeof(bool)) { else if (fieldType == typeof(bool)) {
fieldValue = EditorGUILayout.Toggle(fieldName, (bool)fieldValue); fieldValue = EditorGUILayout.Toggle(fieldPrettyName, (bool)fieldValue);
} }
else if (fieldType.IsEnum) { else if (fieldType.IsEnum) {
fieldValue = EditorGUILayout.EnumPopup(fieldName, (Enum)fieldValue); fieldValue = EditorGUILayout.EnumPopup(fieldPrettyName, (Enum)fieldValue);
} }
else if (fieldType == typeof(string)) { else if (fieldType == typeof(string)) {
@ -76,35 +77,35 @@ public class NodeEditor {
fieldValue = EditorGUILayout.TextArea(fieldValue != null ? (string)fieldValue : ""); fieldValue = EditorGUILayout.TextArea(fieldValue != null ? (string)fieldValue : "");
} }
else else
fieldValue = EditorGUILayout.TextField(fieldName, fieldValue != null ? (string)fieldValue : ""); fieldValue = EditorGUILayout.TextField(fieldPrettyName, fieldValue != null ? (string)fieldValue : "");
} }
else if (fieldType == typeof(Rect)) { else if (fieldType == typeof(Rect)) {
if (fieldName == "position") continue; //Ignore 'position' if (fieldName == "position") continue; //Ignore 'position'
fieldValue = EditorGUILayout.RectField(fieldName, (Rect)fieldValue); fieldValue = EditorGUILayout.RectField(fieldPrettyName, (Rect)fieldValue);
} }
else if (fieldType == typeof(float)) { else if (fieldType == typeof(float)) {
fieldValue = EditorGUILayout.FloatField(fieldName, (float)fieldValue); fieldValue = EditorGUILayout.FloatField(fieldPrettyName, (float)fieldValue);
} }
else if (fieldType == typeof(Vector2)) { else if (fieldType == typeof(Vector2)) {
fieldValue = EditorGUILayout.Vector2Field(fieldName, (Vector2)fieldValue); fieldValue = EditorGUILayout.Vector2Field(fieldPrettyName, (Vector2)fieldValue);
} }
else if (fieldType == typeof(Vector3)) { else if (fieldType == typeof(Vector3)) {
fieldValue = EditorGUILayout.Vector3Field(new GUIContent(fieldName), (Vector3)fieldValue); fieldValue = EditorGUILayout.Vector3Field(new GUIContent(fieldPrettyName), (Vector3)fieldValue);
} }
else if (fieldType == typeof(Vector4)) { else if (fieldType == typeof(Vector4)) {
fieldValue = EditorGUILayout.Vector4Field(fieldName, (Vector4)fieldValue); fieldValue = EditorGUILayout.Vector4Field(fieldPrettyName, (Vector4)fieldValue);
} }
else if (fieldType == typeof(Color)) { else if (fieldType == typeof(Color)) {
fieldValue = EditorGUILayout.ColorField(fieldName, (Color)fieldValue); fieldValue = EditorGUILayout.ColorField(fieldPrettyName, (Color)fieldValue);
} }
else if (fieldType == typeof(AnimationCurve)) { else if (fieldType == typeof(AnimationCurve)) {
AnimationCurve curve = fieldValue != null ? (AnimationCurve)fieldValue : new AnimationCurve(); AnimationCurve curve = fieldValue != null ? (AnimationCurve)fieldValue : new AnimationCurve();
curve = EditorGUILayout.CurveField(fieldName, curve); curve = EditorGUILayout.CurveField(fieldPrettyName, curve);
if (fieldValue != curve) fields[i].SetValue(target, curve); if (fieldValue != curve) fields[i].SetValue(target, curve);
} }
else if (fieldType.IsSubclassOf(typeof(UnityEngine.Object)) || fieldType == typeof(UnityEngine.Object)) { else if (fieldType.IsSubclassOf(typeof(UnityEngine.Object)) || fieldType == typeof(UnityEngine.Object)) {
if (fieldName == "graph") continue; //Ignore 'graph' if (fieldName == "graph") continue; //Ignore 'graph'
fieldValue = EditorGUILayout.ObjectField(fieldName, (UnityEngine.Object)fieldValue, fieldType, true); fieldValue = EditorGUILayout.ObjectField(fieldPrettyName, (UnityEngine.Object)fieldValue, fieldType, true);
} }
if (EditorGUI.EndChangeCheck()) { if (EditorGUI.EndChangeCheck()) {