Unity 6000.2.0a8 C# reference source code

Author: Unity Technologies

Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/Data.cs

@@ -114,6 +114,7 @@ public class Services
         public bool EnablePerformanceReporting;
         public bool EnableAnalytics;
         public bool EnableCrashReporting;
+        public bool EnableInsights;
     }
 
     public class StreamingAssetsFile

Editor/IncrementalBuildPipeline/ScriptCompilationBuildProgram.Data/Data.cs

@@ -56,6 +56,7 @@ public class AssemblyData
     public class ScriptCompilationData_Out
     {
         public AssemblyData_Out[] Assemblies;
+        public bool LocalizeCompilerMessages;
     }
 
     public class AssemblyData_Out

Editor/Mono/AssemblyInfo/AssemblyInfo.cs

@@ -183,10 +183,6 @@
 
 [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: InternalsVisibleTo("UnityEditor.Switch.Tests")]
 
@@ -201,3 +197,9 @@
 
 [assembly: InternalsVisibleTo("Unity.GraphToolsAuthoringFramework.InternalEditorBridge")]
 
+// Module test assemblies
+[assembly: InternalsVisibleTo("Unity.Modules.Licensing.Tests.Editor")]
+// This should move with the AnimationWindow to a module at some point
+[assembly: InternalsVisibleTo("Unity.Modules.Animation.AnimationWindow.Tests.Editor")]
+[assembly: InternalsVisibleTo("Unity.Modules.Physics.Tests.Editor")]
+

Editor/Mono/AssetPipeline/SpeedTree/SpeedTree9Importer.cs

@@ -317,8 +317,8 @@ static ulong ComputeDefaultShaderHash()
 
         static void DirtyCustomDependencies()
         {
-            DateTime now = DateTime.Now;
-            if (Application.isPlaying || now - s_LastCheck < k_CheckDependencyFrequency)
+            DateTime now = DateTime.UtcNow;
+            if (Application.isPlaying || ((now - s_LastCheck) < k_CheckDependencyFrequency))
             {
                 return;
             }

Editor/Mono/BaseBuildTarget.cs

@@ -29,6 +29,7 @@ internal abstract class BaseBuildTarget : IBuildTarget
     public virtual IUIPlatformProperties UIPlatformProperties => Properties as IUIPlatformProperties;
     public virtual IAudioPlatformProperties AudioPlatformProperties => Properties as IAudioPlatformProperties;
     public virtual IVRPlatformProperties VRPlatformProperties => Properties as IVRPlatformProperties;
+    public virtual ISubtargetPlatformProperties TextureSubtargetPlatformProperties => Properties as ISubtargetPlatformProperties;
 
     protected virtual IPlatformProperties Properties => null;
 

Editor/Mono/BuildPipeline/AssemblyStripper.cs

@@ -300,6 +300,29 @@ public static string WriteEditorData(BuildPostProcessArgs args, NPath linkerInpu
             return items;
         }
 
+        private class AssemblyStripperModuleAdder : IPreStrippingModuleAdder
+        {
+            private List<string> m_ForceIncludes;
+
+            public AssemblyStripperModuleAdder(List<string> forceIncludes)
+            {
+                m_ForceIncludes = forceIncludes;
+            }
+
+            public void AddModule(string moduleName)
+            {
+                if (IsModuleIncluded(moduleName))
+                    return;
+
+                m_ForceIncludes.Add(moduleName);
+            }
+
+            public bool IsModuleIncluded(string moduleName)
+                => m_ForceIncludes.Any(i => string.Equals(i, moduleName));
+        }
+
+        public static event Action<IPreStrippingModuleAdder> onCollectIncludedModules;
+
         static void CollectIncludedAndExcludedModules(out List<string> forceInclude, out List<string> forceExclude)
         {
             forceInclude = new List<string>();
@@ -313,6 +336,9 @@ static void CollectIncludedAndExcludedModules(out List<string> forceInclude, out
                 else if (includeSetting == ModuleIncludeSetting.ForceExclude)
                     forceExclude.Add(module);
             }
+
+            var adder = new AssemblyStripperModuleAdder(forceInclude);
+            onCollectIncludedModules?.Invoke(adder);
         }
 
         private static NPath WriteMethodsToPreserveBlackList(RuntimeClassRegistry rcr, NPath linkerInputDirectory)

Editor/Mono/BuildProfile/BuildProfileContext.cs

@@ -808,6 +808,20 @@ static void UpdateActiveProfilePlayerSettingsObjectFromYAML()
             activeProfile?.UpdatePlayerSettingsObjectFromYAML();
         }
 
+        [RequiredByNativeCode]
+        static void SerializeActiveProfilePlayerSettings()
+        {
+            var profile = EditorUserBuildSettings.activeBuildProfile;
+            if (profile == null)
+                return;
+
+            if (!EditorUtility.IsDirty(profile.playerSettings))
+                return;
+
+            profile.SerializePlayerSettings();
+        }
+
+
         static bool ShouldReturnActiveProfile(GUID platformGuid, string sharedSetting = null)
         {
             if (!string.IsNullOrEmpty(sharedSetting))

Editor/Mono/BuildProfile/BuildProfileGraphicsSettingsEditor.cs

@@ -7,6 +7,7 @@
 using UnityEngine.Bindings;
 using UnityEngine.UIElements;
 using UnityEngine.Rendering;
+using UnityEngine;
 
 namespace UnityEditor.Build.Profile
 {
@@ -33,6 +34,8 @@ public override VisualElement CreateInspectorGUI()
             BindEnumFieldWithFadeGroup(root, "Lightmap", CalculateLightmapStrippingFromCurrentScene);
             BindEnumFieldWithFadeGroup(root, "Fog", CalculateFogStrippingFromCurrentScene);
 
+            BindShaderPreload(root);
+
             // Align fields as in the inspector
             var type = typeof(BaseField<>);
             root.Query<BindableElement>()
@@ -59,6 +62,57 @@ void BindEnumFieldWithFadeGroup(VisualElement content, string id, Action buttonC
             content.MandatoryQ<Button>($"Import{id}FromCurrentScene").clicked += buttonCallback;
         }
 
+        void BindShaderPreload(VisualElement root)
+        {
+            var shaderPreloadProperty = serializedObject.FindProperty("m_PreloadedShaders");
+            shaderPreloadProperty.isExpanded = false;
+            
+            var delayedShaderTimeLimitProperty = serializedObject.FindProperty("m_PreloadShadersBatchTimeLimit");
+            var shaderPreloadToggle = root.MandatoryQ<Toggle>("ShaderPreloadToggle");
+            var delayedShaderTimeLimitGroup = root.MandatoryQ<VisualElement>("DelayedShaderTimeLimitGroup");
+            var delayedShaderTimeLimit = root.MandatoryQ<IntegerField>("DelayedShaderTimeLimit");
+            shaderPreloadToggle.RegisterValueChangedCallback(evt => {
+                delayedShaderTimeLimitGroup.style.display = evt.newValue ? DisplayStyle.Flex : DisplayStyle.None;
+                var newVal = evt.newValue ? delayedShaderTimeLimit.value : -1;
+                if (delayedShaderTimeLimitProperty.intValue != newVal)
+                {
+                    delayedShaderTimeLimitProperty.intValue = newVal;
+                    delayedShaderTimeLimitProperty.serializedObject.ApplyModifiedProperties();
+                }
+            });
+            delayedShaderTimeLimit.RegisterValueChangedCallback(evt =>
+            {
+                if (delayedShaderTimeLimitProperty.intValue != evt.newValue)
+                {
+                    delayedShaderTimeLimitProperty.intValue = evt.newValue;
+                    delayedShaderTimeLimitProperty.serializedObject.ApplyModifiedProperties();
+                }
+            });
+            shaderPreloadToggle.SetValueWithoutNotify(delayedShaderTimeLimitProperty.intValue >= 0);
+            delayedShaderTimeLimit.SetValueWithoutNotify(Mathf.Max(0, delayedShaderTimeLimitProperty.intValue));
+            delayedShaderTimeLimitGroup.style.display = delayedShaderTimeLimitProperty.intValue >= 0 ? DisplayStyle.Flex : DisplayStyle.None;
+            
+            var shaderTracking = root.MandatoryQ<HelpBox>("ShaderTrackingInfoBox");
+            shaderTracking.schedule.Execute(() =>
+                shaderTracking.text =
+                    $"Currently tracked: {ShaderUtil.GetCurrentShaderVariantCollectionShaderCount()} shaders {ShaderUtil.GetCurrentShaderVariantCollectionVariantCount()} total variants").Every(500);
+
+            var saveButton = root.MandatoryQ<Button>("SaveShaderVariants");
+            saveButton.clickable = new Clickable(() =>
+            {
+                var assetPath = EditorUtility.SaveFilePanelInProject(
+                    L10n.Tr("Save Shader Variant Collection"),
+                    "NewShaderVariants",
+                    "shadervariants",
+                    L10n.Tr("Save shader variant collection"),
+                    ProjectWindowUtil.GetActiveFolderPath());
+                if (!string.IsNullOrEmpty(assetPath))
+                    ShaderUtil.SaveCurrentShaderVariantCollection(assetPath);
+            });
+            var clearButton = root.MandatoryQ<Button>("ClearCurrentShaderVariants");
+            clearButton.clickable = new Clickable(ShaderUtil.ClearCurrentShaderVariantCollection);
+        }
+
         void CalculateLightmapStrippingFromCurrentScene()
         {
             bool lightmapKeepPlain, lightmapKeepDirCombined, lightmapKeepDynamicPlain, lightmapKeepDynamicDirCombined, lightmapKeepShadowMask, lightmapKeepSubtractive;

Editor/Mono/BuildProfile/BuildProfileModuleUtil.cs

@@ -13,6 +13,7 @@
 using UnityEngine.UIElements;
 using TargetAttributes = UnityEditor.BuildTargetDiscovery.TargetAttributes;
 using UnityEditor.Profiling;
+using InternalEditorUtility = UnityEditorInternal.InternalEditorUtility;
 
 namespace UnityEditor.Build.Profile
 {
@@ -33,6 +34,7 @@ internal class BuildProfileModuleUtil
         public const int k_MaxAssetFileNameLengthWithoutExtension = k_MaxAssetFileNameLength - 6;
         static readonly string k_NoModuleLoaded = L10n.Tr("No {0} module loaded.");
         static readonly string k_DerivedPlatformInactive = L10n.Tr("{0} is currently disabled.");
+        static readonly string k_DerivedPlatformDisabled = L10n.Tr("{0} was disabled via command-line arguments.");
         static readonly string k_EditorWillNeedToBeReloaded = L10n.Tr("Note: Editor will need to be restarted to load any newly installed modules");
         static readonly string k_BuildProfileRecompileReason = L10n.Tr("Active build profile scripting defines changes.");
         static readonly GUIContent k_OpenDownloadPage = EditorGUIUtility.TrTextContent("Open Download Page");
@@ -187,11 +189,29 @@ public static VisualElement CreateModuleNotInstalledElement(GUID platformId)
                 });
             }
 
+            if (IsBuildProfileDisabledViaArguments(platformId))
+                return new IMGUIContainer(() =>
+                {
+                    GUILayout.Label(EditorGUIUtility.TextContent(string.Format(k_DerivedPlatformDisabled, BuildTargetDiscovery.BuildPlatformDisplayName(platformId))));
+                });
+
             return new IMGUIContainer(
                 () => BuildPlayerWindow.ShowNoModuleLabel(platformId,
                     k_NoModuleLoaded, k_OpenDownloadPage, k_InstallModuleWithHub, k_EditorWillNeedToBeReloaded));
         }
 
+        static bool IsBuildProfileDisabledViaArguments(GUID platformId)
+        {
+            var (buildTarget, _) = BuildTargetDiscovery.GetBuildTargetAndSubtargetFromGUID(platformId);
+            var buildTargetInfoList = BuildTargetDiscovery.GetBuildTargetInfoList();
+
+            foreach (var info in buildTargetInfoList)
+                if (info.buildTargetPlatformVal.Equals(buildTarget))
+                    return InternalEditorUtility.IsPlaybackEngineDisabled(info.dirName);
+
+            return false;
+        }
+
         /// <summary>
         /// Exported from <see cref="BuildPlayerWindow"/>, UI code specifically for when current license does not cover
         /// BuildTarget.
@@ -247,7 +267,7 @@ public static string GetModuleName(GUID platformId)
         /// </summary>
         public static void SwitchLegacyActiveFromBuildProfile(BuildProfile profile)
         {
-            EditorUserBuildSettings.SwitchActiveBuildTargetGuid(profile.platformGuid);
+            EditorUserBuildSettings.SwitchActiveBuildTargetGuid(profile);
         }
 
         public static void SwitchLegacySelectedBuildTargets(BuildProfile profile)

Editor/Mono/BuildProfile/BuildProfilePlatformSettingsBase.cs

@@ -117,6 +117,7 @@ internal protected virtual bool installInBuildFolder
             set => m_InstallInBuildFolder = value;
         }
 
+
         /// <summary>
         /// Set platform setting based on strings for name and value. Native
         /// calls this to keep build profiles and EditorUserBuildSettings