diff --git a/Assets/VRM10/Editor/Components/VRM10Window.cs b/Assets/VRM10/Editor/Components/VRM10Window.cs index 331db7550..ad2125531 100644 --- a/Assets/VRM10/Editor/Components/VRM10Window.cs +++ b/Assets/VRM10/Editor/Components/VRM10Window.cs @@ -10,13 +10,15 @@ namespace UniVRM10 /// public class VRM10Window : EditorWindow { - const string WINDOW_TITLE = "VRM1 Window"; - public static void Open() + public const string WINDOW_TITLE = "VRM1.0 Model Editor"; + + public static VRM10Window Open() { var window = (VRM10Window)GetWindow(typeof(VRM10Window)); window.titleContent = new GUIContent(WINDOW_TITLE); window.Show(); window.Root = UnityEditor.Selection.activeTransform?.GetComponent(); + return window; } void OnEnable() diff --git a/Assets/VRM10/Editor/Vrm10InstanceEditor.cs b/Assets/VRM10/Editor/Vrm10InstanceEditor.cs index 878bbf029..26b2ac7bd 100644 --- a/Assets/VRM10/Editor/Vrm10InstanceEditor.cs +++ b/Assets/VRM10/Editor/Vrm10InstanceEditor.cs @@ -115,14 +115,8 @@ namespace UniVRM10 return loaded; } - void Setup(Vrm10Instance instance) + void SetupVRM10Object(Vrm10Instance instance) { - if (instance.Vrm != null) - { - // OK - return; - } - if (!CheckHumanoid(instance.gameObject)) { // can not @@ -162,9 +156,22 @@ namespace UniVRM10 public override void OnInspectorGUI() { + if (target is Vrm10Instance instance) { - Setup(instance); + if (instance.Vrm == null) + { + SetupVRM10Object(instance); + } + + if (instance.Vrm != null) + { + EditorGUILayout.HelpBox("SpringBone utility", MessageType.Info); + if (GUILayout.Button("Open " + VRM10Window.WINDOW_TITLE)) + { + VRM10Window.Open(); + } + } } base.OnInspectorGUI();