From 57581467c9b5ddc6096c1412f61dfd3a15e96d60 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 29 Mar 2021 17:34:14 +0900 Subject: [PATCH] remove IVrmStorage --- Assets/VRM10/Runtime/IO/IVrmStorage.cs | 46 --------------------- Assets/VRM10/Runtime/IO/IVrmStorage.cs.meta | 11 ----- Assets/VRM10/Runtime/IO/ModelLoader.cs | 4 +- Assets/VRM10/Runtime/IO/Vrm10Storage.cs | 2 +- 4 files changed, 3 insertions(+), 60 deletions(-) delete mode 100644 Assets/VRM10/Runtime/IO/IVrmStorage.cs delete mode 100644 Assets/VRM10/Runtime/IO/IVrmStorage.cs.meta diff --git a/Assets/VRM10/Runtime/IO/IVrmStorage.cs b/Assets/VRM10/Runtime/IO/IVrmStorage.cs deleted file mode 100644 index ed25e887a..000000000 --- a/Assets/VRM10/Runtime/IO/IVrmStorage.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.Collections.Generic; -using VrmLib; - -namespace UniVRM10 -{ - public interface IVrmStorage - { - ArraySegment OriginalJson { get; } - - #region glTF import - string AssetVersion { get; } - string AssetMinVersion { get; } - string AssetGenerator { get; } - string AssetCopyright { get; } - int NodeCount { get; } - Node CreateNode(int index); - IEnumerable GetChildNodeIndices(int i); - int ImageCount { get; } - Image CreateImage(int index); - int TextureCount { get; } - Texture CreateTexture(int index, List images); - int MaterialCount { get; } - Material CreateMaterial(int index, List textures); - int SkinCount { get; } - Skin CreateSkin(int index, List nodes); - int MeshCount { get; } - MeshGroup CreateMesh(int index, List materials); - (int, int) GetNodeMeshSkin(int index); - int AnimationCount { get; } - Animation CreateAnimation(int index, List nodes); - #endregion - - #region VRM - bool HasVrm { get; } - Meta CreateVrmMeta(List textures); - string VrmExporterVersion { get; } - string VrmSpecVersion { get; } - void LoadVrmHumanoid(List nodes); - ExpressionManager CreateVrmExpression(List meshGroups, List materials, List nodes); - SpringBoneManager CreateVrmSpringBone(List nodes); - FirstPerson CreateVrmFirstPerson(List nodes, List meshGroups); - LookAt CreateVrmLookAt(); - #endregion - } -} diff --git a/Assets/VRM10/Runtime/IO/IVrmStorage.cs.meta b/Assets/VRM10/Runtime/IO/IVrmStorage.cs.meta deleted file mode 100644 index 440e16713..000000000 --- a/Assets/VRM10/Runtime/IO/IVrmStorage.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: dc7a9b66200d54043bef5c969aa774e7 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/VRM10/Runtime/IO/ModelLoader.cs b/Assets/VRM10/Runtime/IO/ModelLoader.cs index 1a50df480..15b283615 100644 --- a/Assets/VRM10/Runtime/IO/ModelLoader.cs +++ b/Assets/VRM10/Runtime/IO/ModelLoader.cs @@ -6,7 +6,7 @@ namespace UniVRM10 { public static class ModelLoader { - public static Model Load(IVrmStorage storage, string rootName, bool estimateHumanoid = false) + public static Model Load(Vrm10Storage storage, string rootName, bool estimateHumanoid = false) { if (storage == null) { @@ -91,7 +91,7 @@ namespace UniVRM10 return model; } - static bool LoadVrm(Model model, IVrmStorage storage) + static bool LoadVrm(Model model, Vrm10Storage storage) { if (!storage.HasVrm) { diff --git a/Assets/VRM10/Runtime/IO/Vrm10Storage.cs b/Assets/VRM10/Runtime/IO/Vrm10Storage.cs index 7faa0ea0c..0880ad7d3 100644 --- a/Assets/VRM10/Runtime/IO/Vrm10Storage.cs +++ b/Assets/VRM10/Runtime/IO/Vrm10Storage.cs @@ -9,7 +9,7 @@ using UniJSON; namespace UniVRM10 { - public class Vrm10Storage : IVrmStorage + public class Vrm10Storage { public ArraySegment OriginalJson { get; private set; } public UniGLTF.glTF Gltf