Fix last issues with double ambient in KerbalKonstructs, and mismatching asphalt albedo between some KSC statics

Author: LGhassen

DeferredKSP/Deferred.cs

@@ -5,7 +5,7 @@
 using System;
 using UnityEngine.SceneManagement;
 
-[assembly: AssemblyVersion("1.2.3")]
+[assembly: AssemblyVersion("1.2.4")]
 [assembly: KSPAssemblyDependency("0Harmony", 0, 0)]
 [assembly: KSPAssemblyDependency("Shabby", 0, 0)]
 namespace Deferred

shaders/DeferredKSPShaders/Assets/Shaders/Replaced shaders/Scenery Shaders/DiffuseKSCGround.shader

@@ -59,6 +59,8 @@ Shader "KSP/Scenery/Diffuse Ground KSC"
 
         void surf(Input i, inout SurfaceOutputStandard o)
         {
+            _TarmacColor = min(_TarmacColor, float4(0.89.xxx, 1.0)); // hack to equalize mismatching color settings in the KSC
+
             float4 groundColor = tex2D(_TarmacTexture,(i.uv_TarmacTexture));
             float blendMask = tex2D(_BlendMaskTexture,(i.uv2_BlendMaskTexture));
 

shaders/DeferredKSPShaders/Assets/Shaders/Replaced shaders/Scenery Shaders/DiffuseKSCGroundSpecular.shader

@@ -67,6 +67,8 @@ Shader "KSP/Scenery/Diffuse Ground KSC Specular"
 
         void surf(Input i, inout SurfaceOutputStandard o)
         {
+            _TarmacColor = min(_TarmacColor, float4(0.89.xxx, 1.0)); // hack to equalize mismatching color settings in the KSC
+
             float4 groundColor = tex2D(_TarmacTexture, i.uv_TarmacTexture);
             float3 groundNormal = UnpackNormalDXT5nm(tex2D(_TarmacNormal, i.uv_TarmacTexture));
             float blendMask = tex2D(_BlendMaskTexture,(i.uv2_BlendMaskTexture));

shaders/DeferredKSPShaders/Assets/Shaders/Replaced shaders/Scenery Shaders/DiffuseMultiply.shader

@@ -18,18 +18,31 @@
 
         CGPROGRAM
         #include "../ReplacementShader.cginc"
-		#pragma surface surf Standard
+        #pragma surface surf Standard
         #pragma target 3.0
 
-		// This shader seems to ignore alpha channel smoothness and _Color property, not sure what's the point
-		void surf (Input IN, inout SurfaceOutputStandard o)
-		{
-			o.Albedo = tex2D(_MainTex, IN.uv_MainTex);
-			o.Smoothness = 0.5;
-			o.Normal = float3(0.0,0.0,1.0);
-			o.Metallic = 0.0;
-			o.Alpha = 1.0;
-		}
+        // This shader seems to ignore alpha channel smoothness and _Color property, not sure what's the point
+        void surf (Input IN, inout SurfaceOutputStandard o)
+        {
+            float4 _TarmacColor = float4(0.89.xxx, 1.0); // hack to equalize mismatching color settings in the KSC
+
+            float4 groundColor = tex2D(_MainTex, IN.uv_MainTex) * _TarmacColor;
+
+            o.Albedo = groundColor.rgb;
+            o.Smoothness = 0.25 * sqrt(max(groundColor.a, 0.0000001)); // match shading in DiffuseKSCGroundSpecular
+            o.Normal = float3(0.0,0.0,1.0);
+            o.Metallic = 0.0;
+            o.Alpha = 1.0;
+
+#if UNITY_PASS_DEFERRED
+            // In deferred rendering do not use the flat ambient because Deferred adds its own ambient as a composite of flat ambient and probe
+            // Also do not use #pragma skip_variants LIGHTPROBE_SH because it impacts lighting in forward and some elements can still render in
+            // forward e.g through the VAB scene doors
+            unity_SHAr = 0.0.xxxx;
+            unity_SHAg = 0.0.xxxx;
+            unity_SHAb = 0.0.xxxx;
+#endif
+        }
 
         ENDCG
     }