Skip to content

Commit c4aff6a

Browse files
author
Unity Technologies
committed
Unity 6000.2.0a8 C# reference source code
1 parent b1cf2a8 commit c4aff6a

File tree

511 files changed

+18355
-7647
lines changed

Some content is hidden

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

511 files changed

+18355
-7647
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ public class Services
114114
public bool EnablePerformanceReporting;
115115
public bool EnableAnalytics;
116116
public bool EnableCrashReporting;
117+
public bool EnableInsights;
117118
}
118119

119120
public class StreamingAssetsFile

‎Editor/IncrementalBuildPipeline/ScriptCompilationBuildProgram.Data/Data.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public class AssemblyData
5656
public class ScriptCompilationData_Out
5757
{
5858
public AssemblyData_Out[] Assemblies;
59+
public bool LocalizeCompilerMessages;
5960
}
6061

6162
public class AssemblyData_Out

‎Editor/Mono/AssemblyInfo/AssemblyInfo.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,6 @@
183183

184184
[assembly: InternalsVisibleTo("Unity.Scenes")]
185185

186-
// This should move with the AnimationWindow to a module at some point
187-
[assembly: InternalsVisibleTo("UnityEditor.Modules.Animation.tests.AnimationWindow")]
188-
189-
[assembly: InternalsVisibleTo("UnityEditor.Modules.Physics.Tests")]
190186

191187
[assembly: InternalsVisibleTo("UnityEditor.Switch.Tests")]
192188

@@ -201,3 +197,9 @@
201197

202198
[assembly: InternalsVisibleTo("Unity.GraphToolsAuthoringFramework.InternalEditorBridge")]
203199

200+
// Module test assemblies
201+
[assembly: InternalsVisibleTo("Unity.Modules.Licensing.Tests.Editor")]
202+
// This should move with the AnimationWindow to a module at some point
203+
[assembly: InternalsVisibleTo("Unity.Modules.Animation.AnimationWindow.Tests.Editor")]
204+
[assembly: InternalsVisibleTo("Unity.Modules.Physics.Tests.Editor")]
205+

‎Editor/Mono/AssetPipeline/SpeedTree/SpeedTree9Importer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,8 +317,8 @@ static ulong ComputeDefaultShaderHash()
317317

318318
static void DirtyCustomDependencies()
319319
{
320-
DateTime now = DateTime.Now;
321-
if (Application.isPlaying || now - s_LastCheck < k_CheckDependencyFrequency)
320+
DateTime now = DateTime.UtcNow;
321+
if (Application.isPlaying || ((now - s_LastCheck) < k_CheckDependencyFrequency))
322322
{
323323
return;
324324
}

‎Editor/Mono/BaseBuildTarget.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ internal abstract class BaseBuildTarget : IBuildTarget
2929
public virtual IUIPlatformProperties UIPlatformProperties => Properties as IUIPlatformProperties;
3030
public virtual IAudioPlatformProperties AudioPlatformProperties => Properties as IAudioPlatformProperties;
3131
public virtual IVRPlatformProperties VRPlatformProperties => Properties as IVRPlatformProperties;
32+
public virtual ISubtargetPlatformProperties TextureSubtargetPlatformProperties => Properties as ISubtargetPlatformProperties;
3233

3334
protected virtual IPlatformProperties Properties => null;
3435

‎Editor/Mono/BuildPipeline/AssemblyStripper.cs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,29 @@ public static string WriteEditorData(BuildPostProcessArgs args, NPath linkerInpu
300300
return items;
301301
}
302302

303+
private class AssemblyStripperModuleAdder : IPreStrippingModuleAdder
304+
{
305+
private List<string> m_ForceIncludes;
306+
307+
public AssemblyStripperModuleAdder(List<string> forceIncludes)
308+
{
309+
m_ForceIncludes = forceIncludes;
310+
}
311+
312+
public void AddModule(string moduleName)
313+
{
314+
if (IsModuleIncluded(moduleName))
315+
return;
316+
317+
m_ForceIncludes.Add(moduleName);
318+
}
319+
320+
public bool IsModuleIncluded(string moduleName)
321+
=> m_ForceIncludes.Any(i => string.Equals(i, moduleName));
322+
}
323+
324+
public static event Action<IPreStrippingModuleAdder> onCollectIncludedModules;
325+
303326
static void CollectIncludedAndExcludedModules(out List<string> forceInclude, out List<string> forceExclude)
304327
{
305328
forceInclude = new List<string>();
@@ -313,6 +336,9 @@ static void CollectIncludedAndExcludedModules(out List<string> forceInclude, out
313336
else if (includeSetting == ModuleIncludeSetting.ForceExclude)
314337
forceExclude.Add(module);
315338
}
339+
340+
var adder = new AssemblyStripperModuleAdder(forceInclude);
341+
onCollectIncludedModules?.Invoke(adder);
316342
}
317343

318344
private static NPath WriteMethodsToPreserveBlackList(RuntimeClassRegistry rcr, NPath linkerInputDirectory)

‎Editor/Mono/BuildProfile/BuildProfileContext.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -808,6 +808,20 @@ static void UpdateActiveProfilePlayerSettingsObjectFromYAML()
808808
activeProfile?.UpdatePlayerSettingsObjectFromYAML();
809809
}
810810

811+
[RequiredByNativeCode]
812+
static void SerializeActiveProfilePlayerSettings()
813+
{
814+
var profile = EditorUserBuildSettings.activeBuildProfile;
815+
if (profile == null)
816+
return;
817+
818+
if (!EditorUtility.IsDirty(profile.playerSettings))
819+
return;
820+
821+
profile.SerializePlayerSettings();
822+
}
823+
824+
811825
static bool ShouldReturnActiveProfile(GUID platformGuid, string sharedSetting = null)
812826
{
813827
if (!string.IsNullOrEmpty(sharedSetting))

‎Editor/Mono/BuildProfile/BuildProfileGraphicsSettingsEditor.cs‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using UnityEngine.Bindings;
88
using UnityEngine.UIElements;
99
using UnityEngine.Rendering;
10+
using UnityEngine;
1011

1112
namespace UnityEditor.Build.Profile
1213
{
@@ -33,6 +34,8 @@ public override VisualElement CreateInspectorGUI()
3334
BindEnumFieldWithFadeGroup(root, "Lightmap", CalculateLightmapStrippingFromCurrentScene);
3435
BindEnumFieldWithFadeGroup(root, "Fog", CalculateFogStrippingFromCurrentScene);
3536

37+
BindShaderPreload(root);
38+
3639
// Align fields as in the inspector
3740
var type = typeof(BaseField<>);
3841
root.Query<BindableElement>()
@@ -59,6 +62,57 @@ void BindEnumFieldWithFadeGroup(VisualElement content, string id, Action buttonC
5962
content.MandatoryQ<Button>($"Import{id}FromCurrentScene").clicked += buttonCallback;
6063
}
6164

65+
void BindShaderPreload(VisualElement root)
66+
{
67+
var shaderPreloadProperty = serializedObject.FindProperty("m_PreloadedShaders");
68+
shaderPreloadProperty.isExpanded = false;
69+
70+
var delayedShaderTimeLimitProperty = serializedObject.FindProperty("m_PreloadShadersBatchTimeLimit");
71+
var shaderPreloadToggle = root.MandatoryQ<Toggle>("ShaderPreloadToggle");
72+
var delayedShaderTimeLimitGroup = root.MandatoryQ<VisualElement>("DelayedShaderTimeLimitGroup");
73+
var delayedShaderTimeLimit = root.MandatoryQ<IntegerField>("DelayedShaderTimeLimit");
74+
shaderPreloadToggle.RegisterValueChangedCallback(evt => {
75+
delayedShaderTimeLimitGroup.style.display = evt.newValue ? DisplayStyle.Flex : DisplayStyle.None;
76+
var newVal = evt.newValue ? delayedShaderTimeLimit.value : -1;
77+
if (delayedShaderTimeLimitProperty.intValue != newVal)
78+
{
79+
delayedShaderTimeLimitProperty.intValue = newVal;
80+
delayedShaderTimeLimitProperty.serializedObject.ApplyModifiedProperties();
81+
}
82+
});
83+
delayedShaderTimeLimit.RegisterValueChangedCallback(evt =>
84+
{
85+
if (delayedShaderTimeLimitProperty.intValue != evt.newValue)
86+
{
87+
delayedShaderTimeLimitProperty.intValue = evt.newValue;
88+
delayedShaderTimeLimitProperty.serializedObject.ApplyModifiedProperties();
89+
}
90+
});
91+
shaderPreloadToggle.SetValueWithoutNotify(delayedShaderTimeLimitProperty.intValue >= 0);
92+
delayedShaderTimeLimit.SetValueWithoutNotify(Mathf.Max(0, delayedShaderTimeLimitProperty.intValue));
93+
delayedShaderTimeLimitGroup.style.display = delayedShaderTimeLimitProperty.intValue >= 0 ? DisplayStyle.Flex : DisplayStyle.None;
94+
95+
var shaderTracking = root.MandatoryQ<HelpBox>("ShaderTrackingInfoBox");
96+
shaderTracking.schedule.Execute(() =>
97+
shaderTracking.text =
98+
$"Currently tracked: {ShaderUtil.GetCurrentShaderVariantCollectionShaderCount()} shaders {ShaderUtil.GetCurrentShaderVariantCollectionVariantCount()} total variants").Every(500);
99+
100+
var saveButton = root.MandatoryQ<Button>("SaveShaderVariants");
101+
saveButton.clickable = new Clickable(() =>
102+
{
103+
var assetPath = EditorUtility.SaveFilePanelInProject(
104+
L10n.Tr("Save Shader Variant Collection"),
105+
"NewShaderVariants",
106+
"shadervariants",
107+
L10n.Tr("Save shader variant collection"),
108+
ProjectWindowUtil.GetActiveFolderPath());
109+
if (!string.IsNullOrEmpty(assetPath))
110+
ShaderUtil.SaveCurrentShaderVariantCollection(assetPath);
111+
});
112+
var clearButton = root.MandatoryQ<Button>("ClearCurrentShaderVariants");
113+
clearButton.clickable = new Clickable(ShaderUtil.ClearCurrentShaderVariantCollection);
114+
}
115+
62116
void CalculateLightmapStrippingFromCurrentScene()
63117
{
64118
bool lightmapKeepPlain, lightmapKeepDirCombined, lightmapKeepDynamicPlain, lightmapKeepDynamicDirCombined, lightmapKeepShadowMask, lightmapKeepSubtractive;

‎Editor/Mono/BuildProfile/BuildProfileModuleUtil.cs‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
using UnityEngine.UIElements;
1414
using TargetAttributes = UnityEditor.BuildTargetDiscovery.TargetAttributes;
1515
using UnityEditor.Profiling;
16+
using InternalEditorUtility = UnityEditorInternal.InternalEditorUtility;
1617

1718
namespace UnityEditor.Build.Profile
1819
{
@@ -33,6 +34,7 @@ internal class BuildProfileModuleUtil
3334
public const int k_MaxAssetFileNameLengthWithoutExtension = k_MaxAssetFileNameLength - 6;
3435
static readonly string k_NoModuleLoaded = L10n.Tr("No {0} module loaded.");
3536
static readonly string k_DerivedPlatformInactive = L10n.Tr("{0} is currently disabled.");
37+
static readonly string k_DerivedPlatformDisabled = L10n.Tr("{0} was disabled via command-line arguments.");
3638
static readonly string k_EditorWillNeedToBeReloaded = L10n.Tr("Note: Editor will need to be restarted to load any newly installed modules");
3739
static readonly string k_BuildProfileRecompileReason = L10n.Tr("Active build profile scripting defines changes.");
3840
static readonly GUIContent k_OpenDownloadPage = EditorGUIUtility.TrTextContent("Open Download Page");
@@ -187,11 +189,29 @@ public static VisualElement CreateModuleNotInstalledElement(GUID platformId)
187189
});
188190
}
189191

192+
if (IsBuildProfileDisabledViaArguments(platformId))
193+
return new IMGUIContainer(() =>
194+
{
195+
GUILayout.Label(EditorGUIUtility.TextContent(string.Format(k_DerivedPlatformDisabled, BuildTargetDiscovery.BuildPlatformDisplayName(platformId))));
196+
});
197+
190198
return new IMGUIContainer(
191199
() => BuildPlayerWindow.ShowNoModuleLabel(platformId,
192200
k_NoModuleLoaded, k_OpenDownloadPage, k_InstallModuleWithHub, k_EditorWillNeedToBeReloaded));
193201
}
194202

203+
static bool IsBuildProfileDisabledViaArguments(GUID platformId)
204+
{
205+
var (buildTarget, _) = BuildTargetDiscovery.GetBuildTargetAndSubtargetFromGUID(platformId);
206+
var buildTargetInfoList = BuildTargetDiscovery.GetBuildTargetInfoList();
207+
208+
foreach (var info in buildTargetInfoList)
209+
if (info.buildTargetPlatformVal.Equals(buildTarget))
210+
return InternalEditorUtility.IsPlaybackEngineDisabled(info.dirName);
211+
212+
return false;
213+
}
214+
195215
/// <summary>
196216
/// Exported from <see cref="BuildPlayerWindow"/>, UI code specifically for when current license does not cover
197217
/// BuildTarget.
@@ -247,7 +267,7 @@ public static string GetModuleName(GUID platformId)
247267
/// </summary>
248268
public static void SwitchLegacyActiveFromBuildProfile(BuildProfile profile)
249269
{
250-
EditorUserBuildSettings.SwitchActiveBuildTargetGuid(profile.platformGuid);
270+
EditorUserBuildSettings.SwitchActiveBuildTargetGuid(profile);
251271
}
252272

253273
public static void SwitchLegacySelectedBuildTargets(BuildProfile profile)

‎Editor/Mono/BuildProfile/BuildProfilePlatformSettingsBase.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ internal protected virtual bool installInBuildFolder
117117
set => m_InstallInBuildFolder = value;
118118
}
119119

120+
120121
/// <summary>
121122
/// Set platform setting based on strings for name and value. Native
122123
/// calls this to keep build profiles and EditorUserBuildSettings

0 commit comments

Comments
 (0)