Refactor shader generation paths and templates

This commit updates file paths and template names used in the shader generation process. It also removes unused template files and adjusts paths in test scripts to match the new structure.

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

Author: cursoragent

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

@@ -4,14 +4,14 @@ 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 (`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~/`)
+- **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. **Edit Properties**:
-   - Modify the plain-text part files under `Packages/com.unity.toonshader/Runtime/Shaders/Common/Parts~/`
+   - 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. **Generate Shader Files**:
@@ -68,7 +68,7 @@ com.unity.toon-graphics-test/
     ├── ShaderGeneratorTest.cs      # Editor test harness
     └── README_ShaderGenerator.md   # This file
 
-com.unity.toonshader/Runtime/Shaders/Common/Parts~/
+com.unity.toonshader/Runtime/Shaders/Common/Parts/
 ├── CommonPropertiesPart.shader     # Shared properties (plain text)
 └── TessellationPropertiesPart.shader # Tessellation-specific properties (plain text)
 

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

@@ -17,12 +17,12 @@ namespace UnityEditor.Rendering.Toon
     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/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 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_SHADER_TEMPLATE_PATH = "Packages/com.unity.toonshader/Runtime/Shaders/Common/Parts/UnityToon_template.shader";
         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";
+        private const string UNITY_TOON_TESSELATION_SHADER_TEMPLATE_PATH = "Packages/com.unity.toonshader/Runtime/Shaders/Common/Parts/UnityToonTessellation_template.shader";
 
         [MenuItem("Toon Shader/Generate Shader Files")]
         public static void GenerateShaderFilesMenu()

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

@@ -18,7 +18,7 @@ public static void TestShaderGeneration()
             try
             {
                 // Test reading the common properties file
-                string commonPropertiesPath = "Packages/com.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/com.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.toonshader/Runtime/Integrated/Shaders/UnityToon.shader

@@ -1,4 +1,4 @@
-//Auto-generated on Wed Nov 05 09:32:04 UTC 2025
+//Auto-generated on Wed Nov 05 09:53:53 UTC 2025
 Shader "Toon" {
     Properties
     {

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

@@ -1,4 +1,4 @@
-//Auto-generated on Wed Nov 05 09:32:04 UTC 2025
+//Auto-generated on Wed Nov 05 09:53:53 UTC 2025
 Shader "Toon(Tessellation)" {
     Properties
     {

com.unity.toonshader/Runtime/Shaders/Common/Parts/UnityToonTessellation.shader.template renamed to com.unity.toonshader/Runtime/Shaders/Common/Parts/UnityToonTessellation_template.shader

@@ -137,13 +137,13 @@ def load_properties_from_shader(shader_path, descriptor):
 def generate_shader_files():
     try:
         # Read the common properties shader
-        common_properties_path = "com.unity.toonshader/Runtime/Shaders/Common/Parts~/CommonPropertiesPart.shader"
+        common_properties_path = "com.unity.toonshader/Runtime/Shaders/Common/Parts/CommonPropertiesPart.shader"
         common_properties = load_properties_from_shader(common_properties_path, "common")
         if not common_properties:
             return False
 
         # Read the tessellation properties shader
-        tessellation_properties_path = "com.unity.toonshader/Runtime/Shaders/Common/Parts~/TessellationPropertiesPart.shader"
+        tessellation_properties_path = "com.unity.toonshader/Runtime/Shaders/Common/Parts/TessellationPropertiesPart.shader"
         tessellation_properties = load_properties_from_shader(tessellation_properties_path, "tessellation")
         if tessellation_properties is None:
             return False
@@ -155,7 +155,7 @@ def generate_shader_files():
         print("\nGenerating UnityToon.shader...")
         success1 = generate_shader(
             "com.unity.toonshader/Runtime/Integrated/Shaders/UnityToon.shader",
-            "com.unity.toonshader/Runtime/Shaders/Common/Parts~/UnityToon.shader.template",
+            "com.unity.toonshader/Runtime/Shaders/Common/Parts/UnityToon_template.shader",
             common_properties,
             "",
             auto_comment_line,
@@ -165,7 +165,7 @@ def generate_shader_files():
         print("\nGenerating UnityToonTessellation.shader...")
         success2 = generate_shader(
             "com.unity.toonshader/Runtime/Integrated/Shaders/UnityToonTessellation.shader",
-            "com.unity.toonshader/Runtime/Shaders/Common/Parts~/UnityToonTessellation.shader.template",
+            "com.unity.toonshader/Runtime/Shaders/Common/Parts/UnityToonTessellation_template.shader",
             common_properties,
             tessellation_properties,
             auto_comment_line,

com.unity.toonshader/Runtime/Shaders/Common/Parts/UnityToon.shader.template renamed to com.unity.toonshader/Runtime/Shaders/Common/Parts/UnityToon_template.shader

@@ -10,7 +10,7 @@ static void Main()
         try
         {
             // Test reading the common properties shader
-            string commonPropertiesPath = "com.unity.toonshader/Runtime/Shaders/Common/Parts~/CommonPropertiesPart.shader";
+            string commonPropertiesPath = "com.unity.toonshader/Runtime/Shaders/Common/Parts/CommonPropertiesPart.shader";
             string commonPropertiesShader = File.ReadAllText(commonPropertiesPath);
 
             if (string.IsNullOrEmpty(commonPropertiesShader))
@@ -28,7 +28,7 @@ static void Main()
             Console.WriteLine($"Successfully extracted common properties. Length: {commonProperties.Length} characters");
 
             // Test reading the tessellation properties shader
-            string tessellationPropertiesPath = "com.unity.toonshader/Runtime/Shaders/Common/Parts~/TessellationPropertiesPart.shader";
+            string tessellationPropertiesPath = "com.unity.toonshader/Runtime/Shaders/Common/Parts/TessellationPropertiesPart.shader";
             string tessellationPropertiesShader = File.ReadAllText(tessellationPropertiesPath);
 
             if (string.IsNullOrEmpty(tessellationPropertiesShader))

generate_UnityToon.py

@@ -12,7 +12,7 @@
 def test_shader_generation():
     try:
         # Test reading the common properties shader
-        common_properties_path = "com.unity.toonshader/Runtime/Shaders/Common/Parts~/CommonPropertiesPart.shader"
+        common_properties_path = "com.unity.toonshader/Runtime/Shaders/Common/Parts/CommonPropertiesPart.shader"
         with open(common_properties_path, 'r') as f:
             common_properties_shader = f.read()
 
@@ -28,7 +28,7 @@ def test_shader_generation():
         print(f"Successfully extracted common properties. Length: {len(common_properties)} characters")
 
         # Test reading the tessellation properties shader
-        tessellation_properties_path = "com.unity.toonshader/Runtime/Shaders/Common/Parts~/TessellationPropertiesPart.shader"
+        tessellation_properties_path = "com.unity.toonshader/Runtime/Shaders/Common/Parts/TessellationPropertiesPart.shader"
         with open(tessellation_properties_path, 'r') as f:
             tessellation_properties_shader = f.read()