Added Unity 6 Support

Assets/VideoEditorAssets/ModifiedDefaultPlayables/LightControl/Editor/LightControlDrawer.cs

@@ -13,6 +13,13 @@ public override float GetPropertyHeight (SerializedProperty property, GUIContent
 
     public override void OnGUI (Rect position, SerializedProperty property, GUIContent label)
     {
+        // Support dark/light mode for label text
+        Color originalLabelColor = GUI.color;
+        if (!EditorGUIUtility.isProSkin)
+        {
+            GUI.color = new Color(0, 0, 0, 1); // Black for light mode
+        }
+
         SerializedProperty colorProp = property.FindPropertyRelative("color");
         SerializedProperty intensityProp = property.FindPropertyRelative("intensity");
         SerializedProperty bounceIntensityProp = property.FindPropertyRelative("bounceIntensity");
@@ -29,5 +36,7 @@ public override void OnGUI (Rect position, SerializedProperty property, GUIConte
 
         singleFieldRect.y += EditorGUIUtility.singleLineHeight;
         EditorGUI.PropertyField(singleFieldRect, rangeProp);
+
+        GUI.color = originalLabelColor;
     }
 }

Assets/VideoEditorAssets/ModifiedDefaultPlayables/ScreenFader/Editor/ScreenFaderDrawer.cs

@@ -14,9 +14,18 @@ public override float GetPropertyHeight (SerializedProperty property, GUIContent
 
     public override void OnGUI (Rect position, SerializedProperty property, GUIContent label)
     {
+        // Support dark/light mode for label text
+        Color originalLabelColor = GUI.color;
+        if (!EditorGUIUtility.isProSkin)
+        {
+            GUI.color = new Color(0, 0, 0, 1); // Black for light mode
+        }
+
         SerializedProperty colorProp = property.FindPropertyRelative("color");
 
         Rect singleFieldRect = new Rect(position.x, position.y, position.width, EditorGUIUtility.singleLineHeight);
         EditorGUI.PropertyField(singleFieldRect, colorProp);
+
+        GUI.color = originalLabelColor;
     }
 }

Assets/VideoEditorAssets/ModifiedDefaultPlayables/TextSwitcher/Editor/TextSwitcherDrawer.cs

@@ -14,6 +14,13 @@ public override float GetPropertyHeight (SerializedProperty property, GUIContent
 
     public override void OnGUI (Rect position, SerializedProperty property, GUIContent label)
     {
+        // Support dark/light mode for label text
+        Color originalLabelColor = GUI.color;
+        if (!EditorGUIUtility.isProSkin)
+        {
+            GUI.color = new Color(0, 0, 0, 1); // Black for light mode
+        }
+
         SerializedProperty colorProp = property.FindPropertyRelative("color");
         SerializedProperty fontSizeProp = property.FindPropertyRelative("fontSize");
         SerializedProperty textProp = property.FindPropertyRelative("text");
@@ -26,5 +33,7 @@ public override void OnGUI (Rect position, SerializedProperty property, GUIConte
 
         singleFieldRect.y += EditorGUIUtility.singleLineHeight;
         EditorGUI.PropertyField(singleFieldRect, textProp);
+
+        GUI.color = originalLabelColor;
     }
 }

Assets/VideoEditorAssets/ModifiedDefaultPlayables/TimeDilation/Editor/TimeDilationDrawer.cs

@@ -12,9 +12,18 @@ public override float GetPropertyHeight (SerializedProperty property, GUIContent
 
     public override void OnGUI (Rect position, SerializedProperty property, GUIContent label)
     {
+        // Support dark/light mode for label text
+        Color originalLabelColor = GUI.color;
+        if (!EditorGUIUtility.isProSkin)
+        {
+            GUI.color = new Color(0, 0, 0, 1); // Black for light mode
+        }
+
         SerializedProperty timeScaleProp = property.FindPropertyRelative("timeScale");
 
         Rect singleFieldRect = new Rect(position.x, position.y, position.width, EditorGUIUtility.singleLineHeight);
         EditorGUI.PropertyField(singleFieldRect, timeScaleProp);
+
+        GUI.color = originalLabelColor;
     }
 }

Assets/VideoEditorAssets/ModifiedDefaultPlayables/TransformTween/Editor/TransformTweenDrawer.cs

@@ -20,6 +20,13 @@ public override float GetPropertyHeight (SerializedProperty property, GUIContent
 
     public override void OnGUI (Rect position, SerializedProperty property, GUIContent label)
     {
+        // Support dark/light mode for label text
+        Color originalLabelColor = GUI.color;
+        if (!EditorGUIUtility.isProSkin)
+        {
+            GUI.color = new Color(0, 0, 0, 1); // Black for light mode
+        }
+
         SerializedProperty tweenPositionProp = property.FindPropertyRelative ("tweenPosition");
         SerializedProperty tweenRotationProp = property.FindPropertyRelative("tweenRotation");
         SerializedProperty tweenTypeProp = property.FindPropertyRelative ("tweenType");
@@ -40,5 +47,7 @@ public override void OnGUI (Rect position, SerializedProperty property, GUIConte
             singleFieldRect.y += EditorGUIUtility.singleLineHeight;
             EditorGUI.PropertyField (singleFieldRect, customCurveProp, m_CustomCurveContent);
         }
+
+        GUI.color = originalLabelColor;
     }
 }

Assets/VideoEditorAssets/ModifiedDefaultPlayables/Video/Editor/VideoScriptPlayableAssetEditor.cs

@@ -23,6 +23,12 @@ public override void OnInspectorGUI()
     {
         VideoScriptPlayableAsset videoAsset = (VideoScriptPlayableAsset)target;
         GUIStyle lStyle = GetLabelStyle();
+
+        // Ensure label color is set for dark/light mode compatibility
+        if (lStyle.normal.textColor == Color.black)
+        {
+            lStyle.normal.textColor = EditorGUIUtility.isProSkin ? Color.white : Color.black;
+        }
 
         GUILayout.Label("UI RawImage to play the video on:", lStyle);
         EditorGUILayout.PropertyField(rawImage);
@@ -79,6 +85,8 @@ private GUIStyle GetLabelStyle ()
     {
         GUIStyle labelStyle = new GUIStyle();
         labelStyle.wordWrap = true;
+        // Support both light and dark modes
+        labelStyle.normal.textColor = EditorGUIUtility.isProSkin ? Color.white : Color.black;
         return labelStyle;
     }
 }

Assets/VideoEditorAssets/Scripts/Editor/GameViewUtils.cs

@@ -17,8 +17,20 @@ static GameViewUtils()
         gameViewSizesInstance = instanceProp.GetValue(null, null);
     }
 
+    /// <summary>
+    /// Ensures the value is even (required for MP4/H.264 encoding)
+    /// </summary>
+    private static int MakeEven(int value)
+    {
+        return (value % 2 == 0) ? value : value + 1;
+    }
+
     public static void AddSetSize(int width, int height)
     {
+        // MP4 format requires even dimensions for H.264 codec
+        width = MakeEven(width);
+        height = MakeEven(height);
+
         int idx = FindSize(GameViewSizeGroupType.Standalone, width, height);
         if (idx == -1)
         {
@@ -58,25 +70,24 @@ public static void AddCustomSize(GameViewSizeType viewSizeType, GameViewSizeGrou
         var group = GetGroup(sizeGroupType);
         var addCustomSize = getGroup.ReturnType.GetMethod("AddCustomSize"); // or group.GetType().
         var gvsType = typeof(Editor).Assembly.GetType("UnityEditor.GameViewSize");
-#if NET_4_6
-        var ctor = gvsType.GetConstructor(new Type[] { typeof(Editor).Assembly.GetType("UnityEditor.GameViewSizeType"), typeof(int), typeof(int), typeof(string) });
-        var newGvsType = typeof(Editor).Assembly.GetType("UnityEditor.GameViewSizeType");
-        if (viewSizeType == GameViewSizeType.AspectRatio)
+
+        // Unity 6 and modern Unity versions use the constructor with GameViewSizeType enum
+        var gvsTypeEnum = typeof(Editor).Assembly.GetType("UnityEditor.GameViewSizeType");
+        var ctor = gvsType.GetConstructor(new Type[] { gvsTypeEnum, typeof(int), typeof(int), typeof(string) });
+
+        if (ctor != null)
         {
-            newGvsType = typeof(Editor).Assembly.GetType("UnityEditor.GameViewSizeType.AspectRatio");
+            // Modern Unity version with enum parameter
+            var newSize = ctor.Invoke(new object[] { (int)viewSizeType, width, height, text });
+            addCustomSize.Invoke(group, new object[] { newSize });
         }
         else
         {
-            newGvsType = typeof(Editor).Assembly.GetType("UnityEditor.GameViewSizeType.FixedResolution");
+            // Fallback for older Unity versions with int parameter
+            ctor = gvsType.GetConstructor(new Type[] { typeof(int), typeof(int), typeof(int), typeof(string) });
+            var newSize = ctor.Invoke(new object[] { (int)viewSizeType, width, height, text });
+            addCustomSize.Invoke(group, new object[] { newSize });
         }
-
-        var newSize = ctor.Invoke(new object[] { (int)viewSizeType, width, height, text });
-        addCustomSize.Invoke(group, new object[] { newSize });
-#else
-        var ctor = gvsType.GetConstructor(new Type[] { typeof(int), typeof(int), typeof(int), typeof(string) });
-        var newSize = ctor.Invoke(new object[] { (int)viewSizeType, width, height, text });
-        addCustomSize.Invoke(group, new object[] { newSize });
-#endif
     }
 
     public static bool SizeExists(GameViewSizeGroupType sizeGroupType, string text)

Assets/VideoEditorAssets/Scripts/Editor/LayoutUtility.cs

@@ -11,8 +11,14 @@ private enum MethodType { Save, Load };
 
     static MethodInfo GetMethod(MethodType method_type)
     {
-
-        Type layout = Type.GetType("UnityEditor.WindowLayout,UnityEditor");
+        // In Unity 6, WindowLayout moved to UnityEditor.WindowLayout namespace
+        Type layout = Type.GetType("UnityEditor.WindowLayout,UnityEditor.CoreModule");
+
+        // Fallback for older Unity versions
+        if (layout == null)
+        {
+            layout = Type.GetType("UnityEditor.WindowLayout,UnityEditor");
+        }
 
         MethodInfo save = null;
         MethodInfo load = null;
@@ -37,13 +43,29 @@ static MethodInfo GetMethod(MethodType method_type)
     public static void SaveLayout(string path)
     {
         path = Path.Combine(Directory.GetCurrentDirectory(), path);
-        GetMethod(MethodType.Save).Invoke(null, new object[] { path });
+        var method = GetMethod(MethodType.Save);
+        if (method != null)
+        {
+            method.Invoke(null, new object[] { path });
+        }
+        else
+        {
+            Debug.LogWarning("SaveLayout method not found. Window layout could not be saved.");
+        }
     }
 
     public static void LoadLayout(string path)
     {
         path = Path.Combine(Directory.GetCurrentDirectory(), path);
-        GetMethod(MethodType.Load).Invoke(null, new object[] { path, false });
+        var method = GetMethod(MethodType.Load);
+        if (method != null)
+        {
+            method.Invoke(null, new object[] { path, false });
+        }
+        else
+        {
+            Debug.LogWarning("LoadLayout method not found. Window layout could not be loaded.");
+        }
     }
 
 }

Assets/VideoEditorAssets/Scripts/Editor/VideoEditorWelcomeWindow.cs

@@ -38,11 +38,11 @@ public static void Init()
 
     public void OnGUI()
     {
-        scrollPos = GUILayout.BeginScrollView(scrollPos);
-
         GUIStyle hStyle = GetHeadingStyle();
         GUIStyle pStyle = GetParagraphStyle();
         GUIStyle bStyle = GetButtonStyle();
+
+        scrollPos = GUILayout.BeginScrollView(scrollPos);
 
         GUILayout.Label("Unity Video Editor Template", hStyle);
         GUILayout.Label("Thank you for downloading the Video Editor Template.", pStyle);
@@ -65,9 +65,26 @@ public void OnGUI()
         GUILayout.EndVertical();
         if (GUILayout.Button("Set Resolution", SetResButtonStyle(), GUILayout.Height(42)))
         {
+            // MP4 format requires even dimensions
+            int adjustedWidth = (width % 2 == 0) ? width : width + 1;
+            int adjustedHeight = (height % 2 == 0) ? height : height + 1;
+
+            if (adjustedWidth != width || adjustedHeight != height)
+            {
+                width = adjustedWidth;
+                height = adjustedHeight;
+                UnityEngine.Debug.LogWarning($"Resolution adjusted to even dimensions for MP4 compatibility: {width}x{height}");
+            }
+
             GameViewUtils.AddSetSize(width, height);
         }
         GUILayout.EndHorizontal();
+
+        GUIStyle noteStyle = new GUIStyle(pStyle);
+        noteStyle.fontSize = 11;
+        noteStyle.fontStyle = FontStyle.Italic;
+        noteStyle.normal.textColor = EditorGUIUtility.isProSkin ? new Color(0.8f, 0.8f, 0.8f) : new Color(0.3f, 0.3f, 0.3f);
+        GUILayout.Label("Note: MP4 format requires even dimensions. Odd values will be automatically adjusted.", noteStyle);
 
 
         GUILayout.Label("See the sample scene for example use. Specifically look at the 'GlobalTimeline' object. To export the video simply enter playmode and wait. You do not need to build anything! To see the video output settings look at the RecorderClip on in the Timeline of the 'GlobalTimeline' object.", pStyle);
@@ -80,7 +97,7 @@ public void OnGUI()
         GUILayout.BeginHorizontal();
         if (GUILayout.Button("YouTube Tutorials", bStyle))
         {
-            Application.OpenURL(VideoEditorConstants.WindowLayoutPath);
+            Application.OpenURL(VideoEditorConstants.YouTubeLink);
         }
         if (GUILayout.Button("Blog Post (written documentation)", bStyle))
         {
@@ -135,6 +152,9 @@ private GUIStyle GetHeadingStyle()
         GUIStyle headingStyle = new GUIStyle();
         headingStyle.fontSize = 20;
         headingStyle.padding = new RectOffset(10, 10, 10, 10);
+        headingStyle.fontStyle = FontStyle.Bold;
+        // Support both light and dark modes
+        headingStyle.normal.textColor = EditorGUIUtility.isProSkin ? Color.white : Color.black;
         return headingStyle;
     }
 
@@ -144,6 +164,8 @@ private GUIStyle GetParagraphStyle()
         paraStyle.fontSize = 14;
         paraStyle.padding = new RectOffset(10, 10, 10, 10);
         paraStyle.wordWrap = true;
+        // Support both light and dark modes
+        paraStyle.normal.textColor = EditorGUIUtility.isProSkin ? Color.white : Color.black;
         return paraStyle;
     }
 
@@ -159,6 +181,7 @@ private static Rect GetEditorMainWindowPos()
         var windows = Resources.FindObjectsOfTypeAll(containerWinType);
         foreach (var win in windows)
         {
+            if (win == null) continue;
             var showmode = (int)showModeField.GetValue(win);
             if (showmode == 4) // main window
             {