From 44702737ca910f0bf5eeaa752875e5b479b130a0 Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Wed, 26 Mar 2025 16:24:44 +0900
Subject: [PATCH] port to UIToolKit, done

---
 .../VRM10Viewer/UIToolkit/MainView.uxml       |  6 +++-
 .../VRM10Viewer/UIToolkit/VRM10MainView.cs    | 31 ++++++++++++++-----
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/Assets/VRM10_Samples/VRM10Viewer/UIToolkit/MainView.uxml b/Assets/VRM10_Samples/VRM10Viewer/UIToolkit/MainView.uxml
index 79d645c87..9df3596bb 100644
--- a/Assets/VRM10_Samples/VRM10Viewer/UIToolkit/MainView.uxml
+++ b/Assets/VRM10_Samples/VRM10Viewer/UIToolkit/MainView.uxml
@@ -23,6 +23,8 @@
             <ui:Slider label="ExternalX" high-value="10" name="SpringboneExternalX" />
             <ui:Slider label="ExternalY" high-value="10" name="SpringboneExternalY" />
             <ui:Slider label="ExternalZ" high-value="10" name="SpringboneExternalZ" />
+            <ui:Button text="Reset Spring" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ResetSpring" />
+            <ui:Button text="ReconstructSpring" parse-escape-sequences="true" display-tooltip-when-elided="true" name="ReconstructSpring" />
             <ui:Label tabindex="-1" text="Expression" parse-escape-sequences="true" display-tooltip-when-elided="true" name="__Expression__" style="-unity-font-style: bold; -unity-text-align: upper-center;" />
             <ui:Toggle label="AutoEmotions" name="AutoEmotions" value="true" style="flex-direction: row-reverse;" />
             <ui:Instance template="EmotionElement" name="Happy" style="flex-shrink: 0;">
@@ -65,7 +67,9 @@
             <ui:Slider label="Yaw" high-value="180" name="Yaw" low-value="-180" />
             <ui:Slider label="Pitch" high-value="90" name="Pitch" low-value="-90" />
         </ui:VisualElement>
-        <ui:VisualElement style="flex-grow: 1;" />
+        <ui:VisualElement style="flex-grow: 1; flex-direction: column-reverse;">
+            <ui:Label tabindex="-1" text="Label" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Version" style="align-self: center;" />
+        </ui:VisualElement>
         <ui:Instance template="MetaView" name="Meta" style="background-color: rgba(255, 255, 255, 0.39);" />
     </ui:VisualElement>
 </ui:UXML>
diff --git a/Assets/VRM10_Samples/VRM10Viewer/UIToolkit/VRM10MainView.cs b/Assets/VRM10_Samples/VRM10Viewer/UIToolkit/VRM10MainView.cs
index f023f4236..8c680bee0 100644
--- a/Assets/VRM10_Samples/VRM10Viewer/UIToolkit/VRM10MainView.cs
+++ b/Assets/VRM10_Samples/VRM10Viewer/UIToolkit/VRM10MainView.cs
@@ -13,6 +13,7 @@ namespace UniVRM10.VRM10Viewer
         [SerializeField]
         VRM10ViewerController m_controller = new();
 
+        VisualElement m_root;
         // left
         Toggle m_useAsync;
         Toggle m_useSpringboneSingleton;
@@ -73,18 +74,32 @@ namespace UniVRM10.VRM10Viewer
             // The UXML is already instantiated by the UIDocument component
             var uiDocument = GetComponent<UIDocument>();
             var root = uiDocument.rootVisualElement;
+            m_root = root;
 
-            var openModelButton = root.Q<Button>("OpenModel");
-            openModelButton.clicked += () =>
+            root.Q<Button>("OpenModel").clicked += () =>
             {
                 m_controller.OnOpenModelClicked(MakeLoadOptions());
             };
 
-            // m_openMotion.onClick.AddListener(m_controller.OnOpenMotionClicked);
+            root.Q<Button>("OpenMotion").clicked += () =>
+            {
+                m_controller.OnOpenMotionClicked();
+            };
 
-            // m_pastePose.onClick.AddListener(m_controller.OnPastePoseClicked);
-            // m_resetSpringBone.onClick.AddListener(m_controller.OnResetSpringBoneClicked);
-            // m_reconstructSpringBone.onClick.AddListener(m_controller.OnReconstructSpringBoneClicked);
+            root.Q<Button>("PastePose").clicked += () =>
+            {
+                m_controller.OnPastePoseClicked();
+            };
+
+            root.Q<Button>("ResetSpring").clicked += () =>
+            {
+                m_controller.OnResetSpringBoneClicked();
+            };
+
+            root.Q<Button>("ReconstructSpring").clicked += () =>
+            {
+                m_controller.OnReconstructSpringBoneClicked();
+            };
 
             QueryOrAssert(out m_useAsync, root, "UseAsync");
             QueryOrAssert(out m_useSpringboneSingleton, root, "UseSpringboneSingleton");
@@ -137,7 +152,7 @@ namespace UniVRM10.VRM10Viewer
             m_autoBlink = gameObject.AddComponent<VRM10Blinker>();
             m_autoLipsync = gameObject.AddComponent<VRM10AIUEO>();
 
-            // m_version.text = string.Format("VRM10ViewerUI {0}", PackageVersion.VERSION);
+            root.Q<Label>("Version").text = string.Format("VRM10ViewerUI {0}", PackageVersion.VERSION);
 
             // load initial bvh
             m_controller.Init();
@@ -159,7 +174,7 @@ namespace UniVRM10.VRM10Viewer
         {
             if (Input.GetKeyDown(KeyCode.Tab))
             {
-                // if (Root != null) Root.SetActive(!Root.activeSelf);
+                m_root.style.visibility = m_root.style.visibility == Visibility.Visible ? Visibility.Hidden : Visibility.Visible;
             }
 
             if (Input.GetKeyDown(KeyCode.Escape))