feat: cleanup and improve debug ui

Author: mihakrajnc

Assets/Scripts/GLTF/WearableLoader.cs

@@ -61,21 +61,6 @@ public static async Awaitable<GameObject> LoadGLB(string category, string mainFi
 
             return (mainTexture, maskTexture);
 
-            // using var mainTexWebRequest =
-            //     UnityWebRequestTexture.GetTexture(new Uri(string.Format(APIService.API_CATALYST, files[mainFile])),
-            //         true);
-            //
-            // await mainTexWebRequest.SendWebRequest();
-            //
-            // if (mainTexWebRequest.result != UnityWebRequest.Result.Success)
-            // {
-            //     Debug.LogError($"Failed to load main texture: {mainTexWebRequest.error}");
-            //     return null;
-            // }
-            //
-            // var mainTexture = DownloadHandlerTexture.GetContent(mainTexWebRequest);
-            // return texture;
-
             async Awaitable<Texture2D> LoadTexture(string file)
             {
                 using var webRequest =

Assets/Scripts/PreviewLoader.cs

@@ -217,8 +217,6 @@ private void SetupFacialFeatures(GameObject bodyGO)
     {
         if (!bodyGO) return;
 
-        // TODO: Shouldn't be here
-
         var meshRenderers = bodyGO.GetComponentsInChildren<SkinnedMeshRenderer>(false);
 
         var eyebrows = meshRenderers.FirstOrDefault(mr => mr.name.EndsWith("Eyebrows"));
@@ -283,7 +281,6 @@ private async Task LoadWearable(string category, WearableDefinition wd, AvatarCo
         if (WearablesConstants.FACIAL_FEATURES.Contains(category))
         {
             // This is a facial feature, only comes as a texture
-            // TODO: Assert.IsTrue(wd.MainFile.EndsWith(".glb"), "Only GLB files are supported");
             var tex = await WearableLoader.LoadFacialFeature(wd.MainFile, wd.Files);
             if (tex != null)
             {
@@ -336,7 +333,6 @@ private void CenterMeshes(Transform root)
         root.position -= centerOffset;
     }
 
-
     private static async Awaitable<List<string>> GetUrns(PreviewConfiguration config)
     {
         if (config.Urns.Count > 0) return config.Urns;

Assets/Scripts/UIPresenter.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using UnityEngine;
 using UnityEngine.UIElements;
 using Utils;
@@ -179,6 +180,7 @@ private void EnableDebug()
         // @formatter:off
         var dropdownOptions = new List<(string name, string url)>
         {
+            ("From URL", null),
             ("Profile", "https://example.com/?mode=profile&profile=0x3f574d05ec670fe2c92305480b175654ca512005&background=039dfc"),
             ("Authentication", "https://example.com/?mode=authentication&profile=0x3f574d05ec670fe2c92305480b175654ca512005&background=039dfc"),
             ("Market Wearable", "https://example.com/?mode=marketplace&profile=0x3f574d05ec670fe2c92305480b175654ca512005&contract=0x1b4e20251ec5da51c749f96a4993f3cebf066853&item=0&background=039dfc"),
@@ -193,24 +195,30 @@ private void EnableDebug()
 
         var dropdown = debugPanel.Q<DropdownField>("URLDropdown");
         dropdown.choices = dropdownOptions.Select(o => o.name).ToList();
+        dropdown.index = 0;
         dropdown.RegisterValueChangedCallback(evt =>
         {
             var selected = dropdownOptions.Find(o => o.name == evt.newValue);
             bootstrap.ParseFromURL(selected.url);
             bootstrap.InvokeReload();
         });
 
-        var methodNameField = debugPanel.Q<TextField>("MethodName");
+        var methodNameDropdown = debugPanel.Q<DropdownField>("MethodNameDropdown");
+        methodNameDropdown.choices = typeof(JSBridge)
+            .GetMethods(BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.Instance).Select(m => m.Name)
+            .ToList();
+        methodNameDropdown.index = 0;
+
         var parameterField = debugPanel.Q<TextField>("Parameter");
         debugPanel.Q<Button>("InvokeButton").clicked += () =>
         {
             if (string.IsNullOrEmpty(parameterField.value))
             {
-                GameObject.Find("JSBridge").SendMessage(methodNameField.value);
+                GameObject.Find("JSBridge").SendMessage(methodNameDropdown.value);
             }
             else
             {
-                GameObject.Find("JSBridge").SendMessage(methodNameField.value, parameterField.value);
+                GameObject.Find("JSBridge").SendMessage(methodNameDropdown.value, parameterField.value);
             }
         };
 

Assets/UI/DefaultUI.uxml

@@ -23,11 +23,12 @@
     </engine:VisualElement>
     <engine:VisualElement name="DebugPanel" picking-mode="Ignore" style="flex-direction: column; font-size: 22px; justify-content: flex-end; align-items: stretch; position: absolute; top: 0; left: 0; bottom: 0; right: 0; display: none;">
         <engine:Button text="Hide" name="HideButton" style="width: 93px; align-self: flex-end;" />
-        <engine:VisualElement style="flex-direction: row;">
-            <engine:TextField placeholder-text="MethodName" name="MethodName" style="flex-grow: 1; flex-basis: 1px;" />
+        <engine:VisualElement style="flex-direction: row; height: 50px;">
+            <engine:DropdownField name="MethodNameDropdown" choices="Method" index="0" style="flex-grow: 1; flex-basis: 1px; margin-left: 0;" />
+            <engine:TextField placeholder-text="MethodName" name="MethodName" style="flex-grow: 1; flex-basis: 1px; display: none;" />
             <engine:TextField placeholder-text="Parameter" name="Parameter" style="flex-grow: 1; flex-basis: 1px;" />
             <engine:Button text="Invoke" name="InvokeButton" />
         </engine:VisualElement>
-        <engine:DropdownField name="URLDropdown" style="margin-left: 0;" />
+        <engine:DropdownField name="URLDropdown" choices="From URL" index="0" style="margin-left: 0;" />
     </engine:VisualElement>
 </engine:UXML>