Renamed provider from ShadowShape2DProvider to ShadowCaster2DProvider

unity-cchu · Evergreen · commit f9ff494b8f47 · 2026-02-25T20:59:37.000Z
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Shadow2DSources_PropertyDrawer.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/Shadow2DSources_PropertyDrawer.cs
@@ -7,7 +7,7 @@
 namespace UnityEditor.Rendering.Universal
 {
     [CustomPropertyDrawer(typeof(Shadow2DProviderSources))]
-    internal class Shadow2DProviderSources_PropertyDrawer : Provider2DSources_PropertyDrawer<ShadowShape2DProvider, Shadow2DProviderSource>
+    internal class Shadow2DProviderSources_PropertyDrawer : Provider2DSources_PropertyDrawer<ShadowCaster2DProvider, Shadow2DProviderSource>
     {
         public override int GetProviderType() { return (int)ShadowCaster2D.ShadowCastingSources.ShapeProvider; }
     }
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/ShadowShape2DProvider_SpriteSkin_PropertyDrawer.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/Provider2D/ShadowShape2DProvider_SpriteSkin_PropertyDrawer.cs
@@ -7,14 +7,14 @@
 
 namespace UnityEditor.Rendering.Universal
 {
-    [CustomPropertyDrawer(typeof(ShadowShape2DProvider_SpriteSkin))]
+    [CustomPropertyDrawer(typeof(ShadowCaster2DProvider_SpriteSkin))]
     internal class ShadowShape2DProvider_SpriteSkin_PropertyDrawer : Provider2D_ProperyDrawer
     {
         public static string k_GPUSkinningError = "Shadow Caster 2D is not compatible with GPU skinning.";
 
         public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
         {
-            ShadowShape2DProvider_SpriteSkin provider = property.managedReferenceValue as ShadowShape2DProvider_SpriteSkin;
+            ShadowCaster2DProvider_SpriteSkin provider = property.managedReferenceValue as ShadowCaster2DProvider_SpriteSkin;
             base.OnGUI(position, property, label);
 
             if (PlayerSettings.gpuSkinning)
diff --git a/Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/ShadowCaster2DEditor.cs b/Packages/com.unity.render-pipelines.universal/Editor/2D/Shadows/ShadowCaster2DEditor.cs
@@ -217,7 +217,7 @@ public override void OnInspectorGUI()
 #endif
 
             ShadowCaster2D shadowCaster2D = target as ShadowCaster2D;
-            ShadowShape2DProvider provider = m_ShadowShape2DProvider.boxedValue as ShadowShape2DProvider;
+            ShadowCaster2DProvider provider = m_ShadowShape2DProvider.boxedValue as ShadowCaster2DProvider;
             if (provider != null && shadowCaster2D.shadowCastingSource == ShadowCaster2D.ShadowCastingSources.ShapeProvider)
             {
                 // Draw the fold out for non
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider.cs
@@ -2,18 +2,24 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.Scripting.APIUpdating;
 
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
 
 namespace UnityEngine.Rendering.Universal
 {
-    /// <summary>
-    /// Class <c>ShadowShape2DProvider</c> has methods called by a <c>ShadowCaster2D</c> to determine if it should be listed as a Casting Option, and to provide geometry if it is the active <c>ShadowShape2DProvider</c>
-    /// </summary>
+
+    [System.Obsolete("Use ShadowCaster2DProvider instead.")]
+    public abstract class ShadowShape2DProvider : ShadowCaster2DProvider { }
+
+        /// <summary>
+        /// Class <c>ShadowShape2DProvider</c> has methods called by a <c>ShadowCaster2D</c> to determine if it should be listed as a Casting Option, and to provide geometry if it is the active <c>ShadowShape2DProvider</c>
+        /// </summary>
     [Serializable]
-    public abstract class ShadowShape2DProvider : Provider2D
+    [MovedFrom(true, "UnityEngine.Rendering.Universal", "Unity.RenderPipelines.Universal.2D.Runtime", "ShadowShape2DProvider")]
+    public abstract class ShadowCaster2DProvider : Provider2D
     {
         /// <summary>
         /// Gets the name to be listed in the <c>ShadowCaster2D</c> Casting Option drop down.
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_Collider.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_Collider.cs
@@ -3,11 +3,13 @@
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using Unity.Collections;
+using UnityEngine.Scripting.APIUpdating;
 
 namespace UnityEngine.Rendering.Universal
 {
     [Serializable]
-    class ShadowShape2DProvider_Collider2D : ShadowShape2DProvider
+    [MovedFrom(true, "UnityEngine.Rendering.Universal", "Unity.RenderPipelines.Universal.2D.Runtime", "ShadowShape2DProvider_Collider2D")]
+    class ShadowCaster2DProvider_Collider2D : ShadowCaster2DProvider
     {
         const float k_InitialTrim = 0.05f;
 
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_SpriteRenderer.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_SpriteRenderer.cs
@@ -4,13 +4,15 @@
 using Unity.Collections;
 using Unity.Collections.LowLevel.Unsafe;
 using UnityEngine;
+using UnityEngine.Scripting.APIUpdating;
 using UnityEngine.U2D;
 
 
 namespace UnityEngine.Rendering.Universal
 {
     [Serializable]
-    class ShadowShape2DProvider_SpriteRenderer : ShadowShape2DProvider
+    [MovedFrom(true, "UnityEngine.Rendering.Universal", "Unity.RenderPipelines.Universal.2D.Runtime", "ShadowShape2DProvider_SpriteRenderer")]
+    class ShadowCaster2DProvider_SpriteRenderer : ShadowCaster2DProvider
     {
         const float k_InitialTrim = 0.05f;
 
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_SpriteShape.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_SpriteShape.cs
@@ -7,6 +7,8 @@
 using Unity.Collections.LowLevel.Unsafe;
 using UnityEngine.U2D;
 using Unity.Mathematics;
+using UnityEngine.Scripting.APIUpdating;
+
 
 #if UNITY_EDITOR
 using UnityEditor;
@@ -15,7 +17,8 @@
 namespace UnityEngine.Rendering.Universal
 {
     [Serializable]
-    internal class ShadowShape2DProvider_SpriteShape : ShadowShape2DProvider
+    [MovedFrom(true, "UnityEngine.Rendering.Universal", "Unity.RenderPipelines.Universal", "ShadowShape2DProvider_SpriteShape")]
+    internal class ShadowCaster2DProvider_SpriteShape : ShadowCaster2DProvider
     {
         const float k_InitialTrim = 0.02f;
 
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_SpriteSkin.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Providers/ShadowShape2DProvider_SpriteSkin.cs
@@ -5,13 +5,15 @@
 using Unity.Collections;
 using Unity.Collections.LowLevel.Unsafe;
 using UnityEngine;
+using UnityEngine.Scripting.APIUpdating;
 using UnityEngine.U2D;
 using UnityEngine.U2D.Animation;
 
 namespace UnityEngine.Rendering.Universal
 {
     [Serializable]
-    class ShadowShape2DProvider_SpriteSkin : ShadowShape2DProvider
+    [MovedFrom(true, "UnityEngine.Rendering.Universal", "Unity.RenderPipelines.Universal.2D.Runtime", "ShadowShape2DProvider_SpriteSkin")]
+    class ShadowCaster2DProvider_SpriteSkin : ShadowCaster2DProvider
     {
         const float k_InitialTrim = 0.05f;
 
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShapeProviderUtility.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/Shadow Provider Utility/ShapeProviderUtility.cs
@@ -11,7 +11,7 @@ namespace UnityEngine.Rendering.Universal
 {
     internal class ShapeProviderUtility
     {
-        static public void CallOnBeforeRender(ShadowShape2DProvider shapeProvider, Component component, ShadowMesh2D shadowMesh, Bounds bounds)
+        static public void CallOnBeforeRender(ShadowCaster2DProvider shapeProvider, Component component, ShadowMesh2D shadowMesh, Bounds bounds)
         {
             if (component != null)
             {
@@ -24,7 +24,7 @@ static public void CallOnBeforeRender(ShadowShape2DProvider shapeProvider, Compo
             }
         }
 
-        static public void PersistantDataCreated(ShadowShape2DProvider shapeProvider, Component component, ShadowMesh2D shadowMesh)
+        static public void PersistantDataCreated(ShadowCaster2DProvider shapeProvider, Component component, ShadowMesh2D shadowMesh)
         {
             if (component != null)
             {
@@ -34,20 +34,20 @@ static public void PersistantDataCreated(ShadowShape2DProvider shapeProvider, Co
         }
 
 #if UNITY_EDITOR
-        static public void TryGetDefaultShadowShapeProviderSource(GameObject go, out Component outSource, out ShadowShape2DProvider outProvider)
+        static public void TryGetDefaultShadowShapeProviderSource(GameObject go, out Component outSource, out ShadowCaster2DProvider outProvider)
         {
             outSource = null;
             outProvider = null;
 
             // Create some providers to check against.
-            var providerTypes = TypeCache.GetTypesDerivedFrom<ShadowShape2DProvider>();
-            var providers = new List<ShadowShape2DProvider>(providerTypes.Count);
+            var providerTypes = TypeCache.GetTypesDerivedFrom<ShadowCaster2DProvider>();
+            var providers = new List<ShadowCaster2DProvider>(providerTypes.Count);
             foreach (Type providerType in providerTypes)
             {
                 if (providerType.IsAbstract)
                     continue;
 
-                providers.Add(Activator.CreateInstance(providerType) as ShadowShape2DProvider);
+                providers.Add(Activator.CreateInstance(providerType) as ShadowCaster2DProvider);
             }
 
             // Fetch the components to check.
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowCaster2D.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Shadows/ShadowCaster2D.cs
@@ -92,7 +92,7 @@ internal enum EdgeProcessing
 
         [SerializeField] int m_InstanceId;
         [SerializeField] Component m_ShadowShape2DComponent;
-        [SerializeReference] ShadowShape2DProvider m_ShadowShape2DProvider;
+        [SerializeReference] ShadowCaster2DProvider m_ShadowShape2DProvider;
         [SerializeField] ShadowCastingSources m_ShadowCastingSource = (ShadowCastingSources)(-1);
 
         [SerializeReference] internal ShadowMesh2D m_ShadowMesh;
@@ -158,7 +158,7 @@ public float alphaCutoff
 
         // Make this public if possible...
         internal Component shadowShape2DComponent { get { return m_ShadowShape2DComponent; } set { m_ShadowShape2DComponent = value; } }
-        internal ShadowShape2DProvider shadowShape2DProvider { get { return m_ShadowShape2DProvider; } set { m_ShadowShape2DProvider = value; } }
+        internal ShadowCaster2DProvider shadowShape2DProvider { get { return m_ShadowShape2DProvider; } set { m_ShadowShape2DProvider = value; } }
 
         int m_PreviousShadowGroup = 0;
         bool m_PreviousCastsShadows = true;
diff --git a/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Shadow2DProviderSources.cs b/Packages/com.unity.render-pipelines.universal/Runtime/2D/Sources/Shadow2DProviderSources.cs
@@ -4,7 +4,7 @@
 namespace UnityEngine.Rendering.Universal
 {
     [Serializable]
-    internal class Shadow2DProviderSources : Provider2DSources<ShadowShape2DProvider, Shadow2DProviderSource>
+    internal class Shadow2DProviderSources : Provider2DSources<ShadowCaster2DProvider, Shadow2DProviderSource>
     {
 
         void SetSelectedHashCode(Provider2D provider, Component component)
diff --git a/Packages/com.unity.render-pipelines.universal/Tests/Runtime/ShadowCaster2DTests.cs b/Packages/com.unity.render-pipelines.universal/Tests/Runtime/ShadowCaster2DTests.cs
@@ -29,7 +29,7 @@ public void AddShadowCaster2DWithSpriteSkin()
 
 // ShadowCaster2D.shadowShape2DProvider is always null on Standalone.
 #if UNITY_EDITOR
-            Assert.That(shadowCaster2D.shadowShape2DProvider, Is.TypeOf(typeof(ShadowShape2DProvider_SpriteSkin)));
+            Assert.That(shadowCaster2D.shadowShape2DProvider, Is.TypeOf(typeof(ShadowCaster2DProvider_SpriteSkin)));
 #else
             Assert.That(shadowCaster2D.shadowShape2DProvider, Is.Null);
 #endif
@@ -46,7 +46,7 @@ public void AddShadowCaster2DWithSpriteSkinWhenInactive()
             m_Obj.SetActive(true);
 // ShadowCaster2D.shadowShape2DProvider is always null on Standalone.
 #if UNITY_EDITOR
-            Assert.That(shadowCaster2D.shadowShape2DProvider, Is.TypeOf(typeof(ShadowShape2DProvider_SpriteSkin)));
+            Assert.That(shadowCaster2D.shadowShape2DProvider, Is.TypeOf(typeof(ShadowCaster2DProvider_SpriteSkin)));
 #else
             Assert.That(shadowCaster2D.shadowShape2DProvider, Is.Null);
 #endif

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`namespace UnityEditor.Rendering.Universal`
`8`	`8`	`{`
`9`	`9`	`[CustomPropertyDrawer(typeof(Shadow2DProviderSources))]`
`10`		`- internal class Shadow2DProviderSources_PropertyDrawer : Provider2DSources_PropertyDrawer<ShadowShape2DProvider, Shadow2DProviderSource>`
	`10`	`+ internal class Shadow2DProviderSources_PropertyDrawer : Provider2DSources_PropertyDrawer<ShadowCaster2DProvider, Shadow2DProviderSource>`
`11`	`11`	`{`
`12`	`12`	`public override int GetProviderType() { return (int)ShadowCaster2D.ShadowCastingSources.ShapeProvider; }`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,14 @@`
`7`	`7`
`8`	`8`	`namespace UnityEditor.Rendering.Universal`
`9`	`9`	`{`
`10`		`- [CustomPropertyDrawer(typeof(ShadowShape2DProvider_SpriteSkin))]`
	`10`	`+ [CustomPropertyDrawer(typeof(ShadowCaster2DProvider_SpriteSkin))]`
`11`	`11`	`internal class ShadowShape2DProvider_SpriteSkin_PropertyDrawer : Provider2D_ProperyDrawer`
`12`	`12`	`{`
`13`	`13`	`public static string k_GPUSkinningError = "Shadow Caster 2D is not compatible with GPU skinning.";`
`14`	`14`
`15`	`15`	`public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)`
`16`	`16`	`{`
`17`		`- ShadowShape2DProvider_SpriteSkin provider = property.managedReferenceValue as ShadowShape2DProvider_SpriteSkin;`
	`17`	`+ ShadowCaster2DProvider_SpriteSkin provider = property.managedReferenceValue as ShadowCaster2DProvider_SpriteSkin;`
`18`	`18`	`base.OnGUI(position, property, label);`
`19`	`19`
`20`	`20`	`if (PlayerSettings.gpuSkinning)`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ public override void OnInspectorGUI()`
`217`	`217`	`#endif`
`218`	`218`
`219`	`219`	`ShadowCaster2D shadowCaster2D = target as ShadowCaster2D;`
`220`		`- ShadowShape2DProvider provider = m_ShadowShape2DProvider.boxedValue as ShadowShape2DProvider;`
	`220`	`+ ShadowCaster2DProvider provider = m_ShadowShape2DProvider.boxedValue as ShadowCaster2DProvider;`
`221`	`221`	`if (provider != null && shadowCaster2D.shadowCastingSource == ShadowCaster2D.ShadowCastingSources.ShapeProvider)`
`222`	`222`	`{`
`223`	`223`	`// Draw the fold out for non`
Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,13 @@`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Runtime.CompilerServices;`
`5`	`5`	`using Unity.Collections;`
	`6`	`+using UnityEngine.Scripting.APIUpdating;`
`6`	`7`
`7`	`8`	`namespace UnityEngine.Rendering.Universal`
`8`	`9`	`{`
`9`	`10`	`[Serializable]`
`10`		`- class ShadowShape2DProvider_Collider2D : ShadowShape2DProvider`
	`11`	`+ [MovedFrom(true, "UnityEngine.Rendering.Universal", "Unity.RenderPipelines.Universal.2D.Runtime", "ShadowShape2DProvider_Collider2D")]`
	`12`	`+ class ShadowCaster2DProvider_Collider2D : ShadowCaster2DProvider`
`11`	`13`	`{`
`12`	`14`	`const float k_InitialTrim = 0.05f;`
`13`	`15`
Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,15 @@`
`4`	`4`	`using Unity.Collections;`
`5`	`5`	`using Unity.Collections.LowLevel.Unsafe;`
`6`	`6`	`using UnityEngine;`
	`7`	`+using UnityEngine.Scripting.APIUpdating;`
`7`	`8`	`using UnityEngine.U2D;`
`8`	`9`
`9`	`10`
`10`	`11`	`namespace UnityEngine.Rendering.Universal`
`11`	`12`	`{`
`12`	`13`	`[Serializable]`
`13`		`- class ShadowShape2DProvider_SpriteRenderer : ShadowShape2DProvider`
	`14`	`+ [MovedFrom(true, "UnityEngine.Rendering.Universal", "Unity.RenderPipelines.Universal.2D.Runtime", "ShadowShape2DProvider_SpriteRenderer")]`
	`15`	`+ class ShadowCaster2DProvider_SpriteRenderer : ShadowCaster2DProvider`
`14`	`16`	`{`
`15`	`17`	`const float k_InitialTrim = 0.05f;`
`16`	`18`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace UnityEngine.Rendering.Universal`
`11`	`11`	`{`
`12`	`12`	`internal class ShapeProviderUtility`
`13`	`13`	`{`
`14`		`- static public void CallOnBeforeRender(ShadowShape2DProvider shapeProvider, Component component, ShadowMesh2D shadowMesh, Bounds bounds)`
	`14`	`+ static public void CallOnBeforeRender(ShadowCaster2DProvider shapeProvider, Component component, ShadowMesh2D shadowMesh, Bounds bounds)`
`15`	`15`	`{`
`16`	`16`	`if (component != null)`
`17`	`17`	`{`
`@@ -24,7 +24,7 @@ static public void CallOnBeforeRender(ShadowShape2DProvider shapeProvider, Compo`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`- static public void PersistantDataCreated(ShadowShape2DProvider shapeProvider, Component component, ShadowMesh2D shadowMesh)`
	`27`	`+ static public void PersistantDataCreated(ShadowCaster2DProvider shapeProvider, Component component, ShadowMesh2D shadowMesh)`
`28`	`28`	`{`
`29`	`29`	`if (component != null)`
`30`	`30`	`{`
`@@ -34,20 +34,20 @@ static public void PersistantDataCreated(ShadowShape2DProvider shapeProvider, Co`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`#if UNITY_EDITOR`
`37`		`- static public void TryGetDefaultShadowShapeProviderSource(GameObject go, out Component outSource, out ShadowShape2DProvider outProvider)`
	`37`	`+ static public void TryGetDefaultShadowShapeProviderSource(GameObject go, out Component outSource, out ShadowCaster2DProvider outProvider)`
`38`	`38`	`{`
`39`	`39`	`outSource = null;`
`40`	`40`	`outProvider = null;`
`41`	`41`
`42`	`42`	`// Create some providers to check against.`
`43`		`- var providerTypes = TypeCache.GetTypesDerivedFrom<ShadowShape2DProvider>();`
`44`		`- var providers = new List<ShadowShape2DProvider>(providerTypes.Count);`
	`43`	`+ var providerTypes = TypeCache.GetTypesDerivedFrom<ShadowCaster2DProvider>();`
	`44`	`+ var providers = new List<ShadowCaster2DProvider>(providerTypes.Count);`
`45`	`45`	`foreach (Type providerType in providerTypes)`
`46`	`46`	`{`
`47`	`47`	`if (providerType.IsAbstract)`
`48`	`48`	`continue;`
`49`	`49`
`50`		`- providers.Add(Activator.CreateInstance(providerType) as ShadowShape2DProvider);`
	`50`	`+ providers.Add(Activator.CreateInstance(providerType) as ShadowCaster2DProvider);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`// Fetch the components to check.`