From 18de1eaf1cf47de27f6513a9d8dd71299db23f00 Mon Sep 17 00:00:00 2001 From: sinaioutlander <49360850+sinaioutlander@users.noreply.github.com> Date: Sat, 5 Sep 2020 20:38:46 +1000 Subject: [PATCH] 1.5.6 Cleanup --- src/CachedObjects/Struct/CacheColor.cs | 12 ++++++------ src/CachedObjects/Struct/CacheQuaternion.cs | 10 +++++----- src/CachedObjects/Struct/CacheRect.cs | 12 ++++++------ src/CachedObjects/Struct/CacheVector.cs | 10 +++++----- src/Windows/GameObjectWindow.cs | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/CachedObjects/Struct/CacheColor.cs b/src/CachedObjects/Struct/CacheColor.cs index a11add8..1dec234 100644 --- a/src/CachedObjects/Struct/CacheColor.cs +++ b/src/CachedObjects/Struct/CacheColor.cs @@ -28,7 +28,7 @@ namespace Explorer.CachedObjects public override void DrawValue(Rect window, float width) { - GUILayout.Label($"Color: {(Color)Value}", null); + GUILayout.Label($"Color: {((Color)Value).ToString()}", null); if (CanWrite) { @@ -38,31 +38,31 @@ namespace Explorer.CachedObjects GUILayout.BeginHorizontal(null); GUILayout.Space(whitespace); GUILayout.Label("R:", new GUILayoutOption[] { GUILayout.Width(30) }); - r = GUILayout.TextField(r, new GUILayoutOption[] { GUILayout.Width(70) }); + r = GUILayout.TextField(r, new GUILayoutOption[] { GUILayout.Width(120) }); GUILayout.EndHorizontal(); GUILayout.BeginHorizontal(null); GUILayout.Space(whitespace); GUILayout.Label("G:", new GUILayoutOption[] { GUILayout.Width(30) }); - g = GUILayout.TextField(g, new GUILayoutOption[] { GUILayout.Width(70) }); + g = GUILayout.TextField(g, new GUILayoutOption[] { GUILayout.Width(120) }); GUILayout.EndHorizontal(); GUILayout.BeginHorizontal(null); GUILayout.Space(whitespace); GUILayout.Label("B:", new GUILayoutOption[] { GUILayout.Width(30) }); - b = GUILayout.TextField(b, new GUILayoutOption[] { GUILayout.Width(70) }); + b = GUILayout.TextField(b, new GUILayoutOption[] { GUILayout.Width(120) }); GUILayout.EndHorizontal(); GUILayout.BeginHorizontal(null); GUILayout.Space(whitespace); GUILayout.Label("A:", new GUILayoutOption[] { GUILayout.Width(30) }); - a = GUILayout.TextField(a, new GUILayoutOption[] { GUILayout.Width(70) }); + a = GUILayout.TextField(a, new GUILayoutOption[] { GUILayout.Width(120) }); GUILayout.EndHorizontal(); // draw set value button GUILayout.BeginHorizontal(null); GUILayout.Space(whitespace); - if (GUILayout.Button("Apply", new GUILayoutOption[] { GUILayout.Width(130) })) + if (GUILayout.Button("Apply", new GUILayoutOption[] { GUILayout.Width(155) })) { SetValueFromInput(); } diff --git a/src/CachedObjects/Struct/CacheQuaternion.cs b/src/CachedObjects/Struct/CacheQuaternion.cs index ff4a3c7..98e2d45 100644 --- a/src/CachedObjects/Struct/CacheQuaternion.cs +++ b/src/CachedObjects/Struct/CacheQuaternion.cs @@ -28,7 +28,7 @@ namespace Explorer public override void DrawValue(Rect window, float width) { - GUILayout.Label($"Quaternion: {((Quaternion)Value).eulerAngles}", null); + GUILayout.Label($"Quaternion: {((Quaternion)Value).eulerAngles.ToString()}", null); if (CanWrite) { @@ -38,25 +38,25 @@ namespace Explorer GUILayout.BeginHorizontal(null); GUILayout.Space(whitespace); GUILayout.Label("X:", new GUILayoutOption[] { GUILayout.Width(30) }); - x = GUILayout.TextField(x, new GUILayoutOption[] { GUILayout.Width(70) }); + x = GUILayout.TextField(x, new GUILayoutOption[] { GUILayout.Width(120) }); GUILayout.EndHorizontal(); GUILayout.BeginHorizontal(null); GUILayout.Space(whitespace); GUILayout.Label("Y:", new GUILayoutOption[] { GUILayout.Width(30) }); - y = GUILayout.TextField(y, new GUILayoutOption[] { GUILayout.Width(70) }); + y = GUILayout.TextField(y, new GUILayoutOption[] { GUILayout.Width(120) }); GUILayout.EndHorizontal(); GUILayout.BeginHorizontal(null); GUILayout.Space(whitespace); GUILayout.Label("Z:", new GUILayoutOption[] { GUILayout.Width(30) }); - z = GUILayout.TextField(z, new GUILayoutOption[] { GUILayout.Width(70) }); + z = GUILayout.TextField(z, new GUILayoutOption[] { GUILayout.Width(120) }); GUILayout.EndHorizontal(); // draw set value button GUILayout.BeginHorizontal(null); GUILayout.Space(whitespace); - if (GUILayout.Button("Apply", new GUILayoutOption[] { GUILayout.Width(130) })) + if (GUILayout.Button("Apply", new GUILayoutOption[] { GUILayout.Width(155) })) { SetValueFromInput(); } diff --git a/src/CachedObjects/Struct/CacheRect.cs b/src/CachedObjects/Struct/CacheRect.cs index 8538cc4..6522907 100644 --- a/src/CachedObjects/Struct/CacheRect.cs +++ b/src/CachedObjects/Struct/CacheRect.cs @@ -28,7 +28,7 @@ namespace Explorer.CachedObjects public override void DrawValue(Rect window, float width) { - GUILayout.Label($"Rect: {(Rect)Value}", null); + GUILayout.Label($"Rect: {((Rect)Value).ToString()}", null); if (CanWrite) { @@ -38,31 +38,31 @@ namespace Explorer.CachedObjects GUILayout.BeginHorizontal(null); GUILayout.Space(whitespace); GUILayout.Label("X:", new GUILayoutOption[] { GUILayout.Width(30) }); - x = GUILayout.TextField(x, new GUILayoutOption[] { GUILayout.Width(70) }); + x = GUILayout.TextField(x, new GUILayoutOption[] { GUILayout.Width(120) }); GUILayout.EndHorizontal(); GUILayout.BeginHorizontal(null); GUILayout.Space(whitespace); GUILayout.Label("Y:", new GUILayoutOption[] { GUILayout.Width(30) }); - y = GUILayout.TextField(y, new GUILayoutOption[] { GUILayout.Width(70) }); + y = GUILayout.TextField(y, new GUILayoutOption[] { GUILayout.Width(120) }); GUILayout.EndHorizontal(); GUILayout.BeginHorizontal(null); GUILayout.Space(whitespace); GUILayout.Label("W:", new GUILayoutOption[] { GUILayout.Width(30) }); - w = GUILayout.TextField(w, new GUILayoutOption[] { GUILayout.Width(70) }); + w = GUILayout.TextField(w, new GUILayoutOption[] { GUILayout.Width(120) }); GUILayout.EndHorizontal(); GUILayout.BeginHorizontal(null); GUILayout.Space(whitespace); GUILayout.Label("H:", new GUILayoutOption[] { GUILayout.Width(30) }); - h = GUILayout.TextField(h, new GUILayoutOption[] { GUILayout.Width(70) }); + h = GUILayout.TextField(h, new GUILayoutOption[] { GUILayout.Width(120) }); GUILayout.EndHorizontal(); // draw set value button GUILayout.BeginHorizontal(null); GUILayout.Space(whitespace); - if (GUILayout.Button("Apply", new GUILayoutOption[] { GUILayout.Width(130) })) + if (GUILayout.Button("Apply", new GUILayoutOption[] { GUILayout.Width(155) })) { SetValueFromInput(); } diff --git a/src/CachedObjects/Struct/CacheVector.cs b/src/CachedObjects/Struct/CacheVector.cs index d275ce5..c57c903 100644 --- a/src/CachedObjects/Struct/CacheVector.cs +++ b/src/CachedObjects/Struct/CacheVector.cs @@ -74,13 +74,13 @@ namespace Explorer GUILayout.BeginHorizontal(null); GUILayout.Space(whitespace); GUILayout.Label("X:", new GUILayoutOption[] { GUILayout.Width(30) }); - x = GUILayout.TextField(x, new GUILayoutOption[] { GUILayout.Width(70) }); + x = GUILayout.TextField(x, new GUILayoutOption[] { GUILayout.Width(120) }); GUILayout.EndHorizontal(); GUILayout.BeginHorizontal(null); GUILayout.Space(whitespace); GUILayout.Label("Y:", new GUILayoutOption[] { GUILayout.Width(30) }); - y = GUILayout.TextField(y, new GUILayoutOption[] { GUILayout.Width(70) }); + y = GUILayout.TextField(y, new GUILayoutOption[] { GUILayout.Width(120) }); GUILayout.EndHorizontal(); if (VectorSize > 2) @@ -89,7 +89,7 @@ namespace Explorer GUILayout.BeginHorizontal(null); GUILayout.Space(whitespace); GUILayout.Label("Z:", new GUILayoutOption[] { GUILayout.Width(30) }); - z = GUILayout.TextField(z, new GUILayoutOption[] { GUILayout.Width(70) }); + z = GUILayout.TextField(z, new GUILayoutOption[] { GUILayout.Width(120) }); GUILayout.EndHorizontal(); } if (VectorSize > 3) @@ -98,14 +98,14 @@ namespace Explorer GUILayout.BeginHorizontal(null); GUILayout.Space(whitespace); GUILayout.Label("W:", new GUILayoutOption[] { GUILayout.Width(30) }); - w = GUILayout.TextField(w, new GUILayoutOption[] { GUILayout.Width(70) }); + w = GUILayout.TextField(w, new GUILayoutOption[] { GUILayout.Width(120) }); GUILayout.EndHorizontal(); } // draw set value button GUILayout.BeginHorizontal(null); GUILayout.Space(whitespace); - if (GUILayout.Button("Apply", new GUILayoutOption[] { GUILayout.Width(130) })) + if (GUILayout.Button("Apply", new GUILayoutOption[] { GUILayout.Width(155) })) { SetValueFromInput(); } diff --git a/src/Windows/GameObjectWindow.cs b/src/Windows/GameObjectWindow.cs index 14d8d02..754e060 100644 --- a/src/Windows/GameObjectWindow.cs +++ b/src/Windows/GameObjectWindow.cs @@ -579,7 +579,7 @@ namespace Explorer private Vector3 TranslateControl(TranslateType mode, ref float amount, bool multByTime) { GUILayout.BeginHorizontal(null); - GUILayout.Label($"{(m_localContext ? "Local " : "")} {mode}:", + GUILayout.Label($"{(m_localContext ? "Local " : "")}{mode}:", new GUILayoutOption[] { GUILayout.Width(m_localContext ? 110 : 65) }); var transform = m_object.transform;