Generate MToon format.g.cs in VRMShaders

Assets/UniGLTF/Editor/Generator/Generator.cs

@@ -1,13 +1,14 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Text;
 using UniGLTF.JsonSchema;
 
 namespace GenerateUniGLTFSerialization
 {
     public class Generator
     {
-        static void ClearFolder(DirectoryInfo dir)
+        static void DeleteAllInDirectory(DirectoryInfo dir)
         {
             Console.WriteLine($"clear: {dir}");
 
@@ -22,6 +23,23 @@ static void ClearFolder(DirectoryInfo dir)
             }
         }
 
+        static void CleanDirectory(DirectoryInfo dir)
+        {
+            // clear or create folder
+            if (dir.Exists)
+            {
+                if (dir.EnumerateFileSystemInfos().Any())
+                {
+                    DeleteAllInDirectory(dir);
+                }
+            }
+            else
+            {
+                Console.WriteLine($"create: {dir}");
+                dir.Create();
+            }
+        }
+
         static string CleanupTitle(string title)
         {
             if (string.IsNullOrEmpty(title))
@@ -43,60 +61,63 @@ static string GetStem(string filename)
             return filename.Split('.').First();
         }
 
-        public static void GenerateTo(JsonSchemaSource root, DirectoryInfo dir, bool clearFolder)
+        static void WriteAllTextForce(string path, string contents)
         {
-            // clear or create folder
-            if (dir.Exists)
+            if (string.IsNullOrEmpty(path)) return;
+
+            var dir = Path.GetDirectoryName(path);
+            if (string.IsNullOrEmpty(dir)) return;
+
+            var dirInfo = new DirectoryInfo(dir);
+            if (!dirInfo.Exists)
             {
-                if (dir.EnumerateFileSystemInfos().Any())
-                {
-                    if (!clearFolder)
-                    {
-                        Console.WriteLine($"{dir} is not empty.");
-                        return;
-                    }
-
-                    // clear
-                    ClearFolder(dir);
-                }
+                dirInfo.Create();
             }
-            else
+
+            if (File.Exists(path))
             {
-                Console.WriteLine($"create: {dir}");
-                dir.Create();
+                File.Delete(path);
             }
-
+
+            File.WriteAllText(path, contents, Encoding.UTF8);
+        }
+
+        public static void GenerateTo(JsonSchemaSource root, DirectoryInfo formatDir, DirectoryInfo serializerDir)
+        {
+            CleanDirectory(formatDir);
+            CleanDirectory(serializerDir);
+
             foreach (var s in root.Traverse())
             {
                 // title を掃除
                 s.title = CleanupTitle(s.title);
             }
 
             {
-                var dst = Path.Combine(dir.FullName, "Format.g.cs");
+                var dst = Path.Combine(formatDir.FullName, "Format.g.cs");
                 Console.WriteLine(dst);
                 using (var w = new StringWriter())
                 {
                     FormatWriter.Write(w, root, GetStem(root.FilePath.Name));
-                    File.WriteAllText(dst, w.ToString().Replace("\r\n", "\n"));
+                    WriteAllTextForce(dst, w.ToString().Replace("\r\n", "\n"));
                 }
             }
             {
-                var dst = Path.Combine(dir.FullName, "Deserializer.g.cs");
+                var dst = Path.Combine(serializerDir.FullName, "Deserializer.g.cs");
                 Console.WriteLine(dst);
                 using (var w = new StringWriter())
                 {
                     DeserializerWriter.Write(w, root, GetStem(root.FilePath.Name));
-                    File.WriteAllText(dst, w.ToString().Replace("\r\n", "\n"));
+                    WriteAllTextForce(dst, w.ToString().Replace("\r\n", "\n"));
                 }
             }
             {
-                var dst = Path.Combine(dir.FullName, "Serializer.g.cs");
+                var dst = Path.Combine(serializerDir.FullName, "Serializer.g.cs");
                 Console.WriteLine(dst);
                 using (var w = new StringWriter())
                 {
                     SerializerWriter.Write(w, root, GetStem(root.FilePath.Name));
-                    File.WriteAllText(dst, w.ToString().Replace("\r\n", "\n"));
+                    WriteAllTextForce(dst, w.ToString().Replace("\r\n", "\n"));
                 }
             }
         }

Assets/VRM10/Editor/GeneratorMenu.cs

@@ -39,34 +39,41 @@ static void Run(bool debug)
             {
                 // VRMC_vrm
                 "vrm-specification/specification/VRMC_vrm-1.0_draft/schema/VRMC_vrm.schema.json",
-                "Assets/VRM10/Runtime/Format/Vrm", // dst
+                "Assets/VRM10/Runtime/Format/Vrm", // format
+                "Assets/VRM10/Runtime/Format/Vrm", // serializer
                 // VRMC_node_constraint
                 "vrm-specification/specification/VRMC_node_constraint-1.0_draft/schema/VRMC_node_constraint.schema.json",
-                "Assets/VRM10/Runtime/Format/Constraints", // dst
+                "Assets/VRM10/Runtime/Format/Constraints", // format
+                "Assets/VRM10/Runtime/Format/Constraints", // serializer
                 // VRMC_materials_mtoon
                 "vrm-specification/specification/VRMC_materials_mtoon-1.0_draft/schema/VRMC_materials_mtoon.schema.json",
-                "Assets/VRM10/Runtime/Format/MaterialsMToon", // dst
+                "Assets/VRMShaders/VRM10/Format/Runtime/MaterialsMToon", // format
+                "Assets/VRM10/Runtime/Format/MaterialsMToon", // serializer
                 // VRMC_springBone
                 "vrm-specification/specification/VRMC_springBone-1.0_draft/schema/VRMC_springBone.schema.json",
-                "Assets/VRM10/Runtime/Format/SpringBone", // dst
+                "Assets/VRM10/Runtime/Format/SpringBone", // format
+                "Assets/VRM10/Runtime/Format/SpringBone", // serializer
             };
 
-            for (int i = 0; i < args.Length; i += 2)
+            for (int i = 0; i < args.Length; i += 3)
             {
                 var extensionSchemaPath = new FileInfo(Path.Combine(projectRoot.FullName, args[i]));
                 var parser = new UniGLTF.JsonSchema.JsonSchemaParser(gltf.Directory, extensionSchemaPath.Directory);
                 var extensionSchema = parser.Load(extensionSchemaPath, "");
 
-                var dst = new DirectoryInfo(Path.Combine(projectRoot.FullName, args[i + 1]));
-                Debug.Log(dst);
+                var formatDst = new DirectoryInfo(Path.Combine(projectRoot.FullName, args[i + 1]));
+                Debug.Log($"Format.g Dir: {formatDst}");
+
+                var serializerDst = new DirectoryInfo(Path.Combine(projectRoot.FullName, args[i + 2]));
+                Debug.Log($"Serializer/Deserializer.g Dir: {serializerDst}");
 
                 if (debug)
                 {
                     Debug.Log(extensionSchema.Dump());
                 }
                 else
                 {
-                    GenerateUniGLTFSerialization.Generator.GenerateTo(extensionSchema, dst, clearFolder: true);
+                    GenerateUniGLTFSerialization.Generator.GenerateTo(extensionSchema, formatDst, serializerDst);
                 }
             }
         }

Assets/VRM10/Runtime/Format/Constraints/Deserializer.g.cs

@@ -1,4 +1,4 @@
-// This file is generated from JsonSchema. Don't modify this source code.
+// This file is generated from JsonSchema. Don't modify this source code.
 using UniJSON;
 using System;
 using System.Collections.Generic;

Assets/VRM10/Runtime/Format/Constraints/Format.g.cs

@@ -1,4 +1,4 @@
-// This file is generated from JsonSchema. Don't modify this source code.
+// This file is generated from JsonSchema. Don't modify this source code.
 using System;
 using System.Collections.Generic;
 

Assets/VRM10/Runtime/Format/Constraints/Serializer.g.cs

@@ -1,4 +1,4 @@
-// This file is generated from JsonSchema. Don't modify this source code.
+// This file is generated from JsonSchema. Don't modify this source code.
 using System;
 using System.Collections.Generic;
 using System.Linq;

Assets/VRM10/Runtime/Format/MaterialsMToon/Deserializer.g.cs

@@ -1,4 +1,4 @@
-// This file is generated from JsonSchema. Don't modify this source code.
+// This file is generated from JsonSchema. Don't modify this source code.
 using UniJSON;
 using System;
 using System.Collections.Generic;

Assets/VRM10/Runtime/Format/MaterialsMToon/Serializer.g.cs

@@ -1,4 +1,4 @@
-// This file is generated from JsonSchema. Don't modify this source code.
+// This file is generated from JsonSchema. Don't modify this source code.
 using System;
 using System.Collections.Generic;
 using System.Linq;

Assets/VRM10/Runtime/Format/SpringBone/Deserializer.g.cs

@@ -1,4 +1,4 @@
-// This file is generated from JsonSchema. Don't modify this source code.
+// This file is generated from JsonSchema. Don't modify this source code.
 using UniJSON;
 using System;
 using System.Collections.Generic;

Assets/VRM10/Runtime/Format/SpringBone/Format.g.cs

@@ -1,4 +1,4 @@
-// This file is generated from JsonSchema. Don't modify this source code.
+// This file is generated from JsonSchema. Don't modify this source code.
 using System;
 using System.Collections.Generic;
 

Assets/VRM10/Runtime/Format/SpringBone/Serializer.g.cs

@@ -1,4 +1,4 @@
-// This file is generated from JsonSchema. Don't modify this source code.
+// This file is generated from JsonSchema. Don't modify this source code.
 using System;
 using System.Collections.Generic;
 using System.Linq;

Assets/VRM10/Runtime/Format/Vrm/Deserializer.g.cs

@@ -1,4 +1,4 @@
-// This file is generated from JsonSchema. Don't modify this source code.
+// This file is generated from JsonSchema. Don't modify this source code.
 using UniJSON;
 using System;
 using System.Collections.Generic;

Assets/VRM10/Runtime/Format/Vrm/Format.g.cs

@@ -1,4 +1,4 @@
-// This file is generated from JsonSchema. Don't modify this source code.
+// This file is generated from JsonSchema. Don't modify this source code.
 using System;
 using System.Collections.Generic;
 

Assets/VRM10/Runtime/Format/Vrm/Serializer.g.cs

@@ -1,4 +1,4 @@
-// This file is generated from JsonSchema. Don't modify this source code.
+// This file is generated from JsonSchema. Don't modify this source code.
 using System;
 using System.Collections.Generic;
 using System.Linq;

Assets/VRM10/Runtime/VRM10.asmdef

@@ -3,10 +3,9 @@
     "references": [
         "VrmLib",
         "MToon",
-        "MeshUtility",
-        "MeshUtility.Editor",
         "UniGLTF",
-        "VRMShaders.GLTF.IO.Runtime"
+        "VRMShaders.GLTF.IO.Runtime",
+        "VRMShaders.VRM10.Format.Runtime"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/VRM10/Runtime/Format/MaterialsMToon/Format.g.cs → Assets/VRMShaders/VRM10/Format/Runtime/MaterialsMToon/Format.g.cs

@@ -1,4 +1,4 @@
-// This file is generated from JsonSchema. Don't modify this source code.
+// This file is generated from JsonSchema. Don't modify this source code.
 using System;
 using System.Collections.Generic;
 

Assets/VRMShaders/VRM10/Format/Runtime/VRMShaders.VRM10.Format.Runtime.asmdef

@@ -0,0 +1,13 @@
+{
+    "name": "VRMShaders.VRM10.Format.Runtime",
+    "references": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": false,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}