mirror of
https://github.com/drewcassidy/KSP-Conformal-Decals.git
synced 2024-06-11 05:54:07 +00:00
rename background color property to make KSP happy
This commit is contained in:
parent
3774b9573e
commit
b8b8e9bc24
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -12,14 +12,14 @@ 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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3dd2142129b79d7ea4f3308946312d9173c41939a1839d5aa711bf8103e2364b
|
||||
size 3206
|
||||
oid sha256:41e91c40e21638fcf49f2c5cede4acf1d0b6706fc8b1ac1d7211edc47fb6635a
|
||||
size 3273
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:af0e53faac7d4aa6d62e88f5514c9d04fd0e21fcec6f32ad27b30a3ad5153914
|
||||
size 125182
|
||||
oid sha256:680b0c8662bace934a133136cdb52efd484afe1e22806b36d68796a89cdf153a
|
||||
size 123968
|
||||
|
|
Loading…
Reference in New Issue
Block a user