Unity 6000.0.0b12 C# reference source code

Author: Unity Technologies

Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/Data.cs

@@ -93,6 +93,7 @@ public class Il2CppConfig
         public string[] AdditionalArgs = new string[0];
         public string CompilerFlags;
         public string LinkerFlags;
+        public string LinkerFlagsFile;
         public string ExtraTypes;
         public bool CreateSymbolFiles;
         public bool AllowDebugging;

Editor/Mono/AssemblyInfo/AssemblyInfo.cs

@@ -54,6 +54,7 @@
 [assembly: InternalsVisibleTo("UnityEditor.PS5.Extensions")]
 [assembly: InternalsVisibleTo("UnityEditor.Switch.Extensions")]
 [assembly: InternalsVisibleTo("UnityEditor.WebGL.Extensions")]
+[assembly: InternalsVisibleTo("Unity.Automation.Players.WebGL")]
 [assembly: InternalsVisibleTo("Unity.WebGL.Extensions")]
 [assembly: InternalsVisibleTo("UnityEditor.LinuxStandalone.Extensions")]
 [assembly: InternalsVisibleTo("UnityEditor.CloudRendering.Extensions")]
@@ -149,6 +150,9 @@
 
 [assembly: InternalsVisibleTo("Unity.Entities.Build")]
 
+[assembly: InternalsVisibleTo("Unity.Muse.Common.Bridge")]
+[assembly: InternalsVisibleTo("Unity.Muse.Chat.Bridge")]
+
 [assembly: InternalsVisibleTo("Unity.Scenes")]
 
 // This should move with the AnimationWindow to a module at some point

Editor/Mono/AssetPipeline/SpeedTree/SpeedTree9Importer.cs

@@ -115,10 +115,12 @@ public STMeshGeometry(int vertexCount, int UVCount, int indexLod)
         /// </remarks>
         public delegate void OnCustomEditorSettings(ref SerializedProperty diffusionProfileAsset, ref SerializedProperty diffusionProfileHash);
 
+        [SerializeField]
+        internal SpeedTreeImporterOutputData m_OutputImporterData;
+
         // Cache main objects, created during import process.
         private AssetImportContext m_Context;
         private SpeedTree9Reader m_Tree;
-        private SpeedTreeImporterOutputData m_OutputImporterData;
         private Shader m_Shader;
         private SpeedTreeWindAsset m_WindAsset;
         private STRenderPipeline m_RenderPipeline;
@@ -214,6 +216,8 @@ public override void OnImportAsset(AssetImportContext ctx)
             ctx.AddObjectToAsset(m_OutputImporterData.name, m_OutputImporterData);
             ctx.DependsOnCustomDependency(ImporterSettings.kMaterialSettingsDependencyname);
 
+            AddDependencyOnExtractedMaterials();
+
             TriggerAllCabback();
         }
 
@@ -621,7 +625,7 @@ private void CreateMaterialsForCurrentLOD(STMaterial stMaterial, int lodIndex, b
                 // Explicity regenerate materials, should happen when bumping the material version for example.
                 if (regenerateMaterials)
                 {
-                    extractedMat = CreateMaterial(stMaterial, lodIndex, stMatName, m_PathFromDirectory);
+                    extractedMat = CreateMaterial(stMaterial, lodIndex, extractedMat.name, m_PathFromDirectory);
 
                     SetMaterialTextureAndColorProperties(stMaterial, extractedMat, lodIndex, m_PathFromDirectory);
                 }
@@ -630,10 +634,10 @@ private void CreateMaterialsForCurrentLOD(STMaterial stMaterial, int lodIndex, b
                     RetrieveMaterialSpecialProperties(extractedMat);
                 }
 
-                var existedMatIndex = m_OutputImporterData.lodMaterials.materials.FindIndex(m => m.material.name == stMatName);
+                var existedMatIndex = m_OutputImporterData.lodMaterials.materials.FindIndex(m => m.defaultName == stMatName);
                 if (existedMatIndex == -1)
                 {
-                    m_OutputImporterData.lodMaterials.materials.Add(new MaterialInfo { material = extractedMat, exported = true });
+                    m_OutputImporterData.lodMaterials.materials.Add(new MaterialInfo { material = extractedMat, defaultName = stMatName, exported = true });
                     m_OutputImporterData.lodMaterials.matNameToIndex[stMatName] = m_OutputImporterData.lodMaterials.materials.Count - 1;
                 }
                 else
@@ -646,7 +650,7 @@ private void CreateMaterialsForCurrentLOD(STMaterial stMaterial, int lodIndex, b
             {
                 Material newMat = CreateMaterial(stMaterial, lodIndex, stMatName, m_PathFromDirectory);
 
-                m_OutputImporterData.lodMaterials.materials.Add(new MaterialInfo { material = newMat, exported = false });
+                m_OutputImporterData.lodMaterials.materials.Add(new MaterialInfo { material = newMat, defaultName = stMatName, exported = false });
                 m_OutputImporterData.lodMaterials.matNameToIndex.Add(stMatName, m_OutputImporterData.lodMaterials.materials.Count - 1);
             }
 
@@ -675,7 +679,7 @@ private void CreateAssetIdentifiersAndAddMaterialsToContext()
                     }
                 }
 
-                m_OutputImporterData.materialsIdentifiers.Add(new AssetIdentifier(matInfo.material.GetType(), matInfo.material.name));
+                m_OutputImporterData.materialsIdentifiers.Add(new AssetIdentifier(matInfo.material.GetType(), matInfo.defaultName));
             }
         }
 
@@ -738,7 +742,7 @@ private void RegenerateAndPopulateExternalMaterials(string assetPath)
                 m_OutputImporterData.materialsIdentifiers.Add(new AssetIdentifier(matInfo.material.GetType(), matInfo.material.name));
 
                 // Remap the new material to the importer 'ExternalObjectMap'.
-                if (TryGetExternalMaterial(matInfo.material.name, out var extractedMat))
+                if (TryGetExternalMaterial(matInfo.defaultName, out var extractedMat))
                 {
                     string newMatPath = AssetDatabase.GetAssetPath(extractedMat);
 
@@ -750,7 +754,7 @@ private void RegenerateAndPopulateExternalMaterials(string assetPath)
                         AssetDatabase.CreateAsset(matInfo.material, newMatPath);
                     }
 
-                    if (TryGetSourceAssetIdentifierFromName(matInfo.material.name, out var assetIdentifier))
+                    if (TryGetSourceAssetIdentifierFromName(matInfo.defaultName, out var assetIdentifier))
                     {
                         AddRemap(assetIdentifier, matInfo.material);
                     }
@@ -816,17 +820,17 @@ private bool SetMaterialTexture(Material mat, STMaterial stMaterial, int indexMa
             {
                 MaterialMap stMatMap = stMaterial.Maps[indexMap];
                 string mapPath = stMatMap.Path;
-                if (stMatMap.Used && !string.IsNullOrEmpty(mapPath))
-                {
-                    string finalTexturePath = path + mapPath;
 
-                    Texture2D tex = (m_Context != null)
-                        ? m_Context.GetReferenceToAssetMainObject(finalTexturePath) as Texture2D
-                        : AssetDatabase.LoadAssetAtPath(finalTexturePath, typeof(Texture2D)) as Texture2D;
+                if (!stMatMap.Used)
+                    return false;
+
+                if (!string.IsNullOrEmpty(mapPath))
+                {
+                    Texture2D texture = LoadTexture(mapPath, path);
 
-                    if (tex != null)
+                    if (texture != null)
                     {
-                        mat.SetTexture(property, tex);
+                        mat.SetTexture(property, texture);
                         return true;
                     }
                 }
@@ -835,6 +839,35 @@ private bool SetMaterialTexture(Material mat, STMaterial stMaterial, int indexMa
             return false;
         }
 
+        private Texture2D LoadTexture(string mapPath, string path)
+        {
+            string texturePath = path + mapPath;
+
+            Texture2D texture = (m_Context != null)
+                ? m_Context.GetReferenceToAssetMainObject(texturePath) as Texture2D
+                : AssetDatabase.LoadAssetAtPath(texturePath, typeof(Texture2D)) as Texture2D;
+
+            if (texture != null)
+                return texture;
+
+            // Textures are not located near the asset, let's check if they were moved somewhere else.
+            string mapPathWithoutExtension = Path.GetFileNameWithoutExtension(mapPath);
+            string[] textureAssets = AssetDatabase.FindAssets(mapPathWithoutExtension);
+
+            if (textureAssets != null && textureAssets.Length > 0)
+            {
+                string assetPathFromGUID = AssetDatabase.GUIDToAssetPath(textureAssets[0]);
+
+                texture = (m_Context != null)
+                    ? m_Context.GetReferenceToAssetMainObject(assetPathFromGUID) as Texture2D
+                    : AssetDatabase.LoadAssetAtPath(assetPathFromGUID, typeof(Texture2D)) as Texture2D;
+
+                return texture;
+            }
+
+            return null;
+        }
+
         private bool TryGetInstanceIDFromMaterialProperty(Material material, int propertyName, out int id)
         {
             if (!material.HasProperty(propertyName))
@@ -1094,6 +1127,25 @@ internal void SetMaterialsVersionToCurrent()
             m_MaterialVersion = SPEEDTREE_9_MATERIAL_VERSION;
             MarkDirty();
         }
+
+        private void AddDependencyOnExtractedMaterials()
+        {
+            Dictionary<SourceAssetIdentifier, UnityEngine.Object> extMap = GetExternalObjectMap();
+
+            foreach (var entry in extMap)
+            {
+                if (entry.Value != null)
+                {
+                    string matPath = AssetDatabase.GetAssetPath(entry.Value);
+
+                    m_Context.DependsOnImportedAsset(matPath);
+
+                    // Necessary to avoid the warning "Import of asset setup artifact dependency to but dependency isn't used
+                    // and therefore not registered in the asset database".
+                    AssetDatabase.LoadAssetAtPath(matPath, typeof(Material));
+                }
+            }
+        }
         #endregion
 
         #region Wind

Editor/Mono/AssetPipeline/SpeedTree/SpeedTreeImporterSettings.cs

@@ -85,6 +85,7 @@ internal class PerLODSettings
     internal class MaterialInfo
     {
         public Material material = null;
+        public string defaultName = null;
         public bool exported = false;
     }
 

Editor/Mono/Audio/AudioContainerWindow.cs

@@ -122,21 +122,19 @@ static void OnCreateButtonClicked()
     void OnEnable()
     {
         Instance = this;
-
         m_DiceIconOff = EditorGUIUtility.IconContent("AudioRandomContainer On Icon").image as Texture2D;
         m_DiceIconOn = EditorGUIUtility.IconContent("AudioRandomContainer Icon").image as Texture2D;
-
         SetTitle();
-
-        m_IsInitializing = false;
-        m_Day0ElementsInitialized = false;
-        m_ContainerElementsInitialized = false;
     }
 
     void OnDisable()
     {
         Instance = null;
         State.OnDestroy();
+        UnsubscribeFromGUICallbacksAndEvents();
+        m_IsInitializing = false;
+        m_Day0ElementsInitialized = false;
+        m_ContainerElementsInitialized = false;
         m_CachedElements.Clear();
         m_AddedElements.Clear();
     }
@@ -272,6 +270,11 @@ void InitializeContainerElements()
 
     void SubscribeToGUICallbacksAndEvents()
     {
+        if (!m_ContainerElementsInitialized || m_IsSubscribedToGUICallbacksAndEvents)
+        {
+            return;
+        }
+
         SubscribeToPreviewCallbacksAndEvents();
         SubscribeToVolumeCallbacksAndEvents();
         SubscribeToPitchCallbacksAndEvents();
@@ -283,6 +286,11 @@ void SubscribeToGUICallbacksAndEvents()
 
     void UnsubscribeFromGUICallbacksAndEvents()
     {
+        if (!m_ContainerElementsInitialized || !m_IsSubscribedToGUICallbacksAndEvents)
+        {
+            return;
+        }
+
         UnsubscribeFromPreviewCallbacksAndEvents();
         UnsubscribeFromVolumeCallbacksAndEvents();
         UnsubscribeFromPitchCallbacksAndEvents();

Editor/Mono/BuildPipeline/Il2Cpp/IL2CPPUtils.cs

@@ -35,6 +35,8 @@ public abstract class Sysroot
         public abstract string GetToolchainPath();
         public abstract string GetIl2CppCompilerFlags();
         public abstract string GetIl2CppLinkerFlags();
+        // The sysroot package does not currently contain an implemenation for this method, adding a default implementation to avoid breaking stuff
+        public virtual string GetIl2CppLinkerFlagsFile() => null;
     }
 }
 

Editor/Mono/BuildPlayerWindow.cs

@@ -70,7 +70,7 @@ public GUIContent GetDownloadErrorForTarget(BuildTarget target)
             public GUIContent autoconnectProfiler = EditorGUIUtility.TrTextContent("Autoconnect Profiler", "When the build is started, an open Profiler Window will automatically connect to the Player and start profiling. The \"Build And Run\" option will also automatically open the Profiler Window.");
             public GUIContent autoconnectProfilerDisabled = EditorGUIUtility.TrTextContent("Autoconnect Profiler", "Profiling is only enabled in a Development Player.");
             public GUIContent buildWithDeepProfiler = EditorGUIUtility.TrTextContent("Deep Profiling Support", "Build Player with Deep Profiling Support. This might affect Player performance.");
-            public GUIContent buildWithDeepProfilerDisabled = EditorGUIUtility.TrTextContent("Deep Profiling", "Profiling is only enabled in a Development Player.");
+            public GUIContent buildWithDeepProfilerDisabled = EditorGUIUtility.TrTextContent("Deep Profiling Support", "Profiling is only enabled in a Development Player.");
             public GUIContent allowDebugging = EditorGUIUtility.TrTextContent("Script Debugging", "Enable this setting to allow your script code to be debugged.");
             public GUIContent waitForManagedDebugger = EditorGUIUtility.TrTextContent("Wait For Managed Debugger", "Show a dialog where you can attach a managed debugger before any script execution. Can also use volume Up or Down button to confirm on Android.");
             public GUIContent managedDebuggerFixedPort = EditorGUIUtility.TrTextContent("Managed Debugger Fixed Port", "Use the specified port to attach to the managed debugger. If 0, the port will be automatically selected.");

Editor/Mono/BuildProfile/BuildProfile.cs

@@ -11,55 +11,61 @@
 namespace UnityEditor.Build.Profile
 {
     /// <summary>
-    /// TODO EPIC: https://jira.unity3d.com/browse/PLAT-5745
+    /// Provides a set of configuration settings you can use to build your application on a particular platform.
     /// </summary>
     [RequiredByNativeCode(GenerateProxy = true)]
     [StructLayout(LayoutKind.Sequential)]
-    [VisibleToOtherModules]
-    internal sealed partial class BuildProfile : ScriptableObject
+    [ExcludeFromObjectFactory]
+    [ExcludeFromPreset]
+    public sealed partial class BuildProfile : ScriptableObject
     {
         /// <summary>
         /// Build Target used to fetch module and build profile extension.
         /// </summary>
         [SerializeField] BuildTarget m_BuildTarget = BuildTarget.NoTarget;
-        public BuildTarget buildTarget
+        [VisibleToOtherModules]
+        internal BuildTarget buildTarget
         {
             get => m_BuildTarget;
-            internal set => m_BuildTarget = value;
+            set => m_BuildTarget = value;
         }
 
         /// <summary>
         /// Subtarget, Default for all non-Standalone platforms.
         /// </summary>
         [SerializeField] StandaloneBuildSubtarget m_Subtarget;
-        public StandaloneBuildSubtarget subtarget
+        [VisibleToOtherModules]
+        internal StandaloneBuildSubtarget subtarget
         {
             get => m_Subtarget;
-            internal set => m_Subtarget = value;
+            set => m_Subtarget = value;
         }
 
         /// <summary>
         /// Module name used to fetch build profiles.
         /// </summary>
         [SerializeField] string m_ModuleName;
-        public string moduleName
+        [VisibleToOtherModules]
+        internal string moduleName
         {
             get => m_ModuleName;
-            internal set => m_ModuleName = value;
+            set => m_ModuleName = value;
         }
 
         /// <summary>
         /// Platform module specific build settings; e.g. AndroidBuildSettings.
         /// </summary>
         [SerializeReference] BuildProfilePlatformSettingsBase m_PlatformBuildProfile;
-        public BuildProfilePlatformSettingsBase platformBuildProfile
+        [VisibleToOtherModules]
+        internal BuildProfilePlatformSettingsBase platformBuildProfile
         {
             get => m_PlatformBuildProfile;
-            internal set => m_PlatformBuildProfile = value;
+            set => m_PlatformBuildProfile = value;
         }
 
         [SerializeField] private EditorBuildSettingsScene[] m_Scenes = Array.Empty<EditorBuildSettingsScene>();
-        public EditorBuildSettingsScene[] scenes
+        [VisibleToOtherModules]
+        internal EditorBuildSettingsScene[] scenes
         {
             get
             {
@@ -101,6 +107,14 @@ internal bool IsActiveBuildProfileOrPlatform()
             return profileModuleName == activeModuleName && subtarget == EditorUserBuildSettings.standaloneBuildSubtarget;
         }
 
+        [VisibleToOtherModules]
+        internal bool CanBuildLocally()
+        {
+            // Note: A platform build profile may have a non-null value even if its module is not installed.
+            // This scenario is true for server platform profiles, which are the same type as the standalone one.
+            return platformBuildProfile != null && BuildProfileModuleUtil.IsModuleInstalled(moduleName, subtarget);
+        }
+
         void OnEnable()
         {
             // Check if the platform support module has been installed,
@@ -144,7 +158,7 @@ void CheckSceneListConsistency()
                     RemoveAt(i);
                     continue;
                 }
-                
+
                 if (!isGuidValid)
                     scene.guid = AssetDatabase.GUIDFromAssetPath(scene.path);