diff --git a/Assets/Shaders/DecalFeatureBumped.shader b/Assets/Shaders/DecalFeatureBumped.shader index bd7dfe7..d712b15 100644 --- a/Assets/Shaders/DecalFeatureBumped.shader +++ b/Assets/Shaders/DecalFeatureBumped.shader @@ -8,10 +8,10 @@ Shader "ConformalDecals/Feature/Bumped" _Cutoff ("Alpha cutoff", Range(0,1)) = 0.5 _DecalOpacity("Opacity", Range(0,1) ) = 1 - _Background("Background Color", Color) = (0.9,0.9,0.9,0.7) + _Color("Background Color", Color) = (0.9,0.9,0.9,0.7) - [Enum(UnityEngine.Rendering.CullMode)] _Cull ("Cull", Float) = 0 - [Toggle(DECAL_PREVIEW)] _Preview ("Preview", Float) = 0 + [Enum(UnityEngine.Rendering.CullMode)] _Cull ("Cull", int) = 2 + [Toggle(DECAL_PREVIEW)] _Preview ("Preview", int) = 0 [Header(Effects)] [PerRendererData]_Opacity("_Opacity", Range(0,1) ) = 1 diff --git a/Assets/Shaders/DecalPaint.shader b/Assets/Shaders/DecalPaint.shader index 868e009..ce4a613 100644 --- a/Assets/Shaders/DecalPaint.shader +++ b/Assets/Shaders/DecalPaint.shader @@ -11,10 +11,10 @@ Shader "ConformalDecals/Paint/Diffuse" _Cutoff ("Alpha cutoff", Range(0,1)) = 0.5 _DecalOpacity("Opacity", Range(0,1) ) = 1 - _Background("Background Color", Color) = (0.9,0.9,0.9,0.7) + _Color("Background Color", Color) = (0.9,0.9,0.9,0.7) - [Enum(UnityEngine.Rendering.CullMode)] _Cull ("Cull", Float) = 0 - [Toggle(DECAL_PREVIEW)] _Preview ("Preview", Float) = 0 + [Enum(UnityEngine.Rendering.CullMode)] _Cull ("Cull", int) = 2 + [Toggle(DECAL_PREVIEW)] _Preview ("Preview", int) = 0 [Header(Effects)] [PerRendererData]_Opacity("_Opacity", Range(0,1) ) = 1 diff --git a/Assets/Shaders/DecalPaintSpecular.shader b/Assets/Shaders/DecalPaintSpecular.shader index 0e68414..725bd62 100644 --- a/Assets/Shaders/DecalPaintSpecular.shader +++ b/Assets/Shaders/DecalPaintSpecular.shader @@ -12,17 +12,17 @@ Shader "ConformalDecals/Paint/Specular" _Cutoff ("Alpha cutoff", Range(0,1)) = 0.5 _DecalOpacity("Opacity", Range(0,1) ) = 1 - _Background("Background Color", Color) = (0.9,0.9,0.9,0.7) + _Color("Background Color", Color) = (0.9,0.9,0.9,0.7) [Header(Specularity)] _SpecColor ("_SpecColor", Color) = (0.25, 0.25, 0.25, 1) _Shininess ("Shininess", Range (0.03, 10)) = 0.3 - [Enum(UnityEngine.Rendering.CullMode)] _Cull ("Cull", Float) = 0 - [Toggle(DECAL_PREVIEW)] _Preview ("Preview", Float) = 0 + [Enum(UnityEngine.Rendering.CullMode)] _Cull ("Cull", int) = 2 + [Toggle(DECAL_PREVIEW)] _Preview ("Preview", int) = 0 [Header(Effects)] - [PerRendererData]_Opacity("_Opacity", Range(0,1) ) = 1 + [PerRendererData]_Opacity("_Opacity", Range(0,1) ) = 1 [PerRendererData]_RimFalloff("_RimFalloff", Range(0.01,5) ) = 0.1 [PerRendererData]_RimColor("_RimColor", Color) = (0,0,0,0) [PerRendererData]_UnderwaterFogFactor ("Underwater Fog Factor", Range(0,1)) = 0 diff --git a/Assets/Shaders/DecalsCommon.cginc b/Assets/Shaders/DecalsCommon.cginc index 5008743..128e67d 100644 --- a/Assets/Shaders/DecalsCommon.cginc +++ b/Assets/Shaders/DecalsCommon.cginc @@ -71,9 +71,7 @@ float3 _DecalTangent; float _Cutoff; float _DecalOpacity; - float _Opacity; -float4 _Background; inline void decalClipAlpha(float alpha) { #ifndef DECAL_PREVIEW @@ -223,9 +221,9 @@ fixed4 frag_forward(v2f IN) : SV_Target surf(i, o); #ifdef DECAL_PREVIEW - o.Albedo = lerp(_Background.rgb,o.Albedo, o.Alpha); + o.Albedo = lerp(_Color.rgb,o.Albedo, o.Alpha); o.Normal = lerp(float3(0,0,1), o.Normal, o.Alpha); - o.Gloss = lerp(_Background.a, o.Gloss, o.Alpha); + o.Gloss = lerp(_Color.a, o.Gloss, o.Alpha); o.Emission = lerp(0, o.Emission, o.Alpha); o.Alpha = _Opacity; #endif //DECAL_PREVIEW diff --git a/Distribution/GameData/ConformalDecals/Assets/decal-blank.mu b/Distribution/GameData/ConformalDecals/Assets/decal-blank.mu index 6426bbf..ea50654 100644 --- a/Distribution/GameData/ConformalDecals/Assets/decal-blank.mu +++ b/Distribution/GameData/ConformalDecals/Assets/decal-blank.mu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3dd2142129b79d7ea4f3308946312d9173c41939a1839d5aa711bf8103e2364b -size 3206 +oid sha256:41e91c40e21638fcf49f2c5cede4acf1d0b6706fc8b1ac1d7211edc47fb6635a +size 3273 diff --git a/Distribution/GameData/ConformalDecals/Resources/conformaldecals.shab b/Distribution/GameData/ConformalDecals/Resources/conformaldecals.shab index 814e2ea..6ed0ecd 100644 --- a/Distribution/GameData/ConformalDecals/Resources/conformaldecals.shab +++ b/Distribution/GameData/ConformalDecals/Resources/conformaldecals.shab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af0e53faac7d4aa6d62e88f5514c9d04fd0e21fcec6f32ad27b30a3ad5153914 -size 125182 +oid sha256:680b0c8662bace934a133136cdb52efd484afe1e22806b36d68796a89cdf153a +size 123968