Organize folder structure;

Update RimLighting;

Runtime/Shaders/HDRPToon.shader

@@ -1,7 +1,3 @@
-//Unity Toon Shader/HDRP
-//nobuyuki@unity3d.com
-//toshiyuki@unity3d.com (Universal RP/HDRP) 
-
 Shader "HDRP/Toon"
 {
     Properties

Runtime/Shaders/Includes/Common/UtsHead.hlsl

@@ -1,7 +1,3 @@
-//Unity Toon Shader/HDRP
-//nobuyuki@unity3d.com
-//toshiyuki@unity3d.com (Universal RP/HDRP) 
-
 #ifndef UCTS_HDRP_INCLUDED
 #define UCTS_HDRP_INCLUDED
 

Runtime/Shaders/Includes/Common/UtsLitData.hlsl

@@ -1,4 +1,7 @@
-float ADD_IDX(UtsGetSurfaceData)(FragInputs input, LayerTexCoord layerTexCoord, out SurfaceData surfaceData,
+#ifndef UTS_LIT_DATA
+#define UTS_LIT_DATA
+
+float UtsGetSurfaceData(FragInputs input, LayerTexCoord layerTexCoord, out SurfaceData surfaceData,
                                  out float3 normalTS, out float3 bentNormalTS)
 {
     float3 detailNormalTS = float3(0.0, 0.0, 0.0);
@@ -51,7 +54,7 @@ float ADD_IDX(UtsGetSurfaceData)(FragInputs input, LayerTexCoord layerTexCoord,
     bentNormalTS = ADD_IDX(GetBentNormalTS)(input, layerTexCoord, normalTS, detailNormalTS, detailMask);
 
 #if _PBR_MODE_OFF
-    surfaceData.perceptualSmoothness = 1;
+    surfaceData.perceptualSmoothness = 0.0;
 #else
     #if defined(_MASKMAP_IDX)
     surfaceData.perceptualSmoothness = SAMPLE_UVMAPPING_TEXTURE2D(ADD_IDX(_MaskMap), SAMPLER_MASKMAP_IDX, ADD_IDX(layerTexCoord.base)).a;
@@ -70,7 +73,8 @@ float ADD_IDX(UtsGetSurfaceData)(FragInputs input, LayerTexCoord layerTexCoord,
 #endif
 
 #if _PBR_MODE_OFF
-      surfaceData.metallic = 0;
+    surfaceData.metallic = 0.0;
+    surfaceData.ambientOcclusion = 1.0;
     #else
     // MaskMap is RGBA: Metallic, Ambient Occlusion (Optional), detail Mask (Optional), Smoothness
 #ifdef _MASKMAP_IDX
@@ -386,3 +390,5 @@ void UtsGetSurfaceAndBuiltinData(FragInputs input, float3 V, inout PositionInput
 
     RAY_TRACING_OPTIONAL_ALPHA_TEST_PASS
 }
+
+#endif

Runtime/Shaders/Includes/Common/UtsSurfaceFeatureEvaluation.hlsl

@@ -0,0 +1,54 @@
+#ifndef UTS_SURFACE_FEATURE_EVALUATION
+#define UTS_SURFACE_FEATURE_EVALUATION
+
+// Rim light is calculated per light
+float3 UtsEvaluateColor_RimLight(PositionInputs posInput, UtsBSDFData bsdfData, PreLightData preLightData, float3 L, float3 lightColor)
+{
+    float clampNdotV = ClampNdotV(preLightData.NdotV);
+    float rimLightWeight = 1.0 - clampNdotV;
+    rimLightWeight = pow(rimLightWeight, exp2(lerp(3.0, 0.0, _RimLightLevel)));
+    
+    float3 normalVS = normalize(mul((float3x3)UNITY_MATRIX_V, bsdfData.geomNormalWS));
+    float2 depthUV = posInput.positionNDC.xy + normalVS * (_RimLightLevel * 0.05 / posInput.linearDepth);
+    float offsetedDepth = SampleCameraDepth(depthUV);
+    float depthDiff = saturate(posInput.deviceDepth - offsetedDepth);
+    
+    float halfLambert = 0.5 * dot(bsdfData.normalWS, L) + 0.5;
+    //float rimLightMask = lerp(0.5 * lambert + 0.5, saturate(lambert), _Tweak_LightDirection_MaskLevel * 2.0);
+    float rimLightMask = saturate(smoothstep(_Tweak_LightDirection_MaskLevel, 1.0, halfLambert));
+    
+    rimLightWeight = step(0.0025 / posInput.linearDepth, depthDiff);
+    float3 outColor = rimLightWeight * lightColor * _RimLightColor * _RimLightStrength;
+    return outColor * rimLightMask;
+}
+
+DirectLighting UtsEvaluateAngelRing(FragInputs input, float3 normalWS, float3 V)
+{
+    DirectLighting lighting;
+    ZERO_INITIALIZE(DirectLighting, lighting);
+    
+    // Should we scroll the angel ring texture on x?
+    float3 cameraRight = UNITY_MATRIX_V[0].xyz;
+    float3 cameraFront = UNITY_MATRIX_V[2].xyz;
+    float3 upVector = float3(0, 1, 0);
+    float3 rightAxis = cross(cameraFront, upVector);
+    float cameraRightMagnitude = sqrt(cameraRight.x * cameraRight.x + cameraRight.y * cameraRight.y + cameraRight.z * cameraRight.z);
+    float rightAxisMagnitude = sqrt(rightAxis.x * rightAxis.x + rightAxis.y * rightAxis.y + rightAxis.z * rightAxis.z);
+    float cameraRollCos = dot(rightAxis, cameraRight) / (rightAxisMagnitude * cameraRightMagnitude);
+    float3 cameraRoll = acos(clamp(cameraRollCos, -1.0, 1.0));
+    float cameraDir = cameraRight.y < 0 ? -1.0 : 1.0;
+    
+    float2 arOffsetU = lerp(mul(UNITY_MATRIX_V, float4(normalWS, 0)).xyz, float3(0, 0, 1), _AngelRingOffsetU).xy;
+    arOffsetU = arOffsetU * 0.5 + 0.5;
+    float2 arvnRotate = RotateUV(arOffsetU, -(cameraDir * cameraRoll), 0.5, 1.0);
+    float2 arOffsetUV = float2(arvnRotate.x, lerp(input.texCoord0.y, arvnRotate.y, _AngelRingOffsetV));
+    float4 angelRingColor = SAMPLE_TEXTURE2D(_AngelRingColorMap, sampler_AngelRingColorMap, TRANSFORM_TEX(arOffsetUV, _AngelRingColorMap)) * _AngelRingColor * _AngelRingIntensity;
+    
+    float weight = saturate(dot(normalize(V), normalWS));
+    
+    lighting.specular += angelRingColor.r * angelRingColor.a * weight;
+    
+    return lighting;
+}
+
+#endif

Runtime/Shaders/Includes/Common/UtsSurfaceFeatureEvaluation.hlsl.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0719f4875020bca4b8ccebbb1c92041f
+ShaderIncludeImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Runtime/Shaders/Includes/Deprecated.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b4b440fa5514bff4089187ae3b07b338
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Runtime/Shaders/Includes/Lighting/UtsLightEvaluation.hlsl

@@ -9,8 +9,7 @@
   #define SATURATE_BASE_COLOR_IF_SDR(x) saturate(x)
 #endif
 
-#include "Packages/com.misaki.hdrp-toon/Runtime/Shaders/Includes/Common/UtsMaterialEvaluation.hlsl"
-#include "Packages/com.misaki.hdrp-toon/Runtime/Shaders/Includes/Lighting/UtsShadowEvaluation.hlsl"
+#include "Packages/com.misaki.hdrp-toon/Runtime/Shaders/Includes/Lighting/UtsMaterialEvaluation.hlsl"
 
 const float rateR = 0.299;
 const float rateG = 0.587;

Runtime/Shaders/Includes/Lighting/UtsLightLoop.hlsl

@@ -3,8 +3,10 @@
 
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Macros.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/PhysicalCamera.hlsl"
-#include "Packages/com.misaki.hdrp-toon/Runtime/Shaders/Includes/Lighting/UtsLightEvaluation.hlsl"
+
 #include "Packages/com.misaki.hdrp-toon/Runtime/Models/SurfaceFeature.cs.hlsl"
+#include "Packages/com.misaki.hdrp-toon/Runtime/Shaders/Includes/Common/UtsSurfaceFeatureEvaluation.hlsl"
+#include "Packages/com.misaki.hdrp-toon/Runtime/Shaders/Includes/Lighting/UtsLightEvaluation.hlsl"
 
 // Channel mask enum.
 // this must be same to UI cs code

Runtime/Shaders/Includes/Lighting/UtsMaterialEvaluation.hlsl

@@ -3,6 +3,8 @@
 
 #define ColorSpaceDielectricSpec half4(0.22, 0.22, 0.22, 0.779)
 
+#include "Packages/com.misaki.hdrp-toon/Runtime/Shaders/Includes/Lighting/UtsShadowEvaluation.hlsl"
+
 struct UtsShadeMask
 {
     float baseShadeMask;
@@ -111,53 +113,6 @@ half3 FitWithCurveApprox(half NdotL, half Curvature)
     return lerp(curve0, curve1, mad(oneMinusCurva2, -1.0 * oneMinusCurva2, 1.0));
 }
 
-float3 SampleSDFTexture(float3 L, float2 uv, out float angle)
-{
-    float2 right_uv = float2(1 - uv.x, uv.y);
-    float3 left_SDFTex = SAMPLE_TEXTURE2D(_SDFShadingMap, sampler_SDFShadingMap, uv).rgb;
-    float3 right_SDFTex = SAMPLE_TEXTURE2D(_SDFShadingMap, sampler_SDFShadingMap, right_uv).rgb;
-
-    float2 leftVector = normalize(mul(UNITY_MATRIX_M, float4(1.0, 0.0, 0.0, 0.0)).xz);
-    float2 forwardVector = normalize(mul(UNITY_MATRIX_M, float4(0.0, 0.0, 1.0, 0.0)).xz);
-
-    float2 lightDirection = normalize(L.xz);
-    angle = saturate(dot(forwardVector, lightDirection) * -1.0 + _SDFShadowLevel);
-    bool isRightSide = dot(lightDirection, leftVector) > 0;
-    
-    return isRightSide ? right_SDFTex : left_SDFTex;
-}
-
-float GetHairShadow(PositionInputs posInput, float3 L)
-{
-    float shadow = 1.0;
-    
-    // Push the face fragment view space position towards the light for a little bit
-    float hairShadowOpacity = saturate(Remap(length(posInput.positionWS), float2(_HairShadowFadeOutDistance, _HairShadowFadeInDistance), float2(0, 1)));
-    
-    if (hairShadowOpacity > 0.0)
-    {
-        float3 viewLightDir = TransformWorldToViewDir(L); //  / posInput.deviceDepth; when linearDepth grows large, the movement amount should be lower since we are getting further from the face.
-        float3 cameraDirOS = normalize(TransformWorldToObject(GetCameraPositionWS()));
-        float shadowLengthY = _HairShadowDistance * 5.0 * max(0.5, posInput.linearDepth * _HairShadowDistanceScaleFactor) / posInput.linearDepth;
-        float2 shadowLength = float2(shadowLengthY * 2.0f, shadowLengthY);
-    
-        float3 camDirOS = normalize(TransformWorldToObject(GetCameraPositionWS()));
-        float camDirFactor = 1 - smoothstep(0.1, 0.9, camDirOS.y);
-        shadowLength.y *= camDirFactor;
-
-        float2 samplingPoint = (posInput.positionSS + shadowLength * viewLightDir.xy * (_ScreenSize.xy / float2(1920.0f, 1080.0f))) * _ScreenSize.zw; // Use 1080p as the reference resolution to achieve consistent shadow lengths across various screen resolutions.
-
-        // Then sample the hair buffer, to see if the fragment lands in shadow.
-        float2 scaledUVs = samplingPoint * _HairShadowRTHandleScale.xy; // We have to including the scaling factor for our shadow map since we are not going to allocate new texture if the rendering resolution changed.
-        float hairDepth = SAMPLE_TEXTURE2D(_HairShadowTex, s_linear_clamp_sampler, scaledUVs).r;
-        float shadowMask = posInput.deviceDepth <= hairDepth + _HairShadowDepthBias ? 1 : 0; // Hair < Face means Hair are closer to camera 
-        // Note that we have LinearEyeDepth in the buffer. A comparison of depth is needed so that we don't project the shadow of hair behind the face.
-        shadow = lerp(1, 1.0 - hairShadowOpacity, shadowMask);
-    }
-    
-    return shadow;
-}
-
 DirectLighting UtsShadeSurface(PositionInputs posInput, UtsBSDFData bsdfData, PreLightData preLightData, SHADOW_TYPE shadow, 
     float3 lightColor, float3 V, float3 L, float2 uv, 
     float diffuseDimmer, float specularDimmer)
@@ -221,48 +176,12 @@ DirectLighting UtsShadeSurface(PositionInputs posInput, UtsBSDFData bsdfData, Pr
         
         lighting.diffuse += diffuseTerm * lightColor * diffuseDimmer;
         lighting.specular += specularTerm * lightColor * specularDimmer;
-    }
         
-    return lighting;
-}
-
-float3 UtsEvaluateRimLight(UtsBSDFData bsdfData, PreLightData preLightData, float3 L, float3 lightColor)
+        if (HasFlag(bsdfData.surfaceFeatures, SURFACEFEATURE_RIM_LIGHT))
         {
-    float clampNdotV = ClampNdotV(preLightData.NdotV);
-    float rimLightWeight = 1.0 - clampNdotV;
-    rimLightWeight = pow(rimLightWeight, exp2(lerp(3.0, 0.0, _RimLightLevel)));
-
-    float3 rimlightColor = rimLightWeight * _RimLightColor * _RimLightStrength;
-    
-    float3 outColor = rimlightColor;
-    return outColor;
+            lighting.diffuse += UtsEvaluateColor_RimLight(posInput, bsdfData, preLightData, L, lightColor);
+        }
     }
-
-DirectLighting UtsEvaluateAngelRing(FragInputs input, float3 normalWS, float3 V)
-{
-    DirectLighting lighting;
-    ZERO_INITIALIZE(DirectLighting, lighting);
-    
-    // Should we scroll the angel ring texture on x?
-    float3 cameraRight = UNITY_MATRIX_V[0].xyz;
-    float3 cameraFront = UNITY_MATRIX_V[2].xyz;
-    float3 upVector = float3(0, 1, 0);
-    float3 rightAxis = cross(cameraFront, upVector);
-    float cameraRightMagnitude = sqrt(cameraRight.x * cameraRight.x + cameraRight.y * cameraRight.y + cameraRight.z * cameraRight.z);
-    float rightAxisMagnitude = sqrt(rightAxis.x * rightAxis.x + rightAxis.y * rightAxis.y + rightAxis.z * rightAxis.z);
-    float cameraRollCos = dot(rightAxis, cameraRight) / (rightAxisMagnitude * cameraRightMagnitude);
-    float3 cameraRoll = acos(clamp(cameraRollCos, -1.0, 1.0));
-    float cameraDir = cameraRight.y < 0 ? -1.0 : 1.0;
-    
-    float2 arOffsetU = lerp(mul(UNITY_MATRIX_V, float4(normalWS, 0)).xyz, float3(0, 0, 1), _AngelRingOffsetU).xy;
-    arOffsetU = arOffsetU * 0.5 + 0.5;
-    float2 arvnRotate = RotateUV(arOffsetU, -(cameraDir * cameraRoll), 0.5, 1.0);
-    float2 arOffsetUV = float2(arvnRotate.x, lerp(input.texCoord0.y, arvnRotate.y, _AngelRingOffsetV));
-    float4 angelRingColor = SAMPLE_TEXTURE2D(_AngelRingColorMap, sampler_AngelRingColorMap, TRANSFORM_TEX(arOffsetUV, _AngelRingColorMap)) * _AngelRingColor * _AngelRingIntensity;
-    
-    float weight = saturate(dot(normalize(V), normalWS));
-    
-    lighting.specular += angelRingColor.r * angelRingColor.a * weight;
     
     return lighting;
 }

Runtime/Shaders/Includes/Lighting/UtsShadowEvaluation.hlsl

@@ -10,6 +10,53 @@ float3 UtsGetShadowNormal(UtsBSDFData bsdfData)
 #endif
 }
 
+float3 SampleSDFTexture(float3 L, float2 uv, out float angle)
+{
+    float2 right_uv = float2(1 - uv.x, uv.y);
+    float3 left_SDFTex = SAMPLE_TEXTURE2D(_SDFShadingMap, sampler_SDFShadingMap, uv).rgb;
+    float3 right_SDFTex = SAMPLE_TEXTURE2D(_SDFShadingMap, sampler_SDFShadingMap, right_uv).rgb;
+
+    float2 leftVector = normalize(mul(UNITY_MATRIX_M, float4(1.0, 0.0, 0.0, 0.0)).xz);
+    float2 forwardVector = normalize(mul(UNITY_MATRIX_M, float4(0.0, 0.0, 1.0, 0.0)).xz);
+
+    float2 lightDirection = normalize(L.xz);
+    angle = saturate(dot(forwardVector, lightDirection) * -1.0 + _SDFShadowLevel);
+    bool isRightSide = dot(lightDirection, leftVector) > 0;
+    
+    return isRightSide ? right_SDFTex : left_SDFTex;
+}
+
+float GetHairShadow(PositionInputs posInput, float3 L)
+{
+    float shadow = 1.0;
+    
+    // Push the face fragment view space position towards the light for a little bit
+    float hairShadowOpacity = saturate(Remap(length(posInput.positionWS), float2(_HairShadowFadeOutDistance, _HairShadowFadeInDistance), float2(0, 1)));
+    
+    if (hairShadowOpacity > 0.0)
+    {
+        float3 viewLightDir = TransformWorldToViewDir(L); //  / posInput.deviceDepth; when linearDepth grows large, the movement amount should be lower since we are getting further from the face.
+        float3 cameraDirOS = normalize(TransformWorldToObject(GetCameraPositionWS()));
+        float shadowLengthY = _HairShadowDistance * 5.0 * max(0.5, posInput.linearDepth * _HairShadowDistanceScaleFactor) / posInput.linearDepth;
+        float2 shadowLength = float2(shadowLengthY * 2.0f, shadowLengthY);
+    
+        float3 camDirOS = normalize(TransformWorldToObject(GetCameraPositionWS()));
+        float camDirFactor = 1 - smoothstep(0.1, 0.9, camDirOS.y);
+        shadowLength.y *= camDirFactor;
+
+        float2 samplingPoint = (posInput.positionSS + shadowLength * viewLightDir.xy * (_ScreenSize.xy / float2(1920.0f, 1080.0f))) * _ScreenSize.zw; // Use 1080p as the reference resolution to achieve consistent shadow lengths across various screen resolutions.
+
+        // Then sample the hair buffer, to see if the fragment lands in shadow.
+        float2 scaledUVs = samplingPoint * _HairShadowRTHandleScale.xy; // We have to including the scaling factor for our shadow map since we are not going to allocate new texture if the rendering resolution changed.
+        float hairDepth = SAMPLE_TEXTURE2D(_HairShadowTex, s_linear_clamp_sampler, scaledUVs).r;
+        float shadowMask = posInput.deviceDepth <= hairDepth + _HairShadowDepthBias ? 1 : 0; // Hair < Face means Hair are closer to camera 
+        // Note that we have LinearEyeDepth in the buffer. A comparison of depth is needed so that we don't project the shadow of hair behind the face.
+        shadow = lerp(1, 1.0 - hairShadowOpacity, shadowMask);
+    }
+    
+    return shadow;
+}
+
 // distances = {d, d^2, 1/d, d_proj}, where d_proj = dot(lightToSample, light.forward).
 SHADOW_TYPE UtsEvaluateShadow_Punctual(LightLoopContext lightLoopContext, PositionInputs posInput, LightData light, BuiltinData builtinData, float3 N, float3 L, float4 distances)
 {

Runtime/UTS Renderer/UTSToonmapping/UTSTonemapping.cs

@@ -13,7 +13,6 @@ public sealed class UTSTonemapping : CustomPostProcessVolumeComponent, IPostProc
 
     public bool IsActive() => _material != null && state.value;
 
-    // Do not forget to add this post process in the Custom Post Process Orders list (Project Settings > Graphics > HDRP Global Settings).
     public override CustomPostProcessInjectionPoint injectionPoint => CustomPostProcessInjectionPoint.AfterPostProcess;
 
     const string Shader_Name = "Hidden/Shader/UTSTonemapping";
@@ -38,7 +37,7 @@ public sealed class UTSTonemapping : CustomPostProcessVolumeComponent, IPostProc
         }
 
         _material.SetTexture("_MainTex", source);
-        HDUtils.DrawFullScreen(cmd, _material, destination, shaderPassId: 0);
+        HDUtils.DrawFullScreen(cmd, _material, destination);
     }
 
     public override void Cleanup()