Merge pull request #5 from o-tr/master

v0.2.2をリリース
o-tr · Sep 6, 2024 · 85712a2 · 85712a2
2 parents 7377c39 + 1b2f483
commit 85712a2
Show file tree

Hide file tree

Showing 12 changed files with 331 additions and 284 deletions.
diff --git a/Prefabs/ImageTab.prefab b/Prefabs/ImageTab.prefab
@@ -1304,7 +1304,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: 1061264739079975055}
         m_TargetAssemblyTypeName: 
         m_MethodName: SendCustomEvent
         m_Mode: 5
@@ -1601,7 +1601,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: 1061264739079975055}
         m_TargetAssemblyTypeName: 
         m_MethodName: SendCustomEvent
         m_Mode: 5
@@ -1847,7 +1847,7 @@ GameObject:
   - component: {fileID: 328689077210539682}
   - component: {fileID: 5885815362106339373}
   m_Layer: 13
-  m_Name: Root
+  m_Name: _Root
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2883,7 +2883,7 @@ GameObject:
   - component: {fileID: 756687671811862761}
   - component: {fileID: 7938467624753538088}
   m_Layer: 13
-  m_Name: Root
+  m_Name: _Root
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3527,7 +3527,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4977822125850337398}
   m_Layer: 13
-  m_Name: Controls
+  m_Name: _Controls
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3675,7 +3675,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: 1061264739079975055}
         m_TargetAssemblyTypeName: 
         m_MethodName: SendCustomEvent
         m_Mode: 5
@@ -4599,6 +4599,7 @@ MonoBehaviour:
   controller: {fileID: 0}
   splashImage: {fileID: 0}
   splashImageFitter: {fileID: 0}
+  splashImageTexture: {fileID: 0}
   deviceUuid: dc8143a8-39ec-4a92-bc65-b57e543c6783
   arWatchInterval: 0.2
   arAnchorTop: {fileID: 6787314649853063368}
@@ -4767,7 +4768,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: 1061264739079975055}
         m_TargetAssemblyTypeName: 
         m_MethodName: SendCustomEvent
         m_Mode: 5
@@ -5068,7 +5069,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: 1061264739079975055}
         m_TargetAssemblyTypeName: 
         m_MethodName: SendCustomEvent
         m_Mode: 5
@@ -5220,7 +5221,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: 1061264739079975055}
         m_TargetAssemblyTypeName: 
         m_MethodName: SendCustomEvent
         m_Mode: 5
@@ -5355,7 +5356,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: 1061264739079975055}
         m_TargetAssemblyTypeName: 
         m_MethodName: SendCustomEvent
         m_Mode: 5
@@ -5865,7 +5866,7 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 1
         m_CallState: 2
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: 1061264739079975055}
         m_TargetAssemblyTypeName: 
         m_MethodName: SendCustomEvent
         m_Mode: 5
@@ -5973,7 +5974,7 @@ GameObject:
   - component: {fileID: 1762988244292847304}
   - component: {fileID: 8864945229062523116}
   m_Layer: 13
-  m_Name: Root
+  m_Name: _Root
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -8566,7 +8567,7 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 1
         m_CallState: 2
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: 1061264739079975055}
         m_TargetAssemblyTypeName: 
         m_MethodName: SendCustomEvent
         m_Mode: 5
@@ -10405,7 +10406,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: 1061264739079975055}
         m_TargetAssemblyTypeName: 
         m_MethodName: SendCustomEvent
         m_Mode: 5
@@ -12782,6 +12783,10 @@ PrefabInstance:
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 3392491913851663145, guid: 270ab47512fe7934196f541695ef2907, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 1061264739079975055}
     - target: {fileID: 3392491913851663145, guid: 270ab47512fe7934196f541695ef2907, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
       value: SendCustomEvent
@@ -13285,6 +13290,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 9022346983763826733}
     m_Modifications:
+    - target: {fileID: 4079871079577843496, guid: 4725a69d5693c4c4492e0f6d05cbe4fe, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 1061264739079975055}
     - target: {fileID: 4079871079577843496, guid: 4725a69d5693c4c4492e0f6d05cbe4fe, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
       value: SendCustomEvent

diff --git a/Prefabs/parts/Settings.About.Content.prefab b/Prefabs/parts/Settings.About.Content.prefab
@@ -663,7 +663,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: ImageTab v0.2.1
+  m_text: ImageTab v0.2.2
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 7758130c7e489894db77d74ac7b81c3c, type: 2}
   m_sharedMaterial: {fileID: -6069958157732398970, guid: 7758130c7e489894db77d74ac7b81c3c, type: 2}

diff --git a/Runtime/Editor/ImageTabEditor.cs b/Runtime/Editor/ImageTabEditor.cs
@@ -12,24 +12,25 @@ namespace jp.ootr.ImageTab.Editor
     public class ImageTabEditor : CommonDeviceEditor
     {
         private SerializedProperty _arWatchInterval;
+        private SerializedProperty _uiBookmarkNames;
+        private SerializedProperty _uiBookmarkUrls;
 
         public override void OnEnable()
         {
             base.OnEnable();
             _arWatchInterval = serializedObject.FindProperty("arWatchInterval");
+            _uiBookmarkNames = serializedObject.FindProperty("uIBookmarkNames");
+            _uiBookmarkUrls = serializedObject.FindProperty("uIBookmarkUrls");
         }
 
         protected override void ShowContent()
         {
             EditorGUILayout.Space();
-            var so = new SerializedObject(target);
+            serializedObject.Update();
             EditorGUILayout.PropertyField(_arWatchInterval, new GUIContent("Rotation Check Interval"));
-            so.ApplyModifiedProperties();
+            serializedObject.ApplyModifiedProperties();
             EditorGUILayout.Space();
-            EditorGUI.BeginChangeCheck();
             BuildBookmark((ImageTab)target);
-            if (!EditorGUI.EndChangeCheck()) return;
-            EditorUtility.SetDirty(target);
         }
 
         protected override void ShowScriptName()
@@ -42,29 +43,26 @@ private void BuildBookmark(ImageTab script)
             var newSize = Mathf.Max(script.uIBookmarkNames.Length, script.uIBookmarkUrls.Length);
             if (script.uIBookmarkNames.Length != newSize || script.uIBookmarkUrls.Length != newSize)
             {
-                Array.Resize(ref script.uIBookmarkNames, newSize);
-                Array.Resize(ref script.uIBookmarkUrls, newSize);
+                _uiBookmarkNames.arraySize = newSize;
+                _uiBookmarkUrls.arraySize = newSize;
             }
 
             EditorGUILayout.LabelField("Bookmarks", EditorStyles.boldLabel);
+            serializedObject.Update();
 
             for (var i = 0; i < newSize; i++)
             {
                 EditorGUILayout.BeginHorizontal();
-                script.uIBookmarkNames[i] = EditorGUILayout.TextField(script.uIBookmarkNames[i]);
-                script.uIBookmarkUrls[i] = new VRCUrl(EditorGUILayout.TextField(script.uIBookmarkUrls[i].ToString()));
-
+
+                EditorGUILayout.PropertyField(_uiBookmarkNames.GetArrayElementAtIndex(i), GUIContent.none);
+                EditorGUILayout.PropertyField(_uiBookmarkUrls.GetArrayElementAtIndex(i), GUIContent.none);
+
+
                 if (GUILayout.Button("Remove"))
                 {
                     newSize--;
-                    var tmpNames = new string[newSize];
-                    var tmpUrls = new VRCUrl[newSize];
-                    Array.Copy(script.uIBookmarkNames, tmpNames, i);
-                    Array.Copy(script.uIBookmarkNames, i + 1, tmpNames, i, newSize - i);
-                    Array.Copy(script.uIBookmarkUrls, tmpUrls, i);
-                    Array.Copy(script.uIBookmarkUrls, i + 1, tmpUrls, i, newSize - i);
-                    script.uIBookmarkNames = tmpNames;
-                    script.uIBookmarkUrls = tmpUrls;
+                    _uiBookmarkNames.DeleteArrayElementAtIndex(i);
+                    _uiBookmarkUrls.DeleteArrayElementAtIndex(i);
                 }
 
                 EditorGUILayout.EndHorizontal();
@@ -75,19 +73,20 @@ private void BuildBookmark(ImageTab script)
             if (GUILayout.Button("Add Element"))
             {
                 newSize++;
-                Array.Resize(ref script.uIBookmarkNames, newSize);
-                Array.Resize(ref script.uIBookmarkUrls, newSize);
+                _uiBookmarkNames.arraySize = newSize;
+                _uiBookmarkUrls.arraySize = newSize;
             }
 
             if (GUILayout.Button("Remove Last Element"))
                 if (newSize > 0)
                 {
                     newSize--;
-                    Array.Resize(ref script.uIBookmarkNames, newSize);
-                    Array.Resize(ref script.uIBookmarkUrls, newSize);
+                    _uiBookmarkNames.arraySize = newSize;
+                    _uiBookmarkUrls.arraySize = newSize;
                 }
 
             EditorGUILayout.EndHorizontal();
+            serializedObject.ApplyModifiedProperties();
         }
     }
 }

diff --git a/Runtime/jp.ootr.ImageTab/Scripts/12_LogicDeviceList.cs b/Runtime/jp.ootr.ImageTab/Scripts/12_LogicDeviceList.cs
@@ -1,4 +1,5 @@
-using UnityEngine;
+using jp.ootr.common;
+using UnityEngine;
 using UnityEngine.UI;
 using VRC.Udon.Common.Enums;
 using static jp.ootr.common.UI;
@@ -23,6 +24,8 @@ public override void InitController()
 
         public virtual void UpdateDeviceList()
         {
+            uIDeviceListContainer.ClearChildren();
+
             DeviceListButtonToggles = new Toggle[devices.Length];
             DeviceListButtonSliders = new Slider[devices.Length];
             for (var i = 0; i < devices.Length; i++)
@@ -43,9 +46,11 @@ public virtual void UpdateDeviceList()
                         button.transform.Find("Image").GetComponent<Image>().sprite = uIDeviceScreenIcon;
                         break;
                 }
+
+                button.name = device.deviceUuid;
             }
 
-            uIDeviceListContainer.ToListChildrenVertical(adjustHeight: true);
+            uIDeviceListContainer.ToListChildrenVertical(0,0,true);
         }
     }
 }
diff --git a/Runtime/jp.ootr.ImageTab/Scripts/21_UIBookmark.cs b/Runtime/jp.ootr.ImageTab/Scripts/21_UIBookmark.cs
@@ -55,7 +55,7 @@ protected virtual void UpdateBookmark()
                 _uiBookmarkButtonToggles[i] = toggle;
             }
 
-            uIOriginalBookmarkButton.transform.parent.ToListChildrenVertical(adjustHeight: true);
+            uIOriginalBookmarkButton.transform.parent.ToListChildrenVertical(0,0,true);
 
             SendCustomEventDelayedFrames(nameof(UpdateFooter), 0, EventTiming.LateUpdate);
         }

diff --git a/Runtime/jp.ootr.ImageTab/Scripts/23_UIHistory.cs b/Runtime/jp.ootr.ImageTab/Scripts/23_UIHistory.cs
@@ -40,7 +40,7 @@ public virtual void UpdateHistoryUI(string[] urls, string[] filenames)
             }
             else if (_uiHistoryButtons.Length > urls.Length)
             {
-                for (var i = urls.Length; i < _uiHistoryButtons.Length; i++) Destroy(_uiHistoryButtons[i]);
+                for (var i = urls.Length; i < _uiHistoryButtons.Length; i++) DestroyImmediate(_uiHistoryButtons[i]);
                 _uiHistoryButtons = _uiHistoryButtons.Resize(urls.Length);
                 _uiHistoryButtonToggles = _uiHistoryButtonToggles.Resize(urls.Length);
                 _uiHistoryButtonInputFields = _uiHistoryButtonInputFields.Resize(urls.Length);
@@ -53,7 +53,7 @@ public virtual void UpdateHistoryUI(string[] urls, string[] filenames)
                 if (!_uiHistoryButtonToggles[i].isOn) _uiHistoryButtonToggles[i].isOn = false;
             }
 
-            uIOriginalHistoryButton.transform.parent.ToListChildrenVertical(reverse: true, adjustHeight: true);
+            uIOriginalHistoryButton.transform.parent.ToListChildrenVertical(0,0,true,true);
         }
 
         public virtual void OnHistoryListClicked()

diff --git a/Runtime/jp.ootr.ImageTab/Scripts/27_UIError.cs b/Runtime/jp.ootr.ImageTab/Scripts/27_UIError.cs
@@ -12,6 +12,11 @@ public class UIError : UIAnimatorHandler
         public override void OnFilesLoadFailed(LoadError error)
         {
             base.OnFilesLoadFailed(error);
+            ShowError(error);
+        }
+
+        protected void ShowError(LoadError error)
+        {
             error.ParseMessage(out var title, out var message);
             uIErrorTitle.text = title;
             uIErrorMessage.text = message;

diff --git a/Runtime/jp.ootr.ImageTab/Scripts/ImageTab.cs b/Runtime/jp.ootr.ImageTab/Scripts/ImageTab.cs
@@ -45,7 +45,7 @@ public void OnUrlEndEdit()
             if (_isLoading || urlStr.IsNullOrEmpty() || _syncSource == url.ToString()) return;
             if (!urlStr.IsValidUrl(out var error))
             {
-                OnFilesLoadFailed(error);
+                ShowError(error);
                 return;
             }