Unity 6000.0.8f1 C# reference source code

Author: Unity Technologies

Editor/Mono/AssetPipeline/SpeedTree/SpeedTree9Importer.cs

@@ -228,10 +228,10 @@ private void TriggerAllCabback()
         private void CacheTreeImporterValues(string assetPath)
         {
             // Variables used a lot are cached, since accessing any Reader array has a non-negligeable cost. 
+            m_LODCount = (uint)m_Tree.Lod.Length;
             m_HasFacingData = TreeHasFacingData();
             m_HasBranch2Data = m_Tree.Wind.DoBranch2;
             m_LastLodIsBillboard = m_Tree.BillboardInfo.LastLodIsBillboard;
-            m_LODCount = (uint)m_Tree.Lod.Length;
             m_CollisionObjectsCount = (uint)m_Tree.CollisionObjects.Length;
 
             WindConfigSDK windCfg = m_Tree.Wind;
@@ -349,13 +349,13 @@ private Mesh CreateMeshAndGeometry(Lod lod, int lodIndex)
 
             if (!isBillboard)
             {
-                if (m_HasBranch2Data || m_HasFacingData)
+                if (m_HasBranch2Data || m_HasFacingData) // If Branch2 is available:
                 {
-                    mesh.SetUVs(2, sTMeshGeometry.uvs[2]);
+                    mesh.SetUVs(2, sTMeshGeometry.uvs[2]); // Branch2Pos, Branch2Dir, Branch2Weight, <Unused>
                 }
-                if (m_HasBranch2Data && m_HasFacingData)
+                if (m_HasBranch2Data && m_HasFacingData) // If camera-facing geom is available:
                 {
-                    mesh.SetUVs(3, sTMeshGeometry.uvs[3]);
+                    mesh.SetUVs(3, sTMeshGeometry.uvs[3]); // 2/3 Anchor XYZ, FacingFlag
                 }
             }
 
@@ -405,17 +405,12 @@ private void CalculateMeshGeometry(STMeshGeometry sTMeshGeometry, Lod lod, bool
                 STVertex vertex = vertices[i];
 
                 sTMeshGeometry.vertices[i].Set(
-                    vertex.Anchor.X + vertex.Offset.X,
+                    vertex.Anchor.X + (vertex.CameraFacing ? -vertex.Offset.X : vertex.Offset.X),
                     vertex.Anchor.Y + vertex.Offset.Y,
                     vertex.Anchor.Z + vertex.Offset.Z);
 
                 sTMeshGeometry.vertices[i] *= m_MeshSettings.scaleFactor;
 
-                if (vertex.CameraFacing)
-                {
-                    sTMeshGeometry.vertices[i].x = vertex.Anchor.X - vertex.Offset.X;
-                }
-
                 sTMeshGeometry.normals[i].Set(vertex.Normal.X, vertex.Normal.Y, vertex.Normal.Z);
 
                 Vector3 vertexTangent = new Vector3(vertex.Tangent.X, vertex.Tangent.Y, vertex.Tangent.Z);
@@ -1264,6 +1259,7 @@ bool RippleHasAllCurvesValid(in WindRipple r)
             // st9
             cfg.branch1StretchLimit = wind.Branch1StretchLimit * scaleFactor;
             cfg.branch2StretchLimit = wind.Branch2StretchLimit * scaleFactor;
+            cfg.importScale = scaleFactor;
             cfg.treeExtentX = (treeBounds.Max.X - treeBounds.Min.X) * scaleFactor;
             cfg.treeExtentY = (treeBounds.Max.Y - treeBounds.Min.Y) * scaleFactor;
             cfg.treeExtentZ = (treeBounds.Max.Z - treeBounds.Min.Z) * scaleFactor;
@@ -1277,7 +1273,7 @@ bool RippleHasAllCurvesValid(in WindRipple r)
                 CopyCurve(shared.Turbulence, cfg.turbulenceShared);
                 CopyCurve(shared.Flexibility, cfg.flexibilityShared);
                 cfg.independenceShared = shared.Independence;
-                cfg.sharedHeightStart = wind.SharedStartHeight * scaleFactor;
+                cfg.sharedHeightStart = wind.SharedStartHeight; // this is a % value
                 if (BranchHasAllCurvesValid(in shared))
                 {
                     cfg.doShared = 1;
@@ -1347,29 +1343,25 @@ private void SetWindParameters(ref SpeedTreeWindConfig9 cfg)
         #region Others
         private void CalculateScaleFactorFromUnit()
         {
-            float scaleFactor = m_MeshSettings.scaleFactor;
-
             switch (m_MeshSettings.unitConversion)
             {
                 // Use units in the imported file without any conversion.
                 case STUnitConversion.kLeaveAsIs:
-                    scaleFactor = 1.0f;
+                    m_MeshSettings.scaleFactor = 1.0f;
                     break;
                 case STUnitConversion.kFeetToMeters:
-                    scaleFactor = SpeedTreeConstants.kFeetToMetersRatio;
+                    m_MeshSettings.scaleFactor = SpeedTreeConstants.kFeetToMetersRatio;
                     break;
                 case STUnitConversion.kCentimetersToMeters:
-                    scaleFactor = SpeedTreeConstants.kCentimetersToMetersRatio;
+                    m_MeshSettings.scaleFactor = SpeedTreeConstants.kCentimetersToMetersRatio;
                     break;
                 case STUnitConversion.kInchesToMeters:
-                    scaleFactor = SpeedTreeConstants.kInchesToMetersRatio;
+                    m_MeshSettings.scaleFactor = SpeedTreeConstants.kInchesToMetersRatio;
                     break;
                 case STUnitConversion.kCustomConversion:
                     /* no-op */
                     break;
             }
-
-            m_MeshSettings.scaleFactor = scaleFactor;
         }
 
         private bool TreeHasFacingData()

Editor/Mono/AssetPipeline/TextureImporter.bindings.cs

@@ -452,9 +452,30 @@ public void ReadTextureSettings(TextureImporterSettings dest)
         // Set texture importers settings from [[TextureImporterSettings]] class.
         public void SetTextureSettings(TextureImporterSettings src)
         {
+            ValidateAndCorrectTextureImporterSettings(src);
             settings = src;
         }
 
+        private void ValidateAndCorrectTextureImporterSettings(TextureImporterSettings m_Settings)
+        {
+            switch (m_Settings.textureType)
+            {
+                case TextureImporterType.Sprite:
+                    m_Settings.npotScale = ValidateAndCorrectSetting(m_Settings.npotScale, TextureImporterNPOTScale.None, nameof(m_Settings.npotScale));
+                    break;
+            }
+        }
+
+        private T ValidateAndCorrectSetting<T>(T actual, T expected, string settingName)
+        {
+            if (!actual.Equals(expected))
+            {
+                Debug.LogWarning($"You cannot set {settingName} to {actual} for this texture type. It has been reset to {expected}.");
+                return expected;
+            }
+            return actual;
+        }
+
         private extern TextureImporterSettings settings { get; set; }
 
         [NativeName("GetImportInspectorWarning")]

Editor/Mono/Audio/AudioContainerWindowState.cs

@@ -341,6 +341,11 @@ void OnEditorPlayModeStateChanged(PlayModeStateChange state)
 
     void OnEditorPauseStateChanged(PauseState state)
     {
+        if (m_AudioContainer == null || m_IsSuspended)
+        {
+            return;
+        }
+
         EditorPauseStateChanged?.Invoke(this, EventArgs.Empty);
     }
 

Editor/Mono/BuildPipeline/NamedBuildTarget.cs

@@ -34,6 +34,7 @@ namespace UnityEditor.Build
             "PS5",
             "EmbeddedLinux",
             "QNX",
+            "ReservedCFE"
         };
 
         public static readonly NamedBuildTarget Unknown = new NamedBuildTarget("");
@@ -121,6 +122,8 @@ public static NamedBuildTarget FromBuildTargetGroup(BuildTargetGroup buildTarget
                     return new NamedBuildTarget("GameCoreXboxOne");
                 case BuildTargetGroup.PS5:
                     return new NamedBuildTarget("PS5");
+                case BuildTargetGroup.ReservedCFE:
+                    return new NamedBuildTarget("ReservedCFE");
             }
 
             throw new ArgumentException($"There is no a valid NamedBuildTarget for BuildTargetGroup '{buildTargetGroup}'");

Editor/Mono/BuildPlayerWindow.cs

@@ -157,8 +157,7 @@ static Styles()
         [UsedImplicitly, RequiredByNativeCode]
         public static void ShowBuildPlayerWindow()
         {
-            EditorUserBuildSettings.selectedBuildTargetGroup = EditorUserBuildSettings.activeBuildTargetGroup;
-            GetWindow<BuildPlayerWindow>(false, "Build Settings");
+            BuildPipeline.ShowBuildProfileWindow();
         }
 
         internal static bool WillDrawMultiplayerBuildOptions() => drawingMultiplayerBuildOptions != null;

Editor/Mono/BuildProfile/BuildProfileContext.cs

@@ -89,6 +89,7 @@ internal BuildProfile activeProfile
                     Save();
                     EditorUserBuildSettings.SetBuildProfilePath(string.Empty);
                     activeProfileChanged?.Invoke(prev, m_ActiveProfile);
+                    OnActiveProfileChangedForSettingExtension(prev, null);
                     BuildProfileModuleUtil.RequestScriptCompilation(null);
                     return;
                 }
@@ -104,11 +105,22 @@ internal BuildProfile activeProfile
                 Save();
                 EditorUserBuildSettings.SetBuildProfilePath(AssetDatabase.GetAssetPath(m_ActiveProfile));
                 activeProfileChanged?.Invoke(prev, m_ActiveProfile);
+                OnActiveProfileChangedForSettingExtension(prev, m_ActiveProfile);
                 m_ActiveProfile.UpdateGlobalManagerPlayerSettings();
                 BuildProfileModuleUtil.RequestScriptCompilation(m_ActiveProfile);
             }
         }
 
+        void OnActiveProfileChangedForSettingExtension(BuildProfile previous, BuildProfile newProfile)
+        {
+            BuildTargetDiscovery.TryGetBuildTarget(EditorUserBuildSettings.activeBuildTarget, out IBuildTarget iBuildTarget);
+            if (iBuildTarget == null)
+                return;
+
+            var settingsExtension = ModuleManager.GetEditorSettingsExtension(iBuildTarget.TargetName);
+            settingsExtension?.OnActiveProfileChanged(previous, newProfile);
+        }
+
         internal static void HandlePendingChangesBeforeEnterPlaymode()
         {
             if (!EditorUserBuildSettings.isBuildProfileAvailable)
@@ -466,8 +478,6 @@ BuildProfile GetOrCreateClassicPlatformBuildProfile(string platformId)
                 Debug.LogError($"Build profile extension is null for module {module} and build profile {buildProfile.name}");
             }
 
-            SaveBuildProfileInProject(buildProfile);
-
             return buildProfile;
         }
 
@@ -491,8 +501,6 @@ BuildProfile GetOrCreateSharedBuildProfile()
             // when copying the settings.
             EditorUserBuildSettings.CopyToBuildProfile(buildProfile);
 
-            SaveBuildProfileInProject(buildProfile);
-
             return buildProfile;
         }
 
@@ -569,6 +577,8 @@ static void CreateOrLoad()
             s_Instance.cachedEditorScriptingDefines = BuildDefines.GetBuildProfileScriptDefines();
 
             BuildProfileModuleUtil.DeleteLastRunnableBuildKeyForDeletedProfiles();
+
+            s_Instance.OnActiveProfileChangedForSettingExtension(null, s_Instance.m_ActiveProfile);
         }
 
         [RequiredByNativeCode, UsedImplicitly]

Editor/Mono/BuildProfile/BuildProfileModuleUtil.cs

@@ -39,6 +39,12 @@ internal class BuildProfileModuleUtil
         public static string GetClassicPlatformDisplayName(string platformId) =>
             GetModuleDisplayName(platformId);
 
+        /// <summary>
+        /// Platform description.
+        /// </summary>
+        public static string GetPlatformDescription(string platformGuid) =>
+            BuildTargetDiscovery.BuildPlatformDescription(new GUID(platformGuid));
+
         /// <summary>
         /// Fetch default editor platform icon texture.
         /// </summary>

Editor/Mono/BuildTarget.cs

@@ -141,6 +141,7 @@ public enum BuildTarget
         QNX = 46,
 
         VisionOS = 47,
+        ReservedCFE = 48,
 
         // obsolete identifiers. We're using different values so that ToString() works.
         [System.Obsolete("Use iOS instead (UnityUpgradable) -> iOS", true)]