Unity 2021.1.0a6 C# reference source code

Author: Unity Technologies

Editor/Mono/2D/SpriteAtlas/EditorSpriteAtlas.bindings.cs

@@ -67,11 +67,14 @@ public struct SpriteAtlasPackingSettings
         private bool m_EnableRotation;
         [NativeName("enableTightPacking")]
         private bool m_EnableTightPacking;
+        [NativeName("enableAlphaDilation")]
+        private bool m_EnableAlphaDilation;
 
         public int blockOffset { get { return m_BlockOffset; } set { m_BlockOffset = value; } }
         public int padding { get { return m_Padding; } set { m_Padding = value; } }
         public bool enableRotation { get { return m_EnableRotation; } set { m_EnableRotation = value; } }
         public bool enableTightPacking { get { return m_EnableTightPacking; } set { m_EnableTightPacking = value; } }
+        public bool enableAlphaDilation { get { return m_EnableAlphaDilation; } set { m_EnableAlphaDilation = value; } }
     }
 
     [NativeHeader("Editor/Src/AssetPipeline/TextureImporting/TextureImporterTypes.h")]

Editor/Mono/2D/SpriteAtlas/SpriteAtlasImporterInspector.cs

@@ -52,6 +52,7 @@ class Styles
             public readonly GUIContent bindAsDefaultLabel = EditorGUIUtility.TrTextContent("Include in Build", "Packed textures will be included in the build by default.");
             public readonly GUIContent enableRotationLabel = EditorGUIUtility.TrTextContent("Allow Rotation", "Try rotating the sprite to fit better during packing.");
             public readonly GUIContent enableTightPackingLabel = EditorGUIUtility.TrTextContent("Tight Packing", "Use the mesh outline to fit instead of the whole texture rect during packing.");
+            public readonly GUIContent enableAlphaDilationLabel = EditorGUIUtility.TrTextContent("Alpha Dilation", "Enable Alpha Dilation for SpriteAtlas padding pixels.");
             public readonly GUIContent paddingLabel = EditorGUIUtility.TrTextContent("Padding", "The amount of extra padding between packed sprites.");
 
             public readonly GUIContent generateMipMapLabel = EditorGUIUtility.TrTextContent("Generate Mip Maps");
@@ -121,6 +122,7 @@ private enum AtlasType { Undefined = -1, Master = 0, Variant = 1 }
         private SerializedProperty m_Readable;
         private SerializedProperty m_UseSRGB;
         private SerializedProperty m_EnableTightPacking;
+        private SerializedProperty m_EnableAlphaDilation;
         private SerializedProperty m_EnableRotation;
         private SerializedProperty m_Padding;
         private SerializedProperty m_BindAsDefault;
@@ -234,6 +236,7 @@ void OnEnable()
 
             m_EnableTightPacking = serializedAssetObject.FindProperty("m_ImporterData.packingSettings.enableTightPacking");
             m_EnableRotation = serializedAssetObject.FindProperty("m_ImporterData.packingSettings.enableRotation");
+            m_EnableAlphaDilation = serializedObject.FindProperty("m_EditorData.packingSettings.enableAlphaDilation");
             m_Padding = serializedAssetObject.FindProperty("m_ImporterData.packingSettings.padding");
 
             m_MasterAtlas = serializedAssetObject.FindProperty("m_MasterAtlas");
@@ -541,6 +544,7 @@ private void HandleMasterSettingUI()
 
             HandleBoolToIntPropertyField(m_EnableRotation, styles.enableRotationLabel);
             HandleBoolToIntPropertyField(m_EnableTightPacking, styles.enableTightPackingLabel);
+            HandleBoolToIntPropertyField(m_EnableAlphaDilation, styles.enableAlphaDilationLabel);
             EditorGUILayout.IntPopup(m_Padding, styles.paddingOptions, styles.paddingValues, styles.paddingLabel);
 
             GUILayout.Space(EditorGUI.kSpacing);

Editor/Mono/2D/SpriteAtlas/SpriteAtlasInspector.cs

@@ -53,6 +53,7 @@ class Styles
             public readonly GUIContent bindAsDefaultLabel = EditorGUIUtility.TrTextContent("Include in Build", "Packed textures will be included in the build by default.");
             public readonly GUIContent enableRotationLabel = EditorGUIUtility.TrTextContent("Allow Rotation", "Try rotating the sprite to fit better during packing.");
             public readonly GUIContent enableTightPackingLabel = EditorGUIUtility.TrTextContent("Tight Packing", "Use the mesh outline to fit instead of the whole texture rect during packing.");
+            public readonly GUIContent enableAlphaDilationLabel = EditorGUIUtility.TrTextContent("Alpha Dilation", "Enable Alpha Dilation for SpriteAtlas padding pixels.");
             public readonly GUIContent paddingLabel = EditorGUIUtility.TrTextContent("Padding", "The amount of extra padding between packed sprites.");
 
             public readonly GUIContent generateMipMapLabel = EditorGUIUtility.TrTextContent("Generate Mip Maps");
@@ -119,6 +120,7 @@ private enum AtlasType { Undefined = -1, Master = 0, Variant = 1 }
         private SerializedProperty m_Readable;
         private SerializedProperty m_UseSRGB;
         private SerializedProperty m_EnableTightPacking;
+        private SerializedProperty m_EnableAlphaDilation;
         private SerializedProperty m_EnableRotation;
         private SerializedProperty m_Padding;
         private SerializedProperty m_BindAsDefault;
@@ -199,6 +201,7 @@ void OnEnable()
             m_UseSRGB = serializedObject.FindProperty("m_EditorData.textureSettings.sRGB");
 
             m_EnableTightPacking = serializedObject.FindProperty("m_EditorData.packingSettings.enableTightPacking");
+            m_EnableAlphaDilation = serializedObject.FindProperty("m_EditorData.packingSettings.enableAlphaDilation");
             m_EnableRotation = serializedObject.FindProperty("m_EditorData.packingSettings.enableRotation");
             m_Padding = serializedObject.FindProperty("m_EditorData.packingSettings.padding");
 
@@ -463,6 +466,7 @@ private void HandleMasterSettingUI()
 
             HandleBoolToIntPropertyField(m_EnableRotation, styles.enableRotationLabel);
             HandleBoolToIntPropertyField(m_EnableTightPacking, styles.enableTightPackingLabel);
+            HandleBoolToIntPropertyField(m_EnableAlphaDilation, styles.enableAlphaDilationLabel);
             EditorGUILayout.IntPopup(m_Padding, styles.paddingOptions, styles.paddingValues, styles.paddingLabel);
 
             GUILayout.Space(EditorGUI.kSpacing);

Editor/Mono/AssetPipeline/TextureGenerator.bindings.cs

@@ -204,6 +204,12 @@ public TextureGenerationSettings(TextureImporterType type)
                     m_Settings.alphaIsTransparency = false;
                     m_Settings.alphaSource = TextureImporterAlphaSource.None;
                     break;
+                case TextureImporterType.DirectionalLightmap:
+                    m_Settings.sRGBTexture = false;
+                    m_Settings.npotScale = TextureImporterNPOTScale.ToNearest;
+                    m_Settings.alphaIsTransparency = false;
+                    m_Settings.alphaSource = TextureImporterAlphaSource.None;
+                    break;
                 case TextureImporterType.Shadowmask:
                     m_Settings.sRGBTexture = false;
                     m_Settings.npotScale = TextureImporterNPOTScale.ToNearest;

Editor/Mono/AssetPipeline/TextureImporterEnums.cs

@@ -315,6 +315,7 @@ public enum TextureImporterType
         Advanced = 5,
         SingleChannel = 10,
         Shadowmask = 11,
+        DirectionalLightmap = 12,
     }
 
     public enum TextureImporterCompression

Editor/Mono/AssetPostprocessor.cs

@@ -680,7 +680,7 @@ static bool InvokeMethodIfAvailable<T>(object target, string methodName, object[
                     returnedObject = method.Invoke(target, args) as T;
                 }
 
-                return true;
+                return returnedObject != null;
             }
             return false;
         }

Editor/Mono/Audio/WaveformPreview.cs

@@ -158,7 +158,7 @@ public void Render(Rect rect)
             else if (m_ChannelMode == ChannelMode.SpecificChannel)
                 mode = m_SpecificChannel;
 
-            s_Material.SetInt("_ChanDrawMode", mode);
+            s_Material.SetFloat("_ChanDrawMode", (float)mode);
 
             Graphics.DrawTexture(rect, m_Texture, s_Material);
         }

Editor/Mono/BuildPipeline/BuildUtils.cs

@@ -114,7 +114,7 @@ private static void RunProgram(Program p, string exe, string args, string workin
                 {
                     var errorOutput = p.GetErrorOutput();
                     var standardOutput = p.GetStandardOutput();
-                    messages.AddRange(parser.Parse(errorOutput, standardOutput, true, "n/a (il2cpp)"));
+                    messages.AddRange(parser.Parse(errorOutput, standardOutput, true));
                 }
 
                 foreach (var message in NonerrorMessages(messages))

Editor/Mono/BuildPipeline/Il2Cpp/IL2CPPUtils.cs

@@ -451,6 +451,11 @@ internal static string GetTundraFolder()
             return $"{GetIl2CppFolder()}/external/bee/tundra";
         }
 
+        internal static string GetReapiCacheClientFolder()
+        {
+            return $"{GetIl2CppFolder()}/external/bee/reapi-cache-client";
+        }
+
         internal static string GetAdditionalArguments()
         {
             var arguments = new List<string>();
@@ -740,14 +745,13 @@ private void RunIl2CppWithArguments(List<string> arguments, Action<ProcessStartI
         {
             var args = arguments.Aggregate(String.Empty, (current, arg) => current + arg + " ");
 
-            BeeSettingsIl2Cpp il2cppSettings = new BeeSettingsIl2Cpp();
+            BeeSettingsIl2Cpp beeSettings = new BeeSettingsIl2Cpp();
             var il2cppOutputParser = new Il2CppOutputParser(Path.Combine(generatedCppOutputDirectory, "Il2CppToEditorData.json"));
 
-            il2cppSettings.ToolPath = $"{EscapeSpacesInPath(GetIl2CppExe())}";
-            il2cppSettings.Arguments.AddRange(arguments);
-            il2cppSettings.Serialize(m_PlatformProvider.il2cppBuildCacheDirectory);
+            beeSettings.ToolPath = $"{EscapeSpacesInPath(GetIl2CppExe())}";
+            beeSettings.Arguments.AddRange(arguments);
+            beeSettings.Serialize(m_PlatformProvider.il2cppBuildCacheDirectory);
 
-            FileUtil.CopyDirectoryRecursive(GetIl2CppBeeArtifactsDirectory(), $"{m_PlatformProvider.il2cppBuildCacheDirectory}/artifacts", true);
             void SetupTundraAndStartInfo(ProcessStartInfo startInfo)
             {
                 if (setupStartInfo != null)
@@ -756,11 +760,13 @@ void SetupTundraAndStartInfo(ProcessStartInfo startInfo)
                 // For some reason, TUNDRA_EXECUTABLE needs to be unescaped in order to be found on OSX,
                 // but MONO_EXECUTABLE needs to be escaped in order to be found on OSX
                 startInfo.EnvironmentVariables.Add("TUNDRA_EXECUTABLE", GetIl2CppTundraExe());
+                startInfo.EnvironmentVariables.Add("REAPI_CACHE_CLIENT", GetIl2CppReapiCacheClientExe());
                 startInfo.EnvironmentVariables.Add("MONO_EXECUTABLE", EscapeSpacesInPath(GetMonoBleedingEdgeExe()));
             }
 
+            var beeArgs = $"--no-colors --prebuiltbuildprogram={EscapeSpacesInPath(GetIl2CppBeeBuildProgramExe())}";
             Console.WriteLine("Invoking il2cpp (via bee.exe) with arguments: " + args);
-            Runner.RunManagedProgram(GetIl2CppBeeExe(), "--useprebuiltbuildprogram --no-colors", m_PlatformProvider.il2cppBuildCacheDirectory, il2cppOutputParser, SetupTundraAndStartInfo);
+            Runner.RunManagedProgram(GetIl2CppBeeExe(), beeArgs, m_PlatformProvider.il2cppBuildCacheDirectory, il2cppOutputParser, SetupTundraAndStartInfo);
 
             // Copy IL2CPP outputs to StagingArea
             var nativeOutputDirectoryInBuildCache = GetNativeOutputDirectory(m_PlatformProvider.il2cppBuildCacheDirectory);
@@ -803,6 +809,11 @@ private string GetIl2CppBeeArtifactsDirectory()
             return $"{IL2CPPUtils.GetIl2CppBeeSettingsFolder()}/artifacts";
         }
 
+        private string GetIl2CppBeeBuildProgramExe()
+        {
+            return $"{GetIl2CppBeeArtifactsDirectory()}/buildprogram/buildprogram.exe";
+        }
+
         private string GetIl2CppTundraExe()
         {
             if (Application.platform == RuntimePlatform.OSXEditor)
@@ -813,6 +824,16 @@ private string GetIl2CppTundraExe()
             return $"{IL2CPPUtils.GetTundraFolder()}/tundra-win-x64/tundra2.exe";
         }
 
+        private string GetIl2CppReapiCacheClientExe()
+        {
+            if (Application.platform == RuntimePlatform.OSXEditor)
+                return $"{IL2CPPUtils.GetReapiCacheClientFolder()}/tundra-mac-x64/tundra2";
+            if (Application.platform == RuntimePlatform.LinuxEditor)
+                return $"{IL2CPPUtils.GetReapiCacheClientFolder()}/tundra-linux-x64/tundra2";
+
+            return $"{IL2CPPUtils.GetReapiCacheClientFolder()}/tundra-win-x64/tundra2.exe";
+        }
+
         private string GetMonoBleedingEdgeExe()
         {
             var path = Path.Combine(MonoInstallationFinder.GetMonoInstallation("MonoBleedingEdge"), "bin");

Editor/Mono/BuildPlayerWindow.cs

@@ -67,7 +67,7 @@ public GUIContent GetDownloadErrorForTarget(BuildTarget target)
             public GUIContent buildWithDeepProfiler = EditorGUIUtility.TrTextContent("Deep Profiling Support", "Build Player with Deep Profiling Support. This might affect Player performance.");
             public GUIContent buildWithDeepProfilerDisabled = EditorGUIUtility.TrTextContent("Deep Profiling", "Profiling is only enabled in a Development Player.");
             public GUIContent allowDebugging = EditorGUIUtility.TrTextContent("Script Debugging", "Enable this setting to allow your script code to be debugged.");
-            public GUIContent waitForManagedDebugger = EditorGUIUtility.TrTextContent("Wait For Managed Debugger", "Show a dialog where you can attach a managed debugger before any script execution.");
+            public GUIContent waitForManagedDebugger = EditorGUIUtility.TrTextContent("Wait For Managed Debugger", "Show a dialog where you can attach a managed debugger before any script execution. Can also use volume Up or Down button to confirm on Android.");
             public GUIContent explicitNullChecks = EditorGUIUtility.TrTextContent("Explicit Null Checks");
             public GUIContent explicitDivideByZeroChecks = EditorGUIUtility.TrTextContent("Divide By Zero Checks");
             public GUIContent explicitArrayBoundsChecks = EditorGUIUtility.TrTextContent("Array Bounds Checks");