Shader cleanup and use KSP's Blinn Phong BRDF

Assets/Shaders/DecalFeatureBumped.shader

@@ -1,4 +1,4 @@
-Shader "ConformalDecals/Feature/BumpedVert"
+Shader "ConformalDecals/Feature/Bumped"
 {
     Properties
     {
@@ -25,11 +25,12 @@ Shader "ConformalDecals/Feature/BumpedVert"
             #pragma vertex vert_forward_base
             #pragma fragment frag_forward_base
 
-            #pragma multi_compile_fwdbase nolightmap nodirlightmap nodynlightmap novertexlight
+            #pragma multi_compile_fwdbase nolightmap nodirlightmap nodynlightmap
             
             #include "UnityCG.cginc"
             #include "Lighting.cginc"
             #include "AutoLight.cginc"
+            #include "LightingKSP.cginc"
             #include "DecalsCommon.cginc"
 
             sampler2D _Decal;

Assets/Shaders/DecalNormal.shader

@@ -1,70 +0,0 @@
-Shader "ConformalDecals/Feature/Bumped"
-{
-	Properties 
-	{
-		_Decal ("Decal Texture", 2D) = "gray" {}
-		_DecalBumpMap("Decal Normal Map", 2D) = "bump" {}
-		
-	    _Cutoff ("Alpha cutoff", Range(0,1)) = 0.5
-		_Opacity("_Opacity", Range(0,1) ) = 1
-	}
-	
-	SubShader 
-	{
-		Tags { "Queue" = "Transparent" }
-
-		ZWrite Off
-		ZTest LEqual
-		Blend SrcAlpha OneMinusSrcAlpha  
-
-		CGPROGRAM
-
-		#pragma surface surf Lambert alpha vertex:vert
-		#pragma target 4.0
-
-		float4x4 _ProjectionMatrix;
-		float3 _DecalNormal;
-		float3 _DecalBiNormal;
-		
-		sampler2D _Decal;
-		sampler2D _DecalBumpMap;
-		
-        float _Cutoff;
-		float _Opacity;
-
-		struct Input
-		{
-			float4 pos_decal : TEXCOORD0;
-			float3 normal : NORMAL;
-		};
-
-		void vert (inout appdata_full v, out Input o) {
-			o.pos_decal = mul (_ProjectionMatrix, v.vertex);
-            o.normal = v.normal;
-            float3 localTangent = normalize(cross(v.normal, _DecalBiNormal));
-		}
-
-		void surf (Input IN, inout SurfaceOutput o)
-		{
-			fixed4 projUV = UNITY_PROJ_COORD(IN.pos_decal);
-
-			// since I cant easily affect the clamping mode in KSP, do it here
-			clip(projUV.xyz);
-			clip(1-projUV.xyz);
-			
-			// clip backsides
-			clip(dot(_DecalNormal, IN.normal));
-
-			float4 color = tex2D(_Decal, projUV);
-			float3 normal = UnpackNormal(tex2D(_DecalBumpMap, projUV));
-			
-			clip (color.a - _Cutoff);
-
-			o.Albedo = color.rgb;
-			o.Normal = normal;
-			o.Alpha = color.a * _Opacity;
-		}
-
-		ENDCG
-	}
-}

Assets/Shaders/DecalsCommon.cginc

@@ -6,7 +6,7 @@ struct DecalSurfaceInput
     float4 uv_decal;
     #ifdef DECAL_BASE_NORMAL
         float2 uv_base;
-    #endif
+    #endif //DECAL_BASE_NORMAL
     float3 normal;
     float3 viewDir;
 };
@@ -17,7 +17,7 @@ struct appdata_decal
     float3 normal : NORMAL;
     #ifdef DECAL_BASE_NORMAL
         float4 texcoord : TEXCOORD0;
-    #endif
+    #endif //DECAL_BASE_NORMAL
 };
 
 struct v2f
@@ -27,13 +27,11 @@ struct v2f
     float4 uv_decal : TEXCOORD0;
     #ifdef DECAL_BASE_NORMAL
         float2 uv_base : TEXCOORD1;
-    #endif
+    #endif //DECAL_BASE_NORMAL
     float4 tSpace0 : TEXCOORD2;
     float4 tSpace1 : TEXCOORD3;
     float4 tSpace2 : TEXCOORD4;
-    #if UNITY_SHOULD_SAMPLE_SH
+    fixed3 vlight : TEXCOORD5;
-        half3 sh : TEXCOORD5; // SH
-    #endif
     UNITY_SHADOW_COORDS(6)
 };
 
@@ -57,7 +55,7 @@ v2f vert_forward_base(appdata_decal v)
     
     #ifdef DECAL_BASE_NORMAL
         o.uv_base = TRANSFORM_TEX(v.texcoord, _BumpMap);
-    #endif
+    #endif //DECAL_BASE_NORMAL
     
     float3 worldPos = mul(unity_ObjectToWorld, v.vertex).xyz;
     float3 worldNormal = UnityObjectToWorldNormal(v.normal);
@@ -69,17 +67,21 @@ v2f vert_forward_base(appdata_decal v)
     o.tSpace1 = float4(worldTangent.y, worldBinormal.y, worldNormal.y, worldPos.y);
     o.tSpace2 = float4(worldTangent.z, worldBinormal.z, worldNormal.z, worldPos.z);
     
-    #if UNITY_SHOULD_SAMPLE_SH && !UNITY_SAMPLE_FULL_SH_PER_PIXEL
+    // SH/ambient light
-        o.sh = 0;
+    #if UNITY_SHOULD_SAMPLE_SH
-        // Approximated illumination from non-important point lights
+        float3 shlight = ShadeSH9 (float4(worldNormal,1.0));
-        #ifdef VERTEXLIGHT_ON
+        o.vlight = shlight;
-            o.sh += Shade4PointLights (
+    #else
-            unity_4LightPosX0, unity_4LightPosY0, unity_4LightPosZ0,
+        o.vlight = 0.0;
-            unity_LightColor[0].rgb, unity_LightColor[1].rgb, unity_LightColor[2].rgb, unity_LightColor[3].rgb,
+    #endif // UNITY_SHOULD_SAMPLE_SH
-            unity_4LightAtten0, worldPos, worldNormal);
+    
-        #endif
+    // vertex light
-        o.sh = ShadeSHPerVertex (worldNormal, o.sh);
+    #ifdef VERTEXLIGHT_ON
-    #endif
+        o.vlight += Shade4PointLights (
+        unity_4LightPosX0, unity_4LightPosY0, unity_4LightPosZ0,
+        unity_LightColor[0].rgb, unity_LightColor[1].rgb, unity_LightColor[2].rgb, unity_LightColor[3].rgb,
+        unity_4LightAtten0, worldPos, worldNormal );
+    #endif // VERTEXLIGHT_ON
     
     UNITY_TRANSFER_LIGHTING(o, 0.0); // pass shadow and, possibly, light cookie coordinates to pixel shader
     
@@ -95,7 +97,6 @@ fixed4 frag_forward_base(v2f IN) : SV_Target
     UNITY_EXTRACT_TBN(IN);
     
     float3 worldPos = float3(IN.tSpace0.w, IN.tSpace1.w, IN.tSpace2.w);
-    
     float3 worldTan = float3(IN.tSpace0.x, IN.tSpace1.x, IN.tSpace2.x);
 
     #ifndef USING_DIRECTIONAL_LIGHT
@@ -134,34 +135,11 @@ fixed4 frag_forward_base(v2f IN) : SV_Target
     worldN = normalize(worldN);
     o.Normal = worldN;
     
-    // Setup lighting environment
-    UnityGI gi;
-    UNITY_INITIALIZE_OUTPUT(UnityGI, gi);
-    gi.indirect.diffuse = 0;
-    gi.indirect.specular = 0;
-    gi.light.color = _LightColor0.rgb;
-    gi.light.dir = lightDir;
-    
-    // Call GI (lightmaps/SH/reflections) lighting function
-    UnityGIInput giInput;
-    UNITY_INITIALIZE_OUTPUT(UnityGIInput, giInput);
-    giInput.light = gi.light;
-    giInput.worldPos = worldPos;
-    giInput.worldViewDir = worldViewDir;
-    giInput.atten = atten;
-    giInput.lightmapUV = 0.0;
-    #if UNITY_SHOULD_SAMPLE_SH && !UNITY_SAMPLE_FULL_SH_PER_PIXEL
-      giInput.ambient = IN.sh;
-    #else
-      giInput.ambient.rgb = 0.0;
-    #endif
-    
-    LightingBlinnPhong_GI(o, giInput, gi);
     
     //KSP lighting function
-    //c += LightingBlinnPhongSmooth(o, lightDir, viewDir, atten);
+    c += LightingBlinnPhongSmooth(o, lightDir, viewDir, atten);
-    c += LightingBlinnPhong(o, worldViewDir, gi);
     c.rgb += o.Emission;
+    c.rgb += o.Albedo * IN.vlight;
     return c;
 }