Refactor: Move shader properties to common folder

This commit reorganizes shader property files into a common directory and removes BOM characters.

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

Author: cursoragent

__pycache__/generate_UnityToon.cpython-312.pyc

@@ -17,8 +17,8 @@ namespace UnityEditor.Rendering.Toon
     public class ShaderGenerator : EditorWindow
     {
         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/Integrated/Shaders/CommonPropertiesPart.shader";
-        private const string TESSELATION_PROPERTIES_PATH = "Packages/com.unity.toonshader/Runtime/Integrated/Shaders/TessellationPropertiesPart.shader";
+        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 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";
 
@@ -376,7 +376,7 @@ private string ReadFile(string path)
         {
             if (File.Exists(path))
             {
-                return File.ReadAllText(path);
+                return File.ReadAllText(path).TrimStart('\uFEFF');
             }
             return null;
         }
@@ -390,7 +390,7 @@ private void WriteFile(string path, string content)
                 Directory.CreateDirectory(directory);
             }
 
-            File.WriteAllText(path, content);
+            File.WriteAllText(path, content.TrimStart('\uFEFF'));
         }
 
         private string ApplyAutoGeneratedComment(string content, string commentLine)

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

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

@@ -56,13 +56,15 @@ def get_property_name(line: str):
 
 
 def load_properties_from_shader(shader_path, descriptor):
-    with open(shader_path, 'r') as f:
+    with open(shader_path, 'r', encoding='utf-8') as f:
         shader_content = f.read()
 
     if not shader_content:
         print(f"ERROR: {descriptor} shader file is empty or could not be read")
         return None
 
+    shader_content = shader_content.lstrip('\ufeff')
+
     properties = extract_properties_from_shader_content(shader_content)
     if not properties:
         print(f"ERROR: Could not extract {descriptor} properties from {shader_path}")
@@ -75,13 +77,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/Integrated/Shaders/CommonPropertiesPart.shader"
+        common_properties_path = "common.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/Integrated/Shaders/TessellationPropertiesPart.shader"
+        tessellation_properties_path = "common.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
@@ -237,7 +239,8 @@ def append_property_line(stripped_line, allow_override):
         print(f"Generated new shader content. Original length: {len(original_content)}, New length: {len(new_content)}")
 
         # Write the new shader file
-        with open(shader_path, 'w') as f:
+        new_content = new_content.lstrip('\ufeff')
+        with open(shader_path, 'w', encoding='utf-8') as f:
             f.write(new_content)
 
         print(f"Successfully wrote {shader_path}")

com.unity.toonshader/Runtime/Integrated/Shaders/CommonPropertiesPart.shader renamed to common.unity.toonshader/Runtime/Shaders/Common/Parts~/CommonPropertiesPart.shader

@@ -10,7 +10,7 @@ static void Main()
         try
         {
             // Test reading the common properties shader
-            string commonPropertiesPath = "com.unity.toonshader/Runtime/Integrated/Shaders/CommonPropertiesPart.shader";
+            string commonPropertiesPath = "common.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/Integrated/Shaders/TessellationPropertiesPart.shader";
+            string tessellationPropertiesPath = "common.unity.toonshader/Runtime/Shaders/Common/Parts~/TessellationPropertiesPart.shader";
             string tessellationPropertiesShader = File.ReadAllText(tessellationPropertiesPath);
 
             if (string.IsNullOrEmpty(tessellationPropertiesShader))

com.unity.toonshader/Runtime/Integrated/Shaders/TessellationPropertiesPart.shader renamed to common.unity.toonshader/Runtime/Shaders/Common/Parts~/TessellationPropertiesPart.shader

@@ -12,7 +12,7 @@
 def test_shader_generation():
     try:
         # Test reading the common properties shader
-        common_properties_path = "com.unity.toonshader/Runtime/Integrated/Shaders/CommonPropertiesPart.shader"
+        common_properties_path = "common.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/Integrated/Shaders/TessellationPropertiesPart.shader"
+        tessellation_properties_path = "common.unity.toonshader/Runtime/Shaders/Common/Parts~/TessellationPropertiesPart.shader"
         with open(tessellation_properties_path, 'r') as f:
             tessellation_properties_shader = f.read()