Unity 6000.1.6f1 C# reference source code

Author: Unity Technologies

Editor/Mono/Modules/DefaultBuildProfileExtension.cs

@@ -531,6 +531,37 @@ SerializedProperty currentSetting
  return false;
  }
 
+ /// <summary>
+ /// Helper method for rendering an IMGUI popup over an enum.
+ /// </summary>
+ protected bool ShowIMGUIPopupOption<T>
+ (
+ GUIContent label,
+ T[] options,
+ GUIContent[] optionString,
+ T currentSetting,
+ out T returnSettings
+ ) where T : Enum
+ {
+ using var vertical = new EditorGUILayout.VerticalScope();
+ returnSettings = currentSetting;
+
+ // Find the index of the currently set value relative to the GUI layout
+ var selectedIndex = Array.FindIndex(options,
+ match => match.Equals(currentSetting));
+ selectedIndex = selectedIndex < 0 ? 0 : selectedIndex;
+
+ EditorGUI.BeginChangeCheck();
+ var newIndex = EditorGUILayout.Popup(label, selectedIndex, optionString);
+ if (EditorGUI.EndChangeCheck())
+ {
+ returnSettings = options[newIndex];
+ return true;
+ }
+
+ return false;
+ }
+
  /// <summary>
  /// Helper method for rendering an IMGUI popup for GUIContent
  /// option values

Editor/Mono/Overlays/OverlayCanvas.cs

@@ -282,8 +282,9 @@ internal OverlayContainer GetDockZoneContainer(DockZone zone)
  List<Overlay> m_Overlays = new List<Overlay>();
  List<Overlay> m_TransientOverlays = new();
 
+ internal static string k_DefaultPresetName = "Default";
  [SerializeField]
- string m_LastAppliedPresetName = "Default";
+ string m_LastAppliedPresetName = k_DefaultPresetName;
 
  [SerializeField]
  List<SaveData> m_SaveData = new List<SaveData>();
@@ -713,6 +714,11 @@ internal void CopySaveData(out SaveData[] saveData)
  saveData[i] = new SaveData(saveData[i]);
  }
 
+ internal void SetLastAppliedPresetName(string name)
+ {
+ m_LastAppliedPresetName = name;
+ }
+
  internal void ApplyPreset(IOverlayPreset preset)
  {
  if (!preset.CanApplyToWindow(containerWindow.GetType()))
@@ -722,7 +728,7 @@ internal void ApplyPreset(IOverlayPreset preset)
  return;
  }
 
- m_LastAppliedPresetName = preset.name;
+ SetLastAppliedPresetName(preset.name);
  ApplySaveData(preset.saveData);
  preset.ApplyCustomData(this);
  presetChanged?.Invoke();

Editor/Mono/Overlays/OverlayPresetManager.cs

@@ -391,7 +391,9 @@ public static void GenerateMenu(IGenericMenu menu, string pathPrefix, EditorWind
  {
  menu.AddItem(L10n.Tr($"{pathPrefix}Delete Preset/{preset.name}"), false, () =>
  {
- DeletePreset(preset);
+ DeletePreset(preset);
+ window.overlayCanvas.SetLastAppliedPresetName(OverlayCanvas.k_DefaultPresetName);
+ window.overlayCanvas.afterOverlaysInitialized.Invoke();
  });
  }
  }
@@ -405,6 +407,7 @@ public static void GenerateMenu(IGenericMenu menu, string pathPrefix, EditorWind
  {
  RevertPreferencesPresetsToDefault();
  ReloadAllPresets();
+ window.overlayCanvas.ApplyPreset(GetDefaultPreset(window.GetType()));
  }
  });
  }

Editor/Mono/Tools/BuiltinTools.cs

@@ -722,6 +722,23 @@ static Vector3 ResizeHandlesGUI(Rect rect, Vector3 pivot, Quaternion rotation, o
 
  Vector3 sizeBefore = inverseRotation * (origPos - scalePivot);
  Vector3 sizeAfter = inverseRotation * (newPos - scalePivot);
+
+ // Fix for UUM-102690. If difference is zero, we don't want to scale on that axis
+ if (scaleFromPivot)
+ {
+ Vector3 diff = origPos - scalePivot;
+ if (Mathf.Approximately(diff.x, 0f))
+ {
+ sizeBefore.x = 1f;
+ sizeAfter.x = 1f;
+ }
+ if (Mathf.Approximately(diff.y, 0f))
+ {
+ sizeBefore.y = 1f;
+ sizeAfter.y = 1f;
+ }
+ }
+
  if (xHandle != 1)
  scale.x = sizeAfter.x / sizeBefore.x;
  if (yHandle != 1)
@@ -732,12 +749,6 @@ static Vector3 ResizeHandlesGUI(Rect rect, Vector3 pivot, Quaternion rotation, o
  float refScale = (xHandle == 1 ? scale.y : scale.x);
  scale = Vector3.one * refScale;
  }
-
- if (uniformScaling)
- {
- float refScale = (xHandle == 1 ? scale.y : scale.x);
- scale = Vector3.one * refScale;
- }
  }
 
  if (xHandle == 0)

Modules/BuildProfileEditor/BuildProfileEditor.cs

@@ -6,6 +6,7 @@
 using UnityEditor.Modules;
 using UnityEditor.Build.Profile.Elements;
 using UnityEditor.UIElements;
+using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace UnityEditor.Build.Profile
@@ -391,7 +392,21 @@ void AddScriptingDefineListView(VisualElement root)
 
  var property = serializedObject.FindProperty("m_ScriptingDefines");
  m_PlayerScriptingDefinesFoldout.text = TrText.scriptingDefines;
- m_PlayerScriptingDefinesFoldout.tooltip = TrText.scriptingDefinesTooltip;
+
+ // Add tooltip to the foldout label
+ var playerScriptingDefinesLabel = m_PlayerScriptingDefinesFoldout.Q<Label>();
+ Vector2 tooltipPosition = new Vector2();
+ playerScriptingDefinesLabel.RegisterCallback<MouseOverEvent>(evt =>
+ {
+ tooltipPosition = evt.mousePosition;
+ });
+ playerScriptingDefinesLabel.RegisterCallback<TooltipEvent>(evt =>
+ {
+ evt.tooltip = TrText.scriptingDefinesTooltip;
+ evt.rect = new Rect(tooltipPosition.x, tooltipPosition.y, evt.rect.width, evt.rect.height);
+ evt.StopPropagation();
+ });
+
  var listView = m_PlayerScriptingDefinesFoldout.Q<ListView>("scripting-defines-listview");
  var warningHelpbox = m_PlayerScriptingDefinesFoldout.Q<HelpBox>("scripting-defines-warning-help-box");
  warningHelpbox.text = TrText.scriptingDefinesWarningHelpbox;

Modules/EditorToolbar/ToolbarElements/OverlayMenu.cs

@@ -21,7 +21,24 @@ public OverlayPresetDropdown(EditorWindow targetWindow)
  m_TargetWindow = targetWindow;
  createMenuCallback = DropdownUtility.CreateDropdown;
  SetValueWithoutNotify(m_TargetWindow.overlayCanvas.lastAppliedPresetName);
- 
+ RegisterCallback<AttachToPanelEvent>(OnAttachedToPanel);
+ RegisterCallback<DetachFromPanelEvent>(OnDetachFromPanel);
+ }
+
+ void OnAttachedToPanel(AttachToPanelEvent evt)
+ {
+ m_TargetWindow.overlayCanvas.afterOverlaysInitialized += RefreshPresetDisplayValue;
+ }
+
+ void OnDetachFromPanel(DetachFromPanelEvent evt)
+ {
+ if (m_TargetWindow is not null && m_TargetWindow.overlayCanvas is not null)
+ m_TargetWindow.overlayCanvas.afterOverlaysInitialized -= RefreshPresetDisplayValue;
+ }
+
+ void RefreshPresetDisplayValue()
+ {
+ SetValueWithoutNotify(GetValueToDisplay());
  }
 
  internal override void AddMenuItems(IGenericMenu menu)
@@ -220,6 +237,7 @@ public override VisualElement CreatePanelContent()
  {
  VisualElement content = new VisualElement();
  content.style.minWidth = 160;
+ content.style.maxWidth = 300;
  m_Toolbar = null;
 
  if (isPopup)

Modules/TextCoreFontEngine/Managed/FontEngine.bindings.cs

@@ -114,6 +114,8 @@ public enum FontEngineError
  [UsedByNativeCode]
  public enum GlyphRenderMode
  {
+ DEFAULT = 0x0, // Selects either SDFAA or COLOR based on the font face.
+
  SMOOTH_HINTED = GlyphRasterModes.RASTER_MODE_HINTED | GlyphRasterModes.RASTER_MODE_8BIT | GlyphRasterModes.RASTER_MODE_BITMAP | GlyphRasterModes.RASTER_MODE_1X,
  SMOOTH = GlyphRasterModes.RASTER_MODE_NO_HINTING | GlyphRasterModes.RASTER_MODE_8BIT | GlyphRasterModes.RASTER_MODE_BITMAP | GlyphRasterModes.RASTER_MODE_1X,
 
@@ -132,6 +134,23 @@ public enum GlyphRenderMode
  SDFAA = GlyphRasterModes.RASTER_MODE_NO_HINTING | GlyphRasterModes.RASTER_MODE_8BIT | GlyphRasterModes.RASTER_MODE_SDFAA | GlyphRasterModes.RASTER_MODE_1X,
  }
 
+ // This enum needs to match GlyphRenderMode, except for DEFAULT being removed.
+ internal enum GlyphRenderModeUI
+ {
+ SMOOTH_HINTED = GlyphRenderMode.SMOOTH_HINTED,
+ SMOOTH = GlyphRenderMode.SMOOTH,
+ COLOR_HINTED = GlyphRenderMode.COLOR_HINTED,
+ COLOR = GlyphRenderMode.COLOR,
+ RASTER_HINTED = GlyphRenderMode.RASTER_HINTED,
+ RASTER = GlyphRenderMode.RASTER,
+ SDF = GlyphRenderMode.SDF,
+ SDF8 = GlyphRenderMode.SDF8,
+ SDF16 = GlyphRenderMode.SDF16,
+ SDF32 = GlyphRenderMode.SDF32,
+ SDFAA_HINTED = GlyphRenderMode.SDFAA_HINTED,
+ SDFAA = GlyphRenderMode.SDFAA
+ }
+
  /// <summary>
  /// The modes available when packing glyphs into an atlas texture.
  /// </summary>
@@ -488,6 +507,9 @@ public static string[] GetSystemFontNames()
  [NativeMethod(Name = "TextCore::FontEngine::GetSystemFontReferences", IsThreadSafe = true, IsFreeFunction = true)]
  internal static extern FontReference[] GetSystemFontReferences();
 
+ [VisibleToOtherModules("UnityEngine.TextCoreTextEngineModule")]
+ internal static extern bool IsColorFontFace();
+
 
  /// <summary>
  /// Try finding and returning a reference to a system font for the given family name and style.

Modules/TextCoreTextEngine/Managed/TextAssets/FontAsset.cs

@@ -617,7 +617,7 @@ public static FontAsset CreateFontAsset(string familyName, string styleName, int
  internal static FontAsset? CreateFontAssetInternal(string familyName, string styleName, int pointSize = 90)
  {
  if (FontEngine.TryGetSystemFontReference(familyName, styleName, out FontReference fontRef))
- return CreateFontAsset(fontRef.filePath, fontRef.faceIndex, pointSize, 9, GlyphRenderMode.SDFAA, 1024, 1024, AtlasPopulationMode.DynamicOS, true);
+ return CreateFontAsset(fontRef.filePath, fontRef.faceIndex, pointSize, 9, GlyphRenderMode.DEFAULT, 1024, 1024, AtlasPopulationMode.DynamicOS, true);
  return null;
  }
 
@@ -683,7 +683,7 @@ static FontAsset CreateFontAssetFromFamilyName(string familyName, int pointSize
  FontAsset fontAsset = null;
 
  if (FontEngine.TryGetSystemFontReference(familyName, null, out FontReference fontRef))
- fontAsset = CreateFontAsset(fontRef.filePath, fontRef.faceIndex, pointSize, 9, GlyphRenderMode.SDFAA, 1024, 1024, AtlasPopulationMode.DynamicOS, true);
+ fontAsset = CreateFontAsset(fontRef.filePath, fontRef.faceIndex, pointSize, 9, GlyphRenderMode.DEFAULT, 1024, 1024, AtlasPopulationMode.DynamicOS, true);
 
  if (fontAsset == null)
  return null;
@@ -723,7 +723,8 @@ static FontAsset CreateFontAsset(string fontFilePath, int faceIndex, int samplin
  var fontAsset = CreateFontAssetInstance(null, atlasPadding, renderMode, atlasWidth, atlasHeight, atlasPopulationMode, enableMultiAtlasSupport);
 
  // Set font file path
- fontAsset.m_SourceFontFilePath = fontFilePath;
+ if (fontAsset)
+ fontAsset.m_SourceFontFilePath = fontFilePath;
 
  return fontAsset;
  }
@@ -795,6 +796,11 @@ static FontAsset CreateFontAssetInstance(Font font, int atlasPadding, GlyphRende
  fontAsset.m_Version = "1.1.0";
  fontAsset.faceInfo = FontEngine.GetFaceInfo();
 
+ if (renderMode == GlyphRenderMode.DEFAULT)
+ {
+ renderMode = FontEngine.IsColorFontFace() ? GlyphRenderMode.COLOR : GlyphRenderMode.SDFAA;
+ }
+
  if (atlasPopulationMode == AtlasPopulationMode.Dynamic && font != null)
  {
  fontAsset.sourceFontFile = font;
@@ -829,9 +835,19 @@ static FontAsset CreateFontAssetInstance(Font font, int atlasPadding, GlyphRende
  packingModifier = 0;
 
  if (texFormat == TextureFormat.Alpha8)
- tmpMaterial = new Material(TextShaderUtilities.ShaderRef_MobileBitmap);
+ {
+ if (TextShaderUtilities.ShaderRef_MobileBitmap)
+ tmpMaterial = new Material(TextShaderUtilities.ShaderRef_MobileBitmap);
+ else
+ return null;
+ }
  else
- tmpMaterial = new Material(TextShaderUtilities.ShaderRef_Sprite);
+ {
+ if (TextShaderUtilities.ShaderRef_Sprite)
+ tmpMaterial = new Material(TextShaderUtilities.ShaderRef_Sprite);
+ else
+ return null;
+ }
 
  //tmp_material.name = texture.name + " Material";
  tmpMaterial.SetTexture(TextShaderUtilities.ID_MainTex, texture);

Modules/TextCoreTextEngine/Managed/TextAssets/FontAsset/FontAssetFactory.cs

@@ -104,7 +104,8 @@ static void ProcessFallbackFonts(FontAsset resultFontAsset, FontAsset baseFontAs
  return null;
 
  FontAsset? fontAsset = null;
- fontAsset = FontAsset.CreateFontAsset(font, 90, 9, GlyphRenderMode.SDFAA, 1024, 1024, AtlasPopulationMode.Dynamic, true);
+
+ fontAsset = FontAsset.CreateFontAsset(font, 90, 9, GlyphRenderMode.DEFAULT, 1024, 1024, AtlasPopulationMode.Dynamic, true);
 
  if (fontAsset != null)
  SetupFontAssetSettings(fontAsset);

Modules/TextCoreTextEngine/Managed/TextShaderUtilities.cs

@@ -139,6 +139,13 @@ public static class TextShaderUtilities
  private static float m_clamp = 1.0f;
  public static bool isInitialized = false;
 
+ [VisibleToOtherModules("UnityEngine.UIElementsModule")]
+ internal static readonly string k_SDFText = "Hidden/TextCore/Distance Field SSD";
+ [VisibleToOtherModules("UnityEngine.UIElementsModule")]
+ internal static readonly string k_BitmapText = "Hidden/Internal-GUITextureClipText";
+ [VisibleToOtherModules("UnityEngine.UIElementsModule")]
+ internal static readonly string k_SpriteText = "Hidden/TextCore/Sprite";
+
 
  /// <summary>
  /// Returns a reference to the mobile distance field shader.
@@ -149,7 +156,7 @@ internal static Shader ShaderRef_MobileSDF
  get
  {
  if (((System.Object)k_ShaderRef_MobileSDF) == null)
- k_ShaderRef_MobileSDF = Shader.Find("Hidden/TextCore/Distance Field SSD");
+ k_ShaderRef_MobileSDF = Shader.Find(k_SDFText);
 
  return k_ShaderRef_MobileSDF;
  }
@@ -164,7 +171,7 @@ internal static Shader ShaderRef_MobileBitmap
  get
  {
  if (k_ShaderRef_MobileBitmap == null)
- k_ShaderRef_MobileBitmap = Shader.Find("Hidden/Internal-GUITextureClipText");
+ k_ShaderRef_MobileBitmap = Shader.Find(k_BitmapText);
 
  return k_ShaderRef_MobileBitmap;
  }
@@ -181,7 +188,7 @@ internal static Shader ShaderRef_Sprite
  k_ShaderRef_Sprite = Shader.Find("Text/Sprite");
 
  if (k_ShaderRef_Sprite == null)
- k_ShaderRef_Sprite = Shader.Find("Hidden/TextCore/Sprite");
+ k_ShaderRef_Sprite = Shader.Find(k_SpriteText);
  }
  return k_ShaderRef_Sprite;
  }