This commit is contained in:
Masataka SUMI
2021-05-10 15:58:59 +09:00
parent 5c6b99ba78
commit cd26109977
3 changed files with 9 additions and 9 deletions

View File

@@ -6,7 +6,7 @@ using VRMShaders;
namespace UniVRM10
{
public static class Vrm10MToonMaterialImporter
public static class Vrm10MToonMaterialTextureImporter
{
public static bool TryGetBaseColorTexture(GltfParser parser, glTFMaterial src, out (SubAssetKey, TextureImportParam) pair)
{

View File

@@ -81,21 +81,21 @@ namespace UniVRM10
if (UniGLTF.Extensions.VRMC_materials_mtoon.GltfDeserializer.TryGet(m.extensions, out var mToon))
{
// Enumerate VRM MToon Textures
if (Vrm10MToonMaterialImporter.TryGetBaseColorTexture(parser, m, out var litTex))
if (Vrm10MToonMaterialTextureImporter.TryGetBaseColorTexture(parser, m, out var litTex))
yield return litTex;
if (Vrm10MToonMaterialImporter.TryGetNormalTexture(parser, m, out var normalTex))
if (Vrm10MToonMaterialTextureImporter.TryGetNormalTexture(parser, m, out var normalTex))
yield return normalTex;
if (Vrm10MToonMaterialImporter.TryGetShadeMultiplyTexture(parser, mToon, out var shadeTex))
if (Vrm10MToonMaterialTextureImporter.TryGetShadeMultiplyTexture(parser, mToon, out var shadeTex))
yield return shadeTex;
if (Vrm10MToonMaterialImporter.TryGetShadingShiftTexture(parser, mToon, out var shadeShiftTex))
if (Vrm10MToonMaterialTextureImporter.TryGetShadingShiftTexture(parser, mToon, out var shadeShiftTex))
yield return shadeShiftTex;
if (Vrm10MToonMaterialImporter.TryGetMatcapTexture(parser, mToon, out var matcapTex))
if (Vrm10MToonMaterialTextureImporter.TryGetMatcapTexture(parser, mToon, out var matcapTex))
yield return matcapTex;
if (Vrm10MToonMaterialImporter.TryGetRimMultiplyTexture(parser, mToon, out var rimTex))
if (Vrm10MToonMaterialTextureImporter.TryGetRimMultiplyTexture(parser, mToon, out var rimTex))
yield return rimTex;
if (Vrm10MToonMaterialImporter.TryGetOutlineWidthMultiplyTexture(parser, mToon, out var outlineTex))
if (Vrm10MToonMaterialTextureImporter.TryGetOutlineWidthMultiplyTexture(parser, mToon, out var outlineTex))
yield return outlineTex;
if (Vrm10MToonMaterialImporter.TryGetUvAnimationMaskTexture(parser, mToon, out var uvAnimMaskTex))
if (Vrm10MToonMaterialTextureImporter.TryGetUvAnimationMaskTexture(parser, mToon, out var uvAnimMaskTex))
yield return uvAnimMaskTex;
}
else