From ef6e161d82113b780f18e0b3a2e4b7b8bca4fbb8 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 29 Mar 2021 17:38:14 +0900 Subject: [PATCH] remove IVrmExporter --- Assets/VRM10/Runtime/IO/Vrm10Exporter.cs | 2 +- ...Exporter.cs => Vrm10ExporterExtensions.cs} | 37 +++---------------- ...s.meta => Vrm10ExporterExtensions.cs.meta} | 2 +- 3 files changed, 7 insertions(+), 34 deletions(-) rename Assets/VRM10/Runtime/IO/{IVrmExporter.cs => Vrm10ExporterExtensions.cs} (65%) rename Assets/VRM10/Runtime/IO/{IVrmExporter.cs.meta => Vrm10ExporterExtensions.cs.meta} (83%) diff --git a/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs b/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs index c0561cb56..98ed1bc2e 100644 --- a/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs +++ b/Assets/VRM10/Runtime/IO/Vrm10Exporter.cs @@ -8,7 +8,7 @@ using VrmLib; namespace UniVRM10 { - public class Vrm10Exporter : IVrmExporter + public class Vrm10Exporter { public readonly Vrm10Storage Storage = new Vrm10Storage(); diff --git a/Assets/VRM10/Runtime/IO/IVrmExporter.cs b/Assets/VRM10/Runtime/IO/Vrm10ExporterExtensions.cs similarity index 65% rename from Assets/VRM10/Runtime/IO/IVrmExporter.cs rename to Assets/VRM10/Runtime/IO/Vrm10ExporterExtensions.cs index 22facea42..6fbbd34c4 100644 --- a/Assets/VRM10/Runtime/IO/IVrmExporter.cs +++ b/Assets/VRM10/Runtime/IO/Vrm10ExporterExtensions.cs @@ -1,39 +1,11 @@ -using System; -using System.Collections.Generic; +using System; using VrmLib; namespace UniVRM10 { - public interface IVrmExporter - { - byte[] ToBytes(); - - #region GLTF - void ExportAsset(Model model); - void Reserve(int bytesLength); - void ExportImageAndTextures(List images, List textures); - void ExportMaterialPBR(Material src, PBRMaterial pbr, List textures); - void ExportMaterialUnlit(Material src, UnlitMaterial unlit, List textures); - void ExportMaterialMToon(Material src, MToonMaterial mtoon, List textures); - void ExportMeshes(List groups, List materials, ExportArgs option); - void ExportNodes(Node root, List nodes, List groups, ExportArgs option); - void ExportAnimations(List animations, List nodes, ExportArgs option); - #endregion - - #region VRM - void ExportVrmMeta(Vrm src, List textures); - void ExportVrmHumanoid(Dictionary map, List nodes); - void ExportVrmMaterialProperties(List materials, List textures); - void ExportVrmExpression(ExpressionManager expression, List meshes, List materials, List nodes); - void ExportVrmSpringBone(SpringBoneManager springBone, List nodes); - void ExportVrmFirstPersonAndLookAt(FirstPerson firstPerson, LookAt lookat, List meshes, List nodes); - void ExportVrmEnd(); - #endregion - } - public static class IExporterExtensions { - public static byte[] Export(this IVrmExporter exporter, Model m, ExportArgs option) + public static byte[] Export(this Vrm10Exporter exporter, Model m, ExportArgs option) { exporter.ExportAsset(m); @@ -112,7 +84,7 @@ namespace UniVRM10 return exporter.ToBytes(); } - static void ExportVrm(IVrmExporter exporter, Model m) + static void ExportVrm(Vrm10Exporter exporter, Model m) { if (m.Vrm == null) { @@ -133,5 +105,6 @@ namespace UniVRM10 exporter.ExportVrmEnd(); } + } -} +} \ No newline at end of file diff --git a/Assets/VRM10/Runtime/IO/IVrmExporter.cs.meta b/Assets/VRM10/Runtime/IO/Vrm10ExporterExtensions.cs.meta similarity index 83% rename from Assets/VRM10/Runtime/IO/IVrmExporter.cs.meta rename to Assets/VRM10/Runtime/IO/Vrm10ExporterExtensions.cs.meta index 39837ad1e..88fdbfa52 100644 --- a/Assets/VRM10/Runtime/IO/IVrmExporter.cs.meta +++ b/Assets/VRM10/Runtime/IO/Vrm10ExporterExtensions.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: be395fef7a307d5428ae184a77bda86e +guid: 984cd6e6d31fcc348a71adee5a752400 MonoImporter: externalObjects: {} serializedVersion: 2