Skip to content

Commit 4d031e5

Browse files
author
Unity Technologies
committed
Unity 2022.2.0a16 C# reference source code
1 parent d76ca0c commit 4d031e5

447 files changed

Lines changed: 12307 additions & 4743 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/Data.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public class ConfigurationData
2828
public string UnityLinkerPath;
2929
public string Il2CppPath;
3030
public string NetCoreRunPath;
31+
public string DotNetExe;
3132
public string EditorContentsPath;
3233
public PackageInfo[] Packages;
3334
public string UnityVersion;

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,20 @@ public class PluginsData
2222
public Plugin[] Plugins = new Plugin[0];
2323
}
2424

25+
public class GenerateNativePluginsForAssembliesArgs
26+
{
27+
public string PluginOutputFolder;
28+
public string SymbolOutputFolder;
29+
public string[] Assemblies;
30+
}
31+
32+
public class GenerateNativePluginsForAssembliesSettings
33+
{
34+
public bool HasCallback;
35+
public string DisplayName;
36+
public string[] AdditionalInputFiles = new string[0];
37+
}
38+
2539
public class PlayerBuildConfig
2640
{
2741
public string DestinationPath;
@@ -38,6 +52,7 @@ public class PlayerBuildConfig
3852
public bool GenerateIdeProject;
3953
public bool Development;
4054
public bool UseNewInputSystem;
55+
public GenerateNativePluginsForAssembliesSettings GenerateNativePluginsForAssembliesSettings;
4156
public Services Services;
4257
public string[] ManagedAssemblies;
4358
public StreamingAssetsFile[] StreamingAssetsFiles;
@@ -67,7 +82,7 @@ public class Il2CppConfig
6782
public bool EnableDeepProfilingSupport;
6883
public bool EnableFullGenericSharing;
6984
public string Profile;
70-
public string Defines;
85+
public string[] IDEProjectDefines;
7186

7287
public string ConfigurationName;
7388
public bool GcWBarrierValidation;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public class ScriptCompilationData
2525
public string BuildPlayerDataOutput;
2626
public bool ExtractRuntimeInitializeOnLoads;
2727
public bool EnableDiagnostics;
28+
public bool EmitInfoForScriptUpdater;
2829
public string[] AssembliesToScanForTypeDB;
2930
public string[] SearchPaths;
3031
}

‎Editor/Mono/ActiveEditorTracker.bindings.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,16 @@ public bool hasComponentsWhichCannotBeMultiEdited
172172
static extern void Internal_VerifyModifiedMonoBehaviours(ActiveEditorTracker self);
173173
public void VerifyModifiedMonoBehaviours() { Internal_VerifyModifiedMonoBehaviours(this); }
174174

175+
[FreeFunction]
176+
static extern DataMode Internal_GetDataMode(ActiveEditorTracker self);
177+
[FreeFunction]
178+
static extern void Internal_SetDataMode(ActiveEditorTracker self, DataMode mode);
179+
internal DataMode dataMode
180+
{
181+
get => Internal_GetDataMode(this);
182+
set => Internal_SetDataMode(this, value);
183+
}
184+
175185
[Obsolete("Use Editor.CreateEditor instead")]
176186
public static Editor MakeCustomEditor(UnityObject obj)
177187
{

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ public static void OnEditAnimationEvents(AnimationWindowEvent[] awEvents)
139139
foreach (var evt in data.selectedEvents)
140140
{
141141
evt.functionName = functionName;
142-
evt.stringParameter = string.Empty;
143142
}
144143
}
145144
EditorGUI.showMixedValue = false;

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

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

55
using System;
6-
using System.Linq;
76
using UnityEngine;
87

98
namespace UnityEditor

‎Editor/Mono/AssemblyInfo/AssemblyInfo.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
[assembly: InternalsVisibleTo("UnityEditor.LinuxStandalone.Extensions")]
4747
[assembly: InternalsVisibleTo("UnityEditor.CloudRendering.Extensions")]
4848
[assembly: InternalsVisibleTo("UnityEditor.EmbeddedLinux.Extensions")]
49+
[assembly: InternalsVisibleTo("UnityEditor.QNX.Extensions")]
4950
[assembly: InternalsVisibleTo("UnityEditor.WindowsStandalone.Extensions")]
5051
[assembly: InternalsVisibleTo("UnityEditor.OSXStandalone.Extensions")]
5152
[assembly: InternalsVisibleTo("UnityEditor.Lumin.Extensions")]

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

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ public class AssetImportContext
3939

4040
public extern BuildTarget selectedBuildTarget { get; }
4141

42-
extern void LogMessage(string msg, string file, int line, UnityEngine.Object obj, bool isAnError);
43-
4442
[NativeThrows]
4543
public extern void SetMainObject(Object obj);
4644
public extern Object mainObject { get; }
@@ -175,36 +173,34 @@ public void DependsOnCustomDependency(string dependency)
175173
[NativeName("DependsOnCustomDependency")]
176174
private extern void DependsOnCustomDependencyInternal(string path);
177175

176+
extern void AddImportLog(string msg, string file, int line, ImportLogFlags flags, UnityEngine.Object obj);
177+
178+
void AddImportLog(string msg, ImportLogFlags flags, UnityEngine.Object obj)
179+
{
180+
var st = new StackTrace(2, true);
181+
var sf = st.GetFrame(0);
182+
AddImportLog(msg, sf.GetFileName(), sf.GetFileLineNumber(), flags, obj);
183+
}
184+
178185
public void LogImportError(string msg, UnityEngine.Object obj = null)
179186
{
180-
AddToLog(msg, true, obj);
187+
AddImportLog(msg, ImportLogFlags.Error, obj);
181188
}
182189

183190
internal void LogImportError(string msg, string file, int line, UnityEngine.Object obj = null)
184191
{
185-
AddToLog(msg, file, line, true, obj);
192+
AddImportLog(msg, file, line, ImportLogFlags.Error, obj);
186193
}
187194

188195
public void LogImportWarning(string msg, UnityEngine.Object obj = null)
189196
{
190-
AddToLog(msg, false, obj);
197+
AddImportLog(msg, ImportLogFlags.Warning, obj);
191198
}
192199

193200
internal void LogImportWarning(string msg, string file, int line, UnityEngine.Object obj = null)
194201
{
195-
AddToLog(msg, file, line, false, obj);
202+
AddImportLog(msg, file, line, ImportLogFlags.Warning, obj);
196203
}
197204

198-
void AddToLog(string msg, bool isAnError, UnityEngine.Object obj)
199-
{
200-
var st = new StackTrace(2, true);
201-
var sf = st.GetFrame(0);
202-
AddToLog(msg, sf.GetFileName(), sf.GetFileLineNumber(), isAnError, obj);
203-
}
204-
205-
void AddToLog(string msg, string file, int line, bool isAnError, UnityEngine.Object obj)
206-
{
207-
LogMessage(msg, file, line, obj, isAnError);
208-
}
209205
}
210206
}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using Object = UnityEngine.Object;
1010
using UnityEngine.Bindings;
1111
using UnityEngine.Scripting;
12+
using UnityEditor.AssetImporters;
1213

1314
namespace UnityEditor
1415
{
@@ -92,6 +93,17 @@ public extern string assetBundleVariant
9293
set;
9394
}
9495

96+
public static ImportLog GetImportLog(string path)
97+
{
98+
return GetImportLog(AssetDatabase.GUIDFromAssetPath(path));
99+
}
100+
101+
[FreeFunction("AssetImporter::GetImportLog")]
102+
internal static extern ImportLog GetImportLog(GUID guid);
103+
104+
[FreeFunction("AssetImporter::GetImportLogEntriesCount")]
105+
internal static extern bool GetImportLogEntriesCount(GUID guid, out int nbErrors, out int nbWarnings);
106+
95107
[NativeName("SetAssetBundleName")]
96108
extern public void SetAssetBundleNameAndVariant(string assetBundleName, string assetBundleVariant);
97109

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

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
// Unity C# reference source
2+
// Copyright (c) Unity Technologies. For terms of use, see
3+
// https://unity3d.com/legal/licenses/Unity_Reference_Only_License
4+
5+
using System;
6+
using UnityEngine;
7+
using UnityEngine.Bindings;
8+
using Object = UnityEngine.Object;
9+
10+
namespace UnityEditor.AssetImporters
11+
{
12+
// Subset of C++ LogMessageFlags in LogAssert.h
13+
[Flags]
14+
public enum ImportLogFlags
15+
{
16+
None = 0, // kNoLogMessageFlags
17+
Error = 1 << 6, // kAssetImportError
18+
Warning = 1 << 7 // kAssetImportWarning
19+
};
20+
21+
[NativeHeader("Editor/Src/AssetPipeline/ImportLog.h")]
22+
[NativeHeader("Editor/Src/AssetPipeline/ImportLog.bindings.h")]
23+
[ExcludeFromObjectFactory]
24+
public sealed class ImportLog : Object
25+
{
26+
internal struct Filters
27+
{
28+
public const string SearchToken = "i";
29+
public const string AllIssuesStr = "all";
30+
public const string ErrorsStr = "errors";
31+
public const string WarningsStr = "warnings";
32+
}
33+
34+
[NativeType(CodegenOptions.Custom, "MonoImportLogEntry")]
35+
public struct ImportLogEntry
36+
{
37+
public string message;
38+
public ImportLogFlags flags;
39+
public int line;
40+
public string file;
41+
42+
public UnityEngine.Object context
43+
{
44+
get => Object.FindObjectFromInstanceID(instanceID);
45+
set => instanceID = value.GetInstanceID();
46+
}
47+
48+
internal int instanceID;
49+
};
50+
51+
public extern ImportLogEntry[] logEntries
52+
{
53+
[NativeMethod("GetLogEntries")]
54+
get;
55+
}
56+
57+
[NativeMethod("PrintToConsole")]
58+
internal extern void PrintToConsole();
59+
}
60+
}

0 commit comments

Comments
 (0)