diff options
| -rwxr-xr-x | 3ner.cginc | 1 | ||||
| -rwxr-xr-x | 3ner.shader | 6 | ||||
| -rwxr-xr-x | brdf.cginc | 4 |
3 files changed, 7 insertions, 4 deletions
@@ -311,6 +311,7 @@ float4 frag(v2f i, uint facing : SV_IsFrontFace Pbr pbr = getPbr(i); + [branch] if (_Mode == 1) { clip(pbr.albedo.a - 0.5); } diff --git a/3ner.shader b/3ner.shader index 6af7ec8..b2ae500 100755 --- a/3ner.shader +++ b/3ner.shader @@ -516,7 +516,7 @@ Shader "yum_food/3ner" [HideInInspector] m_start_Matcap0("Matcap 0", Float) = 0 [ThryToggle(_MATCAP0)] _Matcap0_Enabled("Enable", Float) = 0 _Matcap0("Matcap", 2D) = "white" {} - _Matcap0_Strength("Strength", Range(0, 10)) = 1 + _Matcap0_Strength("Strength", Range(-10, 10)) = 1 [ThryWideEnum(Replace, 0, Add, 1, Multiply, 2, Subtract, 3, Add Product, 4)] _Matcap0_Mode("Mode", Int) = 0 [Toggle] _Matcap0_Invert("Invert", Float) = 0 @@ -540,7 +540,7 @@ Shader "yum_food/3ner" [HideInInspector] m_start_Matcap1("Matcap 1", Float) = 0 [ThryToggle(_MATCAP1)] _Matcap1_Enabled("Enable", Float) = 0 _Matcap1("Matcap", 2D) = "white" {} - _Matcap1_Strength("Strength", Range(0, 10)) = 1 + _Matcap1_Strength("Strength", Range(-10, 10)) = 1 [ThryWideEnum(Replace, 0, Add, 1, Multiply, 2, Subtract, 3, Add Product, 4)] _Matcap1_Mode("Mode", Int) = 0 [Toggle] _Matcap1_Invert("Invert", Float) = 0 @@ -565,7 +565,7 @@ Shader "yum_food/3ner" //ifex _Rim_Lighting0_Enabled==0 [HideInInspector] m_start_Rim_Lighting0("Rim Lighting 0", Float) = 0 [ThryToggle(_RIM_LIGHTING0)] _Rim_Lighting0_Enabled("Enable", Float) = 0 - _Rim_Lighting0_Color("Color", Color) = (1, 1, 1, 1) + [HDR] _Rim_Lighting0_Color("Color", Color) = (1, 1, 1, 1) _Rim_Lighting0_Center("Center", Range(0, 1)) = 1 _Rim_Lighting0_Blur("Blur", Range(0, 1)) = 0.1 [ThryWideEnum(Replace, 0, Add, 1, Multiply, 2, Subtract, 3, Add Product, 4)] _Rim_Lighting0_Mode("Mode", Int) = 1 @@ -250,7 +250,9 @@ float4 brdf(Pbr pbr, LightData data, out BrdfData bd) { #else float3 emission = 0; #endif - return float4(diffuse + specular + emission, pbr.albedo.a); + float4 lit = float4(diffuse + specular + emission, pbr.albedo.a); + // Scale albedo by alpha. + return float4(lit.rgb * lit.a, lit.a); } #endif // __BRDF_INC |