Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-12 13:59:21 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

PreShaderPropExporter は既に VRM/MToon 専用

Browse Source
This commit is contained in:
ousttrue
2022-06-02 15:12:22 +09:00
parent 61422eb94c
commit ac19e0d135
3 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@ namespace VRM
//
// extensions.VRM.materialProperties に記録する
//
var prop = UniGLTF.ShaderPropExporter.PreShaderPropExporter.GetPropsForSupportedShader(m.shader.name);
var prop = UniGLTF.ShaderPropExporter.PreShaderPropExporter.GetPropsForMToon();
foreach (var kv in prop.Properties)
{
if (kv.ShaderPropertyType == UniGLTF.ShaderPropExporter.ShaderPropertyType.TexEnv)

7
Assets/VRM/Runtime/IO/VRMMaterialExporter.cs
View File

@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using UniGLTF;
using UniGLTF.ShaderPropExporter;
@@ -135,16 +134,16 @@ namespace VRM
renderQueue = m.renderQueue,
};
if (!PreShaderPropExporter.VRMExtensionShaders.Contains(m.shader.name))
if (m.shader.name != MToon.Utils.ShaderName)
{
material.shader = glTF_VRM_Material.VRM_USE_GLTFSHADER;
return material;
}
var prop = PreShaderPropExporter.GetPropsForSupportedShader(m.shader.name);
var prop = PreShaderPropExporter.GetPropsForMToon();
if (prop == null)
{
Debug.LogWarningFormat("Fail to export shader: {0}", m.shader.name);
throw new Exception("arienai");
}
else
{

24
Assets/VRMShaders/VRM/IO/Runtime/PreShaderPropExporter.cs
View File

@@ -25,17 +25,16 @@ namespace UniGLTF.ShaderPropExporter
}
}
/// <summary>
/// 今はMToon専用
/// </summary>
public static partial class PreShaderPropExporter
{
public static readonly string[] VRMExtensionShaders = new string[]
{
"VRM/UnlitTransparentZWrite",
"VRM/MToon"
};
static Dictionary<string, ShaderProps> m_shaderPropMap;
public static ShaderProps GetPropsForSupportedShader(string shaderName)
const string ShaderName = "VRM/MToon";
public static ShaderProps GetPropsForMToon()
{
if (m_shaderPropMap == null)
{
@@ -51,19 +50,12 @@ namespace UniGLTF.ShaderPropExporter
}
ShaderProps props;
if (m_shaderPropMap.TryGetValue(shaderName, out props))
if (m_shaderPropMap.TryGetValue(ShaderName, out props))
{
return props;
}
#if UNITY_EDITOR
// fallback
Debug.LogWarningFormat("{0} is not predefined shader. Use ShaderUtil", shaderName);
var shader = Shader.Find(shaderName);
return ShaderProps.FromShader(shader);
#else
return null;
#endif
throw new Exception("arienai");
}
}
}