Unity 2023.1.0a24 C# reference source code

Author: Unity Technologies

Editor/Mono/GI/LightmapParameters.bindings.cs

@@ -61,5 +61,13 @@ public float edgeStitching
             get { return stitchEdges ? 1.0f : 0.0f; }
             set { stitchEdges = (value != 0.0f); }
         }
+
+        [NativeHeader("Runtime/Graphics/LightmapEnums.h")]
+        public enum AntiAliasingSamples
+        {
+            SSAA1 = 1,
+            SSAA4 = 2,
+            SSAA16 = 4,
+        }
     }
 }

Editor/Mono/GI/Lightmapping.bindings.cs

@@ -245,9 +245,6 @@ internal static FilterMode filterMode
         [FreeFunction]
         internal static extern MemLabels GetMaterialTexturesMemLabels();
 
-        [FreeFunction]
-        internal static extern MemLabels GetNotShownMemLabels();
-
         [StaticAccessor("PVRMemoryLabelTracker::Get()", StaticAccessorType.Arrow)]
         internal static extern void ResetExplicitlyShownMemLabels();
 
@@ -264,9 +261,6 @@ internal static FilterMode filterMode
         [StaticAccessor("BakedGISceneManager::Get()", StaticAccessorType.Arrow)]
         internal static extern void LogGPUMemoryStatistics();
 
-        [StaticAccessor("BakedGISceneManager::Get()", StaticAccessorType.Arrow)]
-        internal static extern float GetLightmapBakeTimeRaw();
-
         [StaticAccessor("BakedGISceneManager::Get()", StaticAccessorType.Arrow)]
         internal static extern float GetLightmapBakeTimeTotal();
 

Editor/Mono/GUI/PackageImport.cs

@@ -244,12 +244,14 @@ void BottomArea()
             {
                 PackageImportWizard.instance.CancelImport();
             }
-            if (PackageImportWizard.instance.IsProjectSettingStep && GUILayout.Button(EditorGUIUtility.TrTextContent("Back")))
+
+            var isSecondStep = PackageImportWizard.instance.IsMultiStepWizard &&
+                               PackageImportWizard.instance.IsProjectSettingStep;
+            if (isSecondStep && GUILayout.Button(EditorGUIUtility.TrTextContent("Back")))
             {
                 PackageImportWizard.instance.DoPreviousStep(m_ImportPackageItems);
             }
-            var buttonText = PackageImportWizard.instance.IsMultiStepWizard
-                && !PackageImportWizard.instance.IsProjectSettingStep ? "Next" : "Import";
+            var buttonText = isSecondStep || !PackageImportWizard.instance.IsMultiStepWizard ? "Import" : "Next";
             if (GUILayout.Button(EditorGUIUtility.TrTextContent(buttonText)))
             {
                 if (m_ImportPackageItems != null)
@@ -440,8 +442,14 @@ public void StartImport(string packagePath, ImportPackageItem[] items, string pa
                     m_AssetContentItems.Add(item);
             }
 
-            m_IsMultiStepWizard = m_ProjectSettingItems.Any();
-            ShowImportWindow(m_AssetContentItems.ToArray());
+            m_IsMultiStepWizard = m_AssetContentItems.Any() && m_ProjectSettingItems.Any();
+            if (m_AssetContentItems.Any())
+                ShowImportWindow(m_AssetContentItems.ToArray());
+            else if (m_ProjectSettingItems.Any())
+            {
+                m_IsProjectSettingStep = true;
+                ShowImportWindow(m_ProjectSettingItems.ToArray());
+            }
         }
 
         public void DoNextStep(ImportPackageItem[] importPackageItems)
@@ -463,12 +471,12 @@ public void DoNextStep(ImportPackageItem[] importPackageItems)
 
         public void DoPreviousStep(ImportPackageItem[] importPackageItems)
         {
-            if (IsProjectSettingStep)
-            {
-                m_ProjectSettingItems = new List<ImportPackageItem>(importPackageItems);
-                m_IsProjectSettingStep = false;
-                ShowImportWindow(m_AssetContentItems.ToArray());
-            }
+            if (!IsProjectSettingStep || !IsMultiStepWizard)
+                return;
+
+            m_ProjectSettingItems = new List<ImportPackageItem>(importPackageItems);
+            m_IsProjectSettingStep = false;
+            ShowImportWindow(m_AssetContentItems.ToArray());
         }
 
         public void CancelImport()
@@ -495,8 +503,7 @@ private void ShowImportWindow(ImportPackageItem[] items)
 
         private void FinishImport()
         {
-            var completeItemList = IsMultiStepWizard ? m_AssetContentItems.Concat(m_ProjectSettingItems) : m_AssetContentItems;
-            PackageUtility.ImportPackageAssetsWithOrigin(m_AssetOrigin, completeItemList.ToArray());
+            PackageUtility.ImportPackageAssetsWithOrigin(m_AssetOrigin, m_AssetContentItems.Concat(m_ProjectSettingItems).ToArray());
             CloseImportWindow();
         }
 

Editor/Mono/Inspector/Enlighten/LightmapParameters.cs

@@ -5,6 +5,7 @@
 using UnityEngine;
 using UnityEditor;
 using UnityEngine.Rendering;
+using System;
 
 namespace UnityEditor
 {
@@ -91,7 +92,25 @@ public override void OnInspectorGUI()
             if (m_BakedGISettings.value)
             {
                 EditorGUI.indentLevel++;
-                EditorGUILayout.PropertyField(m_AntiAliasingSamples, Styles.antiAliasingSamplesContent);
+                if (m_AntiAliasingSamples.hasMultipleDifferentValues)
+                {
+                    EditorGUI.BeginChangeCheck();
+                    EditorGUI.showMixedValue = true;
+
+                    int fieldValue = EditorGUILayout.IntPopup(Styles.antiAliasingSamplesContent, m_AntiAliasingSamples.intValue, Styles.antiAliasingSamplesStrings, Styles.antiAliasingSampleValues);
+
+                    if (EditorGUI.EndChangeCheck())
+                        m_AntiAliasingSamples.intValue = fieldValue;
+                    
+                    EditorGUI.showMixedValue = false;
+                }
+
+                else
+                {
+                    int fieldValue = EditorGUILayout.IntPopup(Styles.antiAliasingSamplesContent, m_AntiAliasingSamples.intValue, Styles.antiAliasingSamplesStrings, Styles.antiAliasingSampleValues);
+                    m_AntiAliasingSamples.intValue = fieldValue;
+                }
+                
                 const float minPushOff = 0.0001f; // Keep in sync with PLM_MIN_PUSHOFF
                 EditorGUILayout.Slider(m_Pushoff, minPushOff, 1.0f, Styles.pushoffContent);
                 EditorGUILayout.PropertyField(m_BakedLightmapTag, Styles.bakedLightmapTagContent);
@@ -124,6 +143,14 @@ internal override void OnHeaderControlsGUI()
 
         private class Styles
         {
+            public static readonly int[] antiAliasingSampleValues = (int[]) Enum.GetValues(typeof(LightmapParameters.AntiAliasingSamples));
+            public static readonly GUIContent[] antiAliasingSamplesStrings =
+            {
+                EditorGUIUtility.TrTextContent("1"),
+                EditorGUIUtility.TrTextContent("4"),
+                EditorGUIUtility.TrTextContent("16")
+            };
+
             public static readonly GUIContent generalGIContent = EditorGUIUtility.TrTextContent("General Parameters", "Settings used in both Precomputed Realtime Global Illumination and Baked Global Illumination.");
             public static readonly GUIContent precomputedRealtimeGIContent = EditorGUIUtility.TrTextContent("Realtime Global Illumination", "Settings used in Precomputed Realtime Global Illumination where it is precomputed how indirect light can bounce between static objects, but the final lighting is done at runtime. Lights, ambient lighting in addition to the materials and emission of static objects can still be changed at runtime. Only static objects can affect GI by blocking and bouncing light, but non-static objects can receive bounced light via light probes.");  // Reuse the label from the Lighting window
             public static readonly GUIContent resolutionContent = EditorGUIUtility.TrTextContent("Resolution", "Realtime lightmap resolution in texels per world unit. This value is multiplied by the realtime resolution in the Lighting window to give the output lightmap resolution. This should generally be an order of magnitude less than what is common for baked lightmaps to keep the precompute time manageable and the performance at runtime acceptable. Note that if this is made more fine-grained, then the Irradiance Budget will often need to be increased too, to fully take advantage of this increased detail.");
@@ -135,16 +162,12 @@ private class Styles
             public static readonly GUIContent edgeStitchingContent = EditorGUIUtility.TrTextContent("Edge Stitching", "If enabled, ensures that UV charts (aka UV islands) in the generated lightmaps blend together where they meet so there is no visible seam between them.");
             public static readonly GUIContent systemTagContent = EditorGUIUtility.TrTextContent("System Tag", "Systems are groups of objects whose lightmaps are in the same atlas. It is also the granularity at which dependencies are calculated. Multiple systems are created automatically if the scene is big enough, but it can be helpful to be able to split them up manually for e.g. streaming in sections of a level. The system tag lets you force an object into a different realtime system even though all the other parameters are the same.");
             public static readonly GUIContent bakedGIContent = EditorGUIUtility.TrTextContent("Baked Global Illumination", "Settings used in Baked Global Illumination where direct and indirect lighting for static objects is precalculated and saved (baked) into lightmaps for use at runtime. This is useful when lights are known to be static, for mobile, for low end devices and other situations where there is not enough processing power to use Precomputed Realtime GI. You can toggle on each light whether it should be included in the bake.");  // Reuse the label from the Lighting window
-            public static readonly GUIContent antiAliasingSamplesContent = EditorGUIUtility.TrTextContent("Anti-aliasing Samples", "The maximum number of times to supersample a texel to reduce aliasing. Progressive lightmapper supersamples the positions and normals buffers (part of the G-buffer) and hence the sample count is a multiplier on the amount of memory used for those buffers. Progressive lightmapper clamps the value to the [1;16] range.");
+            public static readonly GUIContent antiAliasingSamplesContent = EditorGUIUtility.TrTextContent("Anti-aliasing Samples", "How many samples to use when antialiasing lightmap texels. Ray positions and normals buffers are also increased in size by this value. Higher values improve lightmap quality but also multiply memory usage when baking. A value of 1 disables supersampling.");
             public static readonly GUIContent isTransparent = EditorGUIUtility.TrTextContent("Is Transparent", "If enabled, the object appears transparent during GlobalIllumination lighting calculations. Backfaces are not contributing to and light travels through the surface. This is useful for emissive invisible surfaces.");
             public static readonly GUIContent pushoffContent = EditorGUIUtility.TrTextContent("Pushoff", "The amount to push off geometry for ray tracing, in modelling units. It is applied to all baked light maps, so it will affect direct light, indirect light and AO. Useful for getting rid of unwanted AO or shadowing.");
             public static readonly GUIContent bakedLightmapTagContent = EditorGUIUtility.TrTextContent("Baked Tag", "An integer that lets you force an object into a different baked lightmap even though all the other parameters are the same. This can be useful e.g. when streaming in sections of a level.");
             public static readonly GUIContent limitLightmapCount = EditorGUIUtility.TrTextContent("Limit Lightmap Count", "If enabled, objects with the same baked GI settings will be packed into a specified number of lightmaps. This may reduce the objects' lightmap resolution.");
             public static readonly GUIContent lightmapMaxCount = EditorGUIUtility.TrTextContent("Max Lightmaps", "The maximum number of lightmaps into which objects will be packed.");
-
-            public static readonly GUIContent generalLabel = EditorGUIUtility.TrTextContent("General");
-            public static readonly GUIContent progressiveLabel = EditorGUIUtility.TrTextContent("Progressive Lightmapper");
-            public static readonly GUIContent enlightenLabel = EditorGUIUtility.TrTextContent("Enlighten");
         }
     }
 }

Editor/Mono/Inspector/LightingSettingsEditor.cs

@@ -99,8 +99,6 @@ internal class SharedLightingSettingsEditor
         SerializedProperty m_ForceWhiteAlbedo;
         SerializedProperty m_ForceUpdates;
         SerializedProperty m_FilterMode;
-        SerializedProperty m_TiledBaking;
-        SerializedProperty m_NumRaysToShootPerTexel;
         SerializedProperty m_RespectSceneVisibilityWhenBakingGI;
 
         enum DenoiserTarget
@@ -338,8 +336,6 @@ public void UpdateSettings(SerializedObject lightingSettingsObject)
             m_ForceUpdates = lightingSettingsObject.FindProperty("m_ForceUpdates");
             m_FilterMode = lightingSettingsObject.FindProperty("m_FilterMode");
             m_BounceScale = lightingSettingsObject.FindProperty("m_BounceScale");
-            m_TiledBaking = lightingSettingsObject.FindProperty("m_PVRTiledBaking");
-            m_NumRaysToShootPerTexel = lightingSettingsObject.FindProperty("m_NumRaysToShootPerTexel");
             m_RespectSceneVisibilityWhenBakingGI = lightingSettingsObject.FindProperty("m_RespectSceneVisibilityWhenBakingGI");
         }
 
@@ -511,7 +507,11 @@ void GeneralLightmapSettingsGUI(bool compact)
                             {
                                 EditorGUI.indentLevel++;
 
-                                EditorGUILayout.PropertyField(m_PVRCulling, Styles.culling);
+                                bool iterative = m_GIWorkflowMode.intValue == (int)Lightmapping.GIWorkflowMode.Iterative;
+                                if (iterative)
+                                {
+                                    EditorGUILayout.PropertyField(m_PVRCulling, Styles.culling);
+                                }
                                 EditorGUILayout.PropertyField(m_PVREnvironmentIS, Styles.environmentImportanceSampling);
 
                                 MultiEditableDelayedIntField(m_PVRDirectSampleCount, Styles.directSampleCount);

Editor/Mono/PlayerSettings.deprecated.cs

@@ -4,6 +4,7 @@
 
 using System;
 using UnityEngine;
+using UnityEngine.Bindings;
 
 using EditorGraphicsSettings = UnityEditor.Rendering.EditorGraphicsSettings;
 
@@ -167,6 +168,15 @@ public static AndroidTargetDevice targetDevice
 
             [Obsolete("minifyWithR8 is obsolete and has no effect anymore, since Android Gradle Plugin 7.0 always uses R8", false)]
             public static bool minifyWithR8 { get { return true; } set {} }
+
+            [Obsolete("Renamed to match UI. Please use splitApplicationBinary instead. (UnityUpgradable) -> splitApplicationBinary", false)]
+            public static extern bool useAPKExpansionFiles
+            {
+                [NativeMethod("GetAndroidSplitApplicationBinary")]
+                get;
+                [NativeMethod("SetAndroidSplitApplicationBinary")]
+                set;
+            }
         }
 
         partial class iOS

Editor/Mono/PlayerSettingsAndroid.bindings.cs

@@ -466,9 +466,13 @@ public static extern bool licenseVerification
                 [NativeMethod("GetAndroidLicenseVerification")]
                 get;
             }
-
-            // Use APK Expansion Files
-            public static extern bool useAPKExpansionFiles { get; set; }
+            public static extern bool splitApplicationBinary
+            {
+                [NativeMethod("GetAndroidSplitApplicationBinary")]
+                get;
+                [NativeMethod("SetAndroidSplitApplicationBinary")]
+                set;
+            }
 
             // Application should show ActivityIndicator when loading
             public static extern AndroidShowActivityIndicatorOnLoading showActivityIndicatorOnLoading