Refactor shader generation and paths

This commit restructures the shader generation process by moving the shader generation script to the editor folder and updating paths. It also removes the separate property files and integrates them directly into the shader templates.

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

Author: cursoragent

__pycache__/generate_UnityToon.cpython-312.pyc

@@ -4,23 +4,18 @@ This tool helps maintain consistency between `UnityToon.shader` and `UnityToonTe
 
 ## Files
 
-- **CommonPropertiesPart.shader**: Plain text list of shared property definitions (no Shader wrapper) with original comments preserved
-- **TessellationPropertiesPart.shader**: Plain text list of tessellation-only property definitions (no Shader wrapper)
+- **CommonPropertiesPart.shader**: Plain text list of shared property definitions (no Shader wrapper) with original comments preserved (`Packages/com.unity.toonshader/Runtime/Shaders/Common/Parts~/`)
+- **TessellationPropertiesPart.shader**: Plain text list of tessellation-only property definitions (no Shader wrapper) (`Packages/com.unity.toonshader/Runtime/Shaders/Common/Parts~/`)
 - **ShaderGenerator.cs**: Unity Editor script (now located in the graphics test package) that generates the shader files from the property assets
 
 ## How to Use
 
-1. **Open the Shader Generator Window**:
-   - In Unity, go to `Unity Toon Shader > Generate Shader Files`
-   - This opens the Shader Generator window
+1. **Edit Properties**:
+   - Modify the plain-text part files under `Packages/com.unity.toonshader/Runtime/Shaders/Common/Parts~/`
+   - The files contain only property declarations, so standard ShaderLab property syntax applies
 
-2. **Edit Properties**:
-   - Click "Open Common Properties File" to edit the shared properties shader (includes all original comments)
-   - Click "Open Tessellation Properties File" to edit the tessellation-specific properties shader
-   - Make your changes directly in the shader assets
-
-3. **Generate Shader Files**:
-   - Click "Generate Shader Files" button
+2. **Generate Shader Files**:
+   - In Unity, choose `Toon Shader > Generate Shader Files`
    - The tool will automatically:
      - Replace the Properties blocks in both shader files
      - Preserve all other shader content (HLSLINCLUDE, SubShaders, etc.)
@@ -73,9 +68,11 @@ com.unity.toon-graphics-test/
     ├── ShaderGeneratorTest.cs      # Editor test harness
     └── README_ShaderGenerator.md   # This file
 
-com.unity.toonshader/Runtime/Integrated/Shaders/
+com.unity.toonshader/Runtime/Shaders/Common/Parts~/
 ├── CommonPropertiesPart.shader     # Shared properties (plain text)
-├── TessellationPropertiesPart.shader # Tessellation-specific properties (plain text)
+└── TessellationPropertiesPart.shader # Tessellation-specific properties (plain text)
+
+com.unity.toonshader/Runtime/Integrated/Shaders/
 ├── UnityToon.shader                # Generated shader (regular)
 └── UnityToonTessellation.shader    # Generated shader (tessellation)
 

com.unity.toon-graphics-test/Editor/README_ShaderGenerator.md

@@ -14,57 +14,26 @@ namespace UnityEditor.Rendering.Toon
     /// This helps maintain consistency between UnityToon.shader and UnityToonTessellation.shader
     /// by using a single source of truth for shared properties.
     /// </summary>
-    public class ShaderGenerator : EditorWindow
+    public static class ShaderGenerator
     {
         private static readonly Regex PropertyNameRegex = new Regex(@"(?:\]\s*|^)([A-Za-z_][A-Za-z0-9_]*)\s*\(", RegexOptions.Compiled);
-        private const string COMMON_PROPERTIES_PATH = "Packages/common.unity.toonshader/Runtime/Shaders/Common/Parts~/CommonPropertiesPart.shader";
-        private const string TESSELATION_PROPERTIES_PATH = "Packages/common.unity.toonshader/Runtime/Shaders/Common/Parts~/TessellationPropertiesPart.shader";
+        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_TESSELATION_SHADER_PATH = "Packages/com.unity.toonshader/Runtime/Integrated/Shaders/UnityToonTessellation.shader";
 
-        [MenuItem("Unity Toon Shader/Generate Shader Files")]
-        public static void ShowWindow()
+        [MenuItem("Toon Shader/Generate Shader Files")]
+        public static void GenerateShaderFilesMenu()
         {
-            GetWindow<ShaderGenerator>("Shader Generator");
+            GenerateShaderFiles();
         }
-        
-        private void OnGUI()
+
+        private static void GenerateShaderFiles()
         {
-            GUILayout.Label("Unity Toon Shader Generator", EditorStyles.boldLabel);
-            GUILayout.Space(10);
-            
-            GUILayout.Label("This tool generates UnityToon.shader and UnityToonTessellation.shader from common property files.", EditorStyles.helpBox);
-            GUILayout.Space(10);
-            
-            if (GUILayout.Button("Generate Shader Files", GUILayout.Height(30)))
-            {
-                GenerateShaderFiles();
-            }
-            
-            GUILayout.Space(10);
-            
-            if (GUILayout.Button("Open Common Properties File"))
-            {
-                var asset = AssetDatabase.LoadAssetAtPath<Shader>(COMMON_PROPERTIES_PATH);
-                if (asset != null)
-                {
-                    Selection.activeObject = asset;
-                    EditorGUIUtility.PingObject(asset);
-                }
-            }
-            
-            if (GUILayout.Button("Open Tessellation Properties File"))
-            {
-                var asset = AssetDatabase.LoadAssetAtPath<Shader>(TESSELATION_PROPERTIES_PATH);
-                if (asset != null)
-                {
-                    Selection.activeObject = asset;
-                    EditorGUIUtility.PingObject(asset);
-                }
-            }
+            GenerateShaderFilesInternal();
         }
 
-        private void GenerateShaderFiles()
+        private static void GenerateShaderFilesInternal()
         {
             try
             {
@@ -116,35 +85,43 @@ private void GenerateShaderFiles()
             }
         }
 
-        private void GenerateUnityToonShader(string commonProperties, string autoCommentLine)
+        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))
             {
-                Debug.LogError($"Failed to read original shader from {UNITY_TOON_SHADER_PATH}");
-                return;
+                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);
         }
 
-        private void GenerateUnityToonTessellationShader(string commonProperties, string tessellationProperties, string 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))
             {
-                Debug.LogError($"Failed to read original tessellation shader from {UNITY_TOON_TESSELATION_SHADER_PATH}");
-                return;
+                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);
         }
 
-        private string ReplacePropertiesBlock(string originalContent, string commonProperties, string tessellationProperties, string 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*\{";
@@ -264,7 +241,7 @@ void AppendPropertyLine(string trimmedLine, bool allowOverride)
             return ApplyAutoGeneratedComment(updatedContent, autoCommentLine);
         }
 
-        private string ExtractPropertiesBlockContent(string shaderContent)
+        private static string ExtractPropertiesBlockContent(string shaderContent)
         {
             if (string.IsNullOrEmpty(shaderContent))
             {
@@ -349,7 +326,7 @@ private string ExtractPropertiesBlockContent(string shaderContent)
             return result.ToString();
         }
 
-        private string GetPropertyName(string line)
+        private static string GetPropertyName(string line)
         {
             line = line.Trim();
             if (string.IsNullOrEmpty(line) || line.StartsWith("//", StringComparison.Ordinal))
@@ -372,7 +349,7 @@ private string GetPropertyName(string line)
             return candidate;
         }
 
-        private string ReadFile(string path)
+        private static string ReadFile(string path)
         {
             if (File.Exists(path))
             {
@@ -381,7 +358,7 @@ private string ReadFile(string path)
             return null;
         }
 
-        private void WriteFile(string path, string content)
+        private static void WriteFile(string path, string content)
         {
             // Ensure directory exists
             string directory = Path.GetDirectoryName(path);
@@ -393,7 +370,7 @@ private void WriteFile(string path, string content)
             File.WriteAllText(path, content.TrimStart('\uFEFF'));
         }
 
-        private string ApplyAutoGeneratedComment(string content, string commentLine)
+        private static string ApplyAutoGeneratedComment(string content, string commentLine)
         {
             const string autoPrefix = "//Auto-generated on ";
             string[] lines = content.Split(new[] { "\n" }, StringSplitOptions.None);

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

@@ -12,13 +12,13 @@ namespace UnityEditor.Rendering.Toon
     /// </summary>
     public class ShaderGeneratorTest
     {
-        [MenuItem("Unity Toon Shader/Test Shader Generation")]
+        [MenuItem("Toon Shader/Test Shader Generation")]
         public static void TestShaderGeneration()
         {
             try
             {
                 // Test reading the common properties file
-                string commonPropertiesPath = "Packages/common.unity.toonshader/Runtime/Shaders/Common/Parts~/CommonPropertiesPart.shader";
+                string commonPropertiesPath = "Packages/com.unity.toonshader/Runtime/Shaders/Common/Parts~/CommonPropertiesPart.shader";
                 string commonPropertiesShader = File.ReadAllText(commonPropertiesPath);
 
                 if (string.IsNullOrEmpty(commonPropertiesShader))
@@ -36,7 +36,7 @@ public static void TestShaderGeneration()
                 Debug.Log($"Successfully extracted common properties. Length: {commonProperties.Length} characters");
 
                 // Test reading the tessellation properties file
-                string tessellationPropertiesPath = "Packages/common.unity.toonshader/Runtime/Shaders/Common/Parts~/TessellationPropertiesPart.shader";
+                string tessellationPropertiesPath = "Packages/com.unity.toonshader/Runtime/Shaders/Common/Parts~/TessellationPropertiesPart.shader";
                 string tessellationPropertiesShader = File.ReadAllText(tessellationPropertiesPath);
 
                 if (string.IsNullOrEmpty(tessellationPropertiesShader))

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

@@ -1,4 +1,4 @@
-//Auto-generated on Wed Nov 05 06:37:48 UTC 2025
+//Auto-generated on Wed Nov 05 08:37:28 UTC 2025
 //Unity Toon Shader
 //nobuyuki@unity3d.com
 //toshiyuki@unity3d.com (Intengrated)