Improve AmbientScope and OutlineScope

Runtime/Shaders/Includes/Properties/UtsHdrpProperties.hlsl

@@ -161,9 +161,6 @@ float4 _EmissiveColorMap_ST;
 float _TexWorldScaleEmissive;
 float4 _UVMappingMaskEmissive;
 
-float _ID_Intensity;
-float _IR_Intensity;
-
 float4 _InvPrimScale; // Only XY are used
 
 // Wind
@@ -202,12 +199,6 @@ float4 _SpecularColor;
 float _ToonSpecularStep;
 float _ToonSpecularFeather;
 
-float _ReceivesSSR;
-float _ReceivesSSAO;
-float _AO_Factor;
-float _ReceivesSSGI;
-float _GIMultiplier;
-
 float _NormalScale;
 
 float4 _DetailMap_ST;

Runtime/Shaders/Includes/Properties/UtsTextures.hlsl

@@ -9,7 +9,8 @@ SAMPLER(sampler_SDFShadingMap);
 
 TEXTURE2D_ARRAY(_ShadingRampMap);
 
-TEXTURE2D(_MatCapMap);
+TEXTURE2D(_IndirectDiffuseMatCapMap);
+TEXTURE2D(_IndirectSpecularMatCapMap);
 
 sampler _Set_1st_ShadePosition;
 sampler _Set_2nd_ShadePosition;
@@ -27,7 +28,4 @@ TEXTURE2D(_OutlineWidthMap);
 SAMPLER(sampler_OutlineWidthMap);
 
 TEXTURE2D(_OutlineColorMap);
-SAMPLER(sampler_OutlineColorMap);
-
-TEXTURE2D(_BakedNormalMap);
-SAMPLER(sampler_BakedNormalMap);
+SAMPLER(sampler_OutlineColorMap);

Runtime/Shaders/Includes/Properties/UtsUnityPerMaterial.hlsl

@@ -25,6 +25,30 @@ float _SDFHighlightStrength;
 float _ShadowDistanceBias;
 float _ShadowNormalBias;
 
+// Ambient
+float _IndirectDiffuseMatCapLod;
+
+float _IndirectDiffuseIntensity;
+float _SSAOWeight;
+float _SSGIWeight;
+
+float _IndirectSpecularMatCapLod;
+
+float _IndirectSpecularIntensity;
+float _SSRWeight;
+
+// Outline
+float _OutlineWidth;
+float4 _OutlineColor;
+fixed _AlbedoAffectOutline;
+fixed _SkyColorAffectOutline;
+float _SkyColorIntensity;
+
+float _OutlineFadeIn;
+float _OutlineFadeOut;
+fixed _UseSmoothedNormal;
+
+
 float _utsTechnique;
 float4 _Color;
 
@@ -170,13 +194,6 @@ float _AngelRingIntensity;
 float _AngelRingOffsetU;
 float _AngelRingOffsetV;
 
-float _OutlineWidth;
-float4 _OutlineColor;
-fixed _AlbedoAffectOutline;
-float _OutlineFadeIn;
-float _OutlineFadeOut;
-fixed _UseSmoothedNormal;
-
 #if defined(_UTS_TOON_EV_PER_MODEL)
 // not in materials
 int _ToonLightHiCutFilter;