diff options
| -rw-r--r-- | Editor/tooner.cs | 10 | ||||
| -rw-r--r-- | tooner.shader | 1 | ||||
| -rw-r--r-- | tooner_lighting.cginc | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/Editor/tooner.cs b/Editor/tooner.cs index 602620b..71e7271 100644 --- a/Editor/tooner.cs +++ b/Editor/tooner.cs @@ -709,6 +709,13 @@ public class ToonerGUI : ShaderGUI { mode = RenderingMode.TransClipping; } + MaterialProperty bc; + bc = FindProperty("_Render_Queue_Offset"); + editor.IntegerProperty( + bc, + "Render queue offset"); + int queue_offset = bc.intValue; + EditorGUI.BeginChangeCheck(); mode = (RenderingMode) EditorGUILayout.EnumPopup( MakeLabel("Rendering mode"), mode); @@ -763,7 +770,7 @@ public class ToonerGUI : ShaderGUI { break; } foreach (Material m in editor.targets) { - m.renderQueue = (int) queue; + m.renderQueue = ((int) queue) + queue_offset; m.SetOverrideTag("RenderType", render_type); m.SetInt("_SrcBlend", (int) src_blend); m.SetInt("_DstBlend", (int) dst_blend); @@ -771,7 +778,6 @@ public class ToonerGUI : ShaderGUI { } } - MaterialProperty bc; if (mode == RenderingMode.Cutout) { EditorGUI.BeginChangeCheck(); bc = FindProperty("_Cutout_Mode"); diff --git a/tooner.shader b/tooner.shader index fa0dce9..51054e1 100644 --- a/tooner.shader +++ b/tooner.shader @@ -185,6 +185,7 @@ Shader "yum_food/tooner" _Tess_Dist_Cutoff("Tessellation distance cutoff", Float) = -1.0 _Cutout_Mode("Cutout rendering mode", Float) = 0.0 + _Render_Queue_Offset("Render queue offset", Integer) = 0 _Shadow_Strength("Shadows strength", Range(0, 1)) = 1.0 _Mip_Multiplier("Mipmap multiplier", Float) = 1.0 diff --git a/tooner_lighting.cginc b/tooner_lighting.cginc index 220a1e8..5a0e087 100644 --- a/tooner_lighting.cginc +++ b/tooner_lighting.cginc @@ -927,8 +927,8 @@ float4 effect(inout v2f i) roughness, 0); float3 ltcgi_emission = 0; - ltcgi_emission += acc.diffuse; - ltcgi_emission += acc.specular; + ltcgi_emission += acc.diffuse * albedo.a; + ltcgi_emission += acc.specular * albedo.a; result.rgb += ltcgi_emission; } #endif |