Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-08 03:48:19 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

rename VRMMtoonMaterialImporter to VRMMaterialImporter

Browse Source
This commit is contained in:
ousttrue
2021-04-15 15:05:48 +09:00
parent ea4e842e72
commit da49aa0b2c
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/VRM/Editor/Format/VRMEditorImporterContext.cs
View File

@@ -149,7 +149,7 @@ namespace VRM
.Where(x => x.IsUsed)
.Select(x => (new SubAssetKey(typeof(Texture2D), x.Texture.name), x.Texture))
.ToArray();
var vrmTextures = new VRMMtoonMaterialImporter(m_context.VRM);
var vrmTextures = new VRMMaterialImporter(m_context.VRM);
var dirName = $"{m_prefabPath.FileNameWithoutExtension}.Textures";
TextureExtractor.ExtractTextures(m_context.Parser, m_prefabPath.Parent.Child(dirName), vrmTextures.EnumerateAllTexturesDistinct, subAssets, (_x, _y) => { }, onTextureReloaded);
}

2
Assets/VRM/Editor/Format/VRMImporterMenu.cs
View File

@@ -83,7 +83,7 @@ namespace VRM
using (var context = new VRMImporterContext(parser, map))
{
var editor = new VRMEditorImporterContext(context, prefabPath);
foreach (var (key, textureInfo) in new VRMMtoonMaterialImporter(context.VRM).EnumerateAllTexturesDistinct(parser))
foreach (var (key, textureInfo) in new VRMMaterialImporter(context.VRM).EnumerateAllTexturesDistinct(parser))
{
TextureImporterConfigurator.Configure(textureInfo, map.ToDictionary(x => x.name, x => x.texture as Texture2D));
}

2
Assets/VRM/Editor/Format/vrmAssetPostprocessor.cs
View File

@@ -60,7 +60,7 @@ namespace VRM
using (var context = new VRMImporterContext(parser, map))
{
var editor = new VRMEditorImporterContext(context, prefabPath);
foreach (var (key, textureInfo) in new VRMMtoonMaterialImporter(context.VRM).EnumerateAllTexturesDistinct(parser))
foreach (var (key, textureInfo) in new VRMMaterialImporter(context.VRM).EnumerateAllTexturesDistinct(parser))
{
TextureImporterConfigurator.Configure(textureInfo, map.ToDictionary(x => x.name, x => x.texture as Texture2D));
}

2
Assets/VRM/Runtime/IO/VRMImporterContext.cs
View File

@@ -26,7 +26,7 @@ namespace VRM
{
VRM = vrm;
// override material importer
GltfMaterialImporter.GltfMaterialParamProcessors.Insert(0, new VRMMtoonMaterialImporter(VRM).TryCreateParam);
GltfMaterialImporter.GltfMaterialParamProcessors.Insert(0, new VRMMaterialImporter(VRM).TryCreateParam);
}
else
{

4
Assets/VRM/Runtime/IO/VRMMtoonMaterialImporter.cs → Assets/VRM/Runtime/IO/VRMMaterialImporter.cs
View File

@@ -6,10 +6,10 @@ using VRMShaders;
namespace VRM
{
public class VRMMtoonMaterialImporter
public class VRMMaterialImporter
{
readonly glTF_VRM_extensions m_vrm;
public VRMMtoonMaterialImporter(glTF_VRM_extensions vrm)
public VRMMaterialImporter(glTF_VRM_extensions vrm)
{
m_vrm = vrm;
}

2
Assets/VRM/Runtime/IO/VRMMtoonMaterialImporter.cs.meta → Assets/VRM/Runtime/IO/VRMMaterialImporter.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: bad75b40d017eb74ba79f561d22dc372
guid: 9dd63f87d0de96f4ca4ad4dcd8540584
MonoImporter:
externalObjects: {}
serializedVersion: 2

4
Assets/VRM/Tests/MToonTest.cs
View File

@@ -30,7 +30,7 @@ namespace VRM
var vrmMaterial = VRMMaterialExporter.CreateFromMaterial(srcMaterial, textureManager);
Assert.AreEqual(vrmMaterial.vectorProperties["_MainTex"], new float[] { 0.3f, 0.2f, 0.5f, 0.6f });
var materialImporter = new VRMMtoonMaterialImporter(new glTF_VRM_extensions
var materialImporter = new VRMMaterialImporter(new glTF_VRM_extensions
{
materialProperties = new System.Collections.Generic.List<glTF_VRM_Material> { vrmMaterial }
});
@@ -49,7 +49,7 @@ namespace VRM
var importer = new VRMImporterContext(parser, null);
var materialImporter = new VRMMtoonMaterialImporter(importer.VRM);
var materialImporter = new VRMMaterialImporter(importer.VRM);
Assert.AreEqual(73, parser.GLTF.materials.Count);
Assert.True(materialImporter.TryCreateParam(parser, 0, out MaterialImportParam param));

2
Assets/VRM/Tests/VRMTextureEnumerateTests.cs
View File

@@ -72,7 +72,7 @@ namespace VRM
},
}
};
var items = new VRMMtoonMaterialImporter(vrm).EnumerateAllTexturesDistinct(parser).ToArray();
var items = new VRMMaterialImporter(vrm).EnumerateAllTexturesDistinct(parser).ToArray();
Assert.AreEqual(1, items.Length);
}
}