Unity 2023.3.0a11 C# reference source code

Author: Unity Technologies

Editor/Mono/Animation/AnimationUtility.bindings.cs

@@ -270,6 +270,8 @@ internal static void SetEditorCurveNoSync(AnimationClip clip, EditorCurveBinding
         [NativeThrows]
         extern private static void Internal_SetEditorCurve([NotNull] AnimationClip clip, EditorCurveBinding binding, AnimationCurve curve, bool syncEditorCurves);
 
+        extern internal static bool IsDiscreteIntBinding(EditorCurveBinding binding);
+
         extern internal static void SyncEditorCurves([NotNull] AnimationClip clip);
 
         private static void Internal_InvokeOnCurveWasModified(AnimationClip clip, EditorCurveBinding binding, CurveModifiedType type)

Editor/Mono/Animation/AnimationWindow/AnimationWindowHierarchyGUI.cs

@@ -342,7 +342,7 @@ private void DoValueField(Rect rect, AnimationWindowHierarchyNode node, int row)
 
                     if (curve.valueType == typeof(bool))
                     {
-                        value = GUI.Toggle(valueFieldRect, m_HierarchyItemValueControlIDs[row], (float)value != 0, GUIContent.none, EditorStyles.toggle) ? 1f : 0f;
+                        value = GUI.Toggle(valueFieldRect, m_HierarchyItemValueControlIDs[row], Convert.ToSingle(value) != 0f, GUIContent.none, EditorStyles.toggle) ? 1f : 0f;
                     }
                     else
                     {
@@ -365,7 +365,7 @@ private void DoValueField(Rect rect, AnimationWindowHierarchyNode node, int row)
                                 valueFieldRect,
                                 valueFieldDragRect,
                                 id,
-                                (int)value,
+                                Convert.ToInt32(value),
                                 EditorGUI.kIntFieldFormatString,
                                 m_AnimationSelectionTextField,
                                 true,
@@ -382,7 +382,7 @@ private void DoValueField(Rect rect, AnimationWindowHierarchyNode node, int row)
                                 valueFieldRect,
                                 valueFieldDragRect,
                                 id,
-                                (float)value,
+                                Convert.ToSingle(value),
                                 "g5",
                                 m_AnimationSelectionTextField,
                                 true);
@@ -392,7 +392,8 @@ private void DoValueField(Rect rect, AnimationWindowHierarchyNode node, int row)
                                 Event.current.Use();
                             }
 
-                            if (float.IsInfinity((float)value) || float.IsNaN((float)value))
+                            var floatValue = Convert.ToSingle(value);
+                            if (float.IsInfinity(floatValue) || float.IsNaN(floatValue))
                                 value = 0f;
                         }
                     }

Editor/Mono/Animation/AnimationWindow/AnimationWindowKeyframe.cs

@@ -167,11 +167,11 @@ public Keyframe ToKeyframe()
                 // case 1395978
                 // Negative int values converted to float create NaN values. Limiting discrete int values to only positive values
                 // until we rewrite the animation backend with dedicated int curves.
-                floatValue = UnityEngine.Animations.DiscreteEvaluationAttributeUtilities.ConvertDiscreteIntToFloat(Math.Max((int)value, 0));
+                floatValue = UnityEngine.Animations.DiscreteEvaluationAttributeUtilities.ConvertDiscreteIntToFloat(Math.Max(Convert.ToInt32(value), 0));
             }
             else
             {
-                floatValue = (float)value;
+                floatValue = Convert.ToSingle(value);
             }
 
             var keyframe = new Keyframe(time, floatValue, inTangent, outTangent);

Editor/Mono/Animation/AnimationWindow/AnimationWindowUtility.cs

@@ -280,7 +280,7 @@ public static AnimationWindowKeyframe AddKeyframeToCurve(AnimationWindowCurve cu
             }
             else if (type == typeof(bool) || type == typeof(float) || type == typeof(int))
             {
-                Keyframe tempKey = new Keyframe(time.time, (float)value);
+                Keyframe tempKey = new Keyframe(time.time, Convert.ToSingle(value));
                 if (type == typeof(bool))
                 {
                     AnimationUtility.SetKeyLeftTangentMode(ref tempKey, TangentMode.Constant);

Editor/Mono/Animation/EditorCurveBinding.bindings.cs

@@ -8,6 +8,7 @@
 using UnityEngine.Playables;
 using UnityEngine.Scripting.APIUpdating;
 using UnityEngine.Internal;
+using UnityEngine;
 
 namespace UnityEditor
 {
@@ -128,6 +129,16 @@ static public EditorCurveBinding DiscreteCurve(string inPath, System.Type inType
             binding.m_isSerializeReferenceCurve = 0;
             binding.m_isUnknownCurve = 0;
 
+            if (!AnimationUtility.IsDiscreteIntBinding(binding))
+            {
+                Debug.LogWarning(
+                    $"Property [" + inPropertyName + "] is not a supported discrete curve binding. " +
+                    "Discrete curves only support [" + typeof(Enum) + "] and [" + typeof(int) + " with the `DiscreteEvaluation` attribute].");
+
+                binding.m_isDiscreteCurve = 0;
+                binding.m_isUnknownCurve = 1;
+            }
+
             return binding;
         }
 

Editor/Mono/AssetPipeline/TextureImporter.bindings.cs

@@ -21,7 +21,7 @@ namespace UnityEditor
     public sealed partial class TextureImporter : AssetImporter
     {
         [FreeFunction]
-        private static extern string GetFixedPlatformName(string platform);
+        internal static extern string GetFixedPlatformName(string platform);
 
         [Obsolete("textureFormat is no longer accessible at the TextureImporter level. For old 'simple' formats use the textureCompression property for the equivalent automatic choice (Uncompressed for TrueColor, Compressed and HQCommpressed for 16 bits). For platform specific formats use the [[PlatformTextureSettings]] API. Using this setter will setup various parameters to match the new automatic system as well as possible. Getter will return the last value set.")]
         public extern TextureImporterFormat textureFormat
@@ -103,7 +103,7 @@ public bool GetPlatformTextureSettings(string platform, out int maxTextureSize,
         // public API will always return a valid TextureImporterPlatformSettings, creating it based on the default one if it did not exist.
         public TextureImporterPlatformSettings GetPlatformTextureSettings(string platform)
         {
-            // make sure we are converting the settings to use the proper BuildTargetGroupName to get them (the way it works on other importers)
+            // make sure we are converting the settings to use the proper BuildTarget name to get them (the way it works on other importers)
             platform = GetFixedPlatformName(platform);
 
             TextureImporterPlatformSettings dest = GetPlatformTextureSetting_Internal(platform);

Editor/Mono/Audio/AudioContainerWindow.cs

@@ -94,6 +94,7 @@ sealed class AudioContainerWindow : EditorWindow
     bool m_IsInitializing;
     bool m_Day0ElementsInitialized;
     bool m_ContainerElementsInitialized;
+    private bool m_ClipFieldProgressBarsAreCleared = true;
 
     /// <summary>
     /// Holds the previous state of the list elements for undo/delete housekeeping
@@ -155,15 +156,21 @@ void OnDisable()
 
     void Update()
     {
-        UpdateClipFieldProgressBars();
+        if (State.IsPlayingOrPaused()) { UpdateClipFieldProgressBars(); }
+        else if (!m_ClipFieldProgressBarsAreCleared) { ClearClipFieldProgressBars(); }
 
-        if (m_Meter == null)
-            return;
-
-        if (State != null)
-            m_Meter.Value = State.GetMeterValue();
-        else
-            m_Meter.Value = -80.0f;
+        if (m_Meter != null)
+        {
+            if (State.IsPlayingOrPaused())
+            {
+                if (State != null) { m_Meter.Value = State.GetMeterValue(); }
+                else { m_Meter.Value = -80.0f; }
+            }
+            else
+            {
+                if (m_Meter.Value != -80.0f) { m_Meter.Value = -80.0f; }
+            }
+        }
     }
 
     void OnBecameInvisible()
@@ -331,7 +338,7 @@ void InitializePreviewElements()
         m_SkipButton = UIToolkitUtilities.GetChildByName<Button>(m_ContainerRootVisualElement, "skip-button");
         m_SkipButtonImage = UIToolkitUtilities.GetChildByName<VisualElement>(m_ContainerRootVisualElement, "skip-button-image");
 
-        var skipIcon = UIToolkitUtilities.LoadIcon("icon_next");
+        var skipIcon = UIToolkitUtilities.LoadIcon("Skip");
         m_SkipButtonImage.style.backgroundImage = new StyleBackground(skipIcon);
     }
 
@@ -384,8 +391,8 @@ void UpdateTransportButtonStates()
 
         var image =
             State.IsPlayingOrPaused()
-                ? UIToolkitUtilities.LoadIcon("icon_stop")
-                : UIToolkitUtilities.LoadIcon("icon_play");
+                ? UIToolkitUtilities.LoadIcon("Stop")
+                : UIToolkitUtilities.LoadIcon("Play");
 
         m_PlayButtonImage.style.backgroundImage = new StyleBackground(image);
     }
@@ -915,6 +922,8 @@ void UpdateClipFieldProgressBars()
         foreach (var field in clipFields)
             if (field.Progress != 0.0f)
                 field.Progress = 0.0f;
+
+        m_ClipFieldProgressBarsAreCleared = false;
     }
 
     void ClearClipFieldProgressBars()
@@ -926,6 +935,8 @@ void ClearClipFieldProgressBars()
 
         foreach (var field in clipFields)
             field.Progress = 0.0f;
+
+        m_ClipFieldProgressBarsAreCleared = true;
     }
 
     void DoDelayedListRebuild()

Editor/Mono/Audio/AudioContainerWindowState.cs

@@ -131,9 +131,9 @@ internal void UpdateTarget()
             newTarget = m_AudioContainer;
         }
 
-        if (m_TrackedSource == audioSource && m_AudioContainer == newTarget) 
+        if (m_TrackedSource == audioSource && m_AudioContainer == newTarget)
             return;
-        
+
         Reset();
 
         m_TrackedSource = audioSource;
@@ -144,26 +144,26 @@ internal void UpdateTarget()
 
         TargetChanged?.Invoke(this, EventArgs.Empty);
 
-        if (m_TrackedSource == null) 
+        if (m_TrackedSource == null)
             return;
-        
+
         var trackedSourceSO = new SerializedObject(m_TrackedSource);
         var trackedSourceResourceProperty = trackedSourceSO.FindProperty("m_Resource");
         m_ResourceTrackerElement.TrackPropertyValue(trackedSourceResourceProperty, OnResourceChanged);
     }
     void OnResourceChanged(SerializedProperty property)
     {
         var container = property.objectReferenceValue as AudioRandomContainer;
-        
+
         if (m_AudioContainer == container)
             return;
 
         Reset();
         m_AudioContainer = container;
-        
+
         if (m_AudioContainer != null)
             TargetPath = AssetDatabase.GetAssetPath(m_AudioContainer);
-        
+
         TargetChanged?.Invoke(this, EventArgs.Empty);
     }
 
@@ -245,7 +245,7 @@ internal ActivePlayable[] GetActivePlayables()
 
     internal float GetMeterValue()
     {
-        return IsPlayingOrPaused() ? m_PreviewAudioSource.GetAudioRandomContainerRuntimeMeterValue() : -80f;
+        return m_PreviewAudioSource.GetAudioRandomContainerRuntimeMeterValue();
     }
 
     internal bool IsDirty()

Editor/Mono/Audio/Mixer/GUI/AudioMixerWindow.cs

@@ -241,10 +241,10 @@ static List<AudioMixerController> FindAllAudioMixerControllers()
 
                 if (controller)
                 {
-                    if (controller.IsInitialized())
+                    if (controller.HasValidSnapshots())
                         result.Add(controller);
                     else
-                        Debug.LogError($"Can not display audio mixer window for '{controller.name}' as it has not been properly initialized. The mixer asset is possibly corrupted.");
+                        Debug.LogError($"Can not display audio mixer window for '{controller.name}' as it could not be properly initialized. The mixer asset is possibly corrupted.");
                 }
             }
             return result;
@@ -347,9 +347,9 @@ public void UndoRedoPerformed(in UndoRedoInfo info)
 
         void OnMixerControllerChanged()
         {
-            if (m_Controller != null && !m_Controller.IsInitialized())
+            if (m_Controller != null && !m_Controller.HasValidSnapshots())
             {
-                Debug.LogError($"Can not display audio mixer window for '{m_Controller.name}' as it has not been properly initialized. The mixer asset is possibly corrupted.");
+                Debug.LogError($"Can not display audio mixer window for '{m_Controller.name}' as it could not be properly initialized. The mixer asset is possibly corrupted.");
                 return;
             }
 
@@ -384,11 +384,11 @@ void DetectControllerChange()
 
             if (m_Controller != oldController)
             {
-                if (m_Controller.IsInitialized())
+                if (m_Controller.HasValidSnapshots())
                     OnMixerControllerChanged();
                 else
                 {
-                    Debug.LogError($"Can not display audio mixer window for '{m_Controller.name}' as it has not been properly initialized. The mixer asset is possibly corrupted.");
+                    Debug.LogError($"Can not display audio mixer window for '{m_Controller.name}' as it could not be properly initialized. The mixer asset is possibly corrupted.");
                 }
             }
         }

Editor/Mono/Audio/UIElements/Tickmarks.cs

@@ -49,32 +49,51 @@ private struct MiniScale : Scale
         public Tickmarks() : base()
         {
             generateVisualContent += context => GenerateVisualContent(context);
-
             RegisterCallback<GeometryChangedEvent>(OnGeometryChanged);
+            RegisterCallback<CustomStyleResolvedEvent>(CustomStylesResolved);
+        }
+
+        private static void CustomStylesResolved(CustomStyleResolvedEvent evt)
+        {
+            Tickmarks element = (Tickmarks)evt.currentTarget;
+            element.GetColorsFromStylesheet();
+        }
+
+        private static readonly CustomStyleProperty<Color> s_TickmarkColorProperty = new("--tickmark-color");
+
+        private Color m_TickmarkColor;
+
+        private void GetColorsFromStylesheet()
+        {
+            if (customStyle.TryGetValue(s_TickmarkColorProperty, out var tickmarkColor))
+            {
+                m_TickmarkColor = tickmarkColor;
+            }
         }
 
         private void OnGeometryChanged(GeometryChangedEvent evt)
         {
             MarkDirtyRepaint();
         }
 
-        static void GenerateVisualContent(MeshGenerationContext context)
+        private static void GenerateVisualContent(MeshGenerationContext context)
         {
             var painter2D = context.painter2D;
 
             var contentRect = context.visualElement.contentRect;
 
             Scale scale = contentRect.width > 350 ? new LargeScale() : (contentRect.width > 175 ? new CompactScale() : new MiniScale());
 
-            var gray = new Color(0.85f, 0.85f, 0.85f, 1.0f);
+            var tickmarkColor = (context.visualElement as Tickmarks).m_TickmarkColor;
+            var textColor = tickmarkColor.RGBMultiplied(1.2f); // Compensate for a bug in UI Toolkit which causes MeshGenerationContext.DrawText to render text lighter than the color that you provide.
 
             for (int index = 0; index < scale.DivisionCount(); index += 1)
             {
                 var pos = contentRect.width * index / (scale.DivisionCount() - 1.0f);
 
                 var rect = new Rect(pos - 0.5f, 5.0f, 1.0f, 8.0f);
 
-                painter2D.fillColor = gray;
+                painter2D.fillColor = tickmarkColor;
                 painter2D.BeginPath();
                 painter2D.MoveTo(new Vector2(rect.xMin, rect.yMin));
                 painter2D.LineTo(new Vector2(rect.xMax, rect.yMin));
@@ -94,7 +113,7 @@ static void GenerateVisualContent(MeshGenerationContext context)
                 {
                     var rect = new Rect(pos - 0.5f + spacing * (subIndex + 1.0f) / (subDivCount + 1.0f), 5.0f, 1.0f, 4.0f);
 
-                    painter2D.fillColor = gray;
+                    painter2D.fillColor = tickmarkColor;
                     painter2D.BeginPath();
                     painter2D.MoveTo(new Vector2(rect.xMin, rect.yMin));
                     painter2D.LineTo(new Vector2(rect.xMax, rect.yMin));
@@ -111,7 +130,7 @@ static void GenerateVisualContent(MeshGenerationContext context)
 
                 var rect = new Rect(pos - 10.0f, 10, 20.0f, 20.0f);
 
-                context.DrawText(scale.Labels()[index], new Vector2(pos + scale.LabelOffsets()[index], 14.0f), 10.0f, gray);
+                context.DrawText(scale.Labels()[index], new Vector2(pos + scale.LabelOffsets()[index], 14.0f), 10.0f, textColor);
             }
         }
     }