diff options
| author | yum <yum.food.vr@gmail.com> | 2024-08-28 16:33:39 -0700 |
|---|---|---|
| committer | yum <yum.food.vr@gmail.com> | 2024-08-28 16:33:39 -0700 |
| commit | c1a54b9eefa073a1a0c2bfb61d836b6ea9a590ac (patch) | |
| tree | 69a1b2fe2ca0f6d1769767aebf2e886f1f42793f | |
| parent | f4d0ad8f349bcf99470b2cfa1e9531c4c0b61d29 (diff) | |
Add color (tint) to glitter
| -rw-r--r-- | Editor/tooner.cs | 3 | ||||
| -rw-r--r-- | globals.cginc | 1 | ||||
| -rw-r--r-- | tooner.shader | 1 | ||||
| -rw-r--r-- | tooner_lighting.cginc | 2 |
4 files changed, 6 insertions, 1 deletions
diff --git a/Editor/tooner.cs b/Editor/tooner.cs index 51e13b5..4ce5bd0 100644 --- a/Editor/tooner.cs +++ b/Editor/tooner.cs @@ -928,6 +928,9 @@ public class ToonerGUI : ShaderGUI { MakeLabel(bc, "Glitter mask (RGBA)"), bc); + bc = FindProperty("_Glitter_Color"); + editor.ColorProperty(bc, "Color"); + bc = FindProperty("_Glitter_Density"); editor.FloatProperty( bc, diff --git a/globals.cginc b/globals.cginc index ffd5d69..9794749 100644 --- a/globals.cginc +++ b/globals.cginc @@ -288,6 +288,7 @@ float _Outline_Width_Multiplier; #if defined(_GLITTER) texture2D _Glitter_Mask; +float3 _Glitter_Color; float _Glitter_Density; float _Glitter_Amount; float _Glitter_Speed; diff --git a/tooner.shader b/tooner.shader index 0a0c698..3943ca6 100644 --- a/tooner.shader +++ b/tooner.shader @@ -197,6 +197,7 @@ Shader "yum_food/tooner" _Glitter_Enabled("Glitter enabled", Float) = 0 _Glitter_Mask("Glitter mask", 2D) = "white" {} + _Glitter_Color("Glitter mask", Color) = (1, 1, 1, 1) _Glitter_Density("Glitter density", float) = 400 _Glitter_Amount("Glitter amount", Range(1, 100)) = 35 _Glitter_Speed("Glitter speed", float) = 1 diff --git a/tooner_lighting.cginc b/tooner_lighting.cginc index 0d12303..e4f9077 100644 --- a/tooner_lighting.cginc +++ b/tooner_lighting.cginc @@ -1856,7 +1856,7 @@ float4 effect(inout v2f i) float glitter = get_glitter(i.uv0, i.worldPos, normal, _Glitter_Density, _Glitter_Amount, _Glitter_Speed, glitter_mask, _Glitter_Brightness, _Glitter_Angle, _Glitter_Power); - result.rgb += glitter; + result.rgb += glitter * _Glitter_Color; #endif #if defined(_EMISSION0) { |