Unity 6000.0.17f1 C# reference source code

Author: Unity Technologies

Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/Data.cs

@@ -92,6 +92,10 @@ public class Il2CppConfig
         public string[] AdditionalCppFiles = new string[0];
         public string[] AdditionalArgs = new string[0];
         public string CompilerFlags;
+        public string[] AdditionalLibraries;
+        public string[] AdditionalDefines;
+        public string[] AdditionalIncludeDirectories;
+        public string[] AdditionalLinkDirectories;
         public string LinkerFlags;
         public string LinkerFlagsFile;
         public string ExtraTypes;

Editor/Mono/AssetPipeline/SpeedTree/SpeedTree9Importer.cs

@@ -21,7 +21,11 @@
 
 namespace UnityEditor.SpeedTree.Importer
 {
-    [ScriptedImporter(1, "st9", AllowCaching = true)]
+    // [2024-08-07] version: 2
+    // Fixed mesh's UV2 & UV3 data usage strategy to 'always allocate' from 'conditionally allocate'
+    // to fix unwanted application of leaf-facing effect to geometries without leaf-facing data.
+
+    [ScriptedImporter(version: 2, ext: "st9", AllowCaching = true)]
     public class SpeedTree9Importer : ScriptedImporter
     {
         const int SPEEDTREE_9_WIND_VERSION = 1;
@@ -212,10 +216,10 @@ public override void OnImportAsset(AssetImportContext ctx)
 
             AddDependencyOnExtractedMaterials();
 
-            TriggerAllCabback();
+            TriggerAllCallbacks();
         }
 
-        private void TriggerAllCabback()
+        private void TriggerAllCallbacks()
         {
             var allMethods = AttributeHelper.GetMethodsWithAttribute<MaterialSettingsCallbackAttribute>().methodsWithAttributes;
             foreach (var method in allMethods)
@@ -259,7 +263,7 @@ internal void RegenerateMaterials()
 
                 RegenerateAndPopulateExternalMaterials(this.assetPath);
 
-                TriggerAllCabback();
+                TriggerAllCallbacks();
             }
             finally
             {
@@ -346,17 +350,13 @@ private Mesh CreateMeshAndGeometry(Lod lod, int lodIndex)
 
             mesh.SetUVs(0, sTMeshGeometry.uvs[0]);
             mesh.SetUVs(1, sTMeshGeometry.uvs[1]);
-
             if (!isBillboard)
             {
-                if (m_HasBranch2Data || m_HasFacingData) // If Branch2 is available:
-                {
-                    mesh.SetUVs(2, sTMeshGeometry.uvs[2]); // Branch2Pos, Branch2Dir, Branch2Weight, <Unused>
-                }
-                if (m_HasBranch2Data && m_HasFacingData) // If camera-facing geom is available:
-                {
-                    mesh.SetUVs(3, sTMeshGeometry.uvs[3]); // 2/3 Anchor XYZ, FacingFlag
-                }
+                // SpeedTree shader expects certain UV2 & UV3 values for leaf facing & wind.
+                // if we don't claim them here now, tree rendering may break when Unity
+                // uses UV2 & UV3 and the shader finds unexpected values.
+                mesh.SetUVs(2, sTMeshGeometry.uvs[2]); // Branch2Pos, Branch2Dir, Branch2Weight, <Unused>
+                mesh.SetUVs(3, sTMeshGeometry.uvs[3]); // 2/3 Anchor XYZ, FacingFlag
             }
 
             return mesh;
@@ -453,23 +453,23 @@ private void CalculateMeshGeometry(STMeshGeometry sTMeshGeometry, Lod lod, bool
 
                 if (!isBillboard)
                 {
-                    if (m_HasBranch2Data)
-                    {
-                        sTMeshGeometry.uvs[currentUV++][i].Set(
-                            vertex.BranchWind2.X,
-                            vertex.BranchWind2.Y,
-                            vertex.BranchWind2.Z,
-                            0.0f);
-                    }
-
-                    if (m_HasFacingData)
-                    {
-                        sTMeshGeometry.uvs[currentUV++][i].Set(
-                            vertex.Anchor.X * m_MeshSettings.scaleFactor,
-                            vertex.Anchor.Y * m_MeshSettings.scaleFactor,
-                            vertex.Anchor.Z * m_MeshSettings.scaleFactor,
-                            vertex.CameraFacing ? 1.0f : 0.0f);
-                    }
+                    float anchorX = m_HasFacingData ? vertex.Anchor.X * m_MeshSettings.scaleFactor : 0.0f;
+                    float anchorY = m_HasFacingData ? vertex.Anchor.Y * m_MeshSettings.scaleFactor : 0.0f;
+                    float anchorZ = m_HasFacingData ? vertex.Anchor.Z * m_MeshSettings.scaleFactor : 0.0f;
+                    float leafFacingFlag = vertex.CameraFacing ? 1.0f : 0.0f;
+
+                    sTMeshGeometry.uvs[currentUV++][i].Set(
+                        m_HasBranch2Data ? vertex.BranchWind2.X : anchorX,
+                        m_HasBranch2Data ? vertex.BranchWind2.Y : anchorY,
+                        m_HasBranch2Data ? vertex.BranchWind2.Z : anchorZ,
+                        m_HasBranch2Data ? 0.0f /*UNUSED*/      : leafFacingFlag);
+
+                    bool useUV3 = m_HasBranch2Data && m_HasFacingData;
+                    sTMeshGeometry.uvs[currentUV++][i].Set(
+                         useUV3 ? anchorX        : 0.0f,
+                         useUV3 ? anchorY        : 0.0f,
+                         useUV3 ? anchorZ        : 0.0f,
+                         useUV3 ? leafFacingFlag : 0.0f);
                 }
             }
         }
@@ -502,15 +502,7 @@ private int CalculateNumUVs(bool isBillboard)
             int numUVs = 2;
             if (!isBillboard)
             {
-                if (m_HasBranch2Data)
-                {
-                    numUVs += 1;
-                }
-
-                if (m_HasFacingData)
-                {
-                    numUVs += 1;
-                }
+                numUVs += 2; // reserve UV2 & UV3 for 3D-geometry to detect leaf facing (VS effect) correctly
             }
             return numUVs;
         }

Editor/Mono/BuildPipeline/Il2Cpp/IL2CPPUtils.cs

@@ -34,6 +34,14 @@ public abstract class Sysroot
         public abstract string GetSysrootPath();
         public abstract string GetToolchainPath();
         public abstract string GetIl2CppCompilerFlags();
+        // The sysroot package does not currently contain an implemenation for this method, adding a default implementation to avoid breaking stuff
+        public virtual string[] GetIl2CppAdditionalLibraries() => Array.Empty<string>();
+        // The sysroot package does not currently contain an implemenation for this method, adding a default implementation to avoid breaking stuff
+        public virtual string[] GetIl2CppAdditionalDefines() => Array.Empty<string>();
+        // The sysroot package does not currently contain an implemenation for this method, adding a default implementation to avoid breaking stuff
+        public virtual string[] GetIl2CppAdditionalIncludeDirectories() => Array.Empty<string>();
+        // The sysroot package does not currently contain an implemenation for this method, adding a default implementation to avoid breaking stuff
+        public virtual string[] GetIl2CppAdditionalLinkDirectories() => Array.Empty<string>();
         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/BuildProfile/BuildProfile.cs

@@ -206,6 +206,13 @@ void OnEnable()
 
         void OnDisable()
         {
+            var playerSettingsDirty = EditorUtility.IsDirty(m_PlayerSettings);
+            if (playerSettingsDirty)
+            {
+                BuildProfileModuleUtil.SerializePlayerSettings(this);
+                EditorUtility.SetDirty(this);
+            }
+
             // OnDisable is called when entering play mode, during domain reloads, or when the object is destroyed.
             // Avoid removing player settings for the first two cases to prevent slow syncs (e.g., color space) caused by global manager updates.
             if (!EditorApplication.isUpdating)

Editor/Mono/BuildProfile/BuildProfileModuleUtil.cs

@@ -538,5 +538,78 @@ public static (BuildTarget, StandaloneBuildSubtarget) GetBuildTargetAndSubtarget
         {
             return BuildTargetDiscovery.GetBuildTargetAndSubtargetFromGUID(new GUID(platformId));
         }
+
+        public static string[] GetSettingsRequiringRestart(PlayerSettings previousProfileSettings, PlayerSettings newProfileSettings, BuildTarget oldBuildTarget, BuildTarget newBuildTarget)
+        {
+            return  PlayerSettings.GetSettingsRequiringRestart(previousProfileSettings, newProfileSettings, oldBuildTarget, newBuildTarget);
+        }
+
+        public static PlayerSettings GetGlobalPlayerSettings()
+        {
+            return BuildProfile.GetGlobalPlayerSettings();
+        }
+
+        /// <summary>
+        /// Show the restart editor dialog with the names of the settings that required the restart to take effect
+        /// </summary>
+        public static bool ShowRestartEditorDialog(string[] settingsRequiringRestart)
+        {
+            var editorPromptText = new System.Text.StringBuilder();
+            editorPromptText.AppendLine(L10n.Tr("The Unity editor must be restarted for the following settings to take effect:"));
+            for (int i = 0; i < settingsRequiringRestart.Length; i++)
+            {
+                editorPromptText.AppendLine(settingsRequiringRestart[i]);
+            }
+
+            return EditorUtility.DisplayDialog(L10n.Tr("Unity editor restart required"), editorPromptText.ToString(), L10n.Tr("Apply"), L10n.Tr("Cancel"));
+        }
+
+        public static void RestartEditor()
+        {
+            EditorApplication.RestartEditorAndRecompileScripts();
+        }
+
+        public static bool HandlePlayerSettingsRequiringRestart(BuildProfile currentBuildProfile, BuildProfile nextBuildProfile, BuildTarget currentBuildTarget, BuildTarget nextBuildTarget)
+        {
+
+            PlayerSettings projectSettingsPlayerSettings = GetGlobalPlayerSettings();
+            PlayerSettings currentPlayerSettings = projectSettingsPlayerSettings;
+            PlayerSettings nextPlayerSettings = projectSettingsPlayerSettings;
+
+            if (currentBuildProfile != null)
+            {
+                if (currentBuildProfile.playerSettings != null)
+                {
+                    currentPlayerSettings = currentBuildProfile.playerSettings;
+                }
+            }
+
+            if (nextBuildProfile != null)
+            {
+                if (nextBuildProfile.playerSettings != null)
+                {
+                    nextPlayerSettings = nextBuildProfile.playerSettings;
+                }
+            }
+
+            string[] settingsRequiringRestart = GetSettingsRequiringRestart(currentPlayerSettings,
+                nextPlayerSettings, currentBuildTarget, nextBuildTarget);
+            // if we've found settings that need restarting..
+            if (settingsRequiringRestart.Length > 0 )
+            {
+                // ..we show the restart prompt, if the user restarts, we add a restart call to the editor
+                if (ShowRestartEditorDialog(settingsRequiringRestart))
+                {
+                    EditorApplication.delayCall += () => RestartEditor();
+                }
+                else
+                {
+                    // if the user cancels the restart, then we failed to handle the settings
+                    return false;
+                }
+            }
+            // all other outcomes are a success: found no settings to restart or the user agreed to restart
+            return true;
+        }
     }
 }

Editor/Mono/BuildProfile/BuildProfilePlayerSettings.cs

@@ -215,5 +215,10 @@ static void TryLoadProjectSettingsAssetPlayerSettings()
             if (s_GlobalPlayerSettings == null)
                 s_GlobalPlayerSettings = AssetDatabase.LoadAssetAtPath<PlayerSettings>(k_ProjectSettingsAssetPath);
         }
+
+        internal static PlayerSettings GetGlobalPlayerSettings()
+        {
+            return s_GlobalPlayerSettings;
+        }
     }
 }

Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsEditor.cs

@@ -265,7 +265,7 @@ class SettingsContent
             public static readonly string undoChangedDefaultShaderChunkCountString  = L10n.Tr("Changed Shader Chunk Count Default Setting");
 
             public static readonly string globalPlayerSettingsInfo =
-            L10n.Tr("Editing these global player settings will not affect the current state of the project, because the active build profile is using it's own customized player setitngs. Edit the build profile to change them.");
+            L10n.Tr("Editing these global player settings will not affect the current state of the project, because the active build profile is using its own customized player settings. Edit the build profile to change them.");
             public static readonly string globalPlayerSettingsInfoButton = L10n.Tr("Edit Build Profile");
         }
 
@@ -2217,7 +2217,8 @@ private void OtherSectionRenderingGUI(BuildPlatform platform, ISettingEditorExte
                         api == GraphicsDeviceType.Direct3D11 ||
                         api == GraphicsDeviceType.Metal ||
                         api == GraphicsDeviceType.Vulkan ||
-                        api == GraphicsDeviceType.OpenGLES3)
+                        api == GraphicsDeviceType.OpenGLES3 ||
+                        api == GraphicsDeviceType.Direct3D12)
                     {
                         platformSupportsBatching = true;
                         break;
@@ -3108,6 +3109,10 @@ private void OtherSectionConfigurationGUI(BuildPlatform platform, ISettingEditor
                     EditorGUILayout.PropertyField(m_GCIncremental, SettingsContent.gcIncremental);
                     if (m_GCIncremental.boolValue != oldValue)
                     {
+                        if (!IsActivePlayerSettingsEditor())
+                        {
+                            return;
+                        }
                         // Give the user a chance to change mind and revert changes.
                         if (ShouldRestartEditorToApplySetting())
                         {
@@ -3194,6 +3199,10 @@ private void OtherSectionConfigurationGUI(BuildPlatform platform, ISettingEditor
 
                     if (m_ActiveInputHandler.intValue != currValue)
                     {
+                        if (!IsActivePlayerSettingsEditor())
+                        {
+                            return;
+                        }
                         // Give the user a chance to change mind and revert changes.
                         if (ShouldRestartEditorToApplySetting())
                         {

Editor/Mono/Modules/BeeBuildPostprocessor.cs

@@ -273,6 +273,11 @@ IEnumerable<string> SplitArgs(string args)
 
         protected virtual string Il2CppCompilerFlagsFor(BuildPostProcessArgs args) => null;
 
+        protected virtual string[] Il2CppAdditionalLibrariesFor(BuildPostProcessArgs args) => Array.Empty<string>();
+        protected virtual string[] Il2CppAdditionalDefinesFor(BuildPostProcessArgs args) => Array.Empty<string>();
+        protected virtual string[] Il2CppAdditionalIncludeDirectoriesFor(BuildPostProcessArgs args) => Array.Empty<string>();
+        protected virtual string[] Il2CppAdditionalLinkDirectoriesFor(BuildPostProcessArgs args) => Array.Empty<string>();
+
         protected virtual string Il2CppLinkerFlagsFor(BuildPostProcessArgs args) => null;
 
         protected virtual string Il2CppLinkerFlagsFileFor(BuildPostProcessArgs args) => null;
@@ -296,6 +301,10 @@ Il2CppConfig Il2CppConfigFor(BuildPostProcessArgs args)
             var sysrootPath = Il2CppSysrootPathFor(args);
             var toolchainPath = Il2CppToolchainPathFor(args);
             var compilerFlags = Il2CppCompilerFlagsFor(args);
+            var additionalLibraries = Il2CppAdditionalLibrariesFor(args);
+            var additionalDefines = Il2CppAdditionalDefinesFor(args);
+            var additionalIncludeDirectories = Il2CppAdditionalIncludeDirectoriesFor(args);
+            var additionalLinkDirectories = Il2CppAdditionalLinkDirectoriesFor(args);
             var linkerFlags = Il2CppLinkerFlagsFor(args);
             var linkerFlagsFile = Il2CppLinkerFlagsFileFor(args);
             var relativeDataPath = Il2CppDataRelativePath(args);
@@ -345,6 +354,10 @@ Il2CppConfig Il2CppConfigFor(BuildPostProcessArgs args)
                 AdditionalArgs = additionalArgs.ToArray(),
                 AllowDebugging = allowDebugging,
                 CompilerFlags = compilerFlags,
+                AdditionalLibraries = additionalLibraries,
+                AdditionalDefines = additionalDefines,
+                AdditionalIncludeDirectories = additionalIncludeDirectories,
+                AdditionalLinkDirectories = additionalLinkDirectories,
                 LinkerFlags = linkerFlags,
                 LinkerFlagsFile = linkerFlagsFile,
                 SysRootPath = sysrootPath,

Editor/Mono/Modules/DefaultBuildProfileExtension.cs

@@ -91,13 +91,10 @@ public virtual void OnDisable()
         public VisualElement CreateSettingsGUI(
             SerializedObject serializedObject, SerializedProperty rootProperty, BuildProfileWorkflowState workflowState)
         {
-            var platformWarningsGUI = CreatePlatformBuildWarningsGUI(serializedObject, rootProperty);
             var commonSettingsGUI = CreateCommonSettingsGUI(serializedObject, rootProperty, workflowState);
             var platformSettingsGUI = CreatePlatformSettingsGUI(serializedObject, rootProperty, workflowState);
 
             var settingsGUI = new VisualElement();
-            if (platformWarningsGUI != null)
-                settingsGUI.Add(platformWarningsGUI);
             settingsGUI.Add(platformSettingsGUI);
             if (BuildPlayerWindow.WillDrawMultiplayerBuildOptions())
                 settingsGUI.Add(CreateMultiplayerSettingsGUI(serializedObject.targetObject as BuildProfile));

Editor/Mono/Modules/PlatformSupportModule.cs

@@ -392,6 +392,23 @@ VisualElement CreateSettingsGUI(
             SerializedProperty rootProperty,
             BuildProfileWorkflowState state);
 
+        /// <summary>
+        /// When editing a build profile asset, this method is invoked to render the
+        /// warning help boxes for build related issues.
+        /// </summary>
+        /// <param name="serializedObject">
+        /// Target Build Profile serialized object .
+        /// </param>
+        /// <param name="rootProperty">
+        /// Property instance for <see cref="BuildProfile.platformBuildProfile"/>.
+        /// </param>
+        /// <returns>
+        /// Root visual element for the platform specific warnings.
+        /// </returns>
+        VisualElement CreatePlatformBuildWarningsGUI(
+            SerializedObject serializedObject,
+            SerializedProperty rootProperty);
+
         /// <summary>
         /// Copy settings to the platform settings base we are passing. This is used, for example, when creating
         /// a new classic profile and we need to copy settings - that live in the managed side only - to it

Editor/Mono/Overlays/OverlayCanvas.cs

@@ -837,10 +837,7 @@ void SetActiveOverlayPopup(OverlayPopup popup)
                 if (evt.relatedTarget == null && m_PopupOverlay.containsCursor)
                     EditorApplication.delayCall += m_PopupOverlay.Focus;
                 else
-                {
                     ClosePopupOverlay();
-                    popup.overlay.OnWillBeDestroyed();
-                }
             });
 
             rootVisualElement.Add(m_PopupOverlay);
@@ -852,6 +849,7 @@ internal bool ClosePopupOverlay()
             if (m_PopupOverlay == null)
                 return false;
 
+            m_PopupOverlay.overlay.OnWillBeDestroyed();
             m_PopupOverlay.RemoveFromHierarchy();
             m_PopupOverlay = null;
             return true;

Editor/Mono/PlayerSettings.bindings.cs

@@ -1774,5 +1774,8 @@ internal static extern bool iosCopyPluginsCodeInsteadOfSymlink
         internal static extern void UpdatePlayerSettingsObjectFromYAML(PlayerSettings playerSettings, string yamlSettings);
 
         internal static extern bool platformRequiresReadableAssets { get; set; }
+
+        [StaticAccessor("PlayerSettings", StaticAccessorType.DoubleColon)]
+        internal static extern string[] GetSettingsRequiringRestart(PlayerSettings prevSettings, PlayerSettings newSettings, BuildTarget prevBuildTarget, BuildTarget newBuildTarget);
     }
 }