Skip to content

Commit 664dfe3

Browse files
author
Unity Technologies
committed
Unity 2023.1.0a25 C# reference source code
1 parent a935c76 commit 664dfe3

200 files changed

Lines changed: 3797 additions & 4438 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/Data.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ public class Il2CppConfig
9999
public string SysRootPath;
100100
public string ToolChainPath;
101101
public string RelativeDataPath;
102+
public bool GenerateUsymFile;
103+
public string UsymtoolPath;
102104
}
103105

104106
public class Services

‎Editor/Mono/AssetStore/AssetStoreWindow.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public static AssetStoreWindow Init()
3333
public static void OpenAssetStoreInBrowser()
3434
{
3535
string assetStoreUrl = UnityConnect.instance.GetConfigurationURL(CloudConfigUrl.CloudAssetStoreUrl);
36+
assetStoreUrl += "?utm_source=unity-editor-window-menu&utm_medium=desktop-app";
3637
if (UnityConnect.instance.loggedIn)
3738
UnityConnect.instance.OpenAuthorizedURLInWebBrowser(assetStoreUrl);
3839
else Application.OpenURL(assetStoreUrl);

‎Editor/Mono/BuildPlayerWindow.cs‎

Lines changed: 1 addition & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -542,73 +542,6 @@ static bool IsAnyStandaloneModuleLoaded()
542542
ModuleManager.IsPlatformSupportLoadedByBuildTarget(BuildTarget.StandaloneWindows);
543543
}
544544

545-
static bool IsColorSpaceValid(BuildPlatform platform)
546-
{
547-
if (PlayerSettings.colorSpace == ColorSpace.Linear)
548-
{
549-
var hasMinGraphicsAPI = true;
550-
551-
var apis = PlayerSettings.GetGraphicsAPIs(platform.defaultTarget);
552-
if (platform.namedBuildTarget == NamedBuildTarget.Android)
553-
{
554-
hasMinGraphicsAPI = (apis.Contains(GraphicsDeviceType.Vulkan) || apis.Contains(GraphicsDeviceType.OpenGLES3)) && !apis.Contains(GraphicsDeviceType.OpenGLES2);
555-
}
556-
else if (platform.namedBuildTarget == NamedBuildTarget.iOS || platform.namedBuildTarget == NamedBuildTarget.tvOS)
557-
{
558-
hasMinGraphicsAPI = !apis.Contains(GraphicsDeviceType.OpenGLES3) && !apis.Contains(GraphicsDeviceType.OpenGLES2);
559-
}
560-
else if (platform.namedBuildTarget == NamedBuildTarget.WebGL)
561-
{
562-
// must have OpenGLES3-only
563-
hasMinGraphicsAPI = apis.Contains(GraphicsDeviceType.OpenGLES3) && !apis.Contains(GraphicsDeviceType.OpenGLES2);
564-
}
565-
566-
return hasMinGraphicsAPI;
567-
}
568-
else
569-
{
570-
return true;
571-
}
572-
}
573-
574-
static bool IsHDRCubemapEncodingValid(BuildPlatform platform)
575-
{
576-
var encoding = PlayerSettings.GetHDRCubemapEncodingQualityForPlatformGroup(platform.namedBuildTarget.ToBuildTargetGroup());
577-
return IsGITextureEncodingValid(platform, encoding == HDRCubemapEncodingQuality.Low);
578-
}
579-
580-
static bool IsLightmapEncodingValid(BuildPlatform platform)
581-
{
582-
var encoding = PlayerSettings.GetLightmapEncodingQualityForPlatformGroup(platform.namedBuildTarget.ToBuildTargetGroup());
583-
return IsGITextureEncodingValid(platform, encoding == LightmapEncodingQuality.Low);
584-
}
585-
586-
static bool IsGITextureEncodingValid(BuildPlatform platform, bool isLowQuality)
587-
{
588-
if (isLowQuality)
589-
return true;
590-
591-
var hasMinGraphicsAPI = true;
592-
593-
if (platform.namedBuildTarget == NamedBuildTarget.iOS)
594-
{
595-
var apis = PlayerSettings.GetGraphicsAPIs(BuildTarget.iOS);
596-
hasMinGraphicsAPI = apis.Contains(GraphicsDeviceType.Metal) && !apis.Contains(GraphicsDeviceType.OpenGLES3) && !apis.Contains(GraphicsDeviceType.OpenGLES2);
597-
}
598-
else if (platform.namedBuildTarget == NamedBuildTarget.tvOS)
599-
{
600-
var apis = PlayerSettings.GetGraphicsAPIs(BuildTarget.tvOS);
601-
hasMinGraphicsAPI = apis.Contains(GraphicsDeviceType.Metal) && !apis.Contains(GraphicsDeviceType.OpenGLES3) && !apis.Contains(GraphicsDeviceType.OpenGLES2);
602-
}
603-
else if (platform.namedBuildTarget == NamedBuildTarget.Android)
604-
{
605-
var apis = PlayerSettings.GetGraphicsAPIs(BuildTarget.Android);
606-
hasMinGraphicsAPI = (apis.Contains(GraphicsDeviceType.Vulkan) || apis.Contains(GraphicsDeviceType.OpenGLES3)) && !apis.Contains(GraphicsDeviceType.OpenGLES2);
607-
}
608-
609-
return hasMinGraphicsAPI;
610-
}
611-
612545
static bool IsVirtualTexturingSettingsValid(BuildPlatform platform)
613546
{
614547
if (!PlayerSettings.GetVirtualTexturingSupportEnabled())
@@ -1070,25 +1003,7 @@ private static void GUIBuildButtons(IBuildWindowExtension buildWindowExtension,
10701003
// Disable the 'Build' and 'Build And Run' buttons when the project setup doesn't satisfy the platform requirements
10711004
if (enableBuildButton && enableBuildAndRunButton)
10721005
{
1073-
if (!IsColorSpaceValid(platform))
1074-
{
1075-
enableBuildAndRunButton = false;
1076-
enableBuildButton = false;
1077-
EditorGUILayout.HelpBox(styles.invalidColorSpaceMessage);
1078-
}
1079-
else if (!IsLightmapEncodingValid(platform))
1080-
{
1081-
enableBuildAndRunButton = false;
1082-
enableBuildButton = false;
1083-
EditorGUILayout.HelpBox(styles.invalidLightmapEncodingMessage);
1084-
}
1085-
else if (!IsHDRCubemapEncodingValid(platform))
1086-
{
1087-
enableBuildAndRunButton = false;
1088-
enableBuildButton = false;
1089-
EditorGUILayout.HelpBox(styles.invalidHDRCubemapEncodingMessage);
1090-
}
1091-
else if (!IsVirtualTexturingSettingsValid(platform))
1006+
if (!IsVirtualTexturingSettingsValid(platform))
10921007
{
10931008
enableBuildAndRunButton = false;
10941009
enableBuildButton = false;

‎Editor/Mono/ContainerWindow.bindings.cs‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ internal enum ShowMode
2626
Tooltip = 6,
2727
// Modal Utility window
2828
ModalUtility = 7,
29-
// Show as fullscreen window
30-
Fullscreen = 8
3129
}
3230

3331
//[StaticAccessor("ContainerWindowBindings", StaticAccessorType.DoubleColon)]
@@ -65,12 +63,6 @@ public extern Rect position
6563
[FreeFunction(k_ScriptingPrefix + "ToggleMaximize", HasExplicitThis = true)]
6664
public extern void ToggleMaximize();
6765

68-
[FreeFunction(k_ScriptingPrefix + "ToggleFullscreen", HasExplicitThis = true)]
69-
internal extern void ToggleFullscreen(int displayIndex = 0);
70-
71-
[FreeFunction(k_ScriptingPrefix + "IsFullscreen", HasExplicitThis = true)]
72-
internal extern bool IsFullscreen();
73-
7466
[FreeFunction(k_ScriptingPrefix + "MoveInFrontOf", HasExplicitThis = true)]
7567
public extern void MoveInFrontOf(ContainerWindow other);
7668

@@ -84,9 +76,6 @@ public extern Rect position
8476
[FreeFunction(k_ScriptingPrefix + "SendCaptionEvent", HasExplicitThis = true)]
8577
public extern void SendCaptionEvent(bool mouseDown);
8678

87-
[FreeFunction(k_ScriptingPrefix + "GetDisplayId", HasExplicitThis = true)]
88-
internal extern int GetDisplayId();
89-
9079
// Close the editor window.
9180
[FreeFunction(k_ScriptingPrefix + "InternalClose", HasExplicitThis = true)]
9281
public extern void InternalClose();
@@ -95,7 +84,7 @@ public extern Rect position
9584
private extern void Internal_SetMinMaxSizes(Vector2 minSize, Vector2 maxSize);
9685

9786
[FreeFunction(k_ScriptingPrefix + "Internal_Show", HasExplicitThis = true, ThrowsException = true)]
98-
private extern void Internal_Show(Rect r, int showMode, Vector2 minSize, Vector2 maxSize, int displayIndex = 0);
87+
private extern void Internal_Show(Rect r, int showMode, Vector2 minSize, Vector2 maxSize);
9988

10089
[FreeFunction(k_ScriptingPrefix + "Internal_BringLiveAfterCreation", HasExplicitThis = true)]
10190
private extern void Internal_BringLiveAfterCreation(bool displayImmediately, bool setFocus, bool showMaximized);

‎Editor/Mono/ContainerWindow.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ internal partial class ContainerWindow : ScriptableObject
2525
[SerializeField] Vector2 m_MaxSize = new Vector2(8192, 8192);
2626
[SerializeField] bool m_Maximized;
2727

28-
internal int m_DisplayIndex;
29-
internal bool m_IsFullscreenContainer;
3028
internal bool m_IsMppmCloneWindow;
3129

3230
internal bool m_DontSaveToLayout = false;
@@ -149,21 +147,20 @@ internal void ShowPopupWithMode(ShowMode mode, bool giveFocus)
149147
static Color skinBackgroundColor => EditorGUIUtility.isProSkin ? darkSkinColor : lightSkinColor;
150148

151149
// Show the editor window.
152-
public void Show(ShowMode showMode, bool loadPosition, bool displayImmediately, bool setFocus, int displayIndex = 0)
150+
public void Show(ShowMode showMode, bool loadPosition, bool displayImmediately, bool setFocus)
153151
{
154152
try
155153
{
156154
if (showMode == ShowMode.MainWindow && s_MainWindow && s_MainWindow != this)
157155
throw new InvalidOperationException("Trying to create a second main window from layout when one already exists.");
158156

159-
bool useMousePos = showMode == ShowMode.AuxWindow || showMode == ShowMode.Fullscreen;
157+
bool useMousePos = showMode == ShowMode.AuxWindow;
160158
if (showMode == ShowMode.AuxWindow)
161159
showMode = ShowMode.Utility;
162160

163161
if (showMode == ShowMode.Utility
164162
|| showMode == ShowMode.ModalUtility
165163
|| showMode == ShowMode.AuxWindow
166-
|| showMode == ShowMode.Fullscreen
167164
|| IsPopup(showMode))
168165
m_DontSaveToLayout = true;
169166

@@ -177,7 +174,7 @@ public void Show(ShowMode showMode, bool loadPosition, bool displayImmediately,
177174

178175
var initialMaximizedState = m_Maximized;
179176

180-
Internal_Show(m_PixelRect, m_ShowMode, m_MinSize, m_MaxSize, displayIndex);
177+
Internal_Show(m_PixelRect, m_ShowMode, m_MinSize, m_MaxSize);
181178

182179
// Tell the main view its now in this window (quick hack to get platform-specific code to move its views to the right window)
183180
if (m_RootView)

‎Editor/Mono/Display/EditorDisplayFullscreenSetting.cs‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)