Unity 2022.1.0b15 C# reference source code

Unity Technologies · Unity Technologies · commit 0690d07edcba · 2022-04-07T07:56:08.000Z
diff --git a/Editor/Mono/BuildPlayerWindowBuildMethods.cs b/Editor/Mono/BuildPlayerWindowBuildMethods.cs
@@ -170,7 +170,7 @@ public static void BuildPlayer(BuildPlayerOptions options)
                 bool locationPathExistedBeforeBuild = System.IO.Directory.Exists(options.locationPathName);
                 // Trigger build.
                 // Note: report will be null, if delayToAfterScriptReload = true
-                var report = BuildPipeline.BuildPlayerInternalNoCheck(options.scenes, options.locationPathName, PostprocessBuildPlayer.GetStreamingAssetsBundleManifestPath(), options.targetGroup, options.target, options.subtarget, options.options, options.extraScriptingDefines, delayToAfterScriptReload);
+                var report = BuildPipeline.BuildPlayerInternalNoCheck(options.scenes, options.locationPathName, options.assetBundleManifestPath, options.targetGroup, options.target, options.subtarget, options.options, options.extraScriptingDefines, delayToAfterScriptReload);
 
                 if (report != null
                 )
@@ -308,7 +308,7 @@ internal static BuildPlayerOptions GetBuildPlayerOptionsInternal(bool askForBuil
                 options.subtarget = subtarget;
                 options.targetGroup = buildTargetGroup;
                 options.locationPathName = EditorUserBuildSettings.GetBuildLocation(buildTarget);
-                options.assetBundleManifestPath = null;
+                options.assetBundleManifestPath = PostprocessBuildPlayer.GetStreamingAssetsBundleManifestPath();
 
                 // Build a list of scenes that are enabled
                 ArrayList scenesList = new ArrayList();
diff --git a/Editor/Mono/GUI/Splitter.cs b/Editor/Mono/GUI/Splitter.cs
@@ -178,6 +178,9 @@ public void NormalizeRelativeSizes()
 
         public void RealToRelativeSizes()
         {
+            if (relativeSizes.Length == 0)
+                return;
+
             float check = 1.0f; // try to avoid rounding issues
             float total = 0;
             int k;
@@ -186,13 +189,23 @@ public void RealToRelativeSizes()
             for (k = 0; k < realSizes.Length; k++)
                 total += realSizes[k];
 
-            for (k = 0; k < realSizes.Length; k++)
+            if (total > 0.001f)
             {
-                relativeSizes[k] = realSizes[k] / total;
-                check -= relativeSizes[k];
-            }
-            if (relativeSizes.Length > 0)
+                for (k = 0; k < realSizes.Length; k++)
+                {
+                    relativeSizes[k] = realSizes[k] / total;
+                    check -= relativeSizes[k];
+                }
+
                 relativeSizes[relativeSizes.Length - 1] += check;
+            }
+            else
+            {
+                // Distribute evenly
+                float relativeSize = 1f / relativeSizes.Length;
+                for (k = 0; k < relativeSizes.Length; k++)
+                    relativeSizes[k] = relativeSize;
+            }
         }
 
         public void RelativeToRealSizes(float totalSpace)
diff --git a/Editor/Mono/Graphics/ShaderCompilerData.cs b/Editor/Mono/Graphics/ShaderCompilerData.cs
@@ -45,6 +45,7 @@ public struct ShaderCompilerData
         private ShaderRequirements m_ShaderRequirements;
         private GraphicsTier m_GraphicsTier;
         private ShaderCompilerPlatform m_ShaderCompilerPlatform;
+        private BuildTarget m_BuildTarget;
 
         public ShaderRequirements shaderRequirements
         {
@@ -60,6 +61,8 @@ public ShaderCompilerPlatform shaderCompilerPlatform
         {
             get { return m_ShaderCompilerPlatform; }
         }
+
+        public BuildTarget buildTarget { get { return m_BuildTarget; } }
     }
 
     public enum ShaderCompilerPlatform
diff --git a/Editor/Mono/Inspector/AvatarMaskInspector.cs b/Editor/Mono/Inspector/AvatarMaskInspector.cs
@@ -750,16 +750,19 @@ protected override void ToggleAll()
 
             static bool GetFirstActiveValue(SerializedNodeInfo parent, out bool value)
             {
-                foreach (var treeViewItem in parent.children)
+                if (parent.children != null)
                 {
-                    var child = (SerializedNodeInfo)treeViewItem;
-                    if (child.m_State != SerializedNodeInfo.State.Disabled)
+                    foreach (var treeViewItem in parent.children)
                     {
-                        value = child.nodeState;
-                        return true;
+                        var child = (SerializedNodeInfo)treeViewItem;
+                        if (child.m_State != SerializedNodeInfo.State.Disabled)
+                        {
+                            value = child.nodeState;
+                            return true;
+                        }
+                        if (GetFirstActiveValue(child, out value))
+                            return true;
                     }
-                    if (GetFirstActiveValue(child, out value))
-                        return true;
                 }
                 value = false;
                 return false;
diff --git a/Editor/Mono/Inspector/CubemapPreview.cs b/Editor/Mono/Inspector/CubemapPreview.cs
@@ -192,7 +192,7 @@ private void RenderCubemap(Texture t, Vector2 previewDir, float previewDistance,
             }
 
             m_PreviewUtility.DrawMesh(m_Mesh, Vector3.zero, rot, m_Material, 0);
-            m_PreviewUtility.Render();
+            m_PreviewUtility.Render(Unsupported.useScriptableRenderPipeline);
         }
     }
 }
diff --git a/Editor/Mono/Inspector/MaterialEditor.cs b/Editor/Mono/Inspector/MaterialEditor.cs
@@ -3032,15 +3032,17 @@ internal static void AddAdditionalMaterialMenuItems(GenericMenu menu)
             materialForContextMenu = null;
 
             menu.AddItem(new GUIContent("Create Variant for Renderer"), false, () => {
-                var variant = new Material(material) { name = material.name + " Variant", parent = material };
 
                 var directory = "Assets/Materials";
                 var assetPath = AssetDatabase.GetAssetPath(material);
+                var assetName = Path.GetFileNameWithoutExtension(assetPath) + " Variant";
                 var package = PackageManager.PackageInfo.FindForAssetPath(assetPath);
                 if (package == null || package.source == PackageManager.PackageSource.Local)
                     directory = Path.GetDirectoryName(assetPath);
+
+                var path = AssetDatabase.GenerateUniqueAssetPath(Path.Combine(directory, assetName + ".mat"));
+                var variant = new Material(material) { name = assetName, parent = material };
                 Directory.CreateDirectory(directory);
-                var path = AssetDatabase.GenerateUniqueAssetPath(Path.Combine(directory, variant.name + ".mat"));
                 AssetDatabase.CreateAsset(variant, path);
 
                 foreach (var renderer in renderers)
diff --git a/External/TinyProfiler/TraceMaker.cs b/External/TinyProfiler/TraceMaker.cs
@@ -52,9 +52,11 @@ public static void EmitRawTraceEvents(List<TinyProfiler.ThreadContext> threadCon
                 if (!externalFile.FileExists())
                     continue;
 
-                using (var stream = File.OpenRead(externalFile.ToString(SlashMode.Native)))
+                // Important: need to read this file as text mode, to avoid copying byte-order-marks.
+                using (var stream = File.OpenText(externalFile.ToString(SlashMode.Native)))
                 {
-                    stream.CopyTo(textWriter.BaseStream);
+                    while (!stream.EndOfStream)
+                        textWriter.WriteLine(stream.ReadLine());
                 }
             }
         }
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/BaseBoolField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/BaseBoolField.cs
@@ -98,10 +98,7 @@ public string text
         /// </remarks>
         protected virtual void InitLabel()
         {
-            m_Label = new Label
-            {
-                pickingMode = PickingMode.Ignore
-            };
+            m_Label = new Label();
             visualInput.Add(m_Label);
         }
 
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/BaseTreeView.cs b/ModuleOverrides/com.unity.ui/Core/Controls/BaseTreeView.cs
@@ -328,8 +328,11 @@ public bool TryRemoveItem(int id)
         internal override void OnViewDataReady()
         {
             base.OnViewDataReady();
-            viewController.RebuildTree();
-            RefreshItems();
+            if (viewController != null)
+            {
+                viewController.RebuildTree();
+                RefreshItems();
+            }
         }
 
         private void OnScrollViewKeyDown(KeyDownEvent evt)
diff --git a/ModuleOverrides/com.unity.ui/Core/Controls/InputField/BaseField.cs b/ModuleOverrides/com.unity.ui/Core/Controls/InputField/BaseField.cs
@@ -463,9 +463,12 @@ protected override void ExecuteDefaultAction(EventBase evt)
             {
                 TooltipEvent e = (TooltipEvent)evt;
 
+                //When a label is present, set the tooltip position centered on the label, otherwise center it on the entire field.
                 e.rect = !string.IsNullOrEmpty(label) ? labelElement.worldBound : worldBound;
 
-                e.tooltip = tooltip;
+                if(!string.IsNullOrEmpty(tooltip))
+                    e.tooltip = tooltip;
+
                 e.StopImmediatePropagation();
             }
         }
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRCommandGenerator.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRCommandGenerator.cs
@@ -49,7 +49,8 @@ public unsafe static UIRStylePainter.ClosingInfo PaintElement(RenderChain render
 
             var isClippingWithStencil = ve.renderChainData.clipMethod == ClipMethod.Stencil;
             var isClippingWithScissors = ve.renderChainData.clipMethod == ClipMethod.Scissor;
-            if ((UIRUtility.IsElementSelfHidden(ve) && !isClippingWithStencil && !isClippingWithScissors) || ve.renderChainData.isHierarchyHidden)
+            var isGroup = (ve.renderHints & RenderHints.GroupTransform) != 0; // Groups need to push view and scissors
+            if ((UIRUtility.IsElementSelfHidden(ve) && !isClippingWithStencil && !isClippingWithScissors && !isGroup) || ve.renderChainData.isHierarchyHidden)
             {
                 if (ve.renderChainData.data != null)
                 {
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRRenderEvents.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRRenderEvents.cs
@@ -72,14 +72,26 @@ static Matrix4x4 GetTransformIDTransformInfo(VisualElement ve)
 
         static Vector4 GetClipRectIDClipInfo(VisualElement ve)
         {
+            Rect rect;
+
             Debug.Assert(RenderChainVEData.AllocatesID(ve.renderChainData.clipRectID));
             if (ve.renderChainData.groupTransformAncestor == null)
-                return UIRUtility.ToVector4(ve.worldClip);
+                rect = ve.worldClip;
+            else
+            {
+                rect = ve.worldClipMinusGroup;
+                // Subtract the transform of the group transform ancestor
+                VisualElement.TransformAlignedRect(ref ve.renderChainData.groupTransformAncestor.worldTransformInverse, ref rect);
+            }
 
-            Rect rect = ve.worldClipMinusGroup;
-            // Subtract the transform of the group transform ancestor
-            VisualElement.TransformAlignedRect(ref ve.renderChainData.groupTransformAncestor.worldTransformInverse, ref rect);
-            return UIRUtility.ToVector4(rect);
+            // See ComputeRelativeClipRectCoords in the shader for details on this computation
+            Vector2 min = rect.min;
+            Vector2 max = rect.max;
+            Vector2 diff = max - min;
+            Vector2 mul = new Vector2(1 / (diff.x + 0.0001f), 1 / (diff.y + 0.0001f));
+            Vector2 a = 2 * mul;
+            Vector2 b = -(min + max) * mul;
+            return new Vector4(a.x, a.y, b.x, b.y);
         }
 
         internal static uint DepthFirstOnChildAdded(RenderChain renderChain, VisualElement parent, VisualElement ve, int index, bool resetState)
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRVEShaderInfoAllocator.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRVEShaderInfoAllocator.cs
@@ -177,7 +177,7 @@ internal struct UIRVEShaderInfoAllocator
         internal static readonly Vector4 identityTransformRow0Value = identityTransformValue.GetRow(0);
         internal static readonly Vector4 identityTransformRow1Value = identityTransformValue.GetRow(1);
         internal static readonly Vector4 identityTransformRow2Value = identityTransformValue.GetRow(2);
-        internal static readonly Vector4 infiniteClipRectValue = new Vector4(-float.MaxValue, -float.MaxValue, float.MaxValue, float.MaxValue);
+        internal static readonly Vector4 infiniteClipRectValue = new Vector4(0, 0, 0, 0);
         internal static readonly Vector4 fullOpacityValue = new Vector4(1, 1, 1, 1);
         internal static readonly Vector4 clearColorValue = new Vector4(0, 0, 0, 0);
         internal static readonly TextCoreSettings defaultTextCoreSettingsValue = new TextCoreSettings() {
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRenderer/UIRenderDevice.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRenderer/UIRenderDevice.cs
@@ -84,7 +84,6 @@ public void Dispose()
         private List<List<AllocToUpdate>> m_Updates;
         private UInt32[] m_Fences;
         private MaterialPropertyBlock m_StandardMatProps; // Properties that are constant throughout the evaluation of the commands
-        private MaterialPropertyBlock m_CommonMatProps; // Uniform Clip Rect
         private uint m_FrameIndex;
         private uint m_NextUpdateID = 1; // For the current frame only, 0 is not an accepted value here
         private DrawStatistics m_DrawStats;
@@ -98,10 +97,8 @@ public void Dispose()
         private static bool m_SubscribedToNotifications; // Not thread safe for now
         private static bool m_SynchronousFree; // This is set on domain unload or app quit, so it is irreversible
 
-        static readonly int s_PixelClipInvViewPropID = Shader.PropertyToID("_PixelClipInvView");
         static readonly int s_GradientSettingsTexID = Shader.PropertyToID("_GradientSettingsTex");
         static readonly int s_ShaderInfoTexID = Shader.PropertyToID("_ShaderInfoTex");
-        static readonly int s_ScreenClipRectPropID = Shader.PropertyToID("_ScreenClipRect");
         static readonly int s_TransformsPropID = Shader.PropertyToID("_Transforms");
         static readonly int s_ClipRectsPropID = Shader.PropertyToID("_ClipRects");
 
@@ -295,7 +292,6 @@ void CompleteCreation()
 
             m_Fences = new uint[(int)k_MaxQueuedFrameCount];
             m_StandardMatProps = new MaterialPropertyBlock();
-            m_CommonMatProps = new MaterialPropertyBlock();
             m_DefaultStencilState = Utility.CreateStencilState(new StencilState
             {
                 enabled = true,
@@ -635,25 +631,6 @@ public void Free(MeshHandle mesh)
 
         }
 
-        static void Set1PixelSizeParameter(DrawParams drawParams, MaterialPropertyBlock props)
-        {
-            Vector4 _PixelClipInvView = new Vector4();
-
-            // Size of 1 pixel in clip space
-            RectInt viewport = Utility.GetActiveViewport();
-            _PixelClipInvView.x = 2.0f / viewport.width;
-            _PixelClipInvView.y = 2.0f / viewport.height;
-
-            // Pixel density in group space
-            Matrix4x4 matProj = Utility.GetUnityProjectionMatrix();
-            Matrix4x4 matVPInv = (matProj * drawParams.view.Peek().transform).inverse;
-            Vector3 v = matVPInv.MultiplyVector(new Vector3(_PixelClipInvView.x, _PixelClipInvView.y));
-            _PixelClipInvView.z = 1 / (Mathf.Abs(v.x) + UIRUtility.k_Epsilon);
-            _PixelClipInvView.w = 1 / (Mathf.Abs(v.y) + UIRUtility.k_Epsilon);
-
-            props.SetVector(s_PixelClipInvViewPropID, _PixelClipInvView);
-        }
-
         public void OnFrameRenderingBegin()
         {
             AdvanceFrame();
@@ -754,9 +731,6 @@ void ApplyBatchState(ref EvaluationState st, bool allowMaterialChange)
                     st.mustApplyStencil = true;
                 }
 
-                if (st.mustApplyCommonBlock && m_CommonMatProps != null)
-                    Utility.SetPropertyBlock(m_CommonMatProps);
-
                 if (st.mustApplyStateBlock)
                     Utility.SetPropertyBlock(st.stateMatProps);
 
@@ -799,10 +773,7 @@ public unsafe void EvaluateChain(RenderChainCommand head, Material initialMat, M
                     UIR.Utility.SetVectorArray<Transform3x4>(m_StandardMatProps, s_TransformsPropID, transforms);
                 if (clipRects.Length > 0)
                     UIR.Utility.SetVectorArray<Vector4>(m_StandardMatProps, s_ClipRectsPropID, clipRects);
-                Set1PixelSizeParameter(drawParams, m_CommonMatProps);
-                m_CommonMatProps.SetVector(s_ScreenClipRectPropID, drawParams.view.Peek().clipRect);
                 Utility.SetPropertyBlock(m_StandardMatProps);
-                Utility.SetPropertyBlock(m_CommonMatProps);
             }
 
             int rangesCount = 1024; // Must be powers of two. TODO: Can be estimated better from the render chain command count
@@ -975,16 +946,6 @@ public unsafe void EvaluateChain(RenderChainCommand head, Material initialMat, M
                             }
                         }
                     }
-
-                    if (head.type == CommandType.PushView || head.type == CommandType.PopView)
-                    {
-                        if (m_CommonMatProps != null)
-                        {
-                            Set1PixelSizeParameter(drawParams, m_CommonMatProps);
-                            m_CommonMatProps.SetVector(s_ScreenClipRectPropID, drawParams.view.Peek().clipRect);
-                            Utility.SetPropertyBlock(m_CommonMatProps);
-                        }
-                    }
                 } // If kick ranges
 
                 if (head.type == CommandType.Draw && mustApplyCmdState)
diff --git a/ModuleOverrides/com.unity.ui/Core/Renderer/UIRenderer/UIRenderers.cs b/ModuleOverrides/com.unity.ui/Core/Renderer/UIRenderer/UIRenderers.cs
diff --git a/Modules/Tilemap/ScriptBindings/Tilemap.bindings.cs b/Modules/Tilemap/ScriptBindings/Tilemap.bindings.cs
diff --git a/README.md b/README.md

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public struct ShaderCompilerData`
`45`	`45`	`private ShaderRequirements m_ShaderRequirements;`
`46`	`46`	`private GraphicsTier m_GraphicsTier;`
`47`	`47`	`private ShaderCompilerPlatform m_ShaderCompilerPlatform;`
	`48`	`+ private BuildTarget m_BuildTarget;`
`48`	`49`
`49`	`50`	`public ShaderRequirements shaderRequirements`
`50`	`51`	`{`
`@@ -60,6 +61,8 @@ public ShaderCompilerPlatform shaderCompilerPlatform`
`60`	`61`	`{`
`61`	`62`	`get { return m_ShaderCompilerPlatform; }`
`62`	`63`	`}`
	`64`	`+`
	`65`	`+ public BuildTarget buildTarget { get { return m_BuildTarget; } }`
`63`	`66`	`}`
`64`	`67`
`65`	`68`	`public enum ShaderCompilerPlatform`
Original file line number	Diff line number	Diff line change
`@@ -750,16 +750,19 @@ protected override void ToggleAll()`
`750`	`750`
`751`	`751`	`static bool GetFirstActiveValue(SerializedNodeInfo parent, out bool value)`
`752`	`752`	`{`
`753`		`- foreach (var treeViewItem in parent.children)`
	`753`	`+ if (parent.children != null)`
`754`	`754`	`{`
`755`		`- var child = (SerializedNodeInfo)treeViewItem;`
`756`		`- if (child.m_State != SerializedNodeInfo.State.Disabled)`
	`755`	`+ foreach (var treeViewItem in parent.children)`
`757`	`756`	`{`
`758`		`- value = child.nodeState;`
`759`		`- return true;`
	`757`	`+ var child = (SerializedNodeInfo)treeViewItem;`
	`758`	`+ if (child.m_State != SerializedNodeInfo.State.Disabled)`
	`759`	`+ {`
	`760`	`+ value = child.nodeState;`
	`761`	`+ return true;`
	`762`	`+ }`
	`763`	`+ if (GetFirstActiveValue(child, out value))`
	`764`	`+ return true;`
`760`	`765`	`}`
`761`		`- if (GetFirstActiveValue(child, out value))`
`762`		`- return true;`
`763`	`766`	`}`
`764`	`767`	`value = false;`
`765`	`768`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ private void RenderCubemap(Texture t, Vector2 previewDir, float previewDistance,`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`m_PreviewUtility.DrawMesh(m_Mesh, Vector3.zero, rot, m_Material, 0);`
`195`		`- m_PreviewUtility.Render();`
	`195`	`+ m_PreviewUtility.Render(Unsupported.useScriptableRenderPipeline);`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,11 @@ public static void EmitRawTraceEvents(List<TinyProfiler.ThreadContext> threadCon`
`52`	`52`	`if (!externalFile.FileExists())`
`53`	`53`	`continue;`
`54`	`54`
`55`		`- using (var stream = File.OpenRead(externalFile.ToString(SlashMode.Native)))`
	`55`	`+ // Important: need to read this file as text mode, to avoid copying byte-order-marks.`
	`56`	`+ using (var stream = File.OpenText(externalFile.ToString(SlashMode.Native)))`
`56`	`57`	`{`
`57`		`- stream.CopyTo(textWriter.BaseStream);`
	`58`	`+ while (!stream.EndOfStream)`
	`59`	`+ textWriter.WriteLine(stream.ReadLine());`
`58`	`60`	`}`
`59`	`61`	`}`
`60`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,10 +98,7 @@ public string text`
`98`	`98`	`/// </remarks>`
`99`	`99`	`protected virtual void InitLabel()`
`100`	`100`	`{`
`101`		`- m_Label = new Label`
`102`		`- {`
`103`		`- pickingMode = PickingMode.Ignore`
`104`		`- };`
	`101`	`+ m_Label = new Label();`
`105`	`102`	`visualInput.Add(m_Label);`
`106`	`103`	`}`
`107`	`104`
Original file line number	Diff line number	Diff line change
`@@ -328,8 +328,11 @@ public bool TryRemoveItem(int id)`
`328`	`328`	`internal override void OnViewDataReady()`
`329`	`329`	`{`
`330`	`330`	`base.OnViewDataReady();`
`331`		`- viewController.RebuildTree();`
`332`		`- RefreshItems();`
	`331`	`+ if (viewController != null)`
	`332`	`+ {`
	`333`	`+ viewController.RebuildTree();`
	`334`	`+ RefreshItems();`
	`335`	`+ }`
`333`	`336`	`}`
`334`	`337`
`335`	`338`	`private void OnScrollViewKeyDown(KeyDownEvent evt)`
Original file line number	Diff line number	Diff line change
`@@ -463,9 +463,12 @@ protected override void ExecuteDefaultAction(EventBase evt)`
`463`	`463`	`{`
`464`	`464`	`TooltipEvent e = (TooltipEvent)evt;`
`465`	`465`
	`466`	`+ //When a label is present, set the tooltip position centered on the label, otherwise center it on the entire field.`
`466`	`467`	`e.rect = !string.IsNullOrEmpty(label) ? labelElement.worldBound : worldBound;`
`467`	`468`
`468`		`- e.tooltip = tooltip;`
	`469`	`+ if(!string.IsNullOrEmpty(tooltip))`
	`470`	`+ e.tooltip = tooltip;`
	`471`	`+`
`469`	`472`	`e.StopImmediatePropagation();`
`470`	`473`	`}`
`471`	`474`	`}`