Refactor shader generation to use templates

This change introduces a new template-based approach for generating UnityToon shaders. It replaces the previous method of reading and modifying existing shader files with a more streamlined process that utilizes template files. This improves maintainability and reduces code duplication.

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

Author: cursoragent

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

@@ -20,7 +20,9 @@ public static class ShaderGenerator
         private const string COMMON_PROPERTIES_PATH = "Packages/com.unity.toonshader/Runtime/Shaders/Common/Parts~/CommonPropertiesPart.shader";
         private const string TESSELATION_PROPERTIES_PATH = "Packages/com.unity.toonshader/Runtime/Shaders/Common/Parts~/TessellationPropertiesPart.shader";
         private const string UNITY_TOON_SHADER_PATH = "Packages/com.unity.toonshader/Runtime/Integrated/Shaders/UnityToon.shader";
+        private const string UNITY_TOON_SHADER_TEMPLATE_PATH = "Packages/com.unity.toonshader/Runtime/Shaders/Common/Parts~/UnityToon.shader.template";
         private const string UNITY_TOON_TESSELATION_SHADER_PATH = "Packages/com.unity.toonshader/Runtime/Integrated/Shaders/UnityToonTessellation.shader";
+        private const string UNITY_TOON_TESSELATION_SHADER_TEMPLATE_PATH = "Packages/com.unity.toonshader/Runtime/Shaders/Common/Parts~/UnityToonTessellation.shader.template";
 
         [MenuItem("Toon Shader/Generate Shader Files")]
         public static void GenerateShaderFilesMenu()
@@ -87,158 +89,41 @@ private static void GenerateShaderFilesInternal()
 
         private static void GenerateUnityToonShader(string commonProperties, string autoCommentLine)
         {
-            // Read the original shader file to preserve the rest of the content
-            string originalContent = ReadFile(UNITY_TOON_SHADER_PATH);
-            if (string.IsNullOrEmpty(originalContent))
-            {
-                originalContent = ReadFile(UNITY_TOON_SHADER_PATH + ".template");
-                if (string.IsNullOrEmpty(originalContent))
-                {
-                    Debug.LogError($"Failed to read original shader from {UNITY_TOON_SHADER_PATH}");
-                    return;
-                }
-            }
-            // Replace the Properties block
-            string newContent = ReplacePropertiesBlock(originalContent, commonProperties, string.Empty, autoCommentLine);
-            WriteFile(UNITY_TOON_SHADER_PATH, newContent);
+            GenerateShaderFromTemplate(UNITY_TOON_SHADER_TEMPLATE_PATH, UNITY_TOON_SHADER_PATH, commonProperties, string.Empty, autoCommentLine);
         }
-        
+
         private static void GenerateUnityToonTessellationShader(string commonProperties, string tessellationProperties, string autoCommentLine)
         {
-            // Read the original shader file to preserve the rest of the content
-            string originalContent = ReadFile(UNITY_TOON_TESSELATION_SHADER_PATH);
-            if (string.IsNullOrEmpty(originalContent))
-            {
-                originalContent = ReadFile(UNITY_TOON_TESSELATION_SHADER_PATH + ".template");
-                if (string.IsNullOrEmpty(originalContent))
-                {
-                    Debug.LogError($"Failed to read original tessellation shader from {UNITY_TOON_TESSELATION_SHADER_PATH}");
-                    return;
-                }
-            }
-            // Replace the Properties block
-            string newContent = ReplacePropertiesBlock(originalContent, commonProperties, tessellationProperties, autoCommentLine);
-            WriteFile(UNITY_TOON_TESSELATION_SHADER_PATH, newContent);
+            GenerateShaderFromTemplate(UNITY_TOON_TESSELATION_SHADER_TEMPLATE_PATH, UNITY_TOON_TESSELATION_SHADER_PATH, commonProperties, tessellationProperties, autoCommentLine);
         }
-        
-        private static string ReplacePropertiesBlock(string originalContent, string commonProperties, string tessellationProperties, string autoCommentLine)
-        {
-            // Find the Properties block using a more robust regex that handles nested braces
-            string propertiesPattern = @"Properties\s*\{";
-            Match startMatch = Regex.Match(originalContent, propertiesPattern);
-            
-            if (!startMatch.Success)
-            {
-                Debug.LogError("Could not find Properties block start in shader file");
-                return originalContent;
-            }
-            
-            // Find the matching closing brace
-            int startIndex = startMatch.Index;
-            int braceCount = 0;
-            int endIndex = startIndex;
-            bool foundStart = false;
-            
-            for (int i = startIndex; i < originalContent.Length; i++)
-            {
-                if (originalContent[i] == '{')
-                {
-                    braceCount++;
-                    foundStart = true;
-                }
-                else if (originalContent[i] == '}')
-                {
-                    braceCount--;
-                    if (foundStart && braceCount == 0)
-                    {
-                        endIndex = i;
-                        break;
-                    }
-                }
-            }
-            
-            if (braceCount != 0)
-            {
-                Debug.LogError("Could not find matching closing brace for Properties block");
-                return originalContent;
-            }
-            
-            int lineStartIndex = originalContent.LastIndexOf('\n', startIndex - 1);
-            int baseIndentStart = lineStartIndex == -1 ? 0 : lineStartIndex + 1;
-            string baseIndent = "    ";
-            string blockIndent = baseIndent + "    ";
-
-            // Build new Properties block
-            List<string> newProperties = new List<string>();
-            Dictionary<string, int> propertyLineIndices = new Dictionary<string, int>(StringComparer.Ordinal);
-            int propertyCount = 0;
-
-            newProperties.Add($"{baseIndent}Properties {{");
 
-            void AppendPropertyLine(string trimmedLine, bool allowOverride)
+        private static void GenerateShaderFromTemplate(string templatePath, string outputPath, string commonProperties, string tessellationProperties, string autoCommentLine)
+        {
+            string templateContent = ReadFile(templatePath);
+            if (string.IsNullOrEmpty(templateContent))
             {
-                if (string.IsNullOrEmpty(trimmedLine))
-                {
-                    newProperties.Add(string.Empty);
-                    return;
-                }
-
-                string propertyLine = $"{blockIndent}{trimmedLine}";
-                string propertyName = GetPropertyName(trimmedLine);
-
-                if (propertyName == null)
+                templateContent = ReadFile(outputPath);
+                if (string.IsNullOrEmpty(templateContent))
                 {
-                    newProperties.Add(propertyLine);
+                    Debug.LogError($"Failed to read template or existing shader for {outputPath}");
                     return;
                 }
-
-                if (propertyLineIndices.TryGetValue(propertyName, out int existingIndex))
-                {
-                    if (allowOverride)
-                    {
-                        newProperties[existingIndex] = propertyLine;
-                        return;
-                    }
-
-                    string existingLine = newProperties[existingIndex];
-                    bool existingHidden = existingLine.Trim().StartsWith("[HideInInspector]", StringComparison.Ordinal);
-                    bool newHidden = trimmedLine.StartsWith("[HideInInspector]", StringComparison.Ordinal);
-
-                    if (existingHidden && !newHidden)
-                    {
-                        newProperties[existingIndex] = propertyLine;
-                    }
-                    return;
-                }
-
-                propertyLineIndices[propertyName] = newProperties.Count;
-                propertyCount++;
-                newProperties.Add(propertyLine);
             }
 
-            foreach (string line in commonProperties.Split('\n'))
-            {
-                AppendPropertyLine(line.Trim(), allowOverride: false);
-            }
+            templateContent = templateContent.TrimStart('\uFEFF');
 
-            if (!string.IsNullOrEmpty(tessellationProperties))
-            {
-                newProperties.Add(string.Empty);
-                newProperties.Add($"{blockIndent}// Tessellation-specific properties");
-                foreach (string line in tessellationProperties.Split('\n'))
-                {
-                    AppendPropertyLine(line.Trim(), allowOverride: true);
-                }
-            }
+            PropertySections sections = BuildPropertySections(commonProperties, tessellationProperties, "        ");
 
-            newProperties.Add(baseIndent + "}");
+            templateContent = ReplacePlaceholder(templateContent, "        [COMMON_PROPERTIES]", sections.Common);
+            templateContent = ReplacePlaceholder(templateContent, "[COMMON_PROPERTIES]", sections.Common);
 
-            Debug.Log($"Generated Properties block with {propertyCount} properties");
+            templateContent = ReplacePlaceholder(templateContent, "        [TESSELLATION_PROPERTIES]", sections.Tess);
+            templateContent = ReplacePlaceholder(templateContent, "[TESSELLATION_PROPERTIES]", sections.Tess);
 
-            string newPropertiesText = string.Join("\n", newProperties);
+            Debug.Log($"Generated properties with {sections.Count} entries for {outputPath}");
 
-            string updatedContent = originalContent.Substring(0, baseIndentStart) + newPropertiesText + originalContent.Substring(endIndex + 1);
-            return ApplyAutoGeneratedComment(updatedContent, autoCommentLine);
+            templateContent = ApplyAutoGeneratedComment(templateContent, autoCommentLine);
+            WriteFile(outputPath, templateContent);
         }
 
         private static string ExtractPropertiesBlockContent(string shaderContent)
@@ -395,5 +280,136 @@ private static string ApplyAutoGeneratedComment(string content, string commentLi
 
             return result;
         }
+
+        private static string ReplacePlaceholder(string content, string placeholder, string replacement)
+        {
+            if (content.Contains(placeholder))
+            {
+                return content.Replace(placeholder, replacement ?? string.Empty);
+            }
+
+            return content;
+        }
+
+        private static PropertySections BuildPropertySections(string commonProperties, string tessellationProperties, string indent)
+        {
+            var entries = new List<PropertyEntry>();
+            var nameToIndex = new Dictionary<string, int>(StringComparer.Ordinal);
+
+            void AddLines(string rawText, string source)
+            {
+                if (string.IsNullOrEmpty(rawText))
+                {
+                    return;
+                }
+
+                var lines = rawText.Split(new[] { '\n', '\r' }, StringSplitOptions.None);
+                foreach (var rawLine in lines)
+                {
+                    var trimmed = rawLine.Trim();
+                    var entry = new PropertyEntry
+                    {
+                        Line = trimmed,
+                        Source = source,
+                        Name = GetPropertyName(trimmed)
+                    };
+
+                    if (trimmed.Length == 0)
+                    {
+                        entries.Add(entry);
+                        continue;
+                    }
+
+                    if (!string.IsNullOrEmpty(entry.Name) && nameToIndex.TryGetValue(entry.Name, out int existingIndex))
+                    {
+                        entries[existingIndex] = entry;
+                    }
+                    else
+                    {
+                        entries.Add(entry);
+                        if (!string.IsNullOrEmpty(entry.Name))
+                        {
+                            nameToIndex[entry.Name] = entries.Count - 1;
+                        }
+                    }
+                }
+            }
+
+            AddLines(commonProperties, "common");
+            AddLines(tessellationProperties, "tess");
+
+            int propertyCount = 0;
+            var commonLines = new List<string>();
+            var tessLines = new List<string>();
+
+            foreach (var entry in entries)
+            {
+                if (!string.IsNullOrEmpty(entry.Name))
+                {
+                    propertyCount++;
+                }
+
+                var target = entry.Source == "tess" ? tessLines : commonLines;
+                if (string.IsNullOrEmpty(entry.Line))
+                {
+                    target.Add(string.Empty);
+                }
+                else
+                {
+                    target.Add(indent + entry.Line);
+                }
+            }
+
+            commonLines = CleanupLines(commonLines);
+            tessLines = CleanupLines(tessLines);
+
+            return new PropertySections
+            {
+                Common = string.Join("\n", commonLines),
+                Tess = string.Join("\n", tessLines),
+                Count = propertyCount
+            };
+        }
+
+        private static List<string> CleanupLines(List<string> lines)
+        {
+            var result = new List<string>(lines);
+
+            while (result.Count > 0 && result[0].Length == 0)
+            {
+                result.RemoveAt(0);
+            }
+
+            while (result.Count > 0 && result[result.Count - 1].Length == 0)
+            {
+                result.RemoveAt(result.Count - 1);
+            }
+
+            var cleaned = new List<string>();
+            foreach (var line in result)
+            {
+                if (line.Length == 0 && cleaned.Count > 0 && cleaned[cleaned.Count - 1].Length == 0)
+                {
+                    continue;
+                }
+                cleaned.Add(line);
+            }
+
+            return cleaned;
+        }
+
+        private struct PropertySections
+        {
+            public string Common;
+            public string Tess;
+            public int Count;
+        }
+
+        private class PropertyEntry
+        {
+            public string Line;
+            public string Source;
+            public string Name;
+        }
     }
 }

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

@@ -1,10 +1,7 @@
-//Auto-generated on Wed Nov 05 08:37:28 UTC 2025
-//Unity Toon Shader
-//nobuyuki@unity3d.com
-//toshiyuki@unity3d.com (Intengrated) 
-
+//Auto-generated on Wed Nov 05 09:32:04 UTC 2025
 Shader "Toon" {
-    Properties {
+    Properties
+    {
         // Common Properties for Unity Toon Shader
         // This file contains all shared properties between UnityToon.shader and UnityToonTessellation.shader
         // with comments preserved from the original files
@@ -35,7 +32,7 @@ Shader "Toon" {
         [Enum(OFF, 0, ON, 1, TRANSMODE, 2)] _ClippingMode("CliippingMode", int) = 0
 
         // Cull and ZWrite Properties
-        [Enum(OFF, 0, FRONT, 1, BACK, 2)] _CullMode("Cull Mode", int) = 2  //OFF/FRONT/BACK
+        [HideInInspector] _CullMode("__cullmode", Float) = 2.0
         [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
@@ -57,7 +54,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
 
@@ -499,7 +496,8 @@ Shader "Toon" {
         //////////////////////////////////////////////////////////////////////////////
         //////////////////// End of HDRP material default values. ////////////////////
         //////////////////////////////////////////////////////////////////////////////
-    } 
+    }
+ 
 
     HLSLINCLUDE