From f2495f61b5f2d3659c85eeb2cd2650cebbab114b Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Thu, 27 May 2021 15:38:40 +0900 Subject: [PATCH] mv TextureImportParamSet TextureDescriptorSet --- .../IO/TextureIO/GltfTextureDescriptorGenerator.cs | 12 ++++++------ .../IO/TextureIO/ITextureDescriptorGenerator.cs | 2 +- .../VRM/Runtime/IO/VrmTextureDescriptorGenerator.cs | 12 ++++++------ .../IO/Texture/Vrm10TextureDescriptorGenerator.cs | 12 ++++++------ ...tureImportParamSet.cs => TextureDescriptorSet.cs} | 2 +- ...ParamSet.cs.meta => TextureDescriptorSet.cs.meta} | 0 6 files changed, 20 insertions(+), 20 deletions(-) rename Assets/VRMShaders/GLTF/IO/Runtime/{TextureImportParamSet.cs => TextureDescriptorSet.cs} (93%) rename Assets/VRMShaders/GLTF/IO/Runtime/{TextureImportParamSet.cs.meta => TextureDescriptorSet.cs.meta} (100%) diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureDescriptorGenerator.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureDescriptorGenerator.cs index 3d46a5196..2bbcc621b 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureDescriptorGenerator.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureDescriptorGenerator.cs @@ -28,24 +28,24 @@ namespace UniGLTF public sealed class GltfTextureDescriptorGenerator : ITextureDescriptorGenerator { private readonly GltfParser m_parser; - private TextureImportParamSet _textureImportParamSet; + private TextureDescriptorSet _textureDescriptorSet; public GltfTextureDescriptorGenerator(GltfParser parser) { m_parser = parser; } - public TextureImportParamSet Get() + public TextureDescriptorSet Get() { - if (_textureImportParamSet == null) + if (_textureDescriptorSet == null) { - _textureImportParamSet = new TextureImportParamSet(); + _textureDescriptorSet = new TextureDescriptorSet(); foreach (var (_, param) in EnumerateAllTextures(m_parser)) { - _textureImportParamSet.Add(param); + _textureDescriptorSet.Add(param); } } - return _textureImportParamSet; + return _textureDescriptorSet; } /// diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/ITextureDescriptorGenerator.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/ITextureDescriptorGenerator.cs index e53847ac9..454f852b2 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/ITextureDescriptorGenerator.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/ITextureDescriptorGenerator.cs @@ -9,6 +9,6 @@ namespace UniGLTF /// public interface ITextureDescriptorGenerator { - TextureImportParamSet Get(); + TextureDescriptorSet Get(); } } diff --git a/Assets/VRM/Runtime/IO/VrmTextureDescriptorGenerator.cs b/Assets/VRM/Runtime/IO/VrmTextureDescriptorGenerator.cs index 27e007b8d..18f40a630 100644 --- a/Assets/VRM/Runtime/IO/VrmTextureDescriptorGenerator.cs +++ b/Assets/VRM/Runtime/IO/VrmTextureDescriptorGenerator.cs @@ -10,7 +10,7 @@ namespace VRM { private readonly GltfParser m_parser; private readonly glTF_VRM_extensions m_vrm; - private TextureImportParamSet _textureImportParamSet; + private TextureDescriptorSet _textureDescriptorSet; public VrmTextureDescriptorGenerator(GltfParser parser, glTF_VRM_extensions vrm) { @@ -18,17 +18,17 @@ namespace VRM m_vrm = vrm; } - public TextureImportParamSet Get() + public TextureDescriptorSet Get() { - if (_textureImportParamSet == null) + if (_textureDescriptorSet == null) { - _textureImportParamSet = new TextureImportParamSet(); + _textureDescriptorSet = new TextureDescriptorSet(); foreach (var (_, param) in EnumerateAllTextures(m_parser, m_vrm)) { - _textureImportParamSet.Add(param); + _textureDescriptorSet.Add(param); } } - return _textureImportParamSet; + return _textureDescriptorSet; } diff --git a/Assets/VRM10/Runtime/IO/Texture/Vrm10TextureDescriptorGenerator.cs b/Assets/VRM10/Runtime/IO/Texture/Vrm10TextureDescriptorGenerator.cs index 7b47d1c1f..f8980890d 100644 --- a/Assets/VRM10/Runtime/IO/Texture/Vrm10TextureDescriptorGenerator.cs +++ b/Assets/VRM10/Runtime/IO/Texture/Vrm10TextureDescriptorGenerator.cs @@ -10,24 +10,24 @@ namespace UniVRM10 public sealed class Vrm10TextureDescriptorGenerator : ITextureDescriptorGenerator { private readonly GltfParser m_parser; - private TextureImportParamSet _textureImportParamSet; + private TextureDescriptorSet _textureDescriptorSet; public Vrm10TextureDescriptorGenerator(GltfParser parser) { m_parser = parser; } - public TextureImportParamSet Get() + public TextureDescriptorSet Get() { - if (_textureImportParamSet == null) + if (_textureDescriptorSet == null) { - _textureImportParamSet = new TextureImportParamSet(); + _textureDescriptorSet = new TextureDescriptorSet(); foreach (var (_, param) in EnumerateAllTextures(m_parser)) { - _textureImportParamSet.Add(param); + _textureDescriptorSet.Add(param); } } - return _textureImportParamSet; + return _textureDescriptorSet; } /// diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/TextureImportParamSet.cs b/Assets/VRMShaders/GLTF/IO/Runtime/TextureDescriptorSet.cs similarity index 93% rename from Assets/VRMShaders/GLTF/IO/Runtime/TextureImportParamSet.cs rename to Assets/VRMShaders/GLTF/IO/Runtime/TextureDescriptorSet.cs index f57778c7d..2ec347576 100644 --- a/Assets/VRMShaders/GLTF/IO/Runtime/TextureImportParamSet.cs +++ b/Assets/VRMShaders/GLTF/IO/Runtime/TextureDescriptorSet.cs @@ -5,7 +5,7 @@ namespace VRMShaders /// /// TextureImportParam の集合を Unique な集合にする。 /// - public sealed class TextureImportParamSet + public sealed class TextureDescriptorSet { private readonly Dictionary _params = new Dictionary(); diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/TextureImportParamSet.cs.meta b/Assets/VRMShaders/GLTF/IO/Runtime/TextureDescriptorSet.cs.meta similarity index 100% rename from Assets/VRMShaders/GLTF/IO/Runtime/TextureImportParamSet.cs.meta rename to Assets/VRMShaders/GLTF/IO/Runtime/TextureDescriptorSet.cs.meta