Unity 2023.3.0b8 C# reference source code

Author: Unity Technologies

Editor/Mono/Audio/UIElements/AudioRandomRangeSliderTracker.cs

@@ -16,59 +16,99 @@ class AudioRandomRangeSliderTracker : VisualElement
         public override object CreateInstance() => new AudioRandomRangeSliderTracker();
     }
 
+    static readonly CustomStyleProperty<Color> s_TrackerColorProperty = new("--tracker-color");
+
     Slider m_ParentSlider;
-    float m_PreviousWidth;
     Vector2 m_Range = Vector2.zero;
-    
+    Color m_TrackerColor;
+
+    static void CustomStylesResolved(CustomStyleResolvedEvent evt)
+    {
+        var element = (AudioRandomRangeSliderTracker)evt.currentTarget;
+
+        element.UpdateCustomStyles();
+    }
+
+    void UpdateCustomStyles()
+    {
+        if (customStyle.TryGetValue(s_TrackerColorProperty, out var trackerColor))
+        {
+            m_TrackerColor = trackerColor;
+        }
+    }
+
     internal static AudioRandomRangeSliderTracker Create(Slider parentSlider, Vector2 range)
     {
         var dragContainer = UIToolkitUtilities.GetChildByName<VisualElement>(parentSlider, "unity-drag-container");
         var rangeTrackerAsset = UIToolkitUtilities.LoadUxml("UXML/Audio/AudioRandomRangeSliderTracker.uxml");
         var baseTracker = UIToolkitUtilities.GetChildByName<VisualElement>(parentSlider, "unity-tracker");
         var insertionIndex = dragContainer.IndexOf(baseTracker) + 1;
         var templateContainer = rangeTrackerAsset.Instantiate();
+
         dragContainer.Insert(insertionIndex, templateContainer);
+
         var rangeTracker = UIToolkitUtilities.GetChildAtIndex<AudioRandomRangeSliderTracker>(templateContainer, 0);
+
+        rangeTracker.SetRange(range);
         rangeTracker.m_ParentSlider = parentSlider;
+        rangeTracker.generateVisualContent += GenerateVisualContent;
+        rangeTracker.RegisterCallback<CustomStyleResolvedEvent>(CustomStylesResolved);
         rangeTracker.m_ParentSlider.RegisterCallback<GeometryChangedEvent>(OnGeometryChanged);
-        rangeTracker.SetRange(range);
+
         return rangeTracker;
     }
 
     internal void SetRange(Vector2 range)
     {
         m_Range = range;
-        var minValue = m_ParentSlider.value - Math.Abs(m_Range.x);
-        minValue = Mathf.Clamp(minValue, m_ParentSlider.lowValue, m_ParentSlider.highValue);
-        var maxValue = m_ParentSlider.value + Mathf.Abs(m_Range.y);
-        maxValue = Mathf.Clamp(maxValue, m_ParentSlider.lowValue, m_ParentSlider.highValue);
 
-        if (Mathf.Approximately(parent.contentRect.width, 0) || m_Range == Vector2.zero || Mathf.Approximately(minValue ,maxValue))
-        {
-            style.display = DisplayStyle.None;
-            return;
-        }
-
-        var minValueDelta = minValue - m_ParentSlider.lowValue;
-        var maxValueDelta = maxValue - m_ParentSlider.lowValue;
-
-        var pxPerVal = parent.contentRect.width / m_ParentSlider.range;
-        var translate = style.translate.value;
-        translate.x = pxPerVal * minValueDelta;
-        style.translate = translate;
-        style.width = (maxValueDelta - minValueDelta) * pxPerVal;
-        style.display = DisplayStyle.Flex;
+        MarkDirtyRepaint();
     }
 
     static void OnGeometryChanged(GeometryChangedEvent evt)
     {
         var sliderTracker = UIToolkitUtilities.GetChildByClassName<AudioRandomRangeSliderTracker>(evt.elementTarget, "unity-audio-random-range-slider-tracker");
-        if (Mathf.Approximately(sliderTracker.m_PreviousWidth, sliderTracker.parent.contentRect.width))
-        {
-            return;
-        }
 
-        sliderTracker.m_PreviousWidth = sliderTracker.parent.contentRect.width;
         sliderTracker.SetRange(sliderTracker.m_Range);
     }
+
+    // Maps 'x' from the range '[x_min; x_max]' to the range '[y_min; y_max]'.
+    static float Map(float x, float x_min, float x_max, float y_min, float y_max)
+    {
+        var a = (x_max - x) / (x_max - x_min);
+        var b = (x - x_min) / (x_max - x_min);
+
+        return a * y_min + b * y_max;
+    }
+
+    static void GenerateVisualContent(MeshGenerationContext context)
+    {
+        var painter2D = context.painter2D;
+        var sliderTracker = context.visualElement as AudioRandomRangeSliderTracker;
+        var range = sliderTracker.m_Range;
+        var parentSlider = sliderTracker.m_ParentSlider;
+        var contentRect = context.visualElement.contentRect;
+
+        // Offset the range so it is centered around the parent slider's current value.
+        range.x += parentSlider.value;
+        range.y += parentSlider.value;
+
+        // Map the range from the slider value range (e.g. dB) to the horizontal span of the content-rect (px).
+        var left  = Map(range.y, parentSlider.lowValue, parentSlider.highValue, contentRect.xMin, contentRect.xMax);
+        var right = Map(range.x, parentSlider.lowValue, parentSlider.highValue, contentRect.xMin, contentRect.xMax);
+
+        // Clamp the mapped range so that it lies within the boundaries of the content-rect.
+        left =  Mathf.Clamp(left, contentRect.xMin, contentRect.xMax);
+        right = Mathf.Clamp(right, contentRect.xMin, contentRect.xMax);
+
+        // Draw the tracker.
+        painter2D.fillColor = sliderTracker.m_TrackerColor;
+        painter2D.BeginPath();
+        painter2D.MoveTo(new Vector2(left, contentRect.yMin));
+        painter2D.LineTo(new Vector2(right, contentRect.yMin));
+        painter2D.LineTo(new Vector2(right, contentRect.yMax));
+        painter2D.LineTo(new Vector2(left, contentRect.yMax));
+        painter2D.ClosePath();
+        painter2D.Fill();
+    }
 }

Editor/Mono/Audio/UIElements/OnAudioFilterReadLevelMeter.cs

@@ -13,7 +13,13 @@ internal class OnAudioFilterReadLevelMeter : IMGUIContainer
 
         public OnAudioFilterReadLevelMeter(MonoBehaviour behaviour)
         {
-            onGUIHandler = () => { m_IMGUI_AudioFilterGUI.DrawAudioFilterGUI(behaviour); };
+            onGUIHandler = () =>
+            {
+                if (GUIView.current != null)
+                {
+                    m_IMGUI_AudioFilterGUI.DrawAudioFilterGUI(behaviour);
+                }
+            };
         }
     }
 }

Editor/Mono/BuildProfile/BuildProfileContext.cs

@@ -272,7 +272,7 @@ void OnEnable()
                 var key = viewablePlatformKeys[index];
                 string path = GetFilePathForBuildProfile(key);
 
-                if (!File.Exists(path))
+                if (!File.Exists(path) || !BuildProfileModuleUtil.IsModuleInstalled(key.Item1, key.Item2))
                     continue;
 
                 var profile = InternalEditorUtility.LoadSerializedFileAndForget(path);

Editor/Mono/BuildProfile/BuildProfileModuleUtil.cs

@@ -115,7 +115,7 @@ public static bool IsModuleInstalled(string moduleName, StandaloneBuildSubtarget
             return installed
                 && BuildPipeline.LicenseCheck(buildTarget)
                 && !string.IsNullOrEmpty(moduleName)
-                && ModuleManager.GetBuildPostProcessor(moduleName) != null;
+                && ModuleManager.GetBuildProfileExtension(moduleName) != null;
         }
 
         /// <summary>
@@ -201,9 +201,18 @@ public static string GetModuleName(BuildTarget buildTarget)
         /// </summary>
         public static void SwitchLegacyActiveFromBuildProfile(BuildProfile profile)
         {
-            EditorUserBuildSettings.SwitchActiveBuildTargetAndSubtarget(
-                profile.buildTarget,
-                (int)profile.subtarget);
+            var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(profile.buildTarget);
+
+            if (buildTargetGroup == BuildTargetGroup.Standalone)
+            {
+                EditorUserBuildSettings.SwitchActiveBuildTargetAndSubtarget(
+                    profile.buildTarget,
+                    (int)profile.subtarget);
+                return;
+            }
+
+            // Subtarget fetched by EditorUserBuildSettings maps to the active build profile.
+            EditorUserBuildSettings.SwitchActiveBuildTarget(buildTargetGroup, profile.buildTarget);
         }
 
         public static void SwitchLegacySelectedBuildTargets(BuildProfile profile)
@@ -309,6 +318,12 @@ internal static BuildTarget GetBuildTarget(string moduleName)
             return s_DiscoveredTargetInfos[moduleName].buildTargetPlatformVal;
         }
 
+        [VisibleToOtherModules("UnityEditor.BuildProfileModule")]
+        internal static void SuppressMissingTypeWarning()
+        {
+            SerializationUtility.SuppressMissingTypeWarning(nameof(BuildProfile));
+        }
+
         static Dictionary<string, BuildTargetDiscovery.DiscoveredTargetInfo> InitializeDiscoveredTargetDict()
         {
             var result = new Dictionary<string, BuildTargetDiscovery.DiscoveredTargetInfo>();

Editor/Mono/EditorSerializationUtility.bindings.cs

@@ -113,5 +113,7 @@ public static bool ClearManagedReferenceWithMissingType(UnityObject obj, RefId i
         {
             return ClearManagedReferenceWithMissingTypeInternal(obj, id);
         }
+
+        internal static extern void SuppressMissingTypeWarning(string className);
     };
 }

Editor/Mono/GI/ProbeIntegrator.bindings.cs

@@ -43,9 +43,9 @@ public override string ToString()
         public void Prepare(IDeviceContext context, IWorld world, BufferSlice<Vector3> positions, float pushoff, int bounceCount);
         public void SetProgressReporter(BakeProgressState progress);
         public Result IntegrateDirectRadiance(IDeviceContext context, int positionOffset, int positionCount, int sampleCount,
-            bool ignoreDirectEnvironment, bool ignoreIndirectEnvironment, BufferSlice<SphericalHarmonicsL2> radianceEstimateOut);
+            bool ignoreDirectEnvironment, BufferSlice<SphericalHarmonicsL2> radianceEstimateOut);
         public Result IntegrateIndirectRadiance(IDeviceContext context, int positionOffset, int positionCount, int sampleCount,
-            bool ignoreDirectEnvironment, bool ignoreIndirectEnvironment, BufferSlice<SphericalHarmonicsL2> radianceEstimateOut);
+            bool ignoreIndirectEnvironment, BufferSlice<SphericalHarmonicsL2> radianceEstimateOut);
         public Result IntegrateValidity(IDeviceContext context, int positionOffset, int positionCount, int sampleCount, BufferSlice<float> validityEstimateOut);
     }
     internal class WintermuteProbeIntegrator : IProbeIntegrator
@@ -74,7 +74,7 @@ public void SetProgressReporter(BakeProgressState progress)
             _progress = progress;
         }
         public unsafe IProbeIntegrator.Result IntegrateDirectRadiance(IDeviceContext context, int positionOffset, int positionCount, int sampleCount,
-            bool ignoreDirectEnvironment, bool ignoreIndirectEnvironment, BufferSlice<SphericalHarmonicsL2> radianceEstimateOut)
+            bool ignoreDirectEnvironment, BufferSlice<SphericalHarmonicsL2> radianceEstimateOut)
         {
             Debug.Assert(context is WintermuteContext, "Expected WintermuteContext but got something else.");
             var wmContext = context as WintermuteContext;
@@ -88,6 +88,7 @@ public unsafe IProbeIntegrator.Result IntegrateDirectRadiance(IDeviceContext con
             int directSampleCount = sampleCount;
             int giSampleCount = 0;
             int envSampleCount = 0;
+            const bool ignoreIndirectEnvironment = true;
             var lightBakerResult = LightBaker.IntegrateProbeDirectRadianceWintermute(positionsPtr, _integrationContext, positionOffset, positionCount, _pushoff,
                 _bounceCount, directSampleCount, giSampleCount, envSampleCount, ignoreDirectEnvironment, ignoreIndirectEnvironment, wmContext, _progress, shPtr);
 
@@ -104,7 +105,7 @@ public unsafe IProbeIntegrator.Result IntegrateDirectRadiance(IDeviceContext con
             return lightBakerResult.ConvertToIProbeIntegratorResult();
         }
         public unsafe IProbeIntegrator.Result IntegrateIndirectRadiance(IDeviceContext context,
-            int positionOffset, int positionCount, int sampleCount, bool ignoreDirectEnvironment, bool ignoreIndirectEnvironment,
+            int positionOffset, int positionCount, int sampleCount, bool ignoreIndirectEnvironment,
             BufferSlice<SphericalHarmonicsL2> radianceEstimateOut)
         {
             Debug.Assert(context is WintermuteContext, "Expected WintermuteContext but got something else.");
@@ -117,6 +118,7 @@ public unsafe IProbeIntegrator.Result IntegrateIndirectRadiance(IDeviceContext c
             using var radianceBuffer = new NativeArray<Rendering.SphericalHarmonicsL2>(positionCount, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
             void* shPtr = NativeArrayUnsafeUtility.GetUnsafePtr(radianceBuffer);
             int directSampleCount = 0;
+            const bool ignoreDirectEnvironment = false;
             int giSampleCount = sampleCount;
             int envSampleCount = ignoreIndirectEnvironment ? 0 : sampleCount;
             var lightBakerResult = LightBaker.IntegrateProbeIndirectRadianceWintermute(positionsPtr, _integrationContext, positionOffset, positionCount, _pushoff,
@@ -192,7 +194,7 @@ public void SetProgressReporter(BakeProgressState progress)
             _progress = progress;
         }
         public unsafe IProbeIntegrator.Result IntegrateDirectRadiance(IDeviceContext context, int positionOffset, int positionCount, int sampleCount,
-            bool ignoreDirectEnvironment, bool ignoreIndirectEnvironment, BufferSlice<SphericalHarmonicsL2> radianceEstimateOut)
+            bool ignoreDirectEnvironment, BufferSlice<SphericalHarmonicsL2> radianceEstimateOut)
         {
             Debug.Assert(context is RadeonRaysContext, "Expected RadeonRaysContext but got something else.");
             var rrContext = context as RadeonRaysContext;
@@ -206,6 +208,7 @@ public unsafe IProbeIntegrator.Result IntegrateDirectRadiance(IDeviceContext con
             int directSampleCount = sampleCount;
             int giSampleCount = 0;
             int envSampleCount = 0;
+            const bool ignoreIndirectEnvironment = true;
             var lightBakerResult = LightBaker.IntegrateProbeDirectRadianceRadeonRays(positionsPtr, _integrationContext, positionOffset, positionCount, _pushoff,
                 _bounceCount, directSampleCount, giSampleCount, envSampleCount, ignoreDirectEnvironment, ignoreIndirectEnvironment, rrContext, _progress, shPtr);
 
@@ -223,7 +226,7 @@ public unsafe IProbeIntegrator.Result IntegrateDirectRadiance(IDeviceContext con
         }
 
         public unsafe IProbeIntegrator.Result IntegrateIndirectRadiance(IDeviceContext context, int positionOffset, int positionCount, int sampleCount,
-            bool ignoreDirectEnvironment, bool ignoreIndirectEnvironment, BufferSlice<SphericalHarmonicsL2> radianceEstimateOut)
+            bool ignoreIndirectEnvironment, BufferSlice<SphericalHarmonicsL2> radianceEstimateOut)
         {
             Debug.Assert(context is RadeonRaysContext, "Expected RadeonRaysContext but got something else.");
             var rrContext = context as RadeonRaysContext;
@@ -235,8 +238,9 @@ public unsafe IProbeIntegrator.Result IntegrateIndirectRadiance(IDeviceContext c
             using var radianceBuffer = new NativeArray<Rendering.SphericalHarmonicsL2>(positionCount, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
             void* shPtr = NativeArrayUnsafeUtility.GetUnsafePtr(radianceBuffer);
             int directSampleCount = 0;
+            const bool ignoreDirectEnvironment = false;
             int giSampleCount = sampleCount;
-            int envSampleCount = ignoreIndirectEnvironment ? 0 : sampleCount; ;
+            int envSampleCount = ignoreIndirectEnvironment ? 0 : sampleCount;
             var lightBakerResult = LightBaker.IntegrateProbeIndirectRadianceRadeonRays(positionsPtr, _integrationContext, positionOffset, positionCount, _pushoff,
                 _bounceCount, directSampleCount, giSampleCount, envSampleCount, ignoreDirectEnvironment, ignoreIndirectEnvironment, rrContext, _progress, shPtr);
 

Editor/Mono/GUI/PackageImportTreeView.cs

@@ -534,6 +534,7 @@ protected override void RenameEnded()
         private class PackageImportTreeViewDataSource : TreeViewDataSource
         {
             private PackageImportTreeView m_PackageImportView;
+            private const string k_RootTreeItemName = "InvisibleAssetsFolder";
 
             public PackageImportTreeViewDataSource(TreeViewController treeView, PackageImportTreeView view)
                 : base(treeView)
@@ -559,7 +560,7 @@ public override bool IsExpandable(TreeViewItem item)
             public override void FetchData()
             {
                 int rootDepth = -1; // -1 so its children will have 0 depth
-                m_RootItem = new PackageImportTreeViewItem(null, "Assets".GetHashCode(), rootDepth, null, "InvisibleAssetsFolder");
+                m_RootItem = new PackageImportTreeViewItem(null, k_RootTreeItemName.GetHashCode(), rootDepth, null, k_RootTreeItemName);
 
                 bool initExpandedState = true;
                 if (initExpandedState)

Editor/Mono/ImportSettings/TextureImporterInspector.cs

@@ -932,27 +932,35 @@ void ElementsAtlasGui(TextureInspectorGUIElement guiElements)
             m_ShowElementsAtlasSettings.target = isLayerShape;
             if (EditorGUILayout.BeginFadeGroup(m_ShowElementsAtlasSettings.faded) && isLayerShape)
             {
+                var isEditorTargetPreset = Presets.Preset.IsEditorTargetAPreset(target);
+
                 EditorGUI.indentLevel++;
                 EditorGUI.BeginChangeCheck();
                 EditorGUILayout.PropertyField(m_FlipbookColumns, s_Styles.flipbookColumns);
                 if (EditorGUI.EndChangeCheck())
                 {
                     var val = m_FlipbookColumns.intValue;
-                    val = Mathf.Clamp(val, 1, m_TextureWidth);
+
+                    // It happens when we are directly changing a TextureImporter preset and not an ImportSettings (targetting a 2D texture).
+                    // We don't wanna clamp the value to 'm_TextureWidth', or it will always be set to -1 since there's no texture targeted.
+                    val = Mathf.Clamp(val, 1, !isEditorTargetPreset ? m_TextureWidth : val);
                     m_FlipbookColumns.intValue = val;
                 }
-                if (m_TextureWidth % m_FlipbookColumns.intValue != 0)
+                if (!isEditorTargetPreset && m_TextureWidth % m_FlipbookColumns.intValue != 0)
                     EditorGUILayout.HelpBox($"Image width {m_TextureWidth} does not divide into {m_FlipbookColumns.intValue} columns exactly", MessageType.Warning, true);
 
                 EditorGUI.BeginChangeCheck();
                 EditorGUILayout.PropertyField(m_FlipbookRows, s_Styles.flipbookRows);
                 if (EditorGUI.EndChangeCheck())
                 {
                     var val = m_FlipbookRows.intValue;
-                    val = Mathf.Clamp(val, 1, m_TextureHeight);
+
+                    // It happens when we are directly changing a TextureImporter preset and not an ImportSettings (targetting a 2D texture).
+                    // We don't wanna clamp the value to 'm_TextureHeight', or it will always be set to -1 since there's no texture targeted.
+                    val = Mathf.Clamp(val, 1, !isEditorTargetPreset ? m_TextureHeight : val);
                     m_FlipbookRows.intValue = val;
                 }
-                if (m_TextureHeight % m_FlipbookRows.intValue != 0)
+                if (!isEditorTargetPreset && m_TextureHeight % m_FlipbookRows.intValue != 0)
                     EditorGUILayout.HelpBox($"Image height {m_TextureHeight} does not divide into {m_FlipbookRows.intValue} rows exactly", MessageType.Warning, true);
                 EditorGUI.indentLevel--;
             }