From cb54d0f9ad63f8937e7834e8e871999447f6e523 Mon Sep 17 00:00:00 2001 From: yum Date: Wed, 22 May 2024 13:45:14 -0700 Subject: Add matcap/rim lighting emissions, matcap distortion --- Editor/tooner.cs | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'Editor') diff --git a/Editor/tooner.cs b/Editor/tooner.cs index a9d53b5..9409dbc 100644 --- a/Editor/tooner.cs +++ b/Editor/tooner.cs @@ -132,7 +132,7 @@ public class ToonerGUI : ShaderGUI { void DoCubemap() { MaterialProperty bc = FindProperty("_Cubemap"); editor.TexturePropertySingleLine( - MakeLabel(bc, "Specular override cubemap"), + MakeLabel(bc, "Cubemap"), bc); SetKeyword("_CUBEMAP", bc.textureValue); } @@ -194,9 +194,10 @@ public class ToonerGUI : ShaderGUI { bc); SetKeyword($"_MATCAP{i}_MASK", bc.textureValue); + bool enabled; // c# is a shitty language if (bc.textureValue) { bc = FindProperty($"_Matcap{i}_Mask_Invert"); - bool enabled = bc.floatValue > 1E-6; + enabled = bc.floatValue > 1E-6; EditorGUI.BeginChangeCheck(); enabled = EditorGUILayout.Toggle("Invert mask", enabled); EditorGUI.EndChangeCheck(); @@ -219,7 +220,20 @@ public class ToonerGUI : ShaderGUI { editor.FloatProperty( bc, "Matcap strength"); + + bc = FindProperty($"_Matcap{i}Emission"); + editor.FloatProperty( + bc, + "Emission strength"); EditorGUI.indentLevel -= 1; + + bc = FindProperty($"_Matcap{i}Distortion0"); + enabled = bc.floatValue > 1E-6; + EditorGUI.BeginChangeCheck(); + enabled = EditorGUILayout.Toggle("Enable distortion 0", enabled); + EditorGUI.EndChangeCheck(); + bc.floatValue = enabled ? 1.0f : 0.0f; + SetKeyword($"_MATCAP{i}_DISTORTION0", enabled); } } @@ -287,6 +301,11 @@ public class ToonerGUI : ShaderGUI { bc, "Strength"); + bc = FindProperty($"_Rim_Lighting{i}_Emission"); + editor.FloatProperty( + bc, + "Rim lighting emission"); + EditorGUI.indentLevel -= 1; } } -- cgit v1.2.3