Skip to content

Commit bdb53e2

Browse files
committed
UI improvements
1 parent ab16ac9 commit bdb53e2

File tree

1 file changed

+16
-23
lines changed

1 file changed

+16
-23
lines changed

NormalPainter/Assets/UTJ/NormalPainter/Editor/NormalPainterWindow.cs

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -480,12 +480,15 @@ void DrawEditPanel()
480480
}
481481
else if (settings.smoothMode == 2)
482482
{
483-
int n = EditorGUILayout.IntField("Targets Count", settings.weldTargets.Length);
483+
EditorGUILayout.LabelField("Weld Targets");
484+
EditorGUI.indentLevel++;
485+
int n = EditorGUILayout.IntField("Size", settings.weldTargets.Length);
484486
if (n != settings.weldTargets.Length)
485487
System.Array.Resize(ref settings.weldTargets, n);
486488

487489
for (int i = 0; i < settings.weldTargets.Length; ++i)
488490
settings.weldTargets[i] = (GameObject)EditorGUILayout.ObjectField(settings.weldTargets[i], typeof(GameObject), true);
491+
EditorGUI.indentLevel--;
489492

490493
EditorGUILayout.Space();
491494

@@ -562,8 +565,13 @@ void DrawMiscPanel()
562565
settings.tangentsAutoUpdate = EditorGUILayout.Toggle("Auto Update Tangents", settings.tangentsAutoUpdate);
563566
if (!settings.tangentsAutoUpdate)
564567
{
568+
EditorGUILayout.BeginHorizontal();
569+
EditorGUILayout.BeginVertical(GUILayout.Width(indentSize));
570+
EditorGUILayout.Space();
571+
EditorGUILayout.EndVertical();
565572
if (GUILayout.Button("Recalculate Tangents [T]"))
566573
m_target.RecalculateTangents();
574+
EditorGUILayout.EndHorizontal();
567575
}
568576

569577
if (m_target.GetComponent<SkinnedMeshRenderer>() != null)
@@ -714,33 +722,18 @@ void DrawDisplayPanel()
714722
if (settings.displayIndex == 0)
715723
{
716724
settings.visualize = EditorGUILayout.Toggle("Vidualize [Tab]", settings.visualize);
717-
EditorGUI.indentLevel++;
718-
bool showVertices = EditorGUILayout.Toggle("Vertices", settings.visualize && settings.showVertices);
719-
bool showNormals = EditorGUILayout.Toggle("Normals", settings.visualize && settings.showNormals);
720-
bool showTangents = EditorGUILayout.Toggle("Tangents", settings.visualize && settings.showTangents);
721-
bool showBinormals = EditorGUILayout.Toggle("Binormals", settings.visualize && settings.showBinormals);
722-
EditorGUI.indentLevel--;
723725
if (settings.visualize)
724726
{
725-
settings.showVertices = showVertices;
726-
settings.showNormals = showNormals;
727-
settings.showTangents = showTangents;
728-
settings.showBinormals = showBinormals;
729-
}
730-
else
731-
{
732-
if (showVertices || showNormals || showTangents || showBinormals)
733-
{
734-
settings.showVertices = showVertices;
735-
settings.showNormals = showNormals;
736-
settings.showTangents = showTangents;
737-
settings.showBinormals = showBinormals;
738-
settings.visualize = true;
739-
}
727+
EditorGUI.indentLevel++;
728+
settings.showVertices = EditorGUILayout.Toggle("Vertices", settings.showVertices);
729+
settings.showNormals = EditorGUILayout.Toggle("Normals", settings.showNormals);
730+
settings.showTangents = EditorGUILayout.Toggle("Tangents", settings.showTangents);
731+
settings.showBinormals = EditorGUILayout.Toggle("Binormals", settings.showBinormals);
732+
EditorGUI.indentLevel--;
733+
EditorGUILayout.Space();
740734
}
741735
//settings.showSelectedOnly = EditorGUILayout.Toggle("Selected Only", settings.showSelectedOnly);
742736

743-
EditorGUILayout.Space();
744737
settings.modelOverlay = (ModelOverlay)EditorGUILayout.EnumPopup("Overlay", settings.modelOverlay);
745738
settings.showBrushRange = EditorGUILayout.Toggle("Brush Range", settings.showBrushRange);
746739
}

0 commit comments

Comments
 (0)