Put video player components in appropriate addcomponent menu sections

MerlinVR · MerlinVR · commit ac84dc12adda · 2021-06-08T18:18:23.000-07:00
- Also add example prefabs to example scene
diff --git a/Assets/USharpVideo/Animations/SliderController.controller b/Assets/USharpVideo/Animations/SliderController.controller
@@ -14,13 +14,13 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Target
     m_Type: 3
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
diff --git a/Assets/USharpVideo/Examples/Scenes/VideoPlayerExampleScene.unity b/Assets/USharpVideo/Examples/Scenes/VideoPlayerExampleScene.unity
diff --git a/Assets/USharpVideo/Examples/Scripts/ExampleVideoPlayer.cs b/Assets/USharpVideo/Examples/Scripts/ExampleVideoPlayer.cs
@@ -14,7 +14,7 @@
 
 namespace UdonSharp.Video
 {
-    [AddComponentMenu("Udon Sharp/Video/Example Video Player")]
+    [AddComponentMenu("Udon Sharp/Video/Examples/Example Video Player")]
     public class ExampleVideoPlayer : UdonSharpBehaviour
     {
         public VRCUrlInputField inputField;
diff --git a/Assets/USharpVideo/Examples/Scripts/PlayURLButton.cs b/Assets/USharpVideo/Examples/Scripts/PlayURLButton.cs
@@ -11,6 +11,7 @@ namespace UdonSharp.Video.Examples
     /// Plays a specified video URL when OnButtonPress is triggered by a button in this example. See the URLButton prefab for a use of this.
     /// </summary>
     [UdonBehaviourSyncMode(BehaviourSyncMode.NoVariableSync)]
+    [AddComponentMenu("Udon Sharp/Video/Examples/Play URL Button")]
     public class PlayURLButton : UdonSharpBehaviour
     {
         public USharpVideoPlayer targetVideoPlayer;
diff --git a/Assets/USharpVideo/Examples/Scripts/ReloadButton.cs b/Assets/USharpVideo/Examples/Scripts/ReloadButton.cs
@@ -11,6 +11,7 @@ namespace UdonSharp.Video.Examples
     /// You could use SendCustomEvent on the video player itself from the click events on the button, but that's not as easy to document and explain
     /// </summary>
     [UdonBehaviourSyncMode(BehaviourSyncMode.NoVariableSync)]
+    [AddComponentMenu("Udon Sharp/Video/Examples/Reload Button")]
     public class ReloadButton : UdonSharpBehaviour
     {
         public USharpVideoPlayer targetVideoPlayer;
diff --git a/Assets/USharpVideo/Examples/Scripts/ResyncButton.cs b/Assets/USharpVideo/Examples/Scripts/ResyncButton.cs
@@ -7,6 +7,7 @@
 namespace UdonSharp.Video.Examples
 {
     [UdonBehaviourSyncMode(BehaviourSyncMode.NoVariableSync)]
+    [AddComponentMenu("Udon Sharp/Video/Examples/Resync Button")]
     public class ResyncButton : UdonSharpBehaviour
     {
         public USharpVideoPlayer videoPlayer;
diff --git a/Assets/USharpVideo/Examples/Scripts/SyncDelayManager.cs b/Assets/USharpVideo/Examples/Scripts/SyncDelayManager.cs
@@ -10,6 +10,7 @@ namespace UdonSharp.Video.Examples
     /// This can be used for something like karaoke where one person is singing a video and remote players want to hear the voice synced with the video audio.
     /// </summary>
     [UdonBehaviourSyncMode(BehaviourSyncMode.NoVariableSync)]
+    [AddComponentMenu("Udon Sharp/Video/Examples/Sync Delay Manager")]
     public class SyncDelayManager : UdonSharpBehaviour
     {
         public USharpVideoPlayer videoPlayer;
diff --git a/Assets/USharpVideo/Scripts/Editor/USharpVideoInspector.cs b/Assets/USharpVideo/Scripts/Editor/USharpVideoInspector.cs
@@ -79,7 +79,9 @@ public override void OnInspectorGUI()
             EditorGUILayout.LabelField("Audio", EditorStyles.boldLabel);
 
             EditorGUI.BeginChangeCheck();
+            EditorGUI.BeginDisabledGroup(EditorApplication.isPlayingOrWillChangePlaymode);
             EditorGUILayout.PropertyField(defaultVolumeProperty);
+            EditorGUI.EndDisabledGroup();
             EditorGUILayout.PropertyField(audioRangeProperty);
 
             if (EditorGUI.EndChangeCheck())
diff --git a/Assets/USharpVideo/Scripts/UI/SyncModeController.cs b/Assets/USharpVideo/Scripts/UI/SyncModeController.cs
@@ -7,7 +7,7 @@
 
 namespace UdonSharp.Video
 {
-    [AddComponentMenu("Udon Sharp/Video/Sync Mode Controller")]
+    [AddComponentMenu("Udon Sharp/Video/UI/Sync Mode Controller")]
     [UdonBehaviourSyncMode(BehaviourSyncMode.NoVariableSync)]
     public class SyncModeController : UdonSharpBehaviour
     {
diff --git a/Assets/USharpVideo/Scripts/UI/UIStyle.cs b/Assets/USharpVideo/Scripts/UI/UIStyle.cs
@@ -1,13 +1,9 @@
 ﻿
 using UnityEngine;
 using System;
-using static UdonSharp.Video.Internal.UIStyleMarkup;
+using static UdonSharp.Video.UI.UIStyleMarkup;
 
-#if UNITY_EDITOR
-using UnityEditor;
-#endif
-
-namespace UdonSharp.Video.Internal
+namespace UdonSharp.Video.UI
 {
     [AttributeUsage(AttributeTargets.Field, AllowMultiple = false)]
     internal class StyleMarkupLinkAttribute : Attribute
@@ -57,29 +53,4 @@ internal class UIStyle : ScriptableObject
         [StyleMarkupLink(StyleClass.TextCaret)]
         public Color textCaretColor = Color.white;
     }
-
-//#if UNITY_EDITOR
-
-
-//    [CustomEditor(typeof(UIStyle))]
-//    internal class ColorStyleEditor : Editor
-//    {
-//        SerializedProperty[] fieldProperties;
-
-//        private void OnEnable()
-//        {
-//            FieldInfo[] fields = target.GetType().GetFields(BindingFlags.Public | BindingFlags.Instance);
-
-//            fieldProperties = fields.Select(e => serializedObject.FindProperty(e.Name)).Where(e => e != null).ToArray();
-//        }
-
-//        public override void OnInspectorGUI()
-//        {
-//            foreach (SerializedProperty property in fieldProperties)
-//                EditorGUILayout.PropertyField(property);
-
-//            serializedObject.ApplyModifiedProperties();
-//        }
-//    }
-//#endif
 }
diff --git a/Assets/USharpVideo/Scripts/UI/UIStyleMarkup.cs b/Assets/USharpVideo/Scripts/UI/UIStyleMarkup.cs
@@ -3,8 +3,9 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace UdonSharp.Video.Internal
+namespace UdonSharp.Video.UI
 {
+    [AddComponentMenu("Udon Sharp/Video/UI/Style Markup")]
     internal class UIStyleMarkup : MonoBehaviour
     {
         public enum StyleClass
diff --git a/Assets/USharpVideo/Scripts/UI/UIStyler.cs b/Assets/USharpVideo/Scripts/UI/UIStyler.cs
@@ -11,8 +11,9 @@
 using UdonSharpEditor;
 #endif
 
-namespace UdonSharp.Video.Internal
+namespace UdonSharp.Video.UI
 {
+    [AddComponentMenu("Udon Sharp/Video/UI/Styler")]
     internal class UIStyler : MonoBehaviour
     {
 #pragma warning disable CS0649
diff --git a/Assets/USharpVideo/Scripts/UI/VolumeController.cs b/Assets/USharpVideo/Scripts/UI/VolumeController.cs
@@ -7,7 +7,7 @@
 
 namespace UdonSharp.Video
 {
-    [AddComponentMenu("Udon Sharp/Video/Volume Controller")]
+    [AddComponentMenu("Udon Sharp/Video/UI/Volume Controller")]
     [UdonBehaviourSyncMode(BehaviourSyncMode.NoVariableSync)]
     public class VolumeController : UdonSharpBehaviour
     {
diff --git a/Assets/USharpVideo/Scripts/USharpVideoPlayer.asset b/Assets/USharpVideo/Scripts/USharpVideoPlayer.asset
@@ -616,7 +616,7 @@ MonoBehaviour:
       Data: 42|UnityEngine.TooltipAttribute, UnityEngine.CoreModule
     - Name: tooltip
       Entry: 1
-      Data: The max range of the audio sources
+      Data: The max range of the audio sources on this video player
     - Name: 
       Entry: 8
       Data: 
diff --git a/Assets/USharpVideo/Scripts/USharpVideoPlayer.cs b/Assets/USharpVideo/Scripts/USharpVideoPlayer.cs
@@ -1149,7 +1149,9 @@ public VideoPlayerManager GetVideoManager()
             if (_videoPlayerManager)
                 return _videoPlayerManager;
 
-            _videoPlayerManager = GetComponentInChildren<VideoPlayerManager>();
+            _videoPlayerManager = GetComponentInChildren<VideoPlayerManager>(true);
+            if (_videoPlayerManager == null)
+                LogError("Video Player Manager not found, make sure you have a manager setup properly");
 
             return _videoPlayerManager;
         }
diff --git a/Assets/USharpVideo/Scripts/Utility/ObjectToggle.cs b/Assets/USharpVideo/Scripts/Utility/ObjectToggle.cs
@@ -4,8 +4,9 @@
 using VRC.SDKBase;
 using VRC.Udon;
 
-namespace UdonSharp.Video
+namespace UdonSharp.Video.Internal
 {
+    [AddComponentMenu("Udon Sharp/Video/Internal/Object Toggle")]
     public class ObjectToggle : UdonSharpBehaviour
     {
 #pragma warning disable CS0649
diff --git a/Assets/USharpVideo/Scripts/Utility/RenderTextureOutput.cs b/Assets/USharpVideo/Scripts/Utility/RenderTextureOutput.cs
@@ -13,6 +13,7 @@
 namespace UdonSharp.Video
 {
     [UdonBehaviourSyncMode(BehaviourSyncMode.NoVariableSync)]
+    [AddComponentMenu("Udon Sharp/Video/Utilities/Render Texture Output")]
     public class RenderTextureOutput : UdonSharpBehaviour
     {
 #pragma warning disable CS0649
diff --git a/Assets/USharpVideo/Scripts/Utility/RendererGIUpdate.cs b/Assets/USharpVideo/Scripts/Utility/RendererGIUpdate.cs
@@ -7,6 +7,7 @@
 namespace UdonSharp.Video
 {
     [UdonBehaviourSyncMode(BehaviourSyncMode.NoVariableSync)]
+    [AddComponentMenu("Udon Sharp/Video/Utilities/Renderer GI Update")]
     public class RendererGIUpdate : UdonSharpBehaviour
     {
         Renderer targetRenderer;
diff --git a/Assets/USharpVideo/Scripts/Utility/VideoScreenHandler.cs b/Assets/USharpVideo/Scripts/Utility/VideoScreenHandler.cs
@@ -6,6 +6,7 @@
 namespace UdonSharp.Video
 {
     [UdonBehaviourSyncMode(BehaviourSyncMode.NoVariableSync)]
+    [AddComponentMenu("Udon Sharp/Video/Utilities/Video Screen Handler")]
     public class VideoScreenHandler : UdonSharpBehaviour
     {
         [SerializeField, NotNull, Tooltip("The video player that this pulls from")]
diff --git a/Assets/USharpVideo/Scripts/VideoControlHandler.cs b/Assets/USharpVideo/Scripts/VideoControlHandler.cs
@@ -11,6 +11,7 @@ namespace UdonSharp.Video
 {
     [DefaultExecutionOrder(10)]
     [UdonBehaviourSyncMode(BehaviourSyncMode.NoVariableSync)]
+    [AddComponentMenu("Udon Sharp/Video/UI/Video Control Handler")]
     public class VideoControlHandler : UdonSharpBehaviour
     {
         /// <summary>
diff --git a/Assets/USharpVideo/Scripts/VideoPlayerManager.cs b/Assets/USharpVideo/Scripts/VideoPlayerManager.cs
@@ -20,6 +20,7 @@ namespace UdonSharp.Video
     /// Prior to using this, people would get confused and change settings on the Udon video player components which would break things
     /// </summary>
     [UdonBehaviourSyncMode(BehaviourSyncMode.NoVariableSync)]
+    [AddComponentMenu("Udon Sharp/Video/Internal/Video Player Manager")]
     public class VideoPlayerManager : UdonSharpBehaviour
     {
         public USharpVideoPlayer receiver;

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`namespace UdonSharp.Video`
`16`	`16`	`{`
`17`		`- [AddComponentMenu("Udon Sharp/Video/Example Video Player")]`
	`17`	`+ [AddComponentMenu("Udon Sharp/Video/Examples/Example Video Player")]`
`18`	`18`	`public class ExampleVideoPlayer : UdonSharpBehaviour`
`19`	`19`	`{`
`20`	`20`	`public VRCUrlInputField inputField;`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ namespace UdonSharp.Video.Examples`
`11`	`11`	`/// Plays a specified video URL when OnButtonPress is triggered by a button in this example. See the URLButton prefab for a use of this.`
`12`	`12`	`/// </summary>`
`13`	`13`	`[UdonBehaviourSyncMode(BehaviourSyncMode.NoVariableSync)]`
	`14`	`+ [AddComponentMenu("Udon Sharp/Video/Examples/Play URL Button")]`
`14`	`15`	`public class PlayURLButton : UdonSharpBehaviour`
`15`	`16`	`{`
`16`	`17`	`public USharpVideoPlayer targetVideoPlayer;`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`namespace UdonSharp.Video.Examples`
`8`	`8`	`{`
`9`	`9`	`[UdonBehaviourSyncMode(BehaviourSyncMode.NoVariableSync)]`
	`10`	`+ [AddComponentMenu("Udon Sharp/Video/Examples/Resync Button")]`
`10`	`11`	`public class ResyncButton : UdonSharpBehaviour`
`11`	`12`	`{`
`12`	`13`	`public USharpVideoPlayer videoPlayer;`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ namespace UdonSharp.Video.Examples`
`10`	`10`	`/// This can be used for something like karaoke where one person is singing a video and remote players want to hear the voice synced with the video audio.`
`11`	`11`	`/// </summary>`
`12`	`12`	`[UdonBehaviourSyncMode(BehaviourSyncMode.NoVariableSync)]`
	`13`	`+ [AddComponentMenu("Udon Sharp/Video/Examples/Sync Delay Manager")]`
`13`	`14`	`public class SyncDelayManager : UdonSharpBehaviour`
`14`	`15`	`{`
`15`	`16`	`public USharpVideoPlayer videoPlayer;`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace UdonSharp.Video`
`9`	`9`	`{`
`10`		`- [AddComponentMenu("Udon Sharp/Video/Sync Mode Controller")]`
	`10`	`+ [AddComponentMenu("Udon Sharp/Video/UI/Sync Mode Controller")]`
`11`	`11`	`[UdonBehaviourSyncMode(BehaviourSyncMode.NoVariableSync)]`
`12`	`12`	`public class SyncModeController : UdonSharpBehaviour`
`13`	`13`	`{`