Merge branch '8.x.x/release' into 8.x.x/hd/staging

com.unity.render-pipelines.core/CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [8.2.0] - 2020-07-08
 
 Version Updated
 The version number for this package has increased due to a version update of a related graphics package.

com.unity.render-pipelines.high-definition-config/CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [8.2.0] - 2020-07-08
 
 Version Updated
 The version number for this package has increased due to a version update of a related graphics package.

com.unity.render-pipelines.high-definition/CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [8.2.0] - 2020-07-07
+## [8.2.0] - 2020-07-08
 
 ### Added
 - Added a function (HDRenderPipeline.ResetRTHandleReferenceSize) to reset the reference size of RTHandle systems.

com.unity.render-pipelines.lightweight/CHANGELOG.md

@@ -4,7 +4,7 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [8.2.0] - 2020-07-08
 
 Version Updated
 The version number for this package has increased due to a version update of a related graphics package.

com.unity.render-pipelines.universal/CHANGELOG.md

@@ -4,40 +4,42 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [8.2.0] - 2020-07-08
 
 ### Added
-- Added option to enable/disable Adaptive Performance when it's package is available.
+- Added an option to enable/disable Adaptive Performance when the Adaptive Performance package is available in the project.
+- Added new sections to documentation: [Writing custom shaders](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@8.2/manual/writing-custom-shaders-urp.html), and [Using the beginCameraRendering event](https://docs.unity3d.com/Packages/com.unity.render-pipelines.universal@8.2/manual/using-begincamerarendering.html).
 
 ### Changed
 - The 2D Renderer now supports camera stacking.
-- The pipeline is now computing tangent space in per fragment.
+- URP is now computing tangent space per fragment.
 
 ### Fixed
-- Fixed an issue where grid lines were being drawn on top of opaque objects in the preview window [case 1240723](https://issuetracker.unity3d.com/issues/urp-grid-is-rendered-in-front-of-the-model-in-the-inspector-animation-preview-window-when-depth-or-opaque-texture-is-enabled)
-- Fixed an issue where objects in the preview window were being affected by layer mask settings in the default renderer [case 1204376](https://issuetracker.unity3d.com/issues/urp-prefab-preview-is-blank-when-a-custom-forward-renderer-data-and-default-layer-mask-is-mixed-are-used)
-- Fixed issues with performance when importing fbx files
-- Fixed issues with NullReferenceException happening with URP shaders
-- Fixed an issue where the emission value in particle shaders would not update in the editor without entering playmode.
+- Fixed an issue where grid lines were drawn on top of opaque objects in the preview window. [Case 1240723](https://issuetracker.unity3d.com/issues/urp-grid-is-rendered-in-front-of-the-model-in-the-inspector-animation-preview-window-when-depth-or-opaque-texture-is-enabled).
+- Fixed an issue where objects in the preview window were affected by layer mask settings in the default renderer. [Case 1204376](https://issuetracker.unity3d.com/issues/urp-prefab-preview-is-blank-when-a-custom-forward-renderer-data-and-default-layer-mask-is-mixed-are-used).
+- Fixed issues with performance when importing fbx files.
+- Fixed issues with NullReferenceException happening with URP shaders.
+- Fixed an issue where the emission value in particle shaders would not update in the editor without entering Play mode.
 - Fixed SceneView Draw Modes not being properly updated after opening new scene view panels or changing the editor layout.
 - Fixed issue on Nintendo Switch where maximum number of visible lights in C# code did not match maximum number in shader code.
 - Fixed GLES shaders compilation failing on Windows platform (not a mobile platform) due to uniform count limit.
-- Fixed an issue where preset button could still be used, when it is not supposed to. [case 1246261](https://issuetracker.unity3d.com/issues/urp-reset-functionality-does-not-work-for-renderobject-preset-asset)
-- Fixed an issue that causes viewport to not work correctly when rendering to textures. [case 1225103](https://issuetracker.unity3d.com/issues/urp-the-viewport-rect-isnt-correctly-applied-when-the-camera-is-outputting-into-a-rendertexture)
+- Fixed an issue where the preset button could still be used, when it was not supposed to. [Case 1246261](https://issuetracker.unity3d.com/issues/urp-reset-functionality-does-not-work-for-renderobject-preset-asset).
+- Fixed an issue that caused viewport to not work correctly when rendering to textures. [Case 1225103](https://issuetracker.unity3d.com/issues/urp-the-viewport-rect-isnt-correctly-applied-when-the-camera-is-outputting-into-a-rendertexture).
 - Fixed an issue that caused incorrect sampling of HDR reflection probe textures.
-- Fixed UI text of RenderObjects feature to display LightMode tag instead of Shader Pass Name. [case 1201696](https://issuetracker.unity3d.com/issues/render-feature-slash-pass-ui-has-a-field-for-shader-pass-name-when-it-actually-expects-shader-pass-lightmode)
-- Fixed an issue that caused memory allocations when sorting cameras. [case 1226448](https://issuetracker.unity3d.com/issues/2d-renderer-using-more-than-one-camera-that-renders-out-to-a-render-texture-creates-gc-alloc-every-frame)
-- Fixed an issue that caused the inverse view and projection matrix to output wrong values in some platforms. [case 1243990](https://issuetracker.unity3d.com/issues/urp-8-dot-1-breaks-unity-matrix-i-vp)
+- Fixed UI text of RenderObjects feature to display LightMode tag instead of Shader Pass Name. [Case 1201696](https://issuetracker.unity3d.com/issues/render-feature-slash-pass-ui-has-a-field-for-shader-pass-name-when-it-actually-expects-shader-pass-lightmode).
+- Fixed an issue that caused memory allocations when sorting cameras. [Case 1226448](https://issuetracker.unity3d.com/issues/2d-renderer-using-more-than-one-camera-that-renders-out-to-a-render-texture-creates-gc-alloc-every-frame).
+- Fixed an issue that caused the inverse view and projection matrix to output wrong values in some platforms. [Case 1243990](https://issuetracker.unity3d.com/issues/urp-8-dot-1-breaks-unity-matrix-i-vp).
 - Fixed an issue where only unique names of cameras could be added to the camera stack.
-- Fixed an issue with URP switching such that every avaiable URP makes a total set of supported features such that all URPs are taken into consideration. [case 1157420](https://issuetracker.unity3d.com/issues/lwrp-srp-switching-doesnt-work-even-with-manually-adding-shadervariants-per-scene)
+- Fixed an issue with URP switching so that every available URP makes a total set of supported features, so that all URPs are taken into consideration. [Case 1157420](https://issuetracker.unity3d.com/issues/lwrp-srp-switching-doesnt-work-even-with-manually-adding-shadervariants-per-scene).
 - Fixed an issue that caused incorrect sampling of HDR reflection probe textures.
-- Fixed an issue that caused Android GLES to render blank screen when Depth texture was enabled without Opaque texture [case 1219325](https://issuetracker.unity3d.com/issues/scene-is-not-rendered-on-android-8-and-9-when-depth-texture-is-enabled-in-urp-asset)
-- Fixed an issue where XR multipass throws errors saying that it doesn't support camera stack spamming.
-- Metallic slider on the Lit shader is now linear meaning correct values are used for PBR.
-- Fixed issue where using DOF at the same time as Dynamic Scaling, the depth buffer was sampled with incorrect UVs. [case 1225467](https://issuetracker.unity3d.com/product/unity/issues/guid/1225467/)
+- Fixed an issue that caused Android GLES to render blank screen when Depth texture was enabled without Opaque texture. [Case 1219325](https://issuetracker.unity3d.com/issues/scene-is-not-rendered-on-android-8-and-9-when-depth-texture-is-enabled-in-urp-asset).
+- Fixed an issue where XR multipass repeatedly throws error messages "Multi pass stereo mode doesn't support Camera Stacking".
+- Metallic slider on the Lit shader is now linear, so that correct values are used for PBR.
+- Fixed an issue where using DOF at the same time as Dynamic Scaling, the depth buffer was sampled with incorrect UVs. [Case 1225467](https://issuetracker.unity3d.com/product/unity/issues/guid/1225467/).
 - Fixed an issue where URP Simple Lit shader had attributes swapped incorrectly for BaseMap and BaseColor properties.
-- Fixed an issue where camera stacking with MSAA on OpenGL resulted in a black screen. [case 1250602](https://issuetracker.unity3d.com/issues/urp-camera-stacking-results-in-black-screen-when-msaa-and-opengl-graphics-api-are-used)
-- Fixed issue with Model Importer materials using the Legacy standard shader instead of URP's Lit shader when import happens at Editor startup.
+- Fixed an issue where camera stacking with MSAA on OpenGL resulted in a black screen. [Case 1250602](https://issuetracker.unity3d.com/issues/urp-camera-stacking-results-in-black-screen-when-msaa-and-opengl-graphics-api-are-used).
+- Fixed an issue where Model Importer Materials used the Standard Shader from the Built-in Render Pipeline instead of URP Lit shader when the import happened at Editor startup.
+- Fixed an issue causing shadows to be incorrectly rendered when a light was close to the shadow caster.
 
 ## [8.1.0] - 2020-04-21
 

com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/RendererLighting.cs

@@ -197,9 +197,10 @@ static private void RenderShadows(CommandBuffer cmdBuffer, int layerToRender, Li
                 cmdBuffer.ClearRenderTarget(true, true, Color.black);
 
                 BoundingSphere lightBounds = light.GetBoundingSphere(); // Gets the local bounding sphere...
+                float shadowRadius = 1.42f * lightBounds.radius;
 
                 cmdBuffer.SetGlobalVector("_LightPos", light.transform.position);
-                cmdBuffer.SetGlobalFloat("_LightRadius", lightBounds.radius);
+                cmdBuffer.SetGlobalFloat("_ShadowRadius", shadowRadius);
 
                 Material shadowMaterial = GetShadowMaterial(1);
                 Material removeSelfShadowMaterial = GetRemoveSelfShadowMaterial(1);

com.unity.render-pipelines.universal/Runtime/2D/ShadowCaster2D.cs

@@ -24,7 +24,6 @@ public class ShadowCaster2D : ShadowCasterGroup2D
         [SerializeField] Mesh m_Mesh;
         [SerializeField] int m_InstanceId;
 
-
         internal ShadowCasterGroup2D m_ShadowCasterGroup = null;
         internal ShadowCasterGroup2D m_PreviousShadowCasterGroup = null;
 
@@ -84,7 +83,7 @@ internal bool IsShadowedLayer(int layer)
 
         private void Awake()
         {
-            if(m_ApplyToSortingLayers == null)
+            if (m_ApplyToSortingLayers == null)
                 m_ApplyToSortingLayers = SetDefaultSortingLayers();
 
             Bounds bounds = new Bounds(transform.position, Vector3.one);
@@ -175,5 +174,6 @@ void Reset()
             OnEnable();
         }
 #endif
+
     }
 }

com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowUtility.cs

@@ -55,7 +55,9 @@ static Edge CreateEdge(int triangleIndexA, int triangleIndexB, List<Vector3> ver
             retEdge.AssignVertexIndices(triangles[triangleIndexA], triangles[triangleIndexB]);
 
             Vector3 vertex0 = vertices[retEdge.vertexIndex0];
+            vertex0.z = 0;
             Vector3 vertex1 = vertices[retEdge.vertexIndex1];
+            vertex1.z = 0;
 
             Vector3 edgeDir = Vector3.Normalize(vertex1 - vertex0);
             retEdge.tangent = Vector3.Cross(-Vector3.forward, edgeDir);
@@ -88,7 +90,7 @@ static void SortEdges(List<Edge> edgesToProcess)
             edgesToProcess.Sort();
         }
 
-        static void CreateShadowTriangles(List<Vector3> vertices, List<int> triangles, List<Vector4> tangents, List<Edge> edges)
+        static void CreateShadowTriangles(List<Vector3> vertices, List<Color> colors, List<int> triangles, List<Vector4> tangents, List<Edge> edges)
         {
             for(int edgeIndex=0; edgeIndex<edges.Count; edgeIndex++)
             {
@@ -99,6 +101,8 @@ static void CreateShadowTriangles(List<Vector3> vertices, List<int> triangles, L
 
                     int newVertexIndex = vertices.Count;
                     vertices.Add(vertices[edge.vertexIndex0]);
+                    colors.Add(colors[edge.vertexIndex0]);
+
                     tangents.Add(-edge.tangent);
 
                     triangles.Add(edge.vertexIndex0);
@@ -121,34 +125,45 @@ static void InitializeTangents(int tangentsToAdd, List<Vector4> tangents)
 
         public static void GenerateShadowMesh(Mesh mesh, Vector3[] shapePath)
         {
-            Color meshInteriorColor = new Color(0, 0, 0, 1);
             List<Vector3> vertices = new List<Vector3>();
             List<int> triangles = new List<int>();
             List<Vector4> tangents = new List<Vector4>();
+            List<Color> extrusion = new List<Color>();
 
             // Create interior geometry
             int pointCount = shapePath.Length;
-            var inputs = new ContourVertex[pointCount];
-            for (int i = 0; i < pointCount; ++i)
-                inputs[i] = new ContourVertex() { Position = new Vec3() { X = shapePath[i].x, Y = shapePath[i].y }, Data = meshInteriorColor };
+            var inputs = new ContourVertex[2 * pointCount];
+            for (int i = 0; i < pointCount; i++)
+            {
+                Color extrusionData = new Color(shapePath[i].x, shapePath[i].y, shapePath[i].x, shapePath[i].y);
+                int nextPoint = (i + 1) % pointCount;
+                inputs[2*i] = new ContourVertex() { Position = new Vec3() { X = shapePath[i].x, Y = shapePath[i].y, Z=0 }, Data = extrusionData };
+
+                extrusionData = new Color(shapePath[i].x, shapePath[i].y, shapePath[nextPoint].x, shapePath[nextPoint].y);
+                Vector2 midPoint = 0.5f * (shapePath[i] + shapePath[nextPoint]);
+                inputs[2*i+1] = new ContourVertex() { Position = new Vec3() { X = midPoint.x, Y = midPoint.y, Z = 0}, Data = extrusionData };
+            }
 
             Tess tessI = new Tess();
             tessI.AddContour(inputs, ContourOrientation.Original);
             tessI.Tessellate(WindingRule.EvenOdd, ElementType.Polygons, 3, InterpCustomVertexData);
 
             var indicesI = tessI.Elements.Select(i => i).ToArray();
             var verticesI = tessI.Vertices.Select(v => new Vector3(v.Position.X, v.Position.Y, 0)).ToArray();
+            var extrusionI = tessI.Vertices.Select(v => new Color(((Color)v.Data).r, ((Color)v.Data).g, ((Color)v.Data).b, ((Color)v.Data).a)).ToArray();
 
             vertices.AddRange(verticesI);
             triangles.AddRange(indicesI);
+            extrusion.AddRange(extrusionI);
 
             InitializeTangents(vertices.Count, tangents);
 
             List<Edge> edges = new List<Edge>();
             PopulateEdgeArray(vertices, triangles, edges);
             SortEdges(edges);
-            CreateShadowTriangles(vertices, triangles, tangents, edges);
+            CreateShadowTriangles(vertices, extrusion, triangles, tangents, edges);
 
+            Color[] finalExtrusion = extrusion.ToArray();
             Vector3[] finalVertices = vertices.ToArray();
             int[] finalTriangles = triangles.ToArray();
             Vector4[] finalTangents = tangents.ToArray();
@@ -157,6 +172,7 @@ public static void GenerateShadowMesh(Mesh mesh, Vector3[] shapePath)
             mesh.vertices = finalVertices;
             mesh.triangles = finalTriangles;
             mesh.tangents = finalTangents;
+            mesh.colors = finalExtrusion;
         }
     }
 }

com.unity.render-pipelines.universal/Runtime/ForwardRenderer.cs

@@ -73,7 +73,7 @@ public ForwardRenderer(ForwardRendererData data) : base(data)
             m_RenderOpaqueForwardPass = new DrawObjectsPass("Render Opaques", true, RenderPassEvent.BeforeRenderingOpaques, RenderQueueRange.opaque, data.opaqueLayerMask, m_DefaultStencilState, stencilData.stencilReference);
             m_CopyDepthPass = new CopyDepthPass(RenderPassEvent.AfterRenderingSkybox, m_CopyDepthMaterial);
             m_DrawSkyboxPass = new DrawSkyboxPass(RenderPassEvent.BeforeRenderingSkybox);
-            m_CopyColorPass = new CopyColorPass(RenderPassEvent.BeforeRenderingTransparents, m_SamplingMaterial);
+            m_CopyColorPass = new CopyColorPass(RenderPassEvent.AfterRenderingSkybox, m_SamplingMaterial);
             m_TransparentSettingsPass = new TransparentSettingsPass(RenderPassEvent.BeforeRenderingTransparents, data.shadowTransparentReceive);
             m_RenderTransparentForwardPass = new DrawObjectsPass("Render Transparents", false, RenderPassEvent.BeforeRenderingTransparents, RenderQueueRange.transparent, data.transparentLayerMask, m_DefaultStencilState, stencilData.stencilReference);
             m_OnRenderObjectCallbackPass = new InvokeOnRenderObjectCallbackPass(RenderPassEvent.BeforeRenderingPostProcessing);

com.unity.render-pipelines.universal/Shaders/2D/ShadowGroup2D.shader

@@ -36,6 +36,7 @@ Shader "Hidden/ShadowGroup2D"
                 float3 vertex : POSITION;
                 float4 tangent: TANGENT;
                 float2 uv : TEXCOORD0;
+                float4 extrusion : COLOR;
             };
 
             struct Varyings
@@ -49,7 +50,7 @@ Shader "Hidden/ShadowGroup2D"
             float4 _MainTex_ST;
 
             uniform float3 _LightPos;
-            uniform float  _LightRadius;
+            uniform float  _ShadowRadius;
 
             Varyings vert (Attributes v)
             {
@@ -58,20 +59,37 @@ Shader "Hidden/ShadowGroup2D"
                 float3 lightDir = _LightPos - vertexWS;
                 lightDir.z = 0;
 
+                // Start of code to see if this point should be extruded
                 float3 lightDirection = normalize(lightDir);  
 
-                float3 endpoint = vertexWS + (_LightRadius * -lightDirection);
+                float3 endpoint = vertexWS + (_ShadowRadius * -lightDirection);
 
                 float3 worldTangent = TransformObjectToWorldDir(v.tangent.xyz);
-
                 float sharedShadowTest = saturate(ceil(dot(lightDirection, worldTangent)));
-                float3 sharedShadowOffset = sharedShadowTest * _LightRadius * -lightDirection;
+
+                // Start of code to calculate offset
+                float3 vertexWS0 = TransformObjectToWorld(float3(v.extrusion.xy, 0));
+                float3 vertexWS1 = TransformObjectToWorld(float3(v.extrusion.zw, 0));
+                float3 shadowDir0 = vertexWS0 - _LightPos;
+                shadowDir0.z = 0;
+                shadowDir0 = normalize(shadowDir0);
+
+                float3 shadowDir1 = vertexWS1 -_LightPos;
+                shadowDir1.z = 0;
+                shadowDir1 = normalize(shadowDir1);
+
+                float3 shadowDir = normalize(shadowDir0 + shadowDir1);
+
+
+                float3 sharedShadowOffset = sharedShadowTest * _ShadowRadius * shadowDir;
 
                 float3 position;
                 position = vertexWS + sharedShadowOffset;
 
                 o.vertex = TransformWorldToHClip(position);
 
+
+
                 // RGB - R is shadow value (to support soft shadows), G is Self Shadow Mask, B is No Shadow Mask
                 o.color = 1; // v.color;
                 o.color.g = 0.5;