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

IMaterialValidator

Browse Source
This commit is contained in:
ousttrue 2021-07-16 15:22:57 +09:00
parent 8266498e2e
commit 51b2c48561
2 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Assets/UniGLTF/Editor/UniGLTF/ExportDialog/MeshExportValidator.cs
View File

@ -1,12 +1,39 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using UniGLTF.M17N;
using UnityEngine;
namespace UniGLTF
{
public interface IMaterialValidator
{
/// <summary>
/// shaderName から glTF マテリアルタイプ を得る
///
/// shaderName が エクスポートできるものでないときは null を返す(gltfデフォルトの pbr として処理される)
/// </summary>
/// <param name="shaderName"></param>
/// <returns></returns>
string GetGltfMaterialTypeFromUnityShaderName(string shaderName);
}
public class DefaultMaterialValidator : IMaterialValidator
{
public virtual string GetGltfMaterialTypeFromUnityShaderName(string shaderName)
{
if (shaderName == "Standard")
{
return "pbr";
}
if (MaterialExporter.IsUnlit(shaderName))
{
return "unlit";
}
return null;
}
}
[Serializable]
public class MeshExportValidator : ScriptableObject
{
@ -33,31 +60,18 @@ namespace UniGLTF
public void SetRoot(GameObject ExportRoot, GltfExportSettings settings, IBlendShapeExportFilter blendShapeFilter)
{
if(ExportRoot==null)
if (ExportRoot == null)
{
return;
}
MeshExportInfo.GetInfo(ExportRoot.transform.Traverse().Skip(1), Meshes, settings);
foreach(var info in Meshes)
foreach (var info in Meshes)
{
info.CalcMeshSize(ExportRoot, info.Renderers[0].Item1, settings, blendShapeFilter);
}
}
public Func<string, string> GltfMaterialFromUnityShaderName = DefaultGltfMaterialType;
public static string DefaultGltfMaterialType(string shaderName)
{
if (shaderName == "Standard")
{
return "pbr";
}
if (MaterialExporter.IsUnlit(shaderName))
{
return "unlit";
}
return null;
}
public IMaterialValidator MaterialValidator = new DefaultMaterialValidator();
public enum Messages
{
@ -99,7 +113,7 @@ namespace UniGLTF
{
continue;
}
var gltfMaterial = GltfMaterialFromUnityShaderName(m.shader.name);
var gltfMaterial = MaterialValidator.GetGltfMaterialTypeFromUnityShaderName(m.shader.name);
if (string.IsNullOrEmpty(gltfMaterial))
{
yield return Validation.Warning($"{m}: unknown shader: {m.shader.name} => export as gltf default");

15
Assets/VRM/Editor/Format/VRMExporterWizard.cs
View File

@ -124,14 +124,17 @@ namespace VRM
m_meshes = null;
}
static string GltfMaterialFromUnityShaderName(string shaderName)
class VRMMaterialValidator : DefaultMaterialValidator
{
var name = VRMMaterialExporter.VrmMaterialName(shaderName);
if (!string.IsNullOrEmpty(name))
public override string GetGltfMaterialTypeFromUnityShaderName(string shaderName)
{
return name;
var name = VRMMaterialExporter.VrmMaterialName(shaderName);
if (!string.IsNullOrEmpty(name))
{
return name;
}
return base.GetGltfMaterialTypeFromUnityShaderName(shaderName);
}
return MeshExportValidator.DefaultGltfMaterialType(shaderName);
}
protected override IEnumerable<Validator> ValidatorFactory()
@ -145,7 +148,7 @@ namespace VRM
}
// Mesh/Renderer のチェック
m_meshes.GltfMaterialFromUnityShaderName = GltfMaterialFromUnityShaderName;
m_meshes.MaterialValidator = new VRMMaterialValidator();
yield return m_meshes.Validate;
// Humanoid のチェック