diff --git a/Assets/VRM/UniVRM/DevOnly/Editor/VRMExportUnityPackage.cs b/Assets/VRM/UniVRM/DevOnly/Editor/VRMExportUnityPackage.cs index 4ee98ec0c..77386bdbd 100644 --- a/Assets/VRM/UniVRM/DevOnly/Editor/VRMExportUnityPackage.cs +++ b/Assets/VRM/UniVRM/DevOnly/Editor/VRMExportUnityPackage.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using System.Collections.Generic; using System.IO; @@ -162,10 +162,12 @@ namespace VRM.DevOnly.PackageExporter if (filters.Any()) { var filtersWithRoot = filters.Select(x => $"{root}/{x}").ToArray(); + // filtering Files = files.Where(x => filtersWithRoot.Any(y => x.StartsWith(y))).ToArray(); } else { + // no filter. all files Files = files.ToArray(); } } @@ -194,42 +196,19 @@ namespace VRM.DevOnly.PackageExporter new GlobList("Assets/VRMShaders"), } }, - // new PackageInfo("UniJSON-standalone") - // { - // List = new [] { - // new GlobList("Assets/VRM", "UniJSON"), - // } - // }, - // new PackageInfo("UniHumanoid-standalone") - // { - // List = new []{ - // new GlobList("Assets/VRM", "UniHumanoid"), - // } - // }, - // new PackageInfo("UniGLTF-standalone") - // { - // List = new []{ - // new GlobList("Assets/VRM", "UniGLTF", "UniHumanoid", "UniJSON", "Assets/VRM/DepthFirstScheduler"), - // new GlobList("Assets/VRMShaders", "UniUnlit"), - // } - // } + new PackageInfo("UniVRM-samples") + { + List = new[]{ + new GlobList("Assets/VRM.Samples"), + new GlobList("Assets/StreamingAssets/VRM.Samples"), + } + } }; foreach (var package in packages) { CreateUnityPackage(outputDir, package); } } - - // UniVRM Samples - { - CreateUnityPackage(outputDir, new PackageInfo("UniVRM-samples") - { - List = new[]{ - new GlobList("Assets/VRM.Samples"), - new GlobList("Assets/StreamingAssets/VRM.Samples"), - } - }); - } } public static void CreateUnityPackage(