Merge pull request #1132 from ousttrue/feature1/vrm1_unitypackage

VRM-1.0 の unitypackage も作成する
vrm-c · Aug 6, 2021 · 75aca00 · 75aca00
2 parents c19330b + f5833bb
commit 75aca00
Showing 1 changed file with 18 additions and 30 deletions.
diff --git a/Assets/VRM/Editor/VRMExportUnityPackage.cs b/Assets/VRM/Editor/VRMExportUnityPackage.cs
@@ -24,13 +24,6 @@ public static bool EndsWithAndMeta(this string str, string terminator)
 
     public static class VRMExportUnityPackage
     {
-        const string DATE_FORMAT = "yyyyMMdd";
-
-        static string GetDesktop()
-        {
-            return Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + "/VRM";
-        }
-
         static string GetProjectRoot()
         {
             return Path.GetFullPath(Application.dataPath + "/..");
@@ -141,26 +134,6 @@ static void CreateUnityPackageWithoutBuild()
             CreateUnityPackages(folder);
         }
 
-        public static void CreateUnityPackageWithBuild()
-        {
-            var folder = GetProjectRoot();
-            if (!Directory.Exists(folder))
-            {
-                Directory.CreateDirectory(folder);
-            }
-
-            if (!BuildTestScene())
-            {
-                Debug.LogError("Failed to build test scenes");
-            }
-            CreateUnityPackages(folder);
-        }
-
-        public static void CreateUnityPackage()
-        {
-            CreateUnityPackages(Path.GetFullPath(Path.Combine(Application.dataPath, "..")));
-        }
-
         public class GlobList
         {
             public readonly string[] Files;
@@ -198,21 +171,36 @@ public static void CreateUnityPackages(string outputDir)
             // UniVRM and sub packages
             {
                 var packages = new[]{
-                    new PackageInfo("UniVRM")
+                    new PackageInfo("UniVRM0X")
                     {
                         List = new []{
                             new GlobList("Assets/VRM"),
                             new GlobList("Assets/VRMShaders"),
-                            new GlobList("Assets/MeshUtility"),
                             new GlobList("Assets/UniGLTF"),
                         }
                     },
-                    new PackageInfo("UniVRM-samples")
+                    new PackageInfo("UniVRM0X-samples")
                     {
                         List = new[]{
                             new GlobList("Assets/VRM.Samples"),
                             new GlobList("Assets/StreamingAssets/VRM.Samples"),
                         }
+                    },
+                    new PackageInfo("UniVRM10")
+                    {
+                        List = new []{
+                            new GlobList("Assets/VRM10"),
+                            new GlobList("Assets/VRMShaders"),
+                            new GlobList("Assets/UniGLTF"),
+                        }
+                    },
+                    new PackageInfo("UniVRM10-samples")
+                    {
+                        List = new[]{
+                            new GlobList("Assets/VRM10.Samples"),
+                            new GlobList("Assets/UniGLTF.Samples"), // look dev resources
+                            new GlobList("Assets/StreamingAssets/VRM.Samples"),
+                        }
                     }
                 };
                 foreach (var package in packages)