diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj
index a358b17754ee634a41d7019c923b5fdc2488d936..1949c5b97fa2c1fef8cb645db2d86b3f263d8078 100644
--- a/Assembly-CSharp-Editor.csproj
+++ b/Assembly-CSharp-Editor.csproj
@@ -9,7 +9,7 @@
10.0.20506
2.0
- {2b10e653-4c47-ad1e-4cac-7131423fbdf4}
+ {1b00d2d0-ae7b-edc8-88c8-a29fbb928f9b}
Library
Properties
Assembly-CSharp-Editor
@@ -281,28 +281,28 @@
F:/Unity/2021.1.16f1c1/Editor/Data/PlaybackEngines/MetroSupport/UnityEditor.UWP.Extensions.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/PackageCache/com.unity.collab-proxy@1.7.1/Lib/Editor/PlasticSCM/Unity.Plastic.Antlr3.Runtime.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/PackageCache/com.unity.collab-proxy@1.7.1/Lib/Editor/PlasticSCM/Unity.Plastic.Antlr3.Runtime.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/PackageCache/com.unity.visualscripting@1.6.1/Editor/VisualScripting.Core/Dependencies/YamlDotNet/Unity.VisualScripting.YamlDotNet.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/PackageCache/com.unity.visualscripting@1.6.1/Editor/VisualScripting.Core/Dependencies/YamlDotNet/Unity.VisualScripting.YamlDotNet.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/PackageCache/com.unity.visualscripting@1.6.1/Editor/VisualScripting.Core/Dependencies/DotNetZip/Unity.VisualScripting.IonicZip.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/PackageCache/com.unity.visualscripting@1.6.1/Editor/VisualScripting.Core/Dependencies/DotNetZip/Unity.VisualScripting.IonicZip.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/PackageCache/com.unity.collab-proxy@1.7.1/Lib/Editor/PlasticSCM/log4netPlastic.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/PackageCache/com.unity.collab-proxy@1.7.1/Lib/Editor/PlasticSCM/log4netPlastic.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/PackageCache/com.unity.visualscripting@1.6.1/Runtime/VisualScripting.Flow/Dependencies/NCalc/Unity.VisualScripting.Antlr3.Runtime.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/PackageCache/com.unity.visualscripting@1.6.1/Runtime/VisualScripting.Flow/Dependencies/NCalc/Unity.VisualScripting.Antlr3.Runtime.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/PackageCache/com.unity.nuget.newtonsoft-json@2.0.0/Runtime/Newtonsoft.Json.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/PackageCache/com.unity.nuget.newtonsoft-json@2.0.0/Runtime/Newtonsoft.Json.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/PackageCache/com.unity.collab-proxy@1.7.1/Lib/Editor/PlasticSCM/unityplastic.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/PackageCache/com.unity.collab-proxy@1.7.1/Lib/Editor/PlasticSCM/unityplastic.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll
F:/Unity/2021.1.16f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll
@@ -653,96 +653,96 @@
F:/Unity/2021.1.16f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.XDocument.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/UnityEngine.TestRunner.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/UnityEngine.TestRunner.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/UnityEditor.TestRunner.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/UnityEditor.TestRunner.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.VisualScripting.Flow.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.VisualScripting.Flow.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.VSCode.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.VSCode.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Shaders.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Shaders.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Runtime.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Runtime.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.Timeline.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.Timeline.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.VisualScripting.Core.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.VisualScripting.Core.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.TextMeshPro.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.TextMeshPro.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.VisualScripting.State.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.VisualScripting.State.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.Searcher.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.Searcher.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/VSSettingsProvider.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/VSSettingsProvider.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Runtime.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Runtime.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.VisualScripting.Flow.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.VisualScripting.Flow.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/UnityEditor.UI.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/UnityEditor.UI.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.RenderPipelines.Core.ShaderLibrary.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.RenderPipelines.Core.ShaderLibrary.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/UnityEngine.UI.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/UnityEngine.UI.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.VisualScripting.Core.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.VisualScripting.Core.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.Mathematics.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.Mathematics.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.ShaderGraph.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.ShaderGraph.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.RenderPipeline.Universal.ShaderLibrary.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.RenderPipeline.Universal.ShaderLibrary.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.Timeline.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.Timeline.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.VisualScripting.State.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.VisualScripting.State.dll
- {82f94f72-4224-f4fb-2b83-71cb93896cfd}
+ {3175fd2d-f181-6146-73e6-b2b0cb2e8360}
Assembly-CSharp
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
index 7534f9fa1c5ce550c46c8ff994a1a97d39a42b84..76d0fec83c1a4376f6148e41e6c58ee057ebca7f 100644
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
@@ -9,7 +9,7 @@
10.0.20506
2.0
- {82f94f72-4224-f4fb-2b83-71cb93896cfd}
+ {3175fd2d-f181-6146-73e6-b2b0cb2e8360}
Library
Properties
Assembly-CSharp
@@ -293,10 +293,10 @@
F:/Unity/2021.1.16f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.UnityConnectModule.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/PackageCache/com.unity.visualscripting@1.6.1/Runtime/VisualScripting.Flow/Dependencies/NCalc/Unity.VisualScripting.Antlr3.Runtime.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/PackageCache/com.unity.visualscripting@1.6.1/Runtime/VisualScripting.Flow/Dependencies/NCalc/Unity.VisualScripting.Antlr3.Runtime.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/PackageCache/com.unity.nuget.newtonsoft-json@2.0.0/Runtime/Newtonsoft.Json.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/PackageCache/com.unity.nuget.newtonsoft-json@2.0.0/Runtime/Newtonsoft.Json.dll
F:/Unity/2021.1.16f1c1/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll
@@ -644,85 +644,85 @@
F:/Unity/2021.1.16f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.VisualScripting.Flow.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.VisualScripting.Flow.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.VSCode.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.VSCode.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Shaders.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Shaders.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Runtime.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Runtime.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.Timeline.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.Timeline.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.VisualScripting.Core.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.VisualScripting.Core.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.TextMeshPro.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.TextMeshPro.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.VisualScripting.State.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.VisualScripting.State.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.Searcher.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.Searcher.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/VSSettingsProvider.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/VSSettingsProvider.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Runtime.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Runtime.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.VisualScripting.Flow.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.VisualScripting.Flow.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/UnityEditor.UI.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/UnityEditor.UI.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.RenderPipelines.Core.ShaderLibrary.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.RenderPipelines.Core.ShaderLibrary.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/UnityEngine.UI.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/UnityEngine.UI.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.VisualScripting.Core.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.VisualScripting.Core.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.Mathematics.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.Mathematics.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.ShaderGraph.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.ShaderGraph.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.RenderPipelines.Universal.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.RenderPipeline.Universal.ShaderLibrary.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.RenderPipeline.Universal.ShaderLibrary.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.Timeline.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.Timeline.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Editor.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Editor.dll
- D:/UnityProjects/CustomSRP/CustomSRP_05_BakedLight/Library/ScriptAssemblies/Unity.VisualScripting.State.dll
+ D:/UnityProjects/CustomSRP/CustomSRP_06_ShadowMasks/Library/ScriptAssemblies/Unity.VisualScripting.State.dll
diff --git a/Assets/Custom_RP.asset b/Assets/Custom_RP.asset
index e87bccfd2c349929edfac1494ffaad6f75cbd22f..8fae5e2ebad831c4172c8e1c04d8593480f54a95 100644
--- a/Assets/Custom_RP.asset
+++ b/Assets/Custom_RP.asset
@@ -16,7 +16,7 @@ MonoBehaviour:
useGPUInstancing: 1
useSRPBatcher: 1
shadows:
- maxDistance: 30
+ maxDistance: 12.06
distanceFade: 0.1
directional:
atlasSize: 4096
diff --git a/Assets/Scenes/Baked Light.unity b/Assets/Scenes/Baked Light.unity
index d6b0e18e4282118ec752a4c489b5d21d2d24a78c..cbaccbe12808b2ff1f560b87ccc370c1ea0606e1 100644
--- a/Assets/Scenes/Baked Light.unity
+++ b/Assets/Scenes/Baked Light.unity
@@ -23,7 +23,7 @@ RenderSettings:
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
- m_AmbientIntensity: 0
+ m_AmbientIntensity: 1
m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
@@ -1235,7 +1235,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!108 &705507994
Light:
m_ObjectHideFlags: 0
@@ -1293,7 +1293,7 @@ Light:
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
- m_BoundingSphereOverride: {x: 1.024e-42, y: 6e-44, z: 0, w: 0}
+ m_BoundingSphereOverride: {x: 1e-45, y: 1.3845e-41, z: 1.02e-43, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
diff --git a/Assets/Scenes/Baked Light/LightingData.asset b/Assets/Scenes/Baked Light/LightingData.asset
index e9ef1d3dca10a59b388b57adccaed75d442d1810..c87a61816e32152c1c23aabb79bec59a8992e983 100644
Binary files a/Assets/Scenes/Baked Light/LightingData.asset and b/Assets/Scenes/Baked Light/LightingData.asset differ
diff --git a/Assets/Scenes/Baked Light/Lightmap-0_comp_light.exr b/Assets/Scenes/Baked Light/Lightmap-0_comp_light.exr
index f36db48d53863d88debc6f2a122ffefa6cc1fe50..68f13d40dbec371854a080ece3c4c263db10b56c 100644
Binary files a/Assets/Scenes/Baked Light/Lightmap-0_comp_light.exr and b/Assets/Scenes/Baked Light/Lightmap-0_comp_light.exr differ
diff --git a/Assets/Scenes/Baked Light/Lightmap-0_comp_shadowmask.png b/Assets/Scenes/Baked Light/Lightmap-0_comp_shadowmask.png
new file mode 100644
index 0000000000000000000000000000000000000000..c103f31673024d3ef3f06538f849c6b9e5c6790a
Binary files /dev/null and b/Assets/Scenes/Baked Light/Lightmap-0_comp_shadowmask.png differ
diff --git a/Assets/Scenes/Baked Light/Lightmap-0_comp_shadowmask.png.meta b/Assets/Scenes/Baked Light/Lightmap-0_comp_shadowmask.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..4ff409b1c93f7968e83b317319421f4333172d1c
--- /dev/null
+++ b/Assets/Scenes/Baked Light/Lightmap-0_comp_shadowmask.png.meta
@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 8c14825d4452f5b4492c963b62481681
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 0
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 1
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 3
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 1
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 0
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 11
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/Baked LightSettings.lighting b/Assets/Scenes/Baked LightSettings.lighting
index 0b9efe8e510d66994936d84d977808be047ef10d..f0cddb272027ce2f5b7ceac00c000da24e80aaf3 100644
--- a/Assets/Scenes/Baked LightSettings.lighting
+++ b/Assets/Scenes/Baked LightSettings.lighting
@@ -15,7 +15,7 @@ LightingSettings:
m_BounceScale: 1
m_AlbedoBoost: 1
m_IndirectOutputScale: 1
- m_UsingShadowmask: 0
+ m_UsingShadowmask: 1
m_BakeBackend: 1
m_LightmapMaxSize: 1024
m_BakeResolution: 20
@@ -26,7 +26,7 @@ LightingSettings:
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAO: 0
- m_MixedBakeMode: 0
+ m_MixedBakeMode: 2
m_LightmapsBakeMode: 0
m_FilterMode: 1
m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
diff --git a/Assets/Scripts/Runtime/CameraRenderer.cs b/Assets/Scripts/Runtime/CameraRenderer.cs
index fb1be9f067370e3716fef956315a941633cf51ae..9e12217cbbb91a8ecf5ba66c6a798d002e666f15 100644
--- a/Assets/Scripts/Runtime/CameraRenderer.cs
+++ b/Assets/Scripts/Runtime/CameraRenderer.cs
@@ -129,7 +129,7 @@ public partial class CameraRenderer
{
enableDynamicBatching = useDynamicBatching,
enableInstancing = useGPUInstancing,
- perObjectData = PerObjectData.Lightmaps | PerObjectData.LightProbe | PerObjectData.LightProbeProxyVolume,
+ perObjectData = PerObjectData.Lightmaps | PerObjectData.ShadowMask | PerObjectData.LightProbe | PerObjectData.LightProbeProxyVolume,
};
// 渲染CustomLit表示的pass块
drawingSettings.SetShaderPassName(1, litShaderTagId);
diff --git a/Assets/Scripts/Runtime/Shadows.cs b/Assets/Scripts/Runtime/Shadows.cs
index 6e88c045bf0ccb0ed6721b16e41e874b26699d09..e5edabe4cd1e49408faf338d2f71153b903d8e04 100644
--- a/Assets/Scripts/Runtime/Shadows.cs
+++ b/Assets/Scripts/Runtime/Shadows.cs
@@ -18,6 +18,8 @@ public class Shadows
ShadowSettings shadowSettings;
+ bool useShadowMask;
+
// 可投射阴影的定向光源最大数量
const int maxShadowedDirLightCount = 4;
// 最大级联数量
@@ -65,6 +67,10 @@ public class Shadows
"_CASCADE_BLEND_SOFT",
"_CASCADE_BLEND_DITHER",
};
+ static string[] shadowMaskKeywords =
+ {
+ "_SHADOW_MASK_DISTANCE"
+ };
public void Setup(ScriptableRenderContext context, CullingResults cullingResults, ShadowSettings shadowSettings)
{
@@ -72,6 +78,7 @@ public class Shadows
this.cullingResults = cullingResults;
this.shadowSettings = shadowSettings;
shadowedDirectionalLightCount = 0;
+ useShadowMask = false;
}
///
@@ -93,6 +100,12 @@ public class Shadows
{
if (shadowedDirectionalLightCount < maxShadowedDirLightCount && light.shadows != LightShadows.None && light.shadowStrength > 0f && cullingResults.GetShadowCasterBounds(visibleLightIndex, out Bounds b))
{
+ // 如果使用了ShadowMask
+ LightBakingOutput lightBaking = light.bakingOutput;
+ if (lightBaking.lightmapBakeType == LightmapBakeType.Mixed && lightBaking.mixedLightingMode == MixedLightingMode.Shadowmask)
+ {
+ useShadowMask = true;
+ }
shadowedDirectionalLights[shadowedDirectionalLightCount] = new ShadowedDirectionalLight{
visibleLightIndex = visibleLightIndex,
slopeScaleBias = light.shadowBias,
@@ -120,6 +133,11 @@ public class Shadows
{
buffer.GetTemporaryRT(dirShadowAtlasId, 1, 1, 32, FilterMode.Bilinear, RenderTextureFormat.Shadowmap);
}
+ // 是否使用阴影蒙版
+ buffer.BeginSample(bufferName);
+ SetKeyWords(shadowMaskKeywords, useShadowMask ? QualitySettings.shadowmaskMode == ShadowmaskMode.Shadowmask ? 0 : 1 : -1);
+ buffer.EndSample(bufferName);
+ ExecuteBuffer();
}
///
diff --git a/Assets/ShaderLibrary/GI.hlsl b/Assets/ShaderLibrary/GI.hlsl
index 57aadbfbbd1d0b2025097cb7c570a61d3b075609..5a371060652187b6548b3506805ecd05ff3413be 100644
--- a/Assets/ShaderLibrary/GI.hlsl
+++ b/Assets/ShaderLibrary/GI.hlsl
@@ -10,6 +10,9 @@ SAMPLER(samplerunity_Lightmap);
TEXTURE3D_FLOAT(unity_ProbeVolumeSH);
SAMPLER(samplerunity_ProbeVolumeSH);
+TEXTURE2D(unity_ShadowMask);
+SAMPLER(samplerunity_ShadowMask);
+
// 当需要渲染光照贴图对象时
#if defined(LIGHTMAP_ON)
#define GI_ATTRIBUTE_DATA float2 lightMapUV : TEXCOORD1;
@@ -28,6 +31,7 @@ struct GI
{
// 漫反射颜色
float3 diffuse;
+ ShadowMask shadowMask;
};
// 采样光照贴图
@@ -81,10 +85,26 @@ float3 SampleLightProbe(Surface surfaceWS)
#endif
}
+// 采样shadowMask得到烘焙阴影数据
+float4 SampleBakedShadows(float2 lightMapUV)
+{
+ #if defined(LIGHTMAP_ON)
+ return SAMPLE_TEXTURE2D(unity_ShadowMask, samplerunity_ShadowMask, lightMapUV);
+ #else
+ return 1.0;
+ #endif
+}
+
GI GetGI(float2 lightMapUV, Surface surfaceWS)
{
GI gi;
gi.diffuse = SampleLightMap(lightMapUV) + SampleLightProbe(surfaceWS);
+ gi.shadowMask.distance = false;
+ gi.shadowMask.shadows = 1.0;
+ #if defined(_SHADOW_MASK_DISTANCE)
+ gi.shadowMask.distance = true;
+ gi.shadowMask.shadows = SampleBakedShadows(lightMapUV);
+ #endif
return gi;
}
diff --git a/Assets/ShaderLibrary/Lighting.hlsl b/Assets/ShaderLibrary/Lighting.hlsl
index 02bcd35095d50ee6583b7e47cd14c868cb90d515..81fcff94f69b9a49913d37024a25ee2b4a7b242b 100644
--- a/Assets/ShaderLibrary/Lighting.hlsl
+++ b/Assets/ShaderLibrary/Lighting.hlsl
@@ -19,6 +19,9 @@ float3 GetLighting(Surface surfaceWS, BRDF brdf, GI gi)
{
// 得到表面阴影数据
ShadowData shadowData = GetShadowData(surfaceWS);
+ shadowData.shadowMask = gi.shadowMask;
+ // return gi.shadowMask.shadows.rgb;
+
// 可见光的光照结果进行累加得到最终光照结果
float3 color = gi.diffuse * brdf.diffuse;
for (int i = 0; i < GetDirectionalLightCount(); i++)
diff --git a/Assets/ShaderLibrary/Shadows.hlsl b/Assets/ShaderLibrary/Shadows.hlsl
index 2b63e9088a64160e8fc67a7989e17632d65d530c..5ffeba0488c183b94a8e9589b776cadcf023d05a 100644
--- a/Assets/ShaderLibrary/Shadows.hlsl
+++ b/Assets/ShaderLibrary/Shadows.hlsl
@@ -50,7 +50,14 @@ struct DirectionalShadowData
float normalBias;
};
-// 阴影数据
+// 烘焙阴影数据
+struct ShadowMask
+{
+ bool distance;
+ float4 shadows;
+};
+
+// 表面的阴影数据
struct ShadowData
{
int cascadeIndex;
@@ -58,6 +65,7 @@ struct ShadowData
float strength;
// 混合级联
float cascadeBlend;
+ ShadowMask shadowMask;
};
// 采样阴影图集
@@ -134,6 +142,8 @@ float FadedShadowStrength(float distance, float scale, float fade)
ShadowData GetShadowData(Surface surfaceWS)
{
ShadowData data;
+ data.shadowMask.distance = false;
+ data.shadowMask.shadows = 1.0;
data.cascadeBlend = 1.0;
data.strength = FadedShadowStrength(surfaceWS.depth, _ShadowDistanceFade.x, _ShadowDistanceFade.y);
int i;
diff --git a/Assets/Shaders/Lit.shader b/Assets/Shaders/Lit.shader
index df0a23c1118934ba6f266fb805914a958f6a9d76..6d21a9f5bced8400a71045ea11f2faab77d3d097 100644
--- a/Assets/Shaders/Lit.shader
+++ b/Assets/Shaders/Lit.shader
@@ -56,6 +56,7 @@ Shader "Custom RP/Lit"
#pragma shader_feature _PREMULTIPLY_ALPHA
#pragma multi_compile _ _DIRECTIONAL_PCF3 _DIRECTIONAL_PCF5 _DIRECTIONAL_PCF7
#pragma multi_compile _ _CASCADE_BLEND_SOFT _CASCADE_BLEND_DITHER
+ #pragma multi_compile _ _SHADOW_MASK_DISTANCE
#pragma multi_compile _ LIGHTMAP_ON
#pragma multi_compile_instancing
#pragma vertex LitPassVertex