Skip to content

Commit 750cd77

Browse files
author
Unity Technologies
committed
Unity 6000.0.0b15 C# reference source code
1 parent e336592 commit 750cd77

File tree

215 files changed

+4389
-1246
lines changed

Some content is hidden

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

215 files changed

+4389
-1246
lines changed

‎Editor/Mono/Animation/AnimationWindow/CurveBindingUtility.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ public static object GetCurrentValue(AnimationWindowState state, EditorCurveBind
2929
// Otherwise, evaluate AnimationWindowCurve at current time.
3030
public static object GetCurrentValue(AnimationWindowState state, AnimationWindowCurve curve)
3131
{
32-
if (state.previewing && curve.rootGameObject != null)
32+
// UUM-66112 - state.linkedWithSequencer - Padding for issue in Timeline where muscle
33+
// values are not updated in the editor when previewing in the Animation Window.
34+
// Fallback to curve values.
35+
if (state.previewing && curve.rootGameObject != null && !state.linkedWithSequencer)
3336
{
3437
return GetCurrentValue(state, curve.binding);
3538
}

‎Editor/Mono/Annotation/SceneRenderModeWindow.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ private float windowHeight
163163
modes = Styles.sBuiltinCameraModes.Count(mode => m_SceneView.IsCameraDrawModeSupported(mode) && mode.show) +
164164
SceneView.userDefinedModes.Count(mode => m_SceneView.IsCameraDrawModeSupported(mode) && mode.show);
165165

166-
return UpdatedHeight(headers, modes, GraphicsSettings.renderPipelineAsset != null);
166+
return UpdatedHeight(headers, modes, GraphicsSettings.isScriptableRenderPipelineEnabled);
167167
}
168168
}
169169

@@ -295,7 +295,7 @@ private void Draw(float listElementWidth)
295295
}
296296
}
297297

298-
if (GraphicsSettings.renderPipelineAsset != null)
298+
if (GraphicsSettings.isScriptableRenderPipelineEnabled)
299299
{
300300
DrawSeparator(ref drawPos);
301301
DrawRenderingDebuggerShortCut(drawPos);
@@ -339,7 +339,7 @@ private float RecalculateWindowHeight()
339339
}
340340
}
341341

342-
return UpdatedHeight(headers, modes, GraphicsSettings.renderPipelineAsset != null);
342+
return UpdatedHeight(headers, modes, GraphicsSettings.isScriptableRenderPipelineEnabled);
343343
}
344344

345345
private float UpdatedHeight(int headers, int modes, bool isSRP)

‎Editor/Mono/AssemblyInfo/AssemblyInfo.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,8 @@
153153
[assembly: InternalsVisibleTo("Unity.Muse.Common.Bridge")]
154154
[assembly: InternalsVisibleTo("Unity.Muse.Chat.Bridge")]
155155

156+
[assembly: InternalsVisibleTo("Unity.Multiplayer.Playmode.Editor.Bridge")]
157+
156158
[assembly: InternalsVisibleTo("Unity.Scenes")]
157159

158160
// This should move with the AnimationWindow to a module at some point

‎Editor/Mono/AssetPipeline/TextureGenerator.bindings.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,16 @@ public static unsafe class TextureGenerator
248248
{
249249
public static TextureGenerationOutput GenerateTexture(TextureGenerationSettings settings, NativeArray<Color32> colorBuffer)
250250
{
251-
return GenerateTextureImpl(settings, colorBuffer.GetUnsafeReadOnlyPtr(), colorBuffer.Length * UnsafeUtility.SizeOf<Color32>());
251+
return GenerateTextureImpl(settings, colorBuffer.GetUnsafeReadOnlyPtr(), colorBuffer.Length * UnsafeUtility.SizeOf<Color32>(), 4);
252+
}
253+
254+
public static TextureGenerationOutput GenerateTexture(TextureGenerationSettings settings, NativeArray<Color> colorBuffer)
255+
{
256+
return GenerateTextureImpl(settings, colorBuffer.GetUnsafeReadOnlyPtr(), colorBuffer.Length * UnsafeUtility.SizeOf<Color>(), 16);
252257
}
253258

254259
[NativeThrows]
255260
[NativeMethod("GenerateTextureScripting")]
256-
extern static unsafe TextureGenerationOutput GenerateTextureImpl(TextureGenerationSettings settings, void* colorBuffer, int colorBufferLength);
261+
extern static unsafe TextureGenerationOutput GenerateTextureImpl(TextureGenerationSettings settings, void* colorBuffer, int colorBufferLength, int bytesPerPixel);
257262
}
258263
}

‎Editor/Mono/Audio/AudioContainerWindow.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ void CreateGUI()
232232

233233
m_Day0RootVisualElement.style.display = DisplayStyle.None;
234234
m_ContainerRootVisualElement.style.display = DisplayStyle.Flex;
235+
m_CachedElements = State.AudioContainer.elements.ToList();
235236
m_ClipsListView.Rebuild(); // Force a list rebuild when the list has changed or it will not always render correctly due to a UI toolkit bug.
236237
}
237238
}
@@ -519,12 +520,14 @@ void OnVolumeRandomizationEnabledChanged(SerializedProperty property)
519520
m_VolumeRandomizationButtonImage.style.backgroundImage = new StyleBackground(m_DiceIconOn);
520521
m_VolumeRandomizationRangeSlider.SetEnabled(true);
521522
m_VolumeRandomizationRangeField.SetEnabled(true);
523+
m_VolumeRandomRangeTracker.SetEnabled(true);
522524
}
523525
else
524526
{
525527
m_VolumeRandomizationButtonImage.style.backgroundImage = new StyleBackground(m_DiceIconOff);
526528
m_VolumeRandomizationRangeSlider.SetEnabled(false);
527529
m_VolumeRandomizationRangeField.SetEnabled(false);
530+
m_VolumeRandomRangeTracker.SetEnabled(false);
528531
}
529532
}
530533

@@ -624,12 +627,14 @@ void OnPitchRandomizationEnabledChanged(SerializedProperty property)
624627
m_PitchRandomizationButtonImage.style.backgroundImage = new StyleBackground(m_DiceIconOn);
625628
m_PitchRandomizationRangeSlider.SetEnabled(true);
626629
m_PitchRandomizationRangeField.SetEnabled(true);
630+
m_PitchRandomRangeTracker.SetEnabled(true);
627631
}
628632
else
629633
{
630634
m_PitchRandomizationButtonImage.style.backgroundImage = new StyleBackground(m_DiceIconOff);
631635
m_PitchRandomizationRangeSlider.SetEnabled(false);
632636
m_PitchRandomizationRangeField.SetEnabled(false);
637+
m_PitchRandomRangeTracker.SetEnabled(false);
633638
}
634639
}
635640

@@ -1190,12 +1195,14 @@ void OnTimeRandomizationEnabledChanged(SerializedProperty property)
11901195
m_TimeRandomizationButtonImage.style.backgroundImage = new StyleBackground(m_DiceIconOn);
11911196
m_TimeRandomizationRangeSlider.SetEnabled(true);
11921197
m_TimeRandomizationRangeField.SetEnabled(true);
1198+
m_TimeRandomRangeTracker.SetEnabled(true);
11931199
}
11941200
else
11951201
{
11961202
m_TimeRandomizationButtonImage.style.backgroundImage = new StyleBackground(m_DiceIconOff);
11971203
m_TimeRandomizationRangeSlider.SetEnabled(false);
11981204
m_TimeRandomizationRangeField.SetEnabled(false);
1205+
m_TimeRandomRangeTracker.SetEnabled(false);
11991206
}
12001207
}
12011208

‎Editor/Mono/Audio/UIElements/AudioRandomRangeSliderTracker.cs

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
44

55
using System;
6+
using System.Transactions;
67
using UnityEngine;
78
using UnityEngine.UIElements;
89

@@ -16,11 +17,12 @@ class AudioRandomRangeSliderTracker : VisualElement
1617
public override object CreateInstance() => new AudioRandomRangeSliderTracker();
1718
}
1819

19-
static readonly CustomStyleProperty<Color> s_TrackerColorProperty = new("--tracker-color");
20+
static readonly CustomStyleProperty<Color> s_TrackerEnabledColorProperty = new("--tracker-color");
2021

2122
Slider m_ParentSlider;
2223
Vector2 m_Range = Vector2.zero;
23-
Color m_TrackerColor;
24+
Color m_TrackerEnabledColor;
25+
Color m_TrackerDisabledColor = Color.gray;
2426

2527
static void CustomStylesResolved(CustomStyleResolvedEvent evt)
2628
{
@@ -31,9 +33,9 @@ static void CustomStylesResolved(CustomStyleResolvedEvent evt)
3133

3234
void UpdateCustomStyles()
3335
{
34-
if (customStyle.TryGetValue(s_TrackerColorProperty, out var trackerColor))
36+
if (customStyle.TryGetValue(s_TrackerEnabledColorProperty, out var trackerColor))
3537
{
36-
m_TrackerColor = trackerColor;
38+
m_TrackerEnabledColor = trackerColor;
3739
}
3840
}
3941

@@ -54,6 +56,7 @@ internal static AudioRandomRangeSliderTracker Create(Slider parentSlider, Vector
5456
rangeTracker.generateVisualContent += GenerateVisualContent;
5557
rangeTracker.RegisterCallback<CustomStyleResolvedEvent>(CustomStylesResolved);
5658
rangeTracker.m_ParentSlider.RegisterCallback<GeometryChangedEvent>(OnGeometryChanged);
59+
rangeTracker.RegisterCallback<PropertyChangedEvent>(OnPropertyChanged);
5760

5861
return rangeTracker;
5962
}
@@ -72,6 +75,16 @@ static void OnGeometryChanged(GeometryChangedEvent evt)
7275
sliderTracker.SetRange(sliderTracker.m_Range);
7376
}
7477

78+
static void OnPropertyChanged(PropertyChangedEvent evt)
79+
{
80+
var sliderTracker = evt.elementTarget;
81+
82+
if (evt.property == "enabledSelf")
83+
{
84+
sliderTracker.MarkDirtyRepaint();
85+
}
86+
}
87+
7588
// Maps 'x' from the range '[x_min; x_max]' to the range '[y_min; y_max]'.
7689
static float Map(float x, float x_min, float x_max, float y_min, float y_max)
7790
{
@@ -102,7 +115,7 @@ static void GenerateVisualContent(MeshGenerationContext context)
102115
right = Mathf.Clamp(right, contentRect.xMin, contentRect.xMax);
103116

104117
// Draw the tracker.
105-
painter2D.fillColor = sliderTracker.m_TrackerColor;
118+
painter2D.fillColor = sliderTracker.enabledSelf ? sliderTracker.m_TrackerEnabledColor : sliderTracker.m_TrackerDisabledColor;
106119
painter2D.BeginPath();
107120
painter2D.MoveTo(new Vector2(left, contentRect.yMin));
108121
painter2D.LineTo(new Vector2(right, contentRect.yMin));

‎Editor/Mono/BaseBuildTarget.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ internal abstract class BaseBuildTarget : IBuildTarget
1818

1919
public abstract RuntimePlatform RuntimePlatform { get; }
2020
public abstract string TargetName { get; }
21+
public abstract GUID Guid { get; }
22+
2123
public abstract int GetLegacyId { get; }
2224

2325
public virtual IBuildPlatformProperties BuildPlatformProperties => Properties as IBuildPlatformProperties;

‎Editor/Mono/BuildPipeline/BuildPlatform.cs

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -132,29 +132,10 @@ public string GetBuildTargetDisplayName(NamedBuildTarget namedBuildTarget, Build
132132
}
133133

134134
var suffix = namedBuildTarget == NamedBuildTarget.Server ? " Server" : "";
135-
136-
switch (target)
137-
{
138-
case BuildTarget.StandaloneWindows:
139-
case BuildTarget.StandaloneWindows64:
140-
return $"Windows{suffix}";
141-
case BuildTarget.StandaloneOSX:
142-
// Deprecated
143-
#pragma warning disable 612, 618
144-
case BuildTarget.StandaloneOSXIntel:
145-
case BuildTarget.StandaloneOSXIntel64:
146-
#pragma warning restore 612, 618
147-
return $"macOS{suffix}";
148-
// Deprecated
149-
#pragma warning disable 612, 618
150-
case BuildTarget.StandaloneLinux:
151-
case BuildTarget.StandaloneLinuxUniversal:
152-
#pragma warning restore 612, 618
153-
case BuildTarget.StandaloneLinux64:
154-
return $"Linux{suffix}";
155-
}
156-
157-
return "Unsupported Target";
135+
#pragma warning disable CS0618 // Member is obsolete
136+
string targetName = BuildTargetDiscovery.BuildPlatformDisplayName(target) + suffix;
137+
#pragma warning restore CS0618
138+
return targetName.Length == 0 ? "Unsupported Target" : targetName;
158139
}
159140

160141
public string GetModuleDisplayName(NamedBuildTarget namedBuildTarget, BuildTarget buildTarget)

‎Editor/Mono/BuildPipeline/DataBuildDirtyTracker.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ class BuildData
3939
{
4040
public BuildDataInputFile[] scenes;
4141
public BuildDataInputFile[] inputFiles;
42+
public BuildDataInputFile activeBuildProfile;
4243
public string[] enabledModules;
4344
public string[] resourcePaths;
4445
public BuildOptions buildOptions;
@@ -54,6 +55,7 @@ class BuildData
5455

5556
private BuildData buildData;
5657
private string[] scenes;
58+
private NPath activeBuildProfilePath;
5759
public BuildOptions buildOptions;
5860

5961
bool CheckAssetDirty(BuildDataInputFile file)
@@ -135,12 +137,18 @@ bool DoCheckDirty()
135137
return true;
136138
}
137139

140+
if ((activeBuildProfilePath != buildData.activeBuildProfile.path) || (!string.IsNullOrEmpty(buildData.activeBuildProfile.path) && CheckAssetDirty(buildData.activeBuildProfile)))
141+
{
142+
Console.WriteLine($"Rebuilding Data files because the active build profile have changed");
143+
return true;
144+
}
145+
138146
Console.WriteLine("Not rebuilding Data files -- no changes");
139147
return false;
140148
}
141149

142150
[RequiredByNativeCode]
143-
static public void WriteBuildData(string buildDataPath, BuildReport report, string[] scenes, string[] prefabs)
151+
static public void WriteBuildData(string buildDataPath, BuildReport report, string[] scenes, string[] prefabs, string activeBuildProfilePath)
144152
{
145153
var developmentBuild = report.summary.options.HasFlag(BuildOptions.Development);
146154
var inputScenes = new List<BuildDataInputFile>();
@@ -164,6 +172,7 @@ static public void WriteBuildData(string buildDataPath, BuildReport report, stri
164172
{
165173
scenes = inputScenes.ToArray(),
166174
inputFiles = inputFiles.ToArray(),
175+
activeBuildProfile = new BuildDataInputFile(activeBuildProfilePath, developmentBuild),
167176
buildOptions = report.summary.options & BuildData.BuildOptionsMask,
168177
unityVersion = Application.unityVersion,
169178
resourcePaths = ResourcesAPIInternal.GetAllPaths("").OrderBy(p => p).ToArray(),
@@ -175,7 +184,7 @@ static public void WriteBuildData(string buildDataPath, BuildReport report, stri
175184
}
176185

177186
[RequiredByNativeCode]
178-
static public bool CheckDirty(string buildDataPath, BuildOptions buildOptions, string[] scenes)
187+
static public bool CheckDirty(string buildDataPath, BuildOptions buildOptions, string[] scenes, string activeBuildProfilePath)
179188
{
180189
NPath buildReportPath = buildDataPath;
181190
if (!buildReportPath.FileExists())
@@ -187,6 +196,7 @@ static public bool CheckDirty(string buildDataPath, BuildOptions buildOptions, s
187196
{
188197
buildData = JsonUtility.FromJson<BuildData>(buildReportPath.ReadAllText()),
189198
scenes = scenes,
199+
activeBuildProfilePath = activeBuildProfilePath,
190200
buildOptions = buildOptions
191201
};
192202
return tracker.DoCheckDirty();

‎Editor/Mono/BuildPlayerWindow.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,9 @@ static bool IsVirtualTexturingSettingsValid(BuildPlatform platform)
582582
};
583583
static public string GetPlaybackEngineDownloadURL(string moduleName)
584584
{
585-
if (moduleName == "PS4" || moduleName == "PS5" || moduleName == "XboxOne")
585+
#pragma warning disable CS0618 // Member is obsolete
586+
if (!BuildTargetDiscovery.BuildPlatformCanBeInstalledWithHub(BuildTargetDiscovery.GetBuildTargetByName(moduleName)))
587+
#pragma warning restore CS0618
586588
return "https://unity3d.com/platform-installation";
587589

588590
string fullVersion = InternalEditorUtility.GetFullUnityVersion();
@@ -958,8 +960,9 @@ internal static void ShowNoModuleLabel(
958960
{
959961
GUILayout.Label(EditorGUIUtility.TextContent(string.Format(noModuleLoaded, BuildPlatforms.instance.GetModuleDisplayName(namedBuildTarget, buildTarget))));
960962
string url = "";
961-
962-
if (!isEditorinstalledWithHub || (moduleName == "PS4" || moduleName == "PS5" || moduleName == "XboxOne"))
963+
#pragma warning disable CS0618 // Member is obsolete
964+
if (!isEditorinstalledWithHub || !BuildTargetDiscovery.BuildPlatformCanBeInstalledWithHub(buildTarget))
965+
#pragma warning restore CS0618
963966
{
964967
if (GUILayout.Button(openDownloadPage, EditorStyles.miniButton, GUILayout.ExpandWidth(false)))
965968
{

0 commit comments

Comments
 (0)