Fixes and improvements for 2440851

jacklul · Jun 1, 2024 · c33c2f2 · c33c2f2
1 parent 1ebccfe
commit c33c2f2
Show file tree

Hide file tree

Showing 11 changed files with 3,719 additions and 2,124 deletions.
diff --git a/Assets/USharpVideoSubtitles/Development/DevScene.unity b/Assets/USharpVideoSubtitles/Development/DevScene.unity
diff --git a/Assets/USharpVideoSubtitles/Development/Testing.prefab b/Assets/USharpVideoSubtitles/Development/Testing.prefab
diff --git a/Assets/USharpVideoSubtitles/Fonts/OpenSans SDF.asset b/Assets/USharpVideoSubtitles/Fonts/OpenSans SDF.asset
diff --git a/Assets/USharpVideoSubtitles/Scenes/ExampleScene.unity b/Assets/USharpVideoSubtitles/Scenes/ExampleScene.unity
diff --git a/Assets/USharpVideoSubtitles/Scripts/SubtitleControlHandler.asset b/Assets/USharpVideoSubtitles/Scripts/SubtitleControlHandler.asset
diff --git a/Assets/USharpVideoSubtitles/Scripts/SubtitleControlHandler.cs b/Assets/USharpVideoSubtitles/Scripts/SubtitleControlHandler.cs
@@ -98,6 +98,11 @@ public class SubtitleControlHandler : UdonSharpBehaviour
         [SerializeField]
         private GameObject inputMenu;
 
+        [SerializeField]
+        private Graphic inputLoadButtonBackground;
+        [SerializeField]
+        private Graphic inputLoadButtonIcon;
+
         [SerializeField]
         private Graphic inputMenuButtonBackground;
         [SerializeField]
@@ -440,19 +445,17 @@ public override void OnOwnershipTransferred(VRCPlayerApi player)
 
         public void UpdateOwner()
         {
-#if !UNITY_EDITOR
             if (ownerField)
             {
                 if (manager.IsLocal())
                     ownerField.text = Networking.LocalPlayer.displayName + " " + INDICATOR_LOCAL;
                 else
                     ownerField.text = Networking.GetOwner(manager.gameObject).displayName;
             }
-#endif
 
             if (reloadButton)
             {
-                if (manager.CanSynchronizeSubtitles() || manager.IsLocal())
+                if (manager.CanSynchronizeSubtitles() || manager.IsLocal() || manager.IsSyncedURL())
                 {
                     if (reloadGraphic) reloadGraphic.color = whiteGraphicColor;
                 }
@@ -471,6 +474,7 @@ public void UpdateLockState()
 
                 if (lockGraphic) lockGraphic.color = whiteGraphicColor;
                 if (inputClearButtonIcon) inputClearButtonIcon.color = whiteGraphicColor;
+                if (inputLoadButtonIcon) inputLoadButtonIcon.color = whiteGraphicColor;
 
                 if (inputField) inputField.readOnly = false;
                 if (urlInputField) urlInputField.readOnly = false;
@@ -492,6 +496,7 @@ public void UpdateLockState()
                 {
                     if (lockGraphic) lockGraphic.color = whiteGraphicColor;
                     if (inputClearButtonIcon) inputClearButtonIcon.color = whiteGraphicColor;
+                    if (inputLoadButtonIcon) inputLoadButtonIcon.color = whiteGraphicColor;
 
                     if (inputField) inputField.readOnly = false;
                     if (urlInputField) urlInputField.readOnly = false;
@@ -503,18 +508,18 @@ public void UpdateLockState()
                 {
                     if (lockGraphic) lockGraphic.color = redGraphicColor;
                     if (inputClearButtonIcon) inputClearButtonIcon.color = redGraphicColor;
+                    if (inputLoadButtonIcon) inputLoadButtonIcon.color = redGraphicColor;
 
                     if (inputField) inputField.readOnly = true;
                     if (urlInputField) urlInputField.readOnly = true;
-#if !UNITY_EDITOR
+
                     string onlyMaster = string.Format(
                         @MESSAGE_ONLY_MASTER_CAN_ADD,
                         (manager.IsUsingUSharpVideo() ? manager.GetUSharpVideoOwner() : Networking.GetOwner(manager.gameObject)).displayName
                     );
 
                     if (inputPlaceholderText) inputPlaceholderText.text = onlyMaster;
                     if (urlInputPlaceholderText) urlInputPlaceholderText.text = onlyMaster;
-#endif
                 }
             }
             else
@@ -524,15 +529,28 @@ public void UpdateLockState()
 
                 if (lockGraphic) lockGraphic.color = whiteGraphicColor;
                 if (inputClearButtonIcon) inputClearButtonIcon.color = whiteGraphicColor;
+                if (inputLoadButtonIcon) inputLoadButtonIcon.color = whiteGraphicColor;
 
                 if (inputField) inputField.readOnly = false;
-                if (urlInputField) urlInputField.readOnly = true;
+                if (urlInputField) urlInputField.readOnly = false;
 
                 if (inputPlaceholderText) inputPlaceholderText.text = MESSAGE_PASTE + " " + INDICATOR_ANYONE;
                 if (urlInputPlaceholderText) urlInputPlaceholderText.text = MESSAGE_LOAD_URL + " " + INDICATOR_ANYONE;
             }
         }
 
+        public void LoadInput()
+        {
+            if (inputField && inputField.text.Length > 0) {
+                OnSubtitleInput();
+            } else if (urlInputField && urlInputField.GetUrl().ToString().Length > 0) {
+                OnSubtitleUrlInput();
+            }
+
+            inputField.text = string.Empty;
+            urlInputField.SetUrl(VRCUrl.Empty);
+        }
+
         public void OnSubtitleInput()
         {
             if (!inputField)
@@ -729,22 +747,32 @@ public void OnReloadButton()
                         return;
                     }
                 }
+                else if (manager.IsSyncedURL())
+                {
+                    AnimateReloadButton();
+                    manager.ReloadSyncedURL();
+                    return;
+                }
                 else
                 {
                     SetStickyStatusText(string.Format(MESSAGE_ONLY_OWNER_CAN_SYNC, Networking.GetOwner(manager.gameObject).displayName), 3.0f);
                     return;
                 }
             }
 
+            AnimateReloadButton();
+            manager.SynchronizeSubtitles();
+        }
+
+        private void AnimateReloadButton()
+        {
             if (reloadButton)
             {
                 Animator animator = reloadButton.GetComponent<Animator>();
 
                 if (animator)
                     animator.SetTrigger("Rotate");
             }
-
-            manager.SynchronizeSubtitles();
         }
 
         public void OnLockButton()
@@ -1026,7 +1054,7 @@ private void ImportSettingsFromStringInternal(string settings, int mode)
                             if (alignmentToggle)
                                 alignmentToggle.isOn = tmpInt == 1;
 
-                            // Not exposed to Udon yet (VerticalAlignmentOptions)
+                            // @TODO Not exposed to Udon yet (VerticalAlignmentOptions)
                             /*if (tmpInt == 1)
                                 overlayHandler.SetAlignment(VerticalAlignmentOptions.Top);
                             else