diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureImporter.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureImporter.cs index 30f39c769..91618a655 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureImporter.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureImporter.cs @@ -35,7 +35,7 @@ namespace UniGLTF { var gltfTexture = parser.GLTF.textures[textureIndex]; var gltfImage = parser.GLTF.images[gltfTexture.source]; - var name = TextureImportName.GetExtractKey(TextureImportTypes.sRGB, gltfTexture.name, null, gltfImage.uri); + var name = TextureImportName.GetUnityObjectName(TextureImportTypes.sRGB, gltfTexture.name, gltfImage.uri); var sampler = CreateSampler(parser.GLTF, textureIndex); GetTextureBytesAsync getTextureBytesAsync = () => Task.FromResult(ToArray(parser.GLTF.GetImageBytesFromTextureIndex(parser.Storage, textureIndex))); var key = new SubAssetKey(typeof(Texture2D), name); @@ -47,7 +47,7 @@ namespace UniGLTF { var gltfTexture = parser.GLTF.textures[textureIndex]; var gltfImage = parser.GLTF.images[gltfTexture.source]; - var name = TextureImportName.GetExtractKey(TextureImportTypes.NormalMap, gltfTexture.name, null, gltfImage.uri); + var name = TextureImportName.GetUnityObjectName(TextureImportTypes.NormalMap, null, gltfImage.uri); var sampler = CreateSampler(parser.GLTF, textureIndex); GetTextureBytesAsync getTextureBytesAsync = () => Task.FromResult(ToArray(parser.GLTF.GetImageBytesFromTextureIndex(parser.Storage, textureIndex))); var key = new SubAssetKey(typeof(Texture2D), name); @@ -64,7 +64,7 @@ namespace UniGLTF if (metallicRoughnessTextureIndex.HasValue) { var gltfTexture = parser.GLTF.textures[metallicRoughnessTextureIndex.Value]; - name = TextureImportName.GetExtractKey(TextureImportTypes.StandardMap, gltfTexture.name, gltfTexture.name + ".standard", parser.GLTF.images[gltfTexture.source].uri); + name = TextureImportName.GetUnityObjectName(TextureImportTypes.StandardMap, gltfTexture.name, parser.GLTF.images[gltfTexture.source].uri); sampler = CreateSampler(parser.GLTF, metallicRoughnessTextureIndex.Value); getMetallicRoughnessAsync = () => Task.FromResult(ToArray(parser.GLTF.GetImageBytesFromTextureIndex(parser.Storage, metallicRoughnessTextureIndex.Value))); } @@ -75,7 +75,7 @@ namespace UniGLTF var gltfTexture = parser.GLTF.textures[occlusionTextureIndex.Value]; if (string.IsNullOrEmpty(name)) { - name = TextureImportName.GetExtractKey(TextureImportTypes.StandardMap, gltfTexture.name, gltfTexture.name + ".standard", parser.GLTF.images[gltfTexture.source].uri); + name = TextureImportName.GetUnityObjectName(TextureImportTypes.StandardMap, gltfTexture.name, parser.GLTF.images[gltfTexture.source].uri); } sampler = CreateSampler(parser.GLTF, occlusionTextureIndex.Value); getOcclusionAsync = () => Task.FromResult(ToArray(parser.GLTF.GetImageBytesFromTextureIndex(parser.Storage, occlusionTextureIndex.Value))); diff --git a/Assets/VRM10/Editor/ScriptedImporter/EditorVrm.cs b/Assets/VRM10/Editor/ScriptedImporter/EditorVrm.cs index 10c94a25d..6d0ab9bfc 100644 --- a/Assets/VRM10/Editor/ScriptedImporter/EditorVrm.cs +++ b/Assets/VRM10/Editor/ScriptedImporter/EditorVrm.cs @@ -39,13 +39,13 @@ namespace UniVRM10 } // meta - importer.DrawRemapGUI(new SubAssetKey[] { VRM10MetaObject.ExtractKey }); + importer.DrawRemapGUI(new SubAssetKey[] { VRM10MetaObject.SubAssetKey }); // expression avatar - importer.DrawRemapGUI(new SubAssetKey[] { VRM10ExpressionAvatar.ExtractKey }); + importer.DrawRemapGUI(new SubAssetKey[] { VRM10ExpressionAvatar.SubAssetKey }); // expressions - importer.DrawRemapGUI(vrm.Expressions.Select(x => CreateKey(x).ExtractKey)); + importer.DrawRemapGUI(vrm.Expressions.Select(x => CreateKey(x).SubAssetKey)); if (GUILayout.Button("Clear")) { diff --git a/Assets/VRM10/Runtime/Components/Expression/ExpressionKey.cs b/Assets/VRM10/Runtime/Components/Expression/ExpressionKey.cs index 2f842edef..1376b713b 100644 --- a/Assets/VRM10/Runtime/Components/Expression/ExpressionKey.cs +++ b/Assets/VRM10/Runtime/Components/Expression/ExpressionKey.cs @@ -174,7 +174,7 @@ namespace UniVRM10 return 0; } - public SubAssetKey ExtractKey + public SubAssetKey SubAssetKey { get { diff --git a/Assets/VRM10/Runtime/Components/Expression/VRM10ExpressionAvatar.cs b/Assets/VRM10/Runtime/Components/Expression/VRM10ExpressionAvatar.cs index a05fdd60a..7becb6aac 100644 --- a/Assets/VRM10/Runtime/Components/Expression/VRM10ExpressionAvatar.cs +++ b/Assets/VRM10/Runtime/Components/Expression/VRM10ExpressionAvatar.cs @@ -13,7 +13,7 @@ namespace UniVRM10 [CreateAssetMenu(menuName = "VRM10/ExpressionAvatar")] public sealed class VRM10ExpressionAvatar : ScriptableObject { - public static UniGLTF.SubAssetKey ExtractKey => new UniGLTF.SubAssetKey(typeof(VRM10ExpressionAvatar), "ExpressionAvatar"); + public static UniGLTF.SubAssetKey SubAssetKey => new UniGLTF.SubAssetKey(typeof(VRM10ExpressionAvatar), "ExpressionAvatar"); [SerializeField] public List Clips = new List(); diff --git a/Assets/VRM10/Runtime/Components/Meta/VRM10MetaObject.cs b/Assets/VRM10/Runtime/Components/Meta/VRM10MetaObject.cs index 3b5ae5cd7..4a39948ed 100644 --- a/Assets/VRM10/Runtime/Components/Meta/VRM10MetaObject.cs +++ b/Assets/VRM10/Runtime/Components/Meta/VRM10MetaObject.cs @@ -11,7 +11,7 @@ namespace UniVRM10 [CreateAssetMenu(menuName = "VRM10/MetaObject")] public class VRM10MetaObject : ScriptableObject { - public static SubAssetKey ExtractKey => new SubAssetKey(typeof(VRM10MetaObject), "Meta"); + public static SubAssetKey SubAssetKey => new SubAssetKey(typeof(VRM10MetaObject), "Meta"); [SerializeField] public string ExporterVersion; diff --git a/Assets/VRM10/Runtime/IO/RuntimeUnityBuilder.cs b/Assets/VRM10/Runtime/IO/RuntimeUnityBuilder.cs index bd48874dd..d9b73bc1e 100644 --- a/Assets/VRM10/Runtime/IO/RuntimeUnityBuilder.cs +++ b/Assets/VRM10/Runtime/IO/RuntimeUnityBuilder.cs @@ -245,7 +245,7 @@ namespace UniVRM10 { var src = vrm.Meta; m_meta = ScriptableObject.CreateInstance(); - m_meta.name = VRM10MetaObject.ExtractKey.Name; + m_meta.name = VRM10MetaObject.SubAssetKey.Name; controller.Meta = m_meta; m_meta.Name = src.Name; m_meta.Version = src.Version; @@ -286,14 +286,14 @@ namespace UniVRM10 controller.Expression.ExpressionAvatar = ScriptableObject.CreateInstance(); m_exressionAvatar = controller.Expression.ExpressionAvatar; - m_exressionAvatar.name = VRM10ExpressionAvatar.ExtractKey.Name; + m_exressionAvatar.name = VRM10ExpressionAvatar.SubAssetKey.Name; foreach (var expression in vrm.Expressions) { var clip = ScriptableObject.CreateInstance(); clip.Preset = expression.Preset; clip.ExpressionName = expression.Name; - clip.name = Key(expression).ExtractKey.Name; + clip.name = Key(expression).SubAssetKey.Name; clip.IsBinary = expression.IsBinary.GetValueOrDefault(); clip.OverrideBlink = expression.OverrideBlink; clip.OverrideLookAt = expression.OverrideLookAt; diff --git a/Assets/VRM10/Runtime/IO/Vrm10MToonMaterialImporter.cs b/Assets/VRM10/Runtime/IO/Vrm10MToonMaterialImporter.cs index 183cd39e2..c1a03d127 100644 --- a/Assets/VRM10/Runtime/IO/Vrm10MToonMaterialImporter.cs +++ b/Assets/VRM10/Runtime/IO/Vrm10MToonMaterialImporter.cs @@ -224,7 +224,7 @@ namespace UniVRM10 // thumbnail var imageIndex = vrm.Meta.ThumbnailImage.Value; var gltfImage = parser.GLTF.images[imageIndex]; - var name = TextureImportName.GetExtractKey(TextureImportTypes.sRGB, gltfImage.name, null, gltfImage.uri); + var name = TextureImportName.GetUnityObjectName(TextureImportTypes.sRGB, gltfImage.name, gltfImage.uri); GetTextureBytesAsync getBytesAsync = () => { diff --git a/Assets/VRMShaders/GLTF/IO/Runtime/TextureImportName.cs b/Assets/VRMShaders/GLTF/IO/Runtime/TextureImportName.cs index 060bf77bf..f86566fed 100644 --- a/Assets/VRMShaders/GLTF/IO/Runtime/TextureImportName.cs +++ b/Assets/VRMShaders/GLTF/IO/Runtime/TextureImportName.cs @@ -5,12 +5,12 @@ namespace VRMShaders { public static class TextureImportName { - public static string GetExtractKey(TextureImportTypes type, string gltfName, string convertedName, string uri) + public static string GetUnityObjectName(TextureImportTypes type, string gltfName, string uri) { if (type == TextureImportTypes.StandardMap) { // metallic, smooth, occlusion - return convertedName; + return $"{gltfName}{STANDARD_SUFFIX}"; } else {