From 86d1dc0db7c4b13ce6eacff1a940423dd0f1d9e9 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Thu, 27 May 2021 15:16:03 +0900 Subject: [PATCH] rename --- .../UniGLTF/ScriptedImporter/EditorMaterial.cs | 2 +- .../UniGLTF/ScriptedImporter/ScriptedImporterImpl.cs | 2 +- .../UniGLTF/ScriptedImporter/TextureExtractor.cs | 2 +- Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs | 2 +- .../UniGLTF/IO/TextureIO/GltfTextureSetImporter.cs | 12 ++++++------ .../UniGLTF/IO/TextureIO/ITextureSetImporter.cs | 2 +- Assets/VRM/Runtime/IO/VRMTextureSetImporter.cs | 12 ++++++------ .../Runtime/IO/Texture/Vrm10TextureSetImporter.cs | 12 ++++++------ .../{TextureSet.cs => TextureImportParamSet.cs} | 2 +- ...tureSet.cs.meta => TextureImportParamSet.cs.meta} | 0 10 files changed, 24 insertions(+), 24 deletions(-) rename Assets/VRMShaders/GLTF/IO/Runtime/{TextureSet.cs => TextureImportParamSet.cs} (92%) rename Assets/VRMShaders/GLTF/IO/Runtime/{TextureSet.cs.meta => TextureImportParamSet.cs.meta} (100%) diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/EditorMaterial.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/EditorMaterial.cs index ef6f0cc08..65155353f 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/EditorMaterial.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/EditorMaterial.cs @@ -56,7 +56,7 @@ namespace UniGLTF s_foldTextures = EditorGUILayout.Foldout(s_foldTextures, "Remapped Textures"); if (s_foldTextures) { - importer.DrawRemapGUI(textureSetImporter.GetTextureSet().GetTextureParamsDistinct().Select(x => x.SubAssetKey)); + importer.DrawRemapGUI(textureSetImporter.GetTextureImportParamSet().GetTextureParamsDistinct().Select(x => x.SubAssetKey)); } if (GUILayout.Button("Clear")) diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ScriptedImporterImpl.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ScriptedImporterImpl.cs index 853ce5ba8..a10636d8c 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ScriptedImporterImpl.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ScriptedImporterImpl.cs @@ -44,7 +44,7 @@ namespace UniGLTF using (var loader = new ImporterContext(parser, extractedObjects)) { // Configure TextureImporter to Extracted Textures. - foreach (var textureInfo in loader.TextureSetImporter.GetTextureSet().GetTextureParamsDistinct()) + foreach (var textureInfo in loader.TextureSetImporter.GetTextureImportParamSet().GetTextureParamsDistinct()) { TextureImporterConfigurator.Configure(textureInfo, loader.TextureFactory.ExternalTextures); } diff --git a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/TextureExtractor.cs b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/TextureExtractor.cs index 7b93c608a..70e5b9764 100644 --- a/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/TextureExtractor.cs +++ b/Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/TextureExtractor.cs @@ -80,7 +80,7 @@ namespace UniGLTF Action> onCompleted = null) { var extractor = new TextureExtractor(parser, textureDirectory, subAssets); - foreach (var param in textureSetImporter.GetTextureSet().GetTextureParamsDistinct()) + foreach (var param in textureSetImporter.GetTextureImportParamSet().GetTextureParamsDistinct()) { extractor.Extract(param.SubAssetKey, param); } diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs index 285c48282..99751dcde 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs @@ -183,7 +183,7 @@ namespace UniGLTF public async Task LoadTexturesAsync() { - var textures = TextureSetImporter.GetTextureSet().GetTextureParamsDistinct(); + var textures = TextureSetImporter.GetTextureImportParamSet().GetTextureParamsDistinct(); foreach (var param in textures) { var tex = await TextureFactory.GetTextureAsync(param); diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureSetImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureSetImporter.cs index bd3356913..0421d4f0e 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureSetImporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureSetImporter.cs @@ -28,24 +28,24 @@ namespace UniGLTF public sealed class GltfTextureSetImporter : ITextureSetImporter { private readonly GltfParser m_parser; - private TextureSet _textureSet; + private TextureImportParamSet _textureImportParamSet; public GltfTextureSetImporter(GltfParser parser) { m_parser = parser; } - public TextureSet GetTextureSet() + public TextureImportParamSet GetTextureImportParamSet() { - if (_textureSet == null) + if (_textureImportParamSet == null) { - _textureSet = new TextureSet(); + _textureImportParamSet = new TextureImportParamSet(); foreach (var (_, param) in EnumerateAllTextures(m_parser)) { - _textureSet.Add(param); + _textureImportParamSet.Add(param); } } - return _textureSet; + return _textureImportParamSet; } /// diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/ITextureSetImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/ITextureSetImporter.cs index 481dccae6..6c8460b51 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/ITextureSetImporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/ITextureSetImporter.cs @@ -9,6 +9,6 @@ namespace UniGLTF /// public interface ITextureSetImporter { - TextureSet GetTextureSet(); + TextureImportParamSet GetTextureImportParamSet(); } } diff --git a/Assets/VRM/Runtime/IO/VRMTextureSetImporter.cs b/Assets/VRM/Runtime/IO/VRMTextureSetImporter.cs index f9e46c0fa..0b9c5d843 100644 --- a/Assets/VRM/Runtime/IO/VRMTextureSetImporter.cs +++ b/Assets/VRM/Runtime/IO/VRMTextureSetImporter.cs @@ -10,7 +10,7 @@ namespace VRM { private readonly GltfParser m_parser; private readonly glTF_VRM_extensions m_vrm; - private TextureSet _textureSet; + private TextureImportParamSet _textureImportParamSet; public VRMTextureSetImporter(GltfParser parser, glTF_VRM_extensions vrm) { @@ -18,17 +18,17 @@ namespace VRM m_vrm = vrm; } - public TextureSet GetTextureSet() + public TextureImportParamSet GetTextureImportParamSet() { - if (_textureSet == null) + if (_textureImportParamSet == null) { - _textureSet = new TextureSet(); + _textureImportParamSet = new TextureImportParamSet(); foreach (var (_, param) in EnumerateAllTextures(m_parser, m_vrm)) { - _textureSet.Add(param); + _textureImportParamSet.Add(param); } } - return _textureSet; + return _textureImportParamSet; } diff --git a/Assets/VRM10/Runtime/IO/Texture/Vrm10TextureSetImporter.cs b/Assets/VRM10/Runtime/IO/Texture/Vrm10TextureSetImporter.cs index 3b7cd2561..3577d5b6d 100644 --- a/Assets/VRM10/Runtime/IO/Texture/Vrm10TextureSetImporter.cs +++ b/Assets/VRM10/Runtime/IO/Texture/Vrm10TextureSetImporter.cs @@ -10,24 +10,24 @@ namespace UniVRM10 public sealed class Vrm10TextureSetImporter : ITextureSetImporter { private readonly GltfParser m_parser; - private TextureSet _textureSet; + private TextureImportParamSet _textureImportParamSet; public Vrm10TextureSetImporter(GltfParser parser) { m_parser = parser; } - public TextureSet GetTextureSet() + public TextureImportParamSet GetTextureImportParamSet() { - if (_textureSet == null) + if (_textureImportParamSet == null) { - _textureSet = new TextureSet(); + _textureImportParamSet = new TextureImportParamSet(); foreach (var (_, param) in EnumerateAllTextures(m_parser)) { - _textureSet.Add(param); + _textureImportParamSet.Add(param); } } - return _textureSet; + return _textureImportParamSet; } /// diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/TextureSet.cs b/Assets/VRMShaders/GLTF/IO/Runtime/TextureImportParamSet.cs similarity index 92% rename from Assets/VRMShaders/GLTF/IO/Runtime/TextureSet.cs rename to Assets/VRMShaders/GLTF/IO/Runtime/TextureImportParamSet.cs index 8e4c9c281..d24a02149 100644 --- a/Assets/VRMShaders/GLTF/IO/Runtime/TextureSet.cs +++ b/Assets/VRMShaders/GLTF/IO/Runtime/TextureImportParamSet.cs @@ -2,7 +2,7 @@ namespace VRMShaders { - public sealed class TextureSet + public sealed class TextureImportParamSet { private readonly Dictionary _params = new Dictionary(); diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/TextureSet.cs.meta b/Assets/VRMShaders/GLTF/IO/Runtime/TextureImportParamSet.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/TextureSet.cs.meta rename to Assets/VRMShaders/GLTF/IO/Runtime/TextureImportParamSet.cs.meta