Skip to content

Commit 3c0289c

Browse files
author
Unity Technologies
committed
Unity 6000.6.0a5 C# reference source code
1 parent 99d5fa2 commit 3c0289c

1,149 files changed

Lines changed: 38499 additions & 20869 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/BeeBuildProgramCommon.Data/BeeBuildProgramCommon.Data.gen.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,7 @@
2323
<Compile Include="Data.cs" />
2424
</ItemGroup>
2525
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
26+
<ItemGroup>
27+
<Analyzer Include="/tmp/uitoolkit_gen_1zvoxi0i/Unity.UIToolkit.SourceGenerator.dll" />
28+
</ItemGroup>
2629
</Project>

‎Editor/IncrementalBuildPipeline/BeeBuildProgramCommon.Data/Data.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class ConfigurationData
2828
public string UnityLinkerPath;
2929
public string Il2CppPath;
3030
public bool Il2CppUsingDevelopmentLocation;
31-
public string NetCoreRunPath;
31+
public string Il2CppBclDistributionDirectory;
3232
public string DotNetExe;
3333
public string EditorContentsPath;
3434
public string EditorToolsPath;

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ public enum ScriptingBackend
134134
// Keep in sync with bee LTO modes
135135
public enum BuildProgramLTOMode
136136
{
137-
Full = 0,
138-
Thin = 1
137+
None = 0,
138+
Thin = 1,
139+
Full = 2,
139140
}
140141
}

‎Editor/IncrementalBuildPipeline/PlayerBuildProgramLibrary.Data/PlayerBuildProgramLibrary.Data.gen.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,7 @@
2525
<ProjectReference Include="../BeeBuildProgramCommon.Data/BeeBuildProgramCommon.Data.gen.csproj" />
2626
</ItemGroup>
2727
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
28+
<ItemGroup>
29+
<Analyzer Include="/tmp/uitoolkit_gen_1zvoxi0i/Unity.UIToolkit.SourceGenerator.dll" />
30+
</ItemGroup>
2831
</Project>

‎Editor/IncrementalBuildPipeline/ScriptCompilationBuildProgram.Data/ScriptCompilationBuildProgram.Data.gen.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,7 @@
2424
<ProjectReference Include="../BeeBuildProgramCommon.Data/BeeBuildProgramCommon.Data.gen.csproj" />
2525
</ItemGroup>
2626
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
27+
<ItemGroup>
28+
<Analyzer Include="/tmp/uitoolkit_gen_1zvoxi0i/Unity.UIToolkit.SourceGenerator.dll" />
29+
</ItemGroup>
2730
</Project>

‎Editor/Mono/Animation/AnimationMode.bindings.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ public class AnimationMode
3737
static private bool s_InAnimationPlaybackMode = false;
3838
static private bool s_InAnimationRecordMode = false;
3939

40+
[VisibleToOtherModules("UnityEditor.UIToolkitAuthoringModule")]
4041
static internal event Action onAnimationRecordingStart;
42+
[VisibleToOtherModules("UnityEditor.UIToolkitAuthoringModule")]
4143
static internal event Action onAnimationRecordingStop;
4244
static internal event Action onAnimationPlaybackStart;
4345
static internal event Action onAnimationPlaybackStop;
@@ -136,6 +138,7 @@ internal static void StopAnimationRecording()
136138
onAnimationRecordingStop?.Invoke();
137139
}
138140

141+
[VisibleToOtherModules("UnityEditor.UIToolkitAuthoringModule")]
139142
internal static bool InAnimationRecording()
140143
{
141144
return s_InAnimationRecordMode;

‎Editor/Mono/Animation/AnimationUtility.bindings.cs‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@
1111

1212
using Object = UnityEngine.Object;
1313
using UnityEngine.Animations;
14+
using System.Runtime.InteropServices;
1415

1516
namespace UnityEditor
1617
{
18+
[NativeHeader("Modules/Animation/PPtrKeyframes.h")]
19+
[StructLayout(LayoutKind.Sequential)]
1720
public struct ObjectReferenceKeyframe
1821
{
1922
public float time;
@@ -226,10 +229,9 @@ public static Type PropertyModificationToEditorCurveBinding(PropertyModification
226229
extern public static EditorCurveBinding[] GetCurveBindings([NotNull] AnimationClip clip);
227230
extern public static EditorCurveBinding[] GetObjectReferenceCurveBindings([NotNull] AnimationClip clip);
228231

229-
[return: UnityMarshalAs(NativeType.ScriptingObjectPtr)]
230232
extern public static ObjectReferenceKeyframe[] GetObjectReferenceCurve([NotNull] AnimationClip clip, EditorCurveBinding binding);
231233

232-
public static void SetObjectReferenceCurve(AnimationClip clip, EditorCurveBinding binding, [UnityMarshalAs(NativeType.ScriptingObjectPtr)]ObjectReferenceKeyframe[] keyframes)
234+
public static void SetObjectReferenceCurve(AnimationClip clip, EditorCurveBinding binding, ObjectReferenceKeyframe[] keyframes)
233235
{
234236
Internal_SetObjectReferenceCurve(clip, binding, keyframes, true);
235237
Internal_InvokeOnCurveWasModified(clip, binding, keyframes != null ? CurveModifiedType.CurveModified : CurveModifiedType.CurveDeleted);
@@ -260,7 +262,7 @@ internal static void SetObjectReferenceCurveNoSync(AnimationClip clip, EditorCur
260262
}
261263

262264
[NativeMethod(ThrowsException = true)]
263-
extern private static void Internal_SetObjectReferenceCurve([NotNull] AnimationClip clip, EditorCurveBinding binding, [UnityMarshalAs(NativeType.ScriptingObjectPtr)] ObjectReferenceKeyframe[] keyframes, bool updateMuscleClip);
265+
extern private static void Internal_SetObjectReferenceCurve([NotNull] AnimationClip clip, EditorCurveBinding binding, ObjectReferenceKeyframe[] keyframes, bool updateMuscleClip);
264266

265267
extern public static AnimationCurve GetEditorCurve([NotNull] AnimationClip clip, EditorCurveBinding binding);
266268

@@ -416,24 +418,10 @@ public static AnimationCurve GetEditorCurve(AnimationClip clip, string relativeP
416418
return GetEditorCurve(clip, EditorCurveBinding.FloatCurve(relativePath, type, propertyName));
417419
}
418420

419-
public static AnimationEvent[] GetAnimationEvents(AnimationClip clip)
420-
{
421-
var blittableEvents = GetAnimationEventsInternal(clip);
422-
var animationEvents = Array.ConvertAll(blittableEvents, AnimationEventBlittable.ToAnimationEvent);
423-
foreach (var blittableEvent in blittableEvents)
424-
blittableEvent.Dispose();
425-
return animationEvents;
426-
}
427-
[return:UnityMarshalAs(NativeType.ScriptingObjectPtr)]
428-
extern internal static AnimationEventBlittable[] GetAnimationEventsInternal([NotNull] AnimationClip clip);
429-
public static void SetAnimationEvents(AnimationClip clip, AnimationEvent[] events)
430-
{
431-
var blittableEvents = Array.ConvertAll(events, AnimationEventBlittable.FromAnimationEvent);
432-
SetAnimationEventsInternal(clip, blittableEvents);
433-
foreach (var blittableEvent in blittableEvents)
434-
blittableEvent.Dispose();
435-
}
436-
extern internal static void SetAnimationEventsInternal([NotNull] AnimationClip clip, [NotNull] AnimationEventBlittable[] events);
421+
[NativeMethod("GetAnimationEventsInternal")]
422+
extern public static AnimationEvent[] GetAnimationEvents([NotNull] AnimationClip clip);
423+
[NativeMethod("SetAnimationEventsInternal")]
424+
extern public static void SetAnimationEvents([NotNull] AnimationClip clip, [NotNull] AnimationEvent[] events);
437425

438426
extern public static string CalculateTransformPath([NotNull] Transform targetTransform, Transform root);
439427

‎Editor/Mono/Annotation/AnnotationUtility.bindings.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,8 @@ public enum Flags
2929
kIsDisabled = 1 << 2
3030
};
3131

32-
[return: UnityMarshalAs(NativeType.ScriptingObjectPtr)]
3332
extern internal static Annotation[] GetAnnotations();
3433

35-
[return: UnityMarshalAs(NativeType.ScriptingObjectPtr)]
3634
extern internal static Annotation[] GetRecentlyChangedAnnotations();
3735

3836
extern internal static Annotation GetAnnotation(int classID, string scriptClass);

‎Editor/Mono/AssemblyInfo/AssemblyInfo.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@
179179
[assembly: InternalsVisibleTo("Unity.UI.Builder.EditorTests")]
180180
[assembly: InternalsVisibleTo("Unity.Modules.UIToolkitAuthoring.Tests.Editor")]
181181
[assembly: InternalsVisibleTo("UnityEditor.UIToolkitAuthoringModule")]
182+
[assembly: InternalsVisibleTo("Unity.Modules.GraphViewEditor.Tests.Editor")]
182183
[assembly: InternalsVisibleTo("Unity.GraphViewTestUtilities.Editor")]
183184
[assembly: InternalsVisibleTo("Unity.ProBuilder.Editor")]
184185
[assembly: InternalsVisibleTo("Unity.2D.Sprite.Editor")]
@@ -249,6 +250,7 @@
249250
[assembly: InternalsVisibleTo("Unity.Modules.UI.Tests.Editor")]
250251
[assembly: InternalsVisibleTo("Unity.Modules.Multiplayer.Server.Tests.Editor")]
251252
[assembly: InternalsVisibleTo("Unity.Modules.AssetDatabase.AssetPostProcessor.Tests.Editor")]
253+
[assembly: InternalsVisibleTo("Unity.Modules.AssetPackage.Tests.Editor")]
252254
// This should move with the AnimationWindow to a module at some point
253255
[assembly: InternalsVisibleTo("Unity.Modules.Animation.AnimationWindow.Tests.Editor")]
254256
[assembly: InternalsVisibleTo("Unity.Modules.Physics.Tests.Editor")]
@@ -289,10 +291,12 @@
289291
[assembly: InternalsVisibleTo("Unity.Modules.Core.UnityType.Tests.Editor")]
290292
[assembly: InternalsVisibleTo("Unity.Modules.Core.Camera.Tests.Editor")]
291293
[assembly: InternalsVisibleTo("Unity.Core.VersionControl.Tests.Editor")]
294+
[assembly: InternalsVisibleTo("Unity.ProjectAuditor.Editor")]
292295
[assembly: InternalsVisibleTo("Unity.ProjectAuditor.EditorTests")]
293296
[assembly: InternalsVisibleTo("Unity.Modules.GI.Analytics.Tests.Editor")]
294297
[assembly: InternalsVisibleTo("Unity.CrossModule.AssetLoading.Tests.Editor")]
295298
[assembly: InternalsVisibleTo("Unity.Modules.SceneTemplateEditor.Tests.Editor")]
296299
[assembly: InternalsVisibleTo("Unity.Modules.Core.InspectorWindow.Tests.Editor")]
297300
[assembly: InternalsVisibleTo("Unity.Modules.Terrain.Tests.Editor")]
301+
[assembly: InternalsVisibleTo("Unity.Modules.AI.Tests.Editor")]
298302

‎Editor/Mono/AssemblyValidation.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,22 @@ protected override void Dispose(bool disposing)
114114
}
115115
}
116116

117+
[RequiredByNativeCode]
118+
internal static void DeconstructAssemblyValidationErrorArrayElement(
119+
Error[] array,
120+
int index,
121+
out string message,
122+
out string assemblyPath,
123+
out string assemblyName,
124+
out int flags)
125+
{
126+
var element = array[index];
127+
message = element.message;
128+
assemblyPath = element.assemblyPath;
129+
assemblyName = element.assemblyName;
130+
flags = (int)element.flags;
131+
}
132+
117133
[RequiredByNativeCode]
118134
public static Error[] ValidateAssemblies(string[] assemblyPaths, bool enableLogging)
119135
{

0 commit comments

Comments
 (0)