Unity 2023.2.0a10 C# reference source code

Author: Unity Technologies

Editor/Mono/ActiveEditorTracker.bindings.cs

@@ -55,8 +55,8 @@ public override int GetHashCode()
         public void Destroy() { Internal_Destroy(this); }
 
         [FreeFunction]
-        static extern Array Internal_GetActiveEditors(ActiveEditorTracker self);
-        public Editor[] activeEditors { get { return (Editor[])Internal_GetActiveEditors(this); } }
+        static extern Editor[] Internal_GetActiveEditors(ActiveEditorTracker self);
+        public Editor[] activeEditors { get { return Internal_GetActiveEditors(this); } }
 
         [FreeFunction]
         internal static extern void Internal_GetActiveEditorsNonAlloc(ActiveEditorTracker self, Editor[] editors);

Editor/Mono/Animation/AnimationWindow/AnimationWindowEvent.cs

@@ -13,10 +13,46 @@
 
 namespace UnityEditor
 {
-    internal struct AnimationWindowEventMethod
+    /// <summary>
+    /// Holds the context for AnimationEvent editing.
+    /// </summary>
+    class AnimationEventEditorState
     {
-        public string name;
-        public Type parameterType;
+        static bool s_ShowOverloadedFunctionsDetails = true;
+        static bool s_ShowDuplicatedFunctionsDetails = true;
+
+        bool m_ShowOverloadedFunctionsDetails = s_ShowOverloadedFunctionsDetails;
+        bool m_ShowDuplicatedFunctionsDetails = s_ShowDuplicatedFunctionsDetails;
+
+        /// <summary>
+        /// Used to track whether or not to show extra details about duplicated function names found in among the potential supported functions
+        /// </summary>
+        public bool ShowOverloadedFunctionsDetails
+        {
+            get => m_ShowOverloadedFunctionsDetails;
+            set
+            {
+                m_ShowOverloadedFunctionsDetails = s_ShowOverloadedFunctionsDetails = value;
+            }
+        }
+
+        /// <summary>
+        /// Used to track whether or not to show extra details about overloaded function names found in among the potential supported functions
+        /// </summary>
+        public bool ShowDuplicatedFunctionsDetails
+        {
+            get => m_ShowDuplicatedFunctionsDetails;
+            set
+            {
+                m_ShowDuplicatedFunctionsDetails = s_ShowDuplicatedFunctionsDetails = value;
+            }
+        }
+
+        public AnimationEventEditorState()
+        {
+            m_ShowOverloadedFunctionsDetails = s_ShowOverloadedFunctionsDetails;
+            m_ShowDuplicatedFunctionsDetails = s_ShowDuplicatedFunctionsDetails;
+        }
     }
 
     internal class AnimationWindowEvent : ScriptableObject

Editor/Mono/Animation/AnimationWindow/AnimationWindowEventInspector.cs

@@ -139,4 +139,9 @@
 
 [assembly: InternalsVisibleTo("Unity.Scenes")]
 
+// This should move with the AnimationWindow to a module at some point
+[assembly: InternalsVisibleTo("UnityEditor.Modules.Animation.tests.AnimationWindow")]
+
+[assembly: InternalsVisibleTo("UnityEditor.Modules.Physics.Tests")]
+
 [assembly: AssemblyIsEditorAssembly]

Editor/Mono/AssemblyInfo/AssemblyInfo.cs

@@ -66,6 +66,8 @@ sealed class AudioContainerWindow : EditorWindow
     Texture2D m_DiceIconOff;
     Texture2D m_DiceIconOn;
 
+    bool m_IsLoading;
+
     List<AudioContainerElement> m_CachedElements;
 
     List<AudioContainerElement> CachedElements
@@ -83,8 +85,7 @@ internal static void CreateAudioRandomContainerWindow()
     }
 
     /// <summary>
-    /// Updates the state to reflect selection changes,
-    /// which will implicitly refresh the window content if necessary.
+    /// Updates the state, which will implicitly refresh the window content if needed.
     /// </summary>
     internal void Refresh()
     {
@@ -142,22 +143,36 @@ void SetTitle(bool targetIsDirty)
 
     void CreateGUI()
     {
-        rootVisualElement.Unbind();
-        rootVisualElement.Clear();
-
-        if (m_State.AudioContainer == null)
+        try
         {
-            return;
-        }
+            if (m_IsLoading)
+            {
+                return;
+            }
 
-        var rootAsset = LoadUxml("UXML/Audio/AudioRandomContainer.uxml");
-        rootAsset.CloneTree(rootVisualElement);
+            m_IsLoading = true;
 
-        var styleSheet = LoadStyleSheet("StyleSheets/Audio/AudioRandomContainer.uss");
-        rootVisualElement.styleSheets.Add(styleSheet);
+            rootVisualElement.Unbind();
+            rootVisualElement.Clear();
 
-        CreateBindings();
-        UpdateTransportButtonStates();
+            if (m_State.AudioContainer == null)
+            {
+                return;
+            }
+
+            var rootAsset = LoadUxml("UXML/Audio/AudioRandomContainer.uxml");
+            rootAsset.CloneTree(rootVisualElement);
+
+            var styleSheet = LoadStyleSheet("StyleSheets/Audio/AudioRandomContainer.uss");
+            rootVisualElement.styleSheets.Add(styleSheet);
+
+            CreateBindings();
+            UpdateTransportButtonStates();
+        }
+        finally
+        {
+            m_IsLoading = false;
+        }
     }
 
     void CreateBindings()
@@ -629,7 +644,8 @@ void OnAudioClipDrag(List<AudioClip> audioClips)
         {
             var element = new AudioContainerElement
             {
-                audioClip = audioClip
+                audioClip = audioClip,
+                hideFlags = HideFlags.HideInHierarchy
             };
             elements.Add(element);
             AssetDatabase.AddObjectToAsset(element, m_State.AudioContainer);
@@ -640,11 +656,6 @@ void OnAudioClipDrag(List<AudioClip> audioClips)
         m_State.AudioContainer.elements = elements.ToArray();
     }
 
-    void OnSelectionChange()
-    {
-        m_State.UpdateTarget();
-    }
-
     static VisualTreeAsset LoadUxml(string filePath)
     {
         var asset = EditorGUIUtility.Load(filePath) as VisualTreeAsset;

Editor/Mono/Audio/AudioContainerWindow.cs

@@ -23,6 +23,7 @@ sealed class AudioContainerWindowState
     internal AudioContainerWindowState()
     {
         EditorApplication.playModeStateChanged += OnEditorPlayModeStateChanged;
+        Selection.selectionChanged += OnSelectionChanged;
     }
 
     internal AudioRandomContainer AudioContainer
@@ -75,6 +76,7 @@ internal void OnDestroy()
     {
         Stop();
         EditorApplication.playModeStateChanged -= OnEditorPlayModeStateChanged;
+        Selection.selectionChanged -= OnSelectionChanged;
 
         if (m_PreviewAudioSource != null) Object.DestroyImmediate(m_PreviewAudioSource.gameObject);
     }
@@ -162,7 +164,7 @@ internal void UpdateTarget()
             }
         }
 
-        if (!audioClipSelected && newTarget != m_AudioContainer)
+        if (!audioClipSelected && (newTarget != null && newTarget != m_AudioContainer))
         {
             if (m_AudioContainer != null)
             {
@@ -182,8 +184,6 @@ internal void UpdateTarget()
         }
     }
 
-    // Set up a hidden audio source in the scene for preview purposes
-
     /// <summary>
     /// This method creates a hidden game object in the scene with an audio source for editor previewing purposes.
     /// The preview object is created with the window and destroyed when the window is closed.
@@ -232,4 +232,9 @@ void OnEditorPlayModeStateChanged(PlayModeStateChange state)
             Stop();
         }
     }
+
+    void OnSelectionChanged()
+    {
+        UpdateTarget();
+    }
 }

Editor/Mono/Audio/AudioContainerWindowState.cs

@@ -196,6 +196,12 @@ internal static void CreateEmptyParent()
                 }
 
                 SceneHierarchyWindow.lastInteractedHierarchyWindow.SetExpanded(go.GetInstanceID(), true);
+
+                // Ensure empty parent after reparenting jumps into rename mode if needed UUM-15042
+                if (SceneHierarchyWindow.s_EnterRenameModeForNewGO)
+                {
+                    SceneHierarchyWindow.FrameAndRenameNewGameObject();
+                }
             }
 
             // Set back default parent object if we have one

Editor/Mono/Commands/GOCreationCommands.cs

@@ -4594,11 +4594,19 @@ internal static Vector3 LinkedVector3Field(Rect position, GUIContent label,  GUI
             GUIContent copy = label;
             Rect fullLabelRect = position;
 
-            if(proportionalScaleProperty != null)
+            BeginChangeCheck();
+
+            if (proportionalScaleProperty != null)
+            {
                 BeginPropertyInternal(fullLabelRect, label, proportionalScaleProperty);
+            }
 
+            var scalePropertyId = -1;
             if (property != null)
+            {
                 label = BeginPropertyInternal(position, label, property);
+                scalePropertyId = GUIUtility.keyboardControl;
+            }
 
             SerializedProperty copiedProperty = property == null ? property : property.Copy();
             var toggle = EditorStyles.toggle.CalcSize(GUIContent.none);
@@ -4627,13 +4635,26 @@ internal static Vector3 LinkedVector3Field(Rect position, GUIContent label,  GUI
             position.width -= toggle.x + kDefaultSpacing;
             position.height = kSingleLineHeight;
 
-            var newValue = LinkedVector3Field(position, value, proportionalScale, mixedValues, initialScale, ref axisModified, copiedProperty);
+            if (proportionalScaleProperty != null)
+            {
+                EndProperty();
+            }
 
             if (property != null)
-                EndProperty();
+            {
+                // Note: due to how both the scale + constrainScale property drawn and handled in a custom fashion, the lastcontrolId never correspond
+                // to the scaleProperty. Also s_PendingPropertyKeyboardHandling is nullifed by the constrainScale property.
+                // Make it work for now but I feel this whole system is super brittle.
+                // This will be hopefully fixed up when we use uitk to create these editors.
 
-            if(proportionalScaleProperty != null)
+                var lastId = EditorGUIUtility.s_LastControlID;
+                EditorGUIUtility.s_LastControlID = scalePropertyId;
+                s_PendingPropertyKeyboardHandling = property;
                 EndProperty();
+                EditorGUIUtility.s_LastControlID = lastId;
+            }
+
+            var newValue = LinkedVector3Field(position, value, proportionalScale, mixedValues, initialScale, ref axisModified, copiedProperty);
 
             return newValue;
         }
@@ -4652,7 +4673,6 @@ static Vector3 LinkedVector3Field(Rect position, Vector3 value, bool proportiona
             s_Vector3Floats[1] = value.y;
             s_Vector3Floats[2] = value.z;
             position.height = kSingleLineHeight;
-            BeginChangeCheck();
             const float kPrefixWidthOffset = 3.65f;
             LockingMultiFloatFieldInternal(position, proportionalScale, mixedValues, s_XYZLabels, s_Vector3Floats, new float[] {initialScale.x, initialScale.y, initialScale.z}, property, EditorGUI.CalcPrefixLabelWidth(s_XYZLabels[0]) + kPrefixWidthOffset);
             if (EndChangeCheck())
@@ -7029,6 +7049,8 @@ private static void DoPropertyFieldKeyboardHandling(SerializedProperty property)
             // Copy & Paste
             if (evt.commandName == EventCommandNames.Copy || evt.commandName == EventCommandNames.Paste)
             {
+                if (evt.commandName == EventCommandNames.Paste)
+                    GUI.changed = true;
                 ClipboardContextMenu.SetupPropertyCopyPaste(property, menu: null, evt: evt);
             }
         }

Editor/Mono/EditorGUI.cs

@@ -197,7 +197,7 @@ internal static Vector2 MouseDeltaReader(Rect position, bool activated)
 
         private static GUIStyle s_LargeSplitLeftStyle;
         private static GUIStyle s_LargeSplitRightStyle;
-        internal static bool LargeSplitButtonWithDropdownList(GUIContent content, string[] buttonNames, GenericMenu.MenuFunction2 callback)
+        public static bool LargeSplitButtonWithDropdownList(GUIContent content, string[] buttonNames, GenericMenu.MenuFunction2 callback)
         {
             // Load required styles
             if (s_LargeSplitLeftStyle == null)

Editor/Mono/GUI/InternalEditorGUI.cs

@@ -591,7 +591,7 @@ protected override void ToolGUI(SceneView view, Vector3 handlePosition, bool isS
             TransformManipulator.BeginManipulationHandling(false);
             // Move handle
             EditorGUI.BeginChangeCheck();
-            Vector3 newPos = MoveHandlesGUI(rect, rectRotation * rect.center + handlePosition, rectRotation);
+            Vector3 newPos = MoveHandlesGUI(rect, handlePosition, rectRotation);
             if (EditorGUI.EndChangeCheck() && !isStatic)
             {
                 if (GridSnapping.active)
@@ -932,10 +932,13 @@ static Vector3 MoveHandlesGUI(Rect rect, Vector3 pivot, Quaternion rotation)
                     }
                     else
                     {
+                        // https://jira.unity3d.com/browse/UUM-30232
+                        // https://jira.unity3d.com/browse/UUM-18037
+                        var repaintPivot = rotation * rect.center + pivot;
                         Handles.color = Handles.secondaryColor * new Color(1, 1, 1, 1.5f * discOpacity);
-                        Handles.CircleHandleCap(id, pivot, rotation, discSize, EventType.Repaint);
+                        Handles.CircleHandleCap(id, repaintPivot, rotation, discSize, EventType.Repaint);
                         Handles.color = Handles.secondaryColor * new Color(1, 1, 1, 0.3f * discOpacity);
-                        Handles.DrawSolidDisc(pivot, rotation * Vector3.forward, discSize);
+                        Handles.DrawSolidDisc(repaintPivot, rotation * Vector3.forward, discSize);
                     }
                     break;
                 }