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

Merge pull request #1921 from Santarh/refactorMaterialImport

Browse Source 
Rename material importer class names.
This commit is contained in:
ousttrue
2022-11-15 13:08:33 +09:00
committed by GitHub
parent fa3194c951 4cb02f94a5
commit 9e17df0e9b
44 changed files with 88 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporterEditor.cs
View File

@@ -32,7 +32,7 @@ namespace UniGLTF
}
m_data = new GlbFileParser(m_importer.assetPath).Parse();
var materialGenerator = new GltfMaterialDescriptorGenerator();
var materialGenerator = new BuiltInGltfMaterialDescriptorGenerator();
var materialKeys = m_data.GLTF.materials.Select((_, i) => materialGenerator.Get(m_data, i).SubAssetKey);
var textureKeys = new GltfTextureDescriptorGenerator(m_data).Get().GetEnumerable().Select(x => x.SubAssetKey);
m_materialEditor = new RemapEditorMaterial(materialKeys.Concat(textureKeys), GetEditorMap, SetEditorMap);

6
Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs
View File

@@ -26,7 +26,7 @@ namespace UniGLTF
{
if (m_renderPipeline == UniGLTF.RenderPipelineTypes.UniversalRenderPipeline)
{
if (Shader.Find(UniGLTF.GltfPbrUrpMaterialImporter.ShaderName) == null)
if (Shader.Find(UniGLTF.UrpGltfPbrMaterialImporter.ShaderName) == null)
{
Debug.LogWarning("URP is not installed. Force to BuiltinRenderPipeline");
m_renderPipeline = UniGLTF.RenderPipelineTypes.BuiltinRenderPipeline;
@@ -39,10 +39,10 @@ namespace UniGLTF
switch (renderPipeline)
{
case RenderPipelineTypes.BuiltinRenderPipeline:
return new GltfMaterialDescriptorGenerator();
return new BuiltInGltfMaterialDescriptorGenerator();
case RenderPipelineTypes.UniversalRenderPipeline:
return new GltfUrpMaterialDescriptorGenerator();
return new UrpGltfMaterialDescriptorGenerator();
default:
throw new System.NotImplementedException();

2
Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterEditor.cs
View File

@@ -30,7 +30,7 @@ namespace UniGLTF
}
m_data = new AutoGltfFileParser(m_importer.assetPath).Parse();
var materialGenerator = new GltfMaterialDescriptorGenerator();
var materialGenerator = new BuiltInGltfMaterialDescriptorGenerator();
var materialKeys = m_data.GLTF.materials.Select((_, i) => materialGenerator.Get(m_data, i).SubAssetKey);
var textureKeys = new GltfTextureDescriptorGenerator(m_data).Get().GetEnumerable().Select(x => x.SubAssetKey);
m_materialEditor = new RemapEditorMaterial(materialKeys.Concat(textureKeys), GetEditorMap, SetEditorMap);

2
Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ZipArchivedGltfScriptedImporterEditor.cs
View File

@@ -26,7 +26,7 @@ namespace UniGLTF
m_importer = target as ZipArchivedGltfScriptedImporter;
m_data = new AutoGltfFileParser(m_importer.assetPath).Parse();
var materialGenerator = new GltfMaterialDescriptorGenerator();
var materialGenerator = new BuiltInGltfMaterialDescriptorGenerator();
var materialKeys = m_data.GLTF.materials.Select((_, i) => materialGenerator.Get(m_data, i).SubAssetKey);
var textureKeys = new GltfTextureDescriptorGenerator(m_data).Get().GetEnumerable().Select(x => x.SubAssetKey);
m_materialEditor = new RemapEditorMaterial(materialKeys.Concat(textureKeys), GetEditorMap, SetEditorMap);

2
Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs
View File

@@ -38,7 +38,7 @@ namespace UniGLTF
{
Data = data;
TextureDescriptorGenerator = new GltfTextureDescriptorGenerator(Data);
MaterialDescriptorGenerator = materialGenerator ?? new GltfMaterialDescriptorGenerator();
MaterialDescriptorGenerator = materialGenerator ?? new BuiltInGltfMaterialDescriptorGenerator();
ExternalObjectMap = externalObjectMap ?? new Dictionary<SubAssetKey, UnityEngine.Object>();
textureDeserializer = textureDeserializer ?? new UnityTextureDeserializer();

20
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/GltfMaterialDescriptorGenerator.cs → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/BuiltInGltfMaterialDescriptorGenerator.cs
View File

@@ -9,12 +9,12 @@ namespace UniGLTF
/// <summary>
/// GLTF の MaterialImporter
/// </summary>
public sealed class GltfMaterialDescriptorGenerator : IMaterialDescriptorGenerator
public sealed class BuiltInGltfMaterialDescriptorGenerator : IMaterialDescriptorGenerator
{
public MaterialDescriptor Get(GltfData data, int i)
{
if (GltfUnlitMaterialImporter.TryCreateParam(data, i, out var param)) return param;
if (GltfPbrMaterialImporter.TryCreateParam(data, i, out param)) return param;
if (BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out var param)) return param;
if (BuiltInGltfPbrMaterialImporter.TryCreateParam(data, i, out param)) return param;
// fallback
if (Symbols.VRM_DEVELOP)
{
@@ -22,24 +22,14 @@ namespace UniGLTF
}
return new MaterialDescriptor(
GetMaterialName(i, null),
GltfPbrMaterialImporter.ShaderName,
GltfMaterialImportUtils.ImportMaterialName(i, null),
BuiltInGltfPbrMaterialImporter.ShaderName,
null,
new Dictionary<string, TextureDescriptor>(),
new Dictionary<string, float>(),
new Dictionary<string, Color>(),
new Dictionary<string, Vector4>(),
new Action<Material>[]{});
}
public static string GetMaterialName(int index, glTFMaterial src)
{
if (src != null && !string.IsNullOrEmpty(src.name))
{
return src.name;
}
return $"material_{index:00}";
}
}
}

0
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/GltfMaterialDescriptorGenerator.cs.meta → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/BuiltInGltfMaterialDescriptorGenerator.cs.meta
View File

4
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/GltfPbrMaterialImporter.cs → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfPbrMaterialImporter.cs
View File

@@ -39,7 +39,7 @@ namespace UniGLTF
/// _ZWrite
///
/// </summary>
public static class GltfPbrMaterialImporter
public static class BuiltInGltfPbrMaterialImporter
{
private static readonly int SrcBlend = Shader.PropertyToID("_SrcBlend");
private static readonly int DstBlend = Shader.PropertyToID("_DstBlend");
@@ -206,7 +206,7 @@ namespace UniGLTF
});
matDesc = new MaterialDescriptor(
GltfMaterialDescriptorGenerator.GetMaterialName(i, src),
GltfMaterialImportUtils.ImportMaterialName(i, src),
ShaderName,
null,
textureSlots,

0
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/GltfPbrMaterialImporter.cs.meta → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfPbrMaterialImporter.cs.meta
View File

4
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/GltfUnlitMaterialImporter.cs → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfUnlitMaterialImporter.cs
View File

@@ -7,7 +7,7 @@ using ColorSpace = VRMShaders.ColorSpace;
namespace UniGLTF
{
public static class GltfUnlitMaterialImporter
public static class BuiltInGltfUnlitMaterialImporter
{
private static readonly int Cutoff = Shader.PropertyToID("_Cutoff");
@@ -50,7 +50,7 @@ namespace UniGLTF
}
matDesc = new MaterialDescriptor(
GltfMaterialDescriptorGenerator.GetMaterialName(i, src),
GltfMaterialImportUtils.ImportMaterialName(i, src),
UniUnlitUtil.ShaderName,
null,
textureSlots,

0
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/GltfUnlitMaterialImporter.cs.meta → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfUnlitMaterialImporter.cs.meta
View File

9
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfMaterialImportUtils.cs
View File

@@ -5,6 +5,15 @@ namespace UniGLTF
{
public static class GltfMaterialImportUtils
{
public static string ImportMaterialName(int index, glTFMaterial src)
{
if (src != null && !string.IsNullOrEmpty(src.name))
{
return src.name;
}
return $"material_{index:00}";
}
public static Color? ImportLinearEmissiveFactorFromMaterial(GltfData data, glTFMaterial src)
{
if (src.emissiveFactor == null || src.emissiveFactor.Length != 3) return null;

4
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/GltfPbrURPMaterialImporter.cs → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfPbrMaterialImporter.cs
View File

@@ -11,7 +11,7 @@ namespace UniGLTF
///
/// see: https://github.com/Unity-Technologies/Graphics/blob/v7.5.3/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineMaterialUpgrader.cs#L354-L379
/// </summary>
public static class GltfPbrUrpMaterialImporter
public static class UrpGltfPbrMaterialImporter
{
private static readonly int SrcBlend = Shader.PropertyToID("_SrcBlend");
private static readonly int DstBlend = Shader.PropertyToID("_DstBlend");
@@ -181,7 +181,7 @@ namespace UniGLTF
});
matDesc = new MaterialDescriptor(
GltfMaterialDescriptorGenerator.GetMaterialName(i, src),
GltfMaterialImportUtils.ImportMaterialName(i, src),
ShaderName,
null,
textureSlots,

0
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/GltfPbrURPMaterialImporter.cs.meta → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfPbrMaterialImporter.cs.meta
View File

21
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/GltfURPMaterialDescriptorGenerator.cs → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/UrpGltfMaterialDescriptorGenerator.cs
View File

@@ -10,12 +10,12 @@ namespace UniGLTF
/// <summary>
/// GLTF の MaterialImporter
/// </summary>
public sealed class GltfUrpMaterialDescriptorGenerator : IMaterialDescriptorGenerator
public sealed class UrpGltfMaterialDescriptorGenerator : IMaterialDescriptorGenerator
{
public MaterialDescriptor Get(GltfData data, int i)
{
if (GltfUnlitMaterialImporter.TryCreateParam(data, i, out var param)) return param;
if (GltfPbrUrpMaterialImporter.TryCreateParam(data, i, out param)) return param;
if (BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out var param)) return param;
if (UrpGltfPbrMaterialImporter.TryCreateParam(data, i, out param)) return param;
// fallback
if (Symbols.VRM_DEVELOP)
{
@@ -23,25 +23,14 @@ namespace UniGLTF
}
return new MaterialDescriptor(
GetMaterialName(i, null),
GltfPbrMaterialImporter.ShaderName,
GltfMaterialImportUtils.ImportMaterialName(i, null),
BuiltInGltfPbrMaterialImporter.ShaderName,
null,
new Dictionary<string, TextureDescriptor>(),
new Dictionary<string, float>(),
new Dictionary<string, Color>(),
new Dictionary<string, Vector4>(),
new Collection<Action<Material>>());
}
public static string GetMaterialName(int index, glTFMaterial src)
{
if (src != null && !string.IsNullOrEmpty(src.name))
{
return src.name;
}
return $"material_{index:00}";
}
}
}

0
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/GltfURPMaterialDescriptorGenerator.cs.meta → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/UrpGltfMaterialDescriptorGenerator.cs.meta
View File

2
Assets/UniGLTF/Tests/UniGLTF/GltfLoadTests.cs
View File

@@ -226,7 +226,7 @@ namespace UniGLTF
var path = Path.Combine(root.FullName, "DamagedHelmet/glTF-Binary/DamagedHelmet.glb");
using (var data = new AutoGltfFileParser(path).Parse())
{
var matDesc = new GltfMaterialDescriptorGenerator().Get(data, 0);
var matDesc = new BuiltInGltfMaterialDescriptorGenerator().Get(data, 0);
Assert.AreEqual("Standard", matDesc.ShaderName);
Assert.AreEqual(5, matDesc.TextureSlots.Count);
var (key, value) = matDesc.EnumerateSubAssetKeyValue().First();

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

@@ -109,7 +109,7 @@ namespace VRM
// extract converted textures
//
var subAssets = m_context.TextureFactory.ConvertedTextures;
var vrmTextures = new VRMMaterialDescriptorGenerator(m_context.VRM);
var vrmTextures = new BuiltInVrmMaterialDescriptorGenerator(m_context.VRM);
var dirName = $"{m_prefabPath.FileNameWithoutExtension}.Textures";
TextureExtractor.ExtractTextures(m_context.Data, m_prefabPath.Parent.Child(dirName), m_context.TextureDescriptorGenerator, subAssets, (_x, _y) => { }, onTextureReloaded);
}

21
Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/VRMMaterialDescriptorGenerator.cs → Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/BuiltInVrmMaterialDescriptorGenerator.cs
View File

@@ -6,36 +6,37 @@ using VRMShaders;
namespace VRM
{
public sealed class VRMMaterialDescriptorGenerator : IMaterialDescriptorGenerator
public sealed class BuiltInVrmMaterialDescriptorGenerator : IMaterialDescriptorGenerator
{
readonly glTF_VRM_extensions m_vrm;
public VRMMaterialDescriptorGenerator(glTF_VRM_extensions vrm)
private readonly glTF_VRM_extensions _vrm;
public BuiltInVrmMaterialDescriptorGenerator(glTF_VRM_extensions vrm)
{
m_vrm = vrm;
_vrm = vrm;
}
public MaterialDescriptor Get(GltfData data, int i)
{
// legacy "VRM/UnlitTransparentZWrite"
if (VRMUnlitTransparentZWriteMaterialImporter.TryCreateParam(data, m_vrm, i, out var matDesc))
if (BuiltInVrmUnlitTransparentZWriteMaterialImporter.TryCreateParam(data, _vrm, i, out var matDesc))
{
return matDesc;
}
// mtoon
if (VRMMToonMaterialImporter.TryCreateParam(data, m_vrm, i, out matDesc))
if (BuiltInVrmMToonMaterialImporter.TryCreateParam(data, _vrm, i, out matDesc))
{
return matDesc;
}
// unlit
if (GltfUnlitMaterialImporter.TryCreateParam(data, i, out matDesc))
if (BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out matDesc))
{
return matDesc;
}
// pbr
if (GltfPbrMaterialImporter.TryCreateParam(data, i, out matDesc))
if (BuiltInGltfPbrMaterialImporter.TryCreateParam(data, i, out matDesc))
{
return matDesc;
}
@@ -43,8 +44,8 @@ namespace VRM
// fallback
Debug.LogWarning($"fallback");
return new MaterialDescriptor(
GltfMaterialDescriptorGenerator.GetMaterialName(i, null),
GltfPbrMaterialImporter.ShaderName,
GltfMaterialImportUtils.ImportMaterialName(i, null),
BuiltInGltfPbrMaterialImporter.ShaderName,
null,
new Dictionary<string, TextureDescriptor>(),
new Dictionary<string, float>(),

0
Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/VRMMaterialDescriptorGenerator.cs.meta → Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/BuiltInVrmMaterialDescriptorGenerator.cs.meta
View File

5
Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/VRMMToonMaterialImporter.cs → Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmMToonMaterialImporter.cs
View File

@@ -7,9 +7,10 @@ using VRMShaders;
namespace VRM
{
public static class VRMMToonMaterialImporter
public static class BuiltInVrmMToonMaterialImporter
{
static string[] MToonTextureSlots = new string[]{
private static readonly string[] MToonTextureSlots = new string[]
{
"_MainTex",
"_ShadeTexture",
"_BumpMap",

0
Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/VRMMToonMaterialImporter.cs.meta → Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmMToonMaterialImporter.cs.meta
View File

2
Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/VRMUnlitTransparentZWriteMaterialImporter.cs → Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmUnlitTransparentZWriteMaterialImporter.cs
View File

@@ -9,7 +9,7 @@ using RenderMode = MToon.RenderMode;
namespace VRM
{
public static class VRMUnlitTransparentZWriteMaterialImporter
public static class BuiltInVrmUnlitTransparentZWriteMaterialImporter
{
public const string UnlitTransparentZWriteShaderName = "VRM/UnlitTransparentZWrite";
public const string UnlitTransparentZWriteMainTexturePropName = "_MainTex";

0
Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/VRMUnlitTransparentZWriteMaterialImporter.cs.meta → Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInVrmUnlitTransparentZWriteMaterialImporter.cs.meta
View File

17
Assets/VRM/Runtime/IO/MaterialIO/URP/Import/VRMURPMaterialDescriptorGenerator.cs → Assets/VRM/Runtime/IO/MaterialIO/URP/Import/UrpVrmMaterialDescriptorGenerator.cs
View File

@@ -6,29 +6,30 @@ using VRMShaders;
namespace VRM
{
public sealed class VRMUrpMaterialDescriptorGenerator : IMaterialDescriptorGenerator
public sealed class UrpVrmMaterialDescriptorGenerator : IMaterialDescriptorGenerator
{
readonly glTF_VRM_extensions m_vrm;
public VRMUrpMaterialDescriptorGenerator(glTF_VRM_extensions vrm)
private readonly glTF_VRM_extensions _vrm;
public UrpVrmMaterialDescriptorGenerator(glTF_VRM_extensions vrm)
{
m_vrm = vrm;
_vrm = vrm;
}
public MaterialDescriptor Get(GltfData data, int i)
{
// mtoon URP "MToon" shader is not ready. import fallback to unlit
// unlit "UniUnlit" work in URP
if (GltfUnlitMaterialImporter.TryCreateParam(data, i, out var matDesc)) return matDesc;
if (BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out var matDesc)) return matDesc;
// pbr "Standard" to "Universal Render Pipeline/Lit"
if (GltfPbrUrpMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc;
if (UrpGltfPbrMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc;
// fallback
if (Symbols.VRM_DEVELOP)
{
Debug.LogWarning($"material: {i} out of range. fallback");
}
return new MaterialDescriptor(
GltfMaterialDescriptorGenerator.GetMaterialName(i, null),
GltfPbrMaterialImporter.ShaderName,
GltfMaterialImportUtils.ImportMaterialName(i, null),
BuiltInGltfPbrMaterialImporter.ShaderName,
null,
new Dictionary<string, TextureDescriptor>(),
new Dictionary<string, float>(),

0
Assets/VRM/Runtime/IO/MaterialIO/URP/Import/VRMURPMaterialDescriptorGenerator.cs.meta → Assets/VRM/Runtime/IO/MaterialIO/URP/Import/UrpVrmMaterialDescriptorGenerator.cs.meta
View File

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

@@ -27,7 +27,7 @@ namespace VRM
ITextureDeserializer textureDeserializer = null,
IMaterialDescriptorGenerator materialGenerator = null,
bool loadAnimation = false)
: base(data.Data, externalObjectMap, textureDeserializer, materialGenerator ?? new VRMMaterialDescriptorGenerator(data.VrmExtension))
: base(data.Data, externalObjectMap, textureDeserializer, materialGenerator ?? new BuiltInVrmMaterialDescriptorGenerator(data.VrmExtension))
{
_data = data;
TextureDescriptorGenerator = new VrmTextureDescriptorGenerator(Data, VRM);

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

@@ -31,7 +31,7 @@ namespace VRM
var vrmMaterial = BuiltInVrmExtensionMaterialPropertyExporter.ExportMaterial(srcMaterial, textureExporter);
Assert.AreEqual(vrmMaterial.vectorProperties["_MainTex"], new float[] { 0.3f, 0.2f, 0.5f, 0.6f });
var materialImporter = new VRMMaterialDescriptorGenerator(new glTF_VRM_extensions
var materialImporter = new BuiltInVrmMaterialDescriptorGenerator(new glTF_VRM_extensions
{
materialProperties = new System.Collections.Generic.List<glTF_VRM_Material> { vrmMaterial }
});
@@ -51,7 +51,7 @@ namespace VRM
var importer = new VRMImporterContext(vrm, null);
Assert.AreEqual(73, vrm.Data.GLTF.materials.Count);
Assert.True(VRMMToonMaterialImporter.TryCreateParam(vrm.Data, importer.VRM, 0, out MaterialDescriptor matDesc));
Assert.True(BuiltInVrmMToonMaterialImporter.TryCreateParam(vrm.Data, importer.VRM, 0, out MaterialDescriptor matDesc));
}
}
@@ -71,7 +71,7 @@ namespace VRM
using (var data = new GlbFileParser(path).Parse())
{
var vrmImporter = new VRMImporterContext(new VRMData(data), null);
var materialParam = new VRMMaterialDescriptorGenerator(vrmImporter.VRM).Get(data, 0);
var materialParam = new BuiltInVrmMaterialDescriptorGenerator(vrmImporter.VRM).Get(data, 0);
Assert.AreEqual("VRM/MToon", materialParam.ShaderName);
Assert.AreEqual("Alicia_body", materialParam.TextureSlots["_MainTex"].UnityObjectName);

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

@@ -141,7 +141,7 @@ namespace VRM
};
// 2系統ある？
Assert.IsTrue(VRMMToonMaterialImporter.TryCreateParam(data, vrm, 0, out VRMShaders.MaterialDescriptor matDesc));
Assert.IsTrue(BuiltInVrmMToonMaterialImporter.TryCreateParam(data, vrm, 0, out VRMShaders.MaterialDescriptor matDesc));
Assert.AreEqual(1, matDesc.TextureSlots.Count);
var items = new VrmTextureDescriptorGenerator(data, vrm).Get().GetEnumerable().ToArray();

2
Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporter.cs
View File

@@ -26,7 +26,7 @@ namespace UniVRM10
{
if (RenderPipeline == UniGLTF.RenderPipelineTypes.UniversalRenderPipeline)
{
if (Shader.Find(UniGLTF.GltfPbrUrpMaterialImporter.ShaderName) == null)
if (Shader.Find(UniGLTF.UrpGltfPbrMaterialImporter.ShaderName) == null)
{
Debug.LogWarning("URP is not installed. Force to BuiltinRenderPipeline");
RenderPipeline = UniGLTF.RenderPipelineTypes.BuiltinRenderPipeline;

2
Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs
View File

@@ -72,7 +72,7 @@ namespace UniVRM10
var tmp = m_importer.GetExternalObjectMap();
var generator = new Vrm10MaterialDescriptorGenerator();
var generator = new BuiltInVrm10MaterialDescriptorGenerator();
var materialKeys = m_result.Data.GLTF.materials.Select((x, i) => generator.Get(m_result.Data, i).SubAssetKey);
var textureKeys = new Vrm10TextureDescriptorGenerator(m_result.Data).Get().GetEnumerable().Select(x => x.SubAssetKey);
m_materialEditor = new RemapEditorMaterial(materialKeys.Concat(textureKeys), GetEditorMap, SetEditorMap);

4
Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs
View File

@@ -19,10 +19,10 @@ namespace UniVRM10
switch (renderPipeline)
{
case RenderPipelineTypes.BuiltinRenderPipeline:
return new Vrm10MaterialDescriptorGenerator();
return new BuiltInVrm10MaterialDescriptorGenerator();
case RenderPipelineTypes.UniversalRenderPipeline:
return new Vrm10UrpMaterialDescriptorGenerator();
return new UrpVrm10MaterialDescriptorGenerator();
default:
throw new NotImplementedException();

10
Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Vrm10MaterialDescriptorGenerator.cs → Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/BuiltInVrm10MaterialDescriptorGenerator.cs
View File

@@ -6,23 +6,23 @@ using VRMShaders;
namespace UniVRM10
{
public sealed class Vrm10MaterialDescriptorGenerator : IMaterialDescriptorGenerator
public sealed class BuiltInVrm10MaterialDescriptorGenerator : IMaterialDescriptorGenerator
{
public MaterialDescriptor Get(GltfData data, int i)
{
// mtoon
if (Vrm10MToonMaterialImporter.TryCreateParam(data, i, out MaterialDescriptor matDesc)) return matDesc;
if (BuiltInVrm10MToonMaterialImporter.TryCreateParam(data, i, out MaterialDescriptor matDesc)) return matDesc;
// unlit
if (GltfUnlitMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc;
if (BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc;
// pbr
if (GltfPbrMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc;
if (BuiltInGltfPbrMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc;
// fallback
if (Symbols.VRM_DEVELOP)
{
Debug.LogWarning($"material: {i} out of range. fallback");
}
return new MaterialDescriptor(
GltfMaterialDescriptorGenerator.GetMaterialName(i, null), GltfPbrMaterialImporter.ShaderName,
GltfMaterialImportUtils.ImportMaterialName(i, null), BuiltInGltfPbrMaterialImporter.ShaderName,
null,
new Dictionary<string, TextureDescriptor>(),
new Dictionary<string, float>(),

0
Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Vrm10MaterialDescriptorGenerator.cs.meta → Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/BuiltInVrm10MaterialDescriptorGenerator.cs.meta
View File

2
Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/Vrm10MToonMaterialImporter.cs → Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/BuiltInVrm10MToonMaterialImporter.cs
View File

@@ -14,7 +14,7 @@ namespace UniVRM10
/// <summary>
/// Convert MToon parameters from glTF specification to Unity implementation.
/// </summary>
public static class Vrm10MToonMaterialImporter
public static class BuiltInVrm10MToonMaterialImporter
{
/// <summary>
/// VMRC_materials_mtoon の場合にマテリアル生成情報を作成する

0
Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/Vrm10MToonMaterialImporter.cs.meta → Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Materials/BuiltInVrm10MToonMaterialImporter.cs.meta
View File

10
Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10UrpMaterialDescriptorGenerator.cs → Assets/VRM10/Runtime/IO/Material/URP/Import/UrpVrm10MaterialDescriptorGenerator.cs
View File

@@ -6,19 +6,19 @@ using VRMShaders;
namespace UniVRM10
{
public sealed class Vrm10UrpMaterialDescriptorGenerator : IMaterialDescriptorGenerator
public sealed class UrpVrm10MaterialDescriptorGenerator : IMaterialDescriptorGenerator
{
public MaterialDescriptor Get(GltfData data, int i)
{
// unlit
if (GltfUnlitMaterialImporter.TryCreateParam(data, i, out MaterialDescriptor matDesc)) return matDesc;
if (BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out MaterialDescriptor matDesc)) return matDesc;
// pbr
if (GltfPbrUrpMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc;
if (UrpGltfPbrMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc;
// fallback
Debug.LogWarning($"material: {i} out of range. fallback");
return new MaterialDescriptor(
GltfMaterialDescriptorGenerator.GetMaterialName(i, null),
GltfPbrMaterialImporter.ShaderName,
GltfMaterialImportUtils.ImportMaterialName(i, null),
BuiltInGltfPbrMaterialImporter.ShaderName,
null,
new Dictionary<string, TextureDescriptor>(),
new Dictionary<string, float>(),

0
Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10UrpMaterialDescriptorGenerator.cs.meta → Assets/VRM10/Runtime/IO/Material/URP/Import/UrpVrm10MaterialDescriptorGenerator.cs.meta
View File

0
Assets/VRM10/Runtime/IO/Material/BuiltInRP/Export/Vrm10MaterialExportUtils.cs → Assets/VRM10/Runtime/IO/Material/Vrm10MaterialExportUtils.cs
View File

0
Assets/VRM10/Runtime/IO/Material/BuiltInRP/Export/Vrm10MaterialExportUtils.cs.meta → Assets/VRM10/Runtime/IO/Material/Vrm10MaterialExportUtils.cs.meta
View File

2
Assets/VRM10/Runtime/IO/Vrm10Importer.cs
View File

@@ -42,7 +42,7 @@ namespace UniVRM10
m_controlRigGenerationOption = controlRigGenerationOption;
TextureDescriptorGenerator = new Vrm10TextureDescriptorGenerator(Data);
MaterialDescriptorGenerator = materialGenerator ?? new Vrm10MaterialDescriptorGenerator();
MaterialDescriptorGenerator = materialGenerator ?? new BuiltInVrm10MaterialDescriptorGenerator();
m_externalMap = externalObjectMap;
if (m_externalMap == null)

2
Assets/VRM10/Tests/MaterialImportTests.cs
View File

@@ -25,7 +25,7 @@ namespace UniVRM10
using (var data = new GlbLowLevelParser(AliciaPath, migratedBytes).Parse())
{
var matDesc = new Vrm10MaterialDescriptorGenerator().Get(data, 0);
var matDesc = new BuiltInVrm10MaterialDescriptorGenerator().Get(data, 0);
Assert.AreEqual("Alicia_body", matDesc.Name);
Assert.AreEqual("VRM10/MToon10", matDesc.ShaderName);
Assert.AreEqual("Alicia_body", matDesc.TextureSlots["_MainTex"].UnityObjectName);

8
Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs
View File

@@ -297,11 +297,11 @@ namespace UniVRM10.VRM10Viewer
{
if (useUrp)
{
return new Vrm10UrpMaterialDescriptorGenerator();
return new UrpVrm10MaterialDescriptorGenerator();
}
else
{
return new Vrm10MaterialDescriptorGenerator();
return new BuiltInVrm10MaterialDescriptorGenerator();
}
}
@@ -309,11 +309,11 @@ namespace UniVRM10.VRM10Viewer
{
if (useUrp)
{
return new GltfUrpMaterialDescriptorGenerator();
return new UrpGltfMaterialDescriptorGenerator();
}
else
{
return new GltfMaterialDescriptorGenerator();
return new BuiltInGltfMaterialDescriptorGenerator();
}
}

8
Assets/VRM_Samples/SimpleViewer/ViewerUI.cs
View File

@@ -332,11 +332,11 @@ namespace VRM.SimpleViewer
{
if (useUrp)
{
return new GltfUrpMaterialDescriptorGenerator();
return new UrpGltfMaterialDescriptorGenerator();
}
else
{
return new GltfMaterialDescriptorGenerator();
return new BuiltInGltfMaterialDescriptorGenerator();
}
}
@@ -344,11 +344,11 @@ namespace VRM.SimpleViewer
{
if (useUrp)
{
return new VRM.VRMUrpMaterialDescriptorGenerator(vrm);
return new VRM.UrpVrmMaterialDescriptorGenerator(vrm);
}
else
{
return new VRM.VRMMaterialDescriptorGenerator(vrm);
return new VRM.BuiltInVrmMaterialDescriptorGenerator(vrm);
}
}