Refactor shader property generation and update UnityToon shader

Co-authored-by: sindharta.tanuwijaya <sindharta.tanuwijaya@unity3d.com>

Author: cursoragent

com.unity.toon-graphics-test/Editor/ShaderGenerator.cs

@@ -198,74 +198,59 @@ private string ReplacePropertiesBlock(string originalContent, string commonPrope
 
             newProperties.Add($"{baseIndent}Properties {{");
 
-            // Add common properties
-            string[] commonLines = commonProperties.Split('\n');
-            foreach (string line in commonLines)
+            void AppendPropertyLine(string trimmedLine, bool allowOverride)
             {
-                string trimmed = line.Trim();
-                if (trimmed.Length == 0)
+                if (string.IsNullOrEmpty(trimmedLine))
                 {
                     newProperties.Add(string.Empty);
-                    continue;
+                    return;
                 }
 
-                string propertyLine = $"{blockIndent}{trimmed}";
-                string propertyName = GetPropertyName(trimmed);
+                string propertyLine = $"{blockIndent}{trimmedLine}";
+                string propertyName = GetPropertyName(trimmedLine);
 
-                if (propertyName != null)
+                if (propertyName == null)
                 {
-                    if (propertyLineIndices.TryGetValue(propertyName, out int existingIndex))
+                    newProperties.Add(propertyLine);
+                    return;
+                }
+
+                if (propertyLineIndices.TryGetValue(propertyName, out int existingIndex))
+                {
+                    if (allowOverride)
                     {
                         newProperties[existingIndex] = propertyLine;
+                        return;
                     }
-                    else
+
+                    string existingLine = newProperties[existingIndex];
+                    bool existingHidden = existingLine.Trim().StartsWith("[HideInInspector]", StringComparison.Ordinal);
+                    bool newHidden = trimmedLine.StartsWith("[HideInInspector]", StringComparison.Ordinal);
+
+                    if (existingHidden && !newHidden)
                     {
-                        propertyLineIndices[propertyName] = newProperties.Count;
-                        propertyCount++;
-                        newProperties.Add(propertyLine);
+                        newProperties[existingIndex] = propertyLine;
                     }
+                    return;
                 }
-                else
-                {
-                    newProperties.Add(propertyLine);
-                }
+
+                propertyLineIndices[propertyName] = newProperties.Count;
+                propertyCount++;
+                newProperties.Add(propertyLine);
+            }
+
+            foreach (string line in commonProperties.Split('\n'))
+            {
+                AppendPropertyLine(line.Trim(), allowOverride: false);
             }
 
-            // Add tessellation properties if provided
             if (!string.IsNullOrEmpty(tessellationProperties))
             {
                 newProperties.Add(string.Empty);
                 newProperties.Add($"{blockIndent}// Tessellation-specific properties");
-                string[] tessellationLines = tessellationProperties.Split('\n');
-                foreach (string line in tessellationLines)
+                foreach (string line in tessellationProperties.Split('\n'))
                 {
-                    string trimmed = line.Trim();
-                    if (trimmed.Length == 0)
-                    {
-                        newProperties.Add(string.Empty);
-                        continue;
-                    }
-
-                    string propertyLine = $"{blockIndent}{trimmed}";
-                    string propertyName = GetPropertyName(trimmed);
-
-                    if (propertyName != null)
-                    {
-                        if (propertyLineIndices.TryGetValue(propertyName, out int existingIndex))
-                        {
-                            newProperties[existingIndex] = propertyLine;
-                        }
-                        else
-                        {
-                            propertyLineIndices[propertyName] = newProperties.Count;
-                            propertyCount++;
-                            newProperties.Add(propertyLine);
-                        }
-                    }
-                    else
-                    {
-                        newProperties.Add(propertyLine);
-                    }
+                    AppendPropertyLine(line.Trim(), allowOverride: true);
                 }
             }
 

com.unity.toonshader/Runtime/Integrated/Shaders/UnityToon.shader

@@ -1,4 +1,4 @@
-//Auto-generated on Wed Nov 05 05:42:38 UTC 2025
+//Auto-generated on Wed Nov 05 06:07:09 UTC 2025
 //Unity Toon Shader
 //nobuyuki@unity3d.com
 //toshiyuki@unity3d.com (Intengrated) 
@@ -35,7 +35,7 @@ Shader "Toon" {
         [Enum(OFF, 0, ON, 1, TRANSMODE, 2)] _ClippingMode("CliippingMode", int) = 0
 
         // Cull and ZWrite Properties
-        [HideInInspector] _CullMode("__cullmode", Float) = 2.0
+        [Enum(OFF, 0, FRONT, 1, BACK, 2)] _CullMode("Cull Mode", int) = 2  //OFF/FRONT/BACK
         [Enum(OFF, 0, ONT, 1)]	_ZWriteMode("ZWrite Mode", int) = 1  //OFF/ON
         [Enum(OFF, 0, ONT, 1)]	_ZOverDrawMode("ZOver Draw Mode", Float) = 0  //OFF/ON
         _SPRDefaultUnlitColorMask("SPRDefaultUnlit Path Color Mask", int) = 15
@@ -47,7 +47,7 @@ Shader "Toon" {
         _IsBaseMapAlphaAsClippingMask("IsBaseMapAlphaAsClippingMask", Float) = 0
         //
         [Toggle(_)] _Inverse_Clipping("Inverse_Clipping", Float) = 0
-        _Cutoff("Alpha Cutoff", Range(0.0, 1.0)) = 0.5
+        _Clipping_Level("Clipping_Level", Range(0, 1)) = 0
         // ClippingMask paramaters to Here.
 
         // Base Color Properties
@@ -56,7 +56,7 @@ Shader "Toon" {
         _BaseColor ("BaseColor", Color) = (1,1,1,1)
         //v.2.0.5 : Clipping/TransClipping for SSAO Problems in PostProcessing Stack.
         //If you want to go back the former SSAO results, comment out the below line.
-        _Color("Color", Color) = (1,1,1,1)
+        _Color ("Color", Color) = (1,1,1,1)
         //
         [Toggle(_)] _Is_LightColor_Base ("Is_LightColor_Base", Float ) = 1
 

com.unity.toonshader/Runtime/Integrated/Shaders/UnityToonTessellation.shader

@@ -1,4 +1,4 @@
-//Auto-generated on Wed Nov 05 05:42:38 UTC 2025
+//Auto-generated on Wed Nov 05 06:07:09 UTC 2025
 //Unity Toon Shader
 //nobuyuki@unity3d.com
 //toshiyuki@unity3d.com (Intengrated) 
@@ -35,7 +35,7 @@ Shader "Toon(Tessellation)" {
         [Enum(OFF, 0, ON, 1, TRANSMODE, 2)] _ClippingMode("CliippingMode", int) = 0
 
         // Cull and ZWrite Properties
-        [HideInInspector] _CullMode("__cullmode", Float) = 2.0
+        [Enum(OFF, 0, FRONT, 1, BACK, 2)] _CullMode("Cull Mode", int) = 2  //OFF/FRONT/BACK
         [Enum(OFF, 0, ONT, 1)]	_ZWriteMode("ZWrite Mode", int) = 1  //OFF/ON
         [Enum(OFF, 0, ONT, 1)]	_ZOverDrawMode("ZOver Draw Mode", Float) = 0  //OFF/ON
         _SPRDefaultUnlitColorMask("SPRDefaultUnlit Path Color Mask", int) = 15
@@ -56,7 +56,7 @@ Shader "Toon(Tessellation)" {
         _BaseColor ("BaseColor", Color) = (1,1,1,1)
         //v.2.0.5 : Clipping/TransClipping for SSAO Problems in PostProcessing Stack.
         //If you want to go back the former SSAO results, comment out the below line.
-        _Color("Color", Color) = (1,1,1,1)
+        _Color ("Color", Color) = (1,1,1,1)
         //
         [Toggle(_)] _Is_LightColor_Base ("Is_LightColor_Base", Float ) = 1
 

generate_UnityToon.py

@@ -180,46 +180,48 @@ def generate_shader(shader_path, common_properties, tessellation_properties, aut
         property_count = 0
         new_properties.append(f"{base_indent}Properties {{")
 
-        # Add common properties
-        common_lines = common_properties.split('\n')
-        for line in common_lines:
-            stripped_line = line.strip()
-            if stripped_line:
-                new_line = f"{block_indent}{stripped_line}"
-                property_name = get_property_name(stripped_line)
-                if property_name:
-                    if property_name in property_map:
-                        new_properties[property_map[property_name]] = new_line
-                    else:
-                        property_map[property_name] = len(new_properties)
-                        property_count += 1
-                        new_properties.append(new_line)
-                else:
-                    new_properties.append(new_line)
-            else:
+        def append_property_line(stripped_line, allow_override):
+            nonlocal property_count
+
+            if not stripped_line:
                 new_properties.append("")
+                return
+
+            property_name = get_property_name(stripped_line)
+            new_line = f"{block_indent}{stripped_line}"
+
+            if not property_name:
+                new_properties.append(new_line)
+                return
+
+            if property_name in property_map:
+                if allow_override:
+                    new_properties[property_map[property_name]] = new_line
+                    return
+
+                existing_line = new_properties[property_map[property_name]]
+                existing_hidden = existing_line.strip().startswith("[HideInInspector]")
+                new_hidden = stripped_line.startswith("[HideInInspector]")
+
+                if existing_hidden and not new_hidden:
+                    new_properties[property_map[property_name]] = new_line
+                # otherwise keep existing definition
+                return
+
+            property_map[property_name] = len(new_properties)
+            property_count += 1
+            new_properties.append(new_line)
+
+        # Add common properties
+        for line in common_properties.split('\n'):
+            append_property_line(line.strip(), allow_override=False)
 
         # Add tessellation properties if provided
         if tessellation_properties:
             new_properties.append("")
             new_properties.append(f"{block_indent}// Tessellation-specific properties")
-            tessellation_lines = tessellation_properties.split('\n')
-            for line in tessellation_lines:
-                stripped_line = line.strip()
-                if stripped_line:
-                    new_line = f"{block_indent}{stripped_line}"
-                    property_name = get_property_name(stripped_line)
-                    if property_name:
-                        if property_name in property_map:
-                            new_properties[property_map[property_name]] = new_line
-                        else:
-                            property_map[property_name] = len(new_properties)
-                            property_count += 1
-                            new_properties.append(new_line)
-                    else:
-                        new_properties.append(new_line)
-                else:
-                    new_properties.append("")
+            for line in tessellation_properties.split('\n'):
+                append_property_line(line.strip(), allow_override=True)
 
         new_properties.append(f"{base_indent}}}")