From 3b811e00f11f8a8d118cbfdadb9fc9bd6f08217c Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Sat, 23 May 2020 22:10:27 -0700 Subject: [PATCH] Remove debug code so it actually works --- Assets/Shaders/DecalNormalVert.shader | 4 ++-- Assets/Shaders/DecalsCommon.cginc | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Assets/Shaders/DecalNormalVert.shader b/Assets/Shaders/DecalNormalVert.shader index a7ba1a5..7a37c17 100644 --- a/Assets/Shaders/DecalNormalVert.shader +++ b/Assets/Shaders/DecalNormalVert.shader @@ -54,8 +54,8 @@ Shader "ConformalDecals/Feature/BumpedVert" //clip(color.a - _Cutoff); o.Normal = normal; - o.Albedo = 1;//normal;//color.rgb; - o.Alpha = 1;//color.a * _Opacity; + o.Albedo = color.rgb; + o.Alpha = color.a * _Opacity; } ENDCG diff --git a/Assets/Shaders/DecalsCommon.cginc b/Assets/Shaders/DecalsCommon.cginc index f3fc703..da9aadf 100644 --- a/Assets/Shaders/DecalsCommon.cginc +++ b/Assets/Shaders/DecalsCommon.cginc @@ -162,8 +162,6 @@ fixed4 frag_forward_base(v2f IN) : SV_Target //c += LightingBlinnPhongSmooth(o, lightDir, viewDir, atten); c += LightingBlinnPhong(o, worldViewDir, gi); c.rgb += o.Emission; - c.xyz = (worldTan * 0.5) + 0.5; - c.a = 1; return c; }